Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Cleanup of typos, links, etc. in timezone docs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 14ba0df3d0b14bd7ecc5fbe099ea11864718b492 1 parent 6fcbe90
authored December 23, 2011

Showing 1 changed file with 10 additions and 10 deletions. Show diff stats Hide diff stats

  1. 20  docs/topics/i18n/timezones.txt
20  docs/topics/i18n/timezones.txt
@@ -22,10 +22,10 @@ store data in UTC in your database. Here is why.
22 22
 Many countries have a system of daylight saving time (DST), where clocks are
23 23
 moved forwards in spring and backwards in autumn. If you're working in local
24 24
 time, you're likely to encounter errors twice a year, when the transitions
25  
-happen. pytz' docs discuss `these issues`_ in greater detail. It probably
26  
-doesn't matter for your blog, but it's more annoying if you over-bill or
27  
-under-bill your customers by one hour, twice a year, every year. The solution
28  
-to this problem is to use UTC in the code and local time only when
  25
+happen. The pytz_ documentation discusses `these issues`_ in greater detail.
  26
+It probably doesn't matter for your blog, but it's more annoying if you
  27
+over-bill or under-bill your customers by one hour, twice a year, every year.
  28
+The solution to this problem is to use UTC in the code and local time only when
29 29
 interacting with end users.
30 30
 
31 31
 Time zone support is disabled by default. To enable it, set :setting:`USE_TZ =
@@ -201,7 +201,7 @@ Create a view that can set the current timezone::
201 201
         else:
202 202
             return render(request, 'template.html', {'timezones': pytz.common_timezones})
203 203
 
204  
-Include in :file:`template.html` a form that will ``POST`` to this view:
  204
+Include a form in ``template.html`` that will ``POST`` to this view:
205 205
 
206 206
 .. code-block:: html+django
207 207
 
@@ -247,7 +247,7 @@ in templates. This behaves very much like :doc:`format localization
247 247
 
248 248
 Conversion to local time isn't always appropriate -- you may be generating
249 249
 output for computers rather than for humans. The following filters and tags,
250  
-provided the ``tz`` template library, allow you to control the time zone
  250
+provided by the ``tz`` template tag library, allow you to control the time zone
251 251
 conversions.
252 252
 
253 253
 Template tags
@@ -305,8 +305,8 @@ time zone is unset, the default time zone applies.
305 305
 .. note::
306 306
 
307 307
     In the second block, ``None`` resolves to the Python object ``None``
308  
-    because isn't defined in the template context, not because it's the string
309  
-    ``None``.
  308
+    because it isn't defined in the template context, not because it's the
  309
+    string ``None``.
310 310
 
311 311
 .. templatetag:: get_current_timezone
312 312
 
@@ -418,7 +418,7 @@ with an aware datetime. Since Django now gives you aware datetimes, you'll get
418 418
 exceptions wherever you compare a datetime that comes from a model or a form
419 419
 with a naive datetime that you've created in your code.
420 420
 
421  
-So the second step is to refactor your code wherever you instanciate datetime
  421
+So the second step is to refactor your code wherever you instantiate datetime
422 422
 objects to make them aware. This can be done incrementally.
423 423
 :mod:`django.utils.timezone` defines some handy helpers for compatibility
424 424
 code: :func:`~django.utils.timezone.now`,
@@ -430,7 +430,7 @@ code: :func:`~django.utils.timezone.now`,
430 430
 Finally, in order to help you locate code that needs upgrading, Django raises
431 431
 a warning when you attempt to save a naive datetime to the database. During
432 432
 development, you can turn such warnings into exceptions and get a traceback
433  
-by adding to your settings file::
  433
+by adding the following to your settings file::
434 434
 
435 435
     import warnings
436 436
     warnings.filterwarnings(

0 notes on commit 14ba0df

Please sign in to comment.
Something went wrong with that request. Please try again.