summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2008-11-02 20:53:47 +0000
committerKaren Tracey <kmtracey@gmail.com>2008-11-02 20:53:47 +0000
commit55943c09757c32c4c5ad7bc8a275df0cbbce172e (patch)
treeb27c687b8d8a85be4e461d782d8c2829c69a8407 /docs/topics
parentf1eb098d96bd43de03e94163449d49d598f953e1 (diff)
[1.0.X] Fixed #9497 - Doc typos. Many thanks ramiro.
[9330] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/auth.txt2
-rw-r--r--docs/topics/http/file-uploads.txt4
-rw-r--r--docs/topics/http/urls.txt2
-rw-r--r--docs/topics/i18n.txt8
4 files changed, 9 insertions, 7 deletions
diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
index 4c95adee6c..45d5b1af08 100644
--- a/docs/topics/auth.txt
+++ b/docs/topics/auth.txt
@@ -687,7 +687,7 @@ the following line to your URLconf::
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
diff --git a/docs/topics/http/file-uploads.txt b/docs/topics/http/file-uploads.txt
index 9a32157527..18abeaa087 100644
--- a/docs/topics/http/file-uploads.txt
+++ b/docs/topics/http/file-uploads.txt
@@ -153,8 +153,8 @@ Three settings control Django's file upload behavior:
``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
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index dcbe18ab04..f3030fee3d 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -50,7 +50,7 @@ algorithm the system follows to determine which Python code to execute:
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
diff --git a/docs/topics/i18n.txt b/docs/topics/i18n.txt
index af2af86cd7..b1a8beeb68 100644
--- a/docs/topics/i18n.txt
+++ b/docs/topics/i18n.txt
@@ -298,7 +298,8 @@ Each ``RequestContext`` has access to three translation-specific variables:
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 @@ A quick explanation:
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 @@ That's it. Your translations are ready for use.
``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 @@ project message file that are already in application message files.
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.