Commit 0e552e5c authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Edited some docs changes from the past few days

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7361 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 23912ebb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ SESSION_COOKIE_PATH = '/' # The path of the sessio
SESSION_SAVE_EVERY_REQUEST = False                      # Whether to save the session data on every request.
SESSION_EXPIRE_AT_BROWSER_CLOSE = False                 # Whether sessions expire when a user closes his browser.
SESSION_ENGINE = 'django.contrib.sessions.backends.db'  # The module to store session data
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.
SESSION_FILE_PATH = None                                # Directory to store session files if using the file session module. If None, the backend will use a sensible default.

#########
# CACHE #
+4 −4
Original line number Diff line number Diff line
@@ -172,11 +172,11 @@ Installing the development version
    If you decide to use the latest development version of Django,
    you'll want to pay close attention to `the development timeline`_,
    and you'll want to keep an eye on `the list of
    backwards-incompatible changes`_; this will help you stay on top
    backwards-incompatible changes`_. This will help you stay on top
    of any new features you might want to use, as well as any changes
    you'll need to make to your code when updating your copy of Django
    (for stable releases, any necessary changes are documented in the
    release notes).
    you'll need to make to your code when updating your copy of Django.
    (For stable releases, any necessary changes are documented in the
    release notes.)

.. _the development timeline: http://code.djangoproject.com/timeline
.. _the list of backwards-incompatible changes: http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ works exactly the same way as any other ``newforms`` form. For
example, the ``is_valid()`` method is used to check for validity, the
``is_multipart()`` method is used to determine whether a form requires
multipart file upload (and hence whether ``request.FILES`` must be
passed to the form), etc.; see `the standard newforms documentation`_
passed to the form), etc. See `the standard newforms documentation`_
for more information.

.. _the standard newforms documentation: ../newforms/
+13 −14
Original line number Diff line number Diff line
@@ -143,14 +143,13 @@ All attributes except ``session`` should be considered read-only.

``urlconf``
    Not defined by Django itself, but will be read if other code
    (e.g., a custom middleware class) sets it; when present, this will
    be used as the root URLConf for the current request, overriding
    (e.g., a custom middleware class) sets it. When present, this will
    be used as the root URLconf for the current request, overriding
    the ``ROOT_URLCONF`` setting. See `How Django processes a
    request`_ for details.

.. _How Django processes a request: ../url_dispatch/#how-django-processes-a-request


Methods
-------

@@ -202,9 +201,9 @@ Methods
``is_ajax()``
   **New in Django development version**

   Returns ``True`` if the request was made via an XMLHttpRequest by checking
   the ``HTTP_X_REQUESTED_WITH`` header for the string *'XMLHttpRequest'*. The
   following major Javascript libraries all send this header:
   Returns ``True`` if the request was made via an ``XMLHttpRequest``, by checking
   the ``HTTP_X_REQUESTED_WITH`` header for the string ``'XMLHttpRequest'``. The
   following major JavaScript libraries all send this header:

       * jQuery
       * Dojo
@@ -213,8 +212,8 @@ Methods
       * Prototype
       * YUI

   If you write your own XMLHttpRequest call (on the browser side), you will
   have to set this header manually to use this method.
   If you write your own XMLHttpRequest call (on the browser side), you'll
   have to set this header manually if you want ``is_ajax()`` to work.

QueryDict objects
-----------------
+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ request to the URL ``/rss/beats/0613/``:
      will be an empty list. In our example, ``len(bits) != 1`` and an
      ``ObjectDoesNotExist`` exception will be raised, so ``/rss/beats/`` will
      generate a 404 page. But you can handle this case however you like.  For
      example you could generate a combined feed for all beats.
      example, you could generate a combined feed for all beats.

    * To generate the feed's ``<title>``, ``<link>`` and ``<description>``,
      Django uses the ``title()``, ``link()`` and ``description()`` methods. In
Loading