Author: kmtracey
Date: 2008-11-02 14:43:20 -0600 (Sun, 02 Nov 2008)
New Revision: 9330
Modified:
django/trunk/docs/faq/admin.txt
django/trunk/docs/ref/contrib/databrowse.txt
django/trunk/docs/ref/contrib/sites.txt
django/trunk/docs/ref/databases.txt
django/trunk/docs/ref/models/querysets.txt
django/trunk/docs/ref/models/relations.txt
django/trunk/docs/ref/templates/api.txt
django/trunk/docs/topics/auth.txt
django/trunk/docs/topics/http/file-uploads.txt
django/trunk/docs/topics/http/urls.txt
django/trunk/docs/topics/i18n.txt
Log:
Fixed #9497 - Doc typos. Many thanks ramiro.
Modified: django/trunk/docs/faq/admin.txt
===================================================================
--- django/trunk/docs/faq/admin.txt 2008-11-02 04:23:28 UTC (rev 9329)
+++ django/trunk/docs/faq/admin.txt 2008-11-02 20:43:20 UTC (rev 9330)
@@ -31,7 +31,7 @@
How can I prevent the cache middleware from caching the admin site?
-------------------------------------------------------------------
-Set the :setting:``CACHE_MIDDLEWARE_ANONYMOUS_ONLY`` setting to ``True``. See
the
+Set the :setting:`CACHE_MIDDLEWARE_ANONYMOUS_ONLY` setting to ``True``. See the
:ref:`cache documentation <topics-cache>` for more information.
How do I automatically set a field's value to the user who last edited the
object in the admin?
Modified: django/trunk/docs/ref/contrib/databrowse.txt
===================================================================
--- django/trunk/docs/ref/contrib/databrowse.txt 2008-11-02 04:23:28 UTC
(rev 9329)
+++ django/trunk/docs/ref/contrib/databrowse.txt 2008-11-02 20:43:20 UTC
(rev 9330)
@@ -35,7 +35,7 @@
more.
* Otherwise, determine the full filesystem path to the
- `:file:`django/contrib/databrowse/templates` directory, and add that
+ :file:`django/contrib/databrowse/templates` directory, and add that
directory to your :setting:`TEMPLATE_DIRS` setting.
2. Register a number of models with the Databrowse site::
Modified: django/trunk/docs/ref/contrib/sites.txt
===================================================================
--- django/trunk/docs/ref/contrib/sites.txt 2008-11-02 04:23:28 UTC (rev
9329)
+++ django/trunk/docs/ref/contrib/sites.txt 2008-11-02 20:43:20 UTC (rev
9330)
@@ -207,7 +207,7 @@
files for both the LJWorld.com and Lawrence.com template directories. That
gives you more flexibility, but it's also more complex.
-It's a good idea to exploit the :class:`~django.contrib.sites.models.Site``
+It's a good idea to exploit the :class:`~django.contrib.sites.models.Site`
objects as much as possible, to remove unneeded complexity and redundancy.
Getting the current domain for full URLs
Modified: django/trunk/docs/ref/databases.txt
===================================================================
--- django/trunk/docs/ref/databases.txt 2008-11-02 04:23:28 UTC (rev 9329)
+++ django/trunk/docs/ref/databases.txt 2008-11-02 20:43:20 UTC (rev 9330)
@@ -271,11 +271,11 @@
version of ``pysqlite2`` (``pysqlite-2.x.x.win32-py2.5.exe``) that includes
and
uses a newer version of SQLite. Python 2.6 ships with a newer version of
SQLite and is not affected by this issue.
-
-If you are in such platform and find yourself in the need to update
-``pysqlite``/SQLite, you will also need to manually modify the
-``django/db/backends/sqlite3/base.py`` file in the Django source tree so it
-attempts to import ``pysqlite2`` before that ``sqlite3`` and so it can take
+
+If you are in such platform and find yourself in the need to update
+``pysqlite``/SQLite, you will also need to manually modify the
+``django/db/backends/sqlite3/base.py`` file in the Django source tree so it
+attempts to import ``pysqlite2`` before than ``sqlite3`` and so it can take
advantage of the new ``pysqlite2``/SQLite versions.
.. _oracle-notes:
Modified: django/trunk/docs/ref/models/querysets.txt
===================================================================
--- django/trunk/docs/ref/models/querysets.txt 2008-11-02 04:23:28 UTC (rev
9329)
+++ django/trunk/docs/ref/models/querysets.txt 2008-11-02 20:43:20 UTC (rev
9330)
@@ -35,7 +35,7 @@
* **Slicing.** As explained in :ref:`limiting-querysets`, a ``QuerySet``
can
be sliced, using Python's array-slicing syntax. Usually slicing a
- ``QuerySet`` returns another (unevaluated )``QuerySet``, but Django will
+ ``QuerySet`` returns another (unevaluated ) ``QuerySet``, but Django will
execute the database query if you use the "step" parameter of slice
syntax.
@@ -627,7 +627,7 @@
.. versionadded:: 1.0
In some rare cases, you might wish to pass parameters to the SQL fragments
- in ``extra(select=...)```. For this purpose, use the ``select_params``
+ in ``extra(select=...)``. For this purpose, use the ``select_params``
parameter. Since ``select_params`` is a sequence and the ``select``
attribute is a dictionary, some care is required so that the parameters
are matched up correctly with the extra select pieces. In this situation,
Modified: django/trunk/docs/ref/models/relations.txt
===================================================================
--- django/trunk/docs/ref/models/relations.txt 2008-11-02 04:23:28 UTC (rev
9329)
+++ django/trunk/docs/ref/models/relations.txt 2008-11-02 20:43:20 UTC (rev
9330)
@@ -19,7 +19,7 @@
>>> e = Entry.objects.get(id=234)
>>> b.entry_set.add(e) # Associates Entry e with Blog b.
-.. method:: QuerySet.create(**kwargs)`
+.. method:: QuerySet.create(**kwargs)
Creates a new object, saves it and puts it in the related object set.
Returns the newly created object::
@@ -73,5 +73,5 @@
Note this doesn't delete the related objects -- it just disassociates them.
- Just like ``remove()``, ``clear()`` is only available on ``ForeignKey``s
+ Just like ``remove()``, ``clear()`` is only available on ``ForeignKey``\s
where ``null=True``.
Modified: django/trunk/docs/ref/templates/api.txt
===================================================================
--- django/trunk/docs/ref/templates/api.txt 2008-11-02 04:23:28 UTC (rev
9329)
+++ django/trunk/docs/ref/templates/api.txt 2008-11-02 20:43:20 UTC (rev
9330)
@@ -294,7 +294,7 @@
})
The second difference is that it automatically populates the context with a few
-variables, according to your :setting:`TEMPLATE_CONTEXT_PROCESSORS` setting`.
+variables, according to your :setting:`TEMPLATE_CONTEXT_PROCESSORS` setting.
The :setting:`TEMPLATE_CONTEXT_PROCESSORS` setting is a tuple of callables --
called **context processors** -- that take a request object as their argument
@@ -384,7 +384,7 @@
* ``LANGUAGES`` -- The value of the :setting:`LANGUAGES` setting.
* ``LANGUAGE_CODE`` -- ``request.LANGUAGE_CODE``, if it exists. Otherwise,
- the value of the :setting:`LANGUAGE_CODE` setting`.
+ the value of the :setting:`LANGUAGE_CODE` setting.
See :ref:`topics-i18n` for more.
Modified: django/trunk/docs/topics/auth.txt
===================================================================
--- django/trunk/docs/topics/auth.txt 2008-11-02 04:23:28 UTC (rev 9329)
+++ django/trunk/docs/topics/auth.txt 2008-11-02 20:43:20 UTC (rev 9330)
@@ -687,7 +687,7 @@
a query string, too.
* ``site_name``: The name of the current
- :class:`~django.contrib.sites.models.Site``, according to the
+ :class:`~django.contrib.sites.models.Site`, according to the
:setting:`SITE_ID` setting. If you're using the Django development
version
and you don't have the site framework installed, this will be set to
the
value of ``request.META['SERVER_NAME']``. For more on sites, see
Modified: django/trunk/docs/topics/http/file-uploads.txt
===================================================================
--- django/trunk/docs/topics/http/file-uploads.txt 2008-11-02 04:23:28 UTC
(rev 9329)
+++ django/trunk/docs/topics/http/file-uploads.txt 2008-11-02 20:43:20 UTC
(rev 9330)
@@ -153,9 +153,9 @@
``0`` is very important: it indicates an octal number, which is the
way that modes must be specified. If you try to use ``644``, you'll
get totally incorrect behavior.
-
- **Always prefix the mode with a ``0``.**
+ **Always prefix the mode with a 0.**
+
:setting:`FILE_UPLOAD_HANDLERS`
The actual handlers for uploaded files. Changing this setting allows
complete customization -- even replacement -- of Django's upload
Modified: django/trunk/docs/topics/http/urls.txt
===================================================================
--- django/trunk/docs/topics/http/urls.txt 2008-11-02 04:23:28 UTC (rev
9329)
+++ django/trunk/docs/topics/http/urls.txt 2008-11-02 20:43:20 UTC (rev
9330)
@@ -50,7 +50,7 @@
4. Once one of the regexes matches, Django imports and calls the given
view, which is a simple Python function. The view gets passed an
- :class:`~django.http.HttpRequest`` as its first argument and any values
+ :class:`~django.http.HttpRequest` as its first argument and any values
captured in the regex as remaining arguments.
Example
Modified: django/trunk/docs/topics/i18n.txt
===================================================================
--- django/trunk/docs/topics/i18n.txt 2008-11-02 04:23:28 UTC (rev 9329)
+++ django/trunk/docs/topics/i18n.txt 2008-11-02 20:43:20 UTC (rev 9330)
@@ -298,7 +298,8 @@
currently active locale).
* ``LANGUAGE_CODE`` is the current user's preferred language, as a string.
- Example: ``en-us``. (See "How language preference is discovered", below.)
+ Example: ``en-us``. (See :ref:`how-django-discovers-language-preference`,
+ below.)
* ``LANGUAGE_BIDI`` is the current locale's direction. If True, it's a
right-to-left language, e.g.: Hebrew, Arabic. If False it's a
@@ -514,7 +515,7 @@
out empty, so it's your responsibility to change it. Make sure you keep
the quotes around your translation.
* As a convenience, each message includes, in the form of a comment line
- prefixed with ``#`` and locted above the ``msgid`` line, the filename and
+ prefixed with ``#`` and located above the ``msgid`` line, the filename
and
line number from which the translation string was gleaned.
Long messages are a special case. There, the first string directly after the
@@ -566,6 +567,8 @@
``django-admin compilemessages`` works see `gettext on Windows`_ for more
information.
+.. _how-django-discovers-language-preference:
+
3. How Django discovers language preference
===========================================
@@ -783,7 +786,6 @@
The easiest way out is to store applications that are not part of the project
(and so carry their own translations) outside the project tree. That way,
-
``django-admin.py makemessages`` on the project level will only translate
strings that are connected to your explicit project and not strings that are
distributed independently.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
