Django

Code

Changeset 7361

Show
Ignore:
Timestamp:
03/24/08 23:42:21 (4 months ago)
Author:
adrian
Message:

Edited some docs changes from the past few days

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/conf/global_settings.py

    r7329 r7361  
    288288SESSION_EXPIRE_AT_BROWSER_CLOSE = False                 # Whether sessions expire when a user closes his browser. 
    289289SESSION_ENGINE = 'django.contrib.sessions.backends.db'  # The module to store session data 
    290 SESSION_FILE_PATH = None                                # Directory to store session files if using the file session module. If set to None the backend will use a sensible default. 
     290SESSION_FILE_PATH = None                                # Directory to store session files if using the file session module. If None, the backend will use a sensible default. 
    291291 
    292292######### 

  • django/trunk/docs/i18n.txt

    r7357 r7361  
    826826 
    827827    * Positional interpolation: ``obj`` contains a JavaScript Array object 
    828       whose elements values are then sequentially interpolated in their 
     828      whose elements values are then sequentially interpolated in their 
    829829      corresponding ``fmt`` placeholders in the same order they appear. 
    830830      For example:: 
    …… 
    833833                'There are %s objects. Remaining: %s', 11); 
    834834        s = interpolate(fmts, [11, 20]); 
    835        // s is 'There are 11 objects. Remaining: 20' 
     835        // s is 'There are 11 objects. Remaining: 20' 
    836836 
    837837    * Named interpolation: This mode is selected by passing the optional 
    …… 
    845845 
    846846        fmts = ngettext('Total: %(total)s, there is %(count)s object', 
    847            'there are %(count)s of a total of %(total)s objects', d.count); 
     847        'there are %(count)s of a total of %(total)s objects', d.count); 
    848848        s = interpolate(fmts, d, true); 
    849849 

  • django/trunk/docs/install.txt

    r7314 r7361  
    173173    you'll want to pay close attention to `the development timeline`_, 
    174174    and you'll want to keep an eye on `the list of 
    175     backwards-incompatible changes`_; this will help you stay on top 
     175    backwards-incompatible changes`_. This will help you stay on top 
    176176    of any new features you might want to use, as well as any changes 
    177     you'll need to make to your code when updating your copy of Django 
    178     (for stable releases, any necessary changes are documented in the 
    179     release notes). 
     177    you'll need to make to your code when updating your copy of Django. 
     178    (For stable releases, any necessary changes are documented in the 
     179    release notes.) 
    180180 
    181181.. _the development timeline: http://code.djangoproject.com/timeline 

  • django/trunk/docs/modelforms.txt

    r7305 r7361  
    237237``is_multipart()`` method is used to determine whether a form requires 
    238238multipart file upload (and hence whether ``request.FILES`` must be 
    239 passed to the form), etc.; see `the standard newforms documentation`_ 
     239passed to the form), etc. See `the standard newforms documentation`_ 
    240240for more information. 
    241241 

  • django/trunk/docs/request_response.txt

    r7334 r7361  
    144144``urlconf`` 
    145145    Not defined by Django itself, but will be read if other code 
    146     (e.g., a custom middleware class) sets it; when present, this will 
    147     be used as the root URLConf for the current request, overriding 
     146    (e.g., a custom middleware class) sets it. When present, this will 
     147    be used as the root URLconf for the current request, overriding 
    148148    the ``ROOT_URLCONF`` setting. See `How Django processes a 
    149149    request`_ for details. 
    150150 
    151151.. _How Django processes a request: ../url_dispatch/#how-django-processes-a-request 
    152  
    153152 
    154153Methods 
    …… 
    203202   **New in Django development version** 
    204203 
    205    Returns ``True`` if the request was made via an XMLHttpRequest by checking 
    206    the ``HTTP_X_REQUESTED_WITH`` header for the string *'XMLHttpRequest'*. The 
    207    following major Javascript libraries all send this header: 
    208  
    209    * jQuery 
    210    * Dojo 
    211    * MochiKit 
    212    * MooTools 
    213    * Prototype 
    214    * YUI 
    215  
    216    If you write your own XMLHttpRequest call (on the browser side), you will 
    217    have to set this header manually to use this method. 
     204   Returns ``True`` if the request was made via an ``XMLHttpRequest``, by checking 
     205   the ``HTTP_X_REQUESTED_WITH`` header for the string ``'XMLHttpRequest'``. The 
     206   following major JavaScript libraries all send this header: 
     207 
     208       * jQuery 
     209       * Dojo 
     210       * MochiKit 
     211       * MooTools 
     212       * Prototype 
     213       * YUI 
     214 
     215   If you write your own XMLHttpRequest call (on the browser side), you'll 
     216   have to set this header manually if you want ``is_ajax()`` to work. 
    218217 
    219218QueryDict objects 

  • django/trunk/docs/syndication_feeds.txt

    r7328 r7361  
    251251      ``ObjectDoesNotExist`` exception will be raised, so ``/rss/beats/`` will 
    252252      generate a 404 page. But you can handle this case however you like.  For 
    253       example you could generate a combined feed for all beats. 
     253      example, you could generate a combined feed for all beats. 
    254254 
    255255    * To generate the feed's ``<title>``, ``<link>`` and ``<description>``, 

  • django/trunk/docs/tutorial04.txt

    r7315 r7361  
    4040     
    4141    * ``forloop.counter`` indicates how many times the ``for`` tag has 
    42       gone through its loop; for more information, see `the 
     42      gone through its loop. For more information, see `the 
    4343      documentation for the "for" tag`_. 
    4444 

  • django/trunk/docs/url_dispatch.txt

    r7303 r7361  
    3333algorithm the system follows to determine which Python code to execute: 
    3434 
    35     1. Django determines the root URLConf module to use; ordinarily 
     35    1. Django determines the root URLconf module to use. Ordinarily, 
    3636       this is the value of the ``ROOT_URLCONF`` setting in your 
    3737       `settings file`_, but if the incoming ``HttpRequest`` object