diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2008-11-02 20:43:20 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2008-11-02 20:43:20 +0000 |
| commit | c4835830235574886f9bd2b54ace5406bea2d931 (patch) | |
| tree | dc8867b45654891527010007b80c8287a2516d3f /docs/ref | |
| parent | 8a5f2ee912cb29191f35618a05ee90a3df636ae3 (diff) | |
Fixed #9497 - Doc typos. Many thanks ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9330 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/databrowse.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/sites.txt | 2 | ||||
| -rw-r--r-- | docs/ref/databases.txt | 10 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 4 | ||||
| -rw-r--r-- | docs/ref/models/relations.txt | 4 | ||||
| -rw-r--r-- | docs/ref/templates/api.txt | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/docs/ref/contrib/databrowse.txt b/docs/ref/contrib/databrowse.txt index c4da2fe929..d3536d150c 100644 --- a/docs/ref/contrib/databrowse.txt +++ b/docs/ref/contrib/databrowse.txt @@ -35,7 +35,7 @@ How to use Databrowse 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:: diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt index 28c8f4d73a..91a98c4ae4 100644 --- a/docs/ref/contrib/sites.txt +++ b/docs/ref/contrib/sites.txt @@ -207,7 +207,7 @@ In this case, you'd have to create :file:`subject.txt` and :file:`message.txt` t 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 diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index bb033ee72c..59ebff35c8 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -271,11 +271,11 @@ described above, this can be solved by downloading and installing a newer 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: diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index a2b94ebd82..c1fbdce5ca 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -35,7 +35,7 @@ You can evaluate a ``QuerySet`` in the following ways: * **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 @@ of the arguments is required, but you should use at least one of them. .. 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, diff --git a/docs/ref/models/relations.txt b/docs/ref/models/relations.txt index 1ee8b26258..d0906942e8 100644 --- a/docs/ref/models/relations.txt +++ b/docs/ref/models/relations.txt @@ -19,7 +19,7 @@ Extra methods on managers when used in a ForeignKey context >>> 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 @@ Extra methods on managers when used in a ForeignKey context 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``. diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index 6a0cd11b53..c793e5ce69 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -294,7 +294,7 @@ normal ``django.template.Context``. The first difference is that it takes an }) 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 @@ If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every * ``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. |
