summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2011-10-10 15:32:01 +0000
committerLuke Plant <L.Plant.98@cantab.net>2011-10-10 15:32:01 +0000
commitaf244e47ccc88860fe928fec96c7873e3e4017fe (patch)
treecf2ff9d55597c12249a9f5e05a2c634f5a608738 /docs/ref
parent17659adf93574deeaeb23b867f1c67248a7a3c80 (diff)
Fixed a bunch of ReST errors that resulted in interpretation as block quotations
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/admin/index.txt4
-rw-r--r--docs/ref/contrib/comments/example.txt2
-rw-r--r--docs/ref/contrib/localflavor.txt2
-rw-r--r--docs/ref/models/querysets.txt58
4 files changed, 33 insertions, 33 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 02e539e6f2..875c234f03 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -230,7 +230,7 @@ subclass::
This results in an admin page that looks like:
- .. image:: _images/flatfiles_admin.png
+ .. image:: _images/flatfiles_admin.png
If neither ``fieldsets`` nor :attr:`~ModelAdmin.fields` options are present,
Django will default to displaying each field that isn't an ``AutoField`` and
@@ -577,7 +577,7 @@ subclass::
Set ``list_filter`` to activate filters in the right sidebar of the change
list page of the admin, as illustrated in the following screenshot:
- .. image:: _images/users_changelist.png
+ .. image:: _images/users_changelist.png
``list_filter`` should be a list of elements, where each element should be
of one of the following types:
diff --git a/docs/ref/contrib/comments/example.txt b/docs/ref/contrib/comments/example.txt
index 82ae08e66d..e009422b4e 100644
--- a/docs/ref/contrib/comments/example.txt
+++ b/docs/ref/contrib/comments/example.txt
@@ -40,7 +40,7 @@ available in the context, then you can refer to it directly::
.. versionadded:: 1.2
Next, we can use the :ttag:`render_comment_list` tag, to render all comments
-to the given instance (``entry``) by using the ``comments/list.html`` template.
+to the given instance (``entry``) by using the ``comments/list.html`` template::
{% render_comment_list for entry %}
diff --git a/docs/ref/contrib/localflavor.txt b/docs/ref/contrib/localflavor.txt
index fbb10a6a35..99077be0de 100644
--- a/docs/ref/contrib/localflavor.txt
+++ b/docs/ref/contrib/localflavor.txt
@@ -824,7 +824,7 @@ Mexico (``mx``)
.. class:: mx.forms.MXCURPField
- .. versionadded:: 1.4
+ .. versionadded:: 1.4
A field that validates a Mexican *Clave Única de Registro de Población*.
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 11ef73059d..8a3d15cc05 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -936,49 +936,49 @@ of the arguments is required, but you should use at least one of them.
* ``order_by``
- If you need to order the resulting queryset using some of the new
- fields or tables you have included via ``extra()`` use the ``order_by``
- parameter to ``extra()`` and pass in a sequence of strings. These
- strings should either be model fields (as in the normal
- :meth:`order_by()` method on querysets), of the form
- ``table_name.column_name`` or an alias for a column that you specified
- in the ``select`` parameter to ``extra()``.
+ If you need to order the resulting queryset using some of the new
+ fields or tables you have included via ``extra()`` use the ``order_by``
+ parameter to ``extra()`` and pass in a sequence of strings. These
+ strings should either be model fields (as in the normal
+ :meth:`order_by()` method on querysets), of the form
+ ``table_name.column_name`` or an alias for a column that you specified
+ in the ``select`` parameter to ``extra()``.
- For example::
+ For example::
- q = Entry.objects.extra(select={'is_recent': "pub_date > '2006-01-01'"})
- q = q.extra(order_by = ['-is_recent'])
+ q = Entry.objects.extra(select={'is_recent': "pub_date > '2006-01-01'"})
+ q = q.extra(order_by = ['-is_recent'])
- This would sort all the items for which ``is_recent`` is true to the
- front of the result set (``True`` sorts before ``False`` in a
- descending ordering).
+ This would sort all the items for which ``is_recent`` is true to the
+ front of the result set (``True`` sorts before ``False`` in a
+ descending ordering).
- This shows, by the way, that you can make multiple calls to ``extra()``
- and it will behave as you expect (adding new constraints each time).
+ This shows, by the way, that you can make multiple calls to ``extra()``
+ and it will behave as you expect (adding new constraints each time).
* ``params``
- The ``where`` parameter described above may use standard Python
- database string placeholders — ``'%s'`` to indicate parameters the
- database engine should automatically quote. The ``params`` argument is
- a list of any extra parameters to be substituted.
+ The ``where`` parameter described above may use standard Python
+ database string placeholders — ``'%s'`` to indicate parameters the
+ database engine should automatically quote. The ``params`` argument is
+ a list of any extra parameters to be substituted.
- Example::
+ Example::
- Entry.objects.extra(where=['headline=%s'], params=['Lennon'])
+ Entry.objects.extra(where=['headline=%s'], params=['Lennon'])
- Always use ``params`` instead of embedding values directly into
- ``where`` because ``params`` will ensure values are quoted correctly
- according to your particular backend. For example, quotes will be
- escaped correctly.
+ Always use ``params`` instead of embedding values directly into
+ ``where`` because ``params`` will ensure values are quoted correctly
+ according to your particular backend. For example, quotes will be
+ escaped correctly.
- Bad::
+ Bad::
- Entry.objects.extra(where=["headline='Lennon'"])
+ Entry.objects.extra(where=["headline='Lennon'"])
- Good::
+ Good::
- Entry.objects.extra(where=['headline=%s'], params=['Lennon'])
+ Entry.objects.extra(where=['headline=%s'], params=['Lennon'])
defer
~~~~~