Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit af244e47ccc88860fe928fec96c7873e3e4017fe 1 parent 17659ad
Luke Plant authored October 10, 2011
4  docs/ref/contrib/admin/index.txt
@@ -230,7 +230,7 @@ subclass::
230 230
 
231 231
     This results in an admin page that looks like:
232 232
 
233  
-        .. image:: _images/flatfiles_admin.png
  233
+    .. image:: _images/flatfiles_admin.png
234 234
 
235 235
     If neither ``fieldsets`` nor :attr:`~ModelAdmin.fields` options are present,
236 236
     Django will default to displaying each field that isn't an ``AutoField`` and
@@ -577,7 +577,7 @@ subclass::
577 577
     Set ``list_filter`` to activate filters in the right sidebar of the change
578 578
     list page of the admin, as illustrated in the following screenshot:
579 579
 
580  
-        .. image:: _images/users_changelist.png
  580
+    .. image:: _images/users_changelist.png
581 581
 
582 582
     ``list_filter`` should be a list of elements, where each element should be
583 583
     of one of the following types:
2  docs/ref/contrib/comments/example.txt
@@ -40,7 +40,7 @@ available in the context, then you can refer to it directly::
40 40
 .. versionadded:: 1.2
41 41
 
42 42
 Next, we can use the :ttag:`render_comment_list` tag, to render all comments
43  
-to the given instance (``entry``) by using the ``comments/list.html`` template.
  43
+to the given instance (``entry``) by using the ``comments/list.html`` template::
44 44
 
45 45
    {% render_comment_list for entry %}
46 46
 
2  docs/ref/contrib/localflavor.txt
@@ -824,7 +824,7 @@ Mexico (``mx``)
824 824
 
825 825
 .. class:: mx.forms.MXCURPField
826 826
 
827  
-    .. versionadded:: 1.4
  827
+   .. versionadded:: 1.4
828 828
 
829 829
    A field that validates a Mexican *Clave Única de Registro de Población*.
830 830
 
58  docs/ref/models/querysets.txt
@@ -936,49 +936,49 @@ of the arguments is required, but you should use at least one of them.
936 936
 
937 937
     * ``order_by``
938 938
 
939  
-        If you need to order the resulting queryset using some of the new
940  
-        fields or tables you have included via ``extra()`` use the ``order_by``
941  
-        parameter to ``extra()`` and pass in a sequence of strings. These
942  
-        strings should either be model fields (as in the normal
943  
-        :meth:`order_by()` method on querysets), of the form
944  
-        ``table_name.column_name`` or an alias for a column that you specified
945  
-        in the ``select`` parameter to ``extra()``.
  939
+      If you need to order the resulting queryset using some of the new
  940
+      fields or tables you have included via ``extra()`` use the ``order_by``
  941
+      parameter to ``extra()`` and pass in a sequence of strings. These
  942
+      strings should either be model fields (as in the normal
  943
+      :meth:`order_by()` method on querysets), of the form
  944
+      ``table_name.column_name`` or an alias for a column that you specified
  945
+      in the ``select`` parameter to ``extra()``.
946 946
 
947  
-        For example::
  947
+      For example::
948 948
 
949  
-            q = Entry.objects.extra(select={'is_recent': "pub_date > '2006-01-01'"})
950  
-            q = q.extra(order_by = ['-is_recent'])
  949
+          q = Entry.objects.extra(select={'is_recent': "pub_date > '2006-01-01'"})
  950
+          q = q.extra(order_by = ['-is_recent'])
951 951
 
952  
-        This would sort all the items for which ``is_recent`` is true to the
953  
-        front of the result set (``True`` sorts before ``False`` in a
954  
-        descending ordering).
  952
+      This would sort all the items for which ``is_recent`` is true to the
  953
+      front of the result set (``True`` sorts before ``False`` in a
  954
+      descending ordering).
955 955
 
956  
-        This shows, by the way, that you can make multiple calls to ``extra()``
957  
-        and it will behave as you expect (adding new constraints each time).
  956
+      This shows, by the way, that you can make multiple calls to ``extra()``
  957
+      and it will behave as you expect (adding new constraints each time).
958 958
 
959 959
     * ``params``
960 960
 
961  
-        The ``where`` parameter described above may use standard Python
962  
-        database string placeholders — ``'%s'`` to indicate parameters the
963  
-        database engine should automatically quote. The ``params`` argument is
964  
-        a list of any extra parameters to be substituted.
  961
+      The ``where`` parameter described above may use standard Python
  962
+      database string placeholders — ``'%s'`` to indicate parameters the
  963
+      database engine should automatically quote. The ``params`` argument is
  964
+      a list of any extra parameters to be substituted.
965 965
 
966  
-        Example::
  966
+      Example::
967 967
 
968  
-            Entry.objects.extra(where=['headline=%s'], params=['Lennon'])
  968
+          Entry.objects.extra(where=['headline=%s'], params=['Lennon'])
969 969
 
970  
-        Always use ``params`` instead of embedding values directly into
971  
-        ``where`` because ``params`` will ensure values are quoted correctly
972  
-        according to your particular backend. For example, quotes will be
973  
-        escaped correctly.
  970
+      Always use ``params`` instead of embedding values directly into
  971
+      ``where`` because ``params`` will ensure values are quoted correctly
  972
+      according to your particular backend. For example, quotes will be
  973
+      escaped correctly.
974 974
 
975  
-        Bad::
  975
+      Bad::
976 976
 
977  
-            Entry.objects.extra(where=["headline='Lennon'"])
  977
+          Entry.objects.extra(where=["headline='Lennon'"])
978 978
 
979  
-        Good::
  979
+      Good::
980 980
 
981  
-            Entry.objects.extra(where=['headline=%s'], params=['Lennon'])
  981
+          Entry.objects.extra(where=['headline=%s'], params=['Lennon'])
982 982
 
983 983
 defer
984 984
 ~~~~~
18  docs/releases/1.0-alpha-1.txt
@@ -32,7 +32,7 @@ Refactored admin application (newforms-admin)
32 32
     documentation for the admin application is available online in the
33 33
     official Django documentation:
34 34
 
35  
-        :doc:`admin reference </ref/contrib/admin/index>`
  35
+    * :doc:`admin reference </ref/contrib/admin/index>`
36 36
 
37 37
 Improved Unicode handling
38 38
     Django's internals have been refactored to use Unicode throughout;
@@ -43,7 +43,7 @@ Improved Unicode handling
43 43
     Unicode gracefully. Details are available in Django's
44 44
     Unicode-handling documentation:
45 45
 
46  
-         :doc:`unicode reference </ref/unicode>`
  46
+    * :doc:`unicode reference </ref/unicode>`
47 47
 
48 48
 An improved Django ORM
49 49
     Django's object-relational mapper -- the component which provides
@@ -56,8 +56,8 @@ An improved Django ORM
56 56
     including backwards-incompatible modifications and mentions of new
57 57
     features opened up by this refactoring, is available on the Django
58 58
     wiki:
59  
-    
60  
-         http://code.djangoproject.com/wiki/QuerysetRefactorBranch
  59
+
  60
+    * http://code.djangoproject.com/wiki/QuerysetRefactorBranch
61 61
 
62 62
 Automatic escaping of template variables
63 63
     To provide improved security against cross-site scripting (XSS)
@@ -84,7 +84,7 @@ Django 1.0 release, and a comprehensive list of backwards-incompatible
84 84
 changes is also available on the Django wiki for those who want to
85 85
 begin developing and testing their upgrade process:
86 86
 
87  
-    http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
  87
+* http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
88 88
 
89 89
 
90 90
 The Django 1.0 roadmap
@@ -123,7 +123,7 @@ Of course, like any estimated timeline, this is subject to change as
123 123
 requirements dictate. The latest information will always be available
124 124
 on the Django project wiki:
125 125
 
126  
-    http://code.djangoproject.com/wiki/VersionOneRoadmap
  126
+* http://code.djangoproject.com/wiki/VersionOneRoadmap
127 127
 
128 128
 
129 129
 What you can do to help
@@ -136,7 +136,7 @@ codebase in a safe test environment and reporting any bugs or issues
136 136
 you encounter. The Django ticket tracker is the central place to
137 137
 search for open issues:
138 138
 
139  
-    http://code.djangoproject.com/timeline
  139
+* http://code.djangoproject.com/timeline
140 140
 
141 141
 Please open new tickets if no existing ticket corresponds to a problem
142 142
 you're running into.
@@ -145,7 +145,7 @@ Additionally, discussion of Django development, including progress
145 145
 toward the 1.0 release, takes place daily on the django-developers
146 146
 mailing list:
147 147
 
148  
-    http://groups.google.com/group/django-developers
  148
+* http://groups.google.com/group/django-developers
149 149
 
150 150
 ...and in the ``#django-dev`` IRC channel on ``irc.freenode.net``. If
151 151
 you're interested in helping out with Django's development, feel free
@@ -154,7 +154,7 @@ to join the discussions there.
154 154
 Django's online documentation also includes pointers on how to
155 155
 contribute to Django:
156 156
 
157  
-    :doc:`contributing to Django </internals/contributing/index>`
  157
+* :doc:`contributing to Django </internals/contributing/index>`
158 158
 
159 159
 Contributions on any level -- developing code, writing
160 160
 documentation or simply triaging tickets and helping to test proposed
8  docs/releases/1.0-alpha-2.txt
@@ -98,7 +98,7 @@ Of course, like any estimated timeline, this is subject to change as
98 98
 requirements dictate. The latest information will always be available
99 99
 on the Django project wiki:
100 100
 
101  
-    http://code.djangoproject.com/wiki/VersionOneRoadmap
  101
+* http://code.djangoproject.com/wiki/VersionOneRoadmap
102 102
 
103 103
 
104 104
 What you can do to help
@@ -111,7 +111,7 @@ codebase in a safe test environment and reporting any bugs or issues
111 111
 you encounter. The Django ticket tracker is the central place to
112 112
 search for open issues:
113 113
 
114  
-    http://code.djangoproject.com/timeline
  114
+* http://code.djangoproject.com/timeline
115 115
 
116 116
 Please open new tickets if no existing ticket corresponds to a problem
117 117
 you're running into.
@@ -120,7 +120,7 @@ Additionally, discussion of Django development, including progress
120 120
 toward the 1.0 release, takes place daily on the django-developers
121 121
 mailing list:
122 122
 
123  
-    http://groups.google.com/group/django-developers
  123
+* http://groups.google.com/group/django-developers
124 124
 
125 125
 ...and in the ``#django-dev`` IRC channel on ``irc.freenode.net``. If
126 126
 you're interested in helping out with Django's development, feel free
@@ -129,7 +129,7 @@ to join the discussions there.
129 129
 Django's online documentation also includes pointers on how to
130 130
 contribute to Django:
131 131
 
132  
-    :doc:`contributing to Django </internals/contributing/index>`
  132
+* :doc:`contributing to Django </internals/contributing/index>`
133 133
 
134 134
 Contributions on any level -- developing code, writing
135 135
 documentation or simply triaging tickets and helping to test proposed
6  docs/releases/1.0-beta-2.txt
@@ -94,7 +94,7 @@ codebase in a safe test environment and reporting any bugs or issues
94 94
 you encounter. The Django ticket tracker is the central place to
95 95
 search for open issues:
96 96
 
97  
-    http://code.djangoproject.com/timeline
  97
+* http://code.djangoproject.com/timeline
98 98
 
99 99
 Please open new tickets if no existing ticket corresponds to a problem
100 100
 you're running into.
@@ -103,7 +103,7 @@ Additionally, discussion of Django development, including progress
103 103
 toward the 1.0 release, takes place daily on the django-developers
104 104
 mailing list:
105 105
 
106  
-    http://groups.google.com/group/django-developers
  106
+* http://groups.google.com/group/django-developers
107 107
 
108 108
 ...and in the ``#django-dev`` IRC channel on ``irc.freenode.net``. If
109 109
 you're interested in helping out with Django's development, feel free
@@ -112,7 +112,7 @@ to join the discussions there.
112 112
 Django's online documentation also includes pointers on how to
113 113
 contribute to Django:
114 114
 
115  
-    :doc:`contributing to Django </internals/contributing/index>`
  115
+* :doc:`contributing to Django </internals/contributing/index>`
116 116
 
117 117
 Contributions on any level -- developing code, writing
118 118
 documentation or simply triaging tickets and helping to test proposed
8  docs/releases/1.0-beta.txt
@@ -115,7 +115,7 @@ Of course, like any estimated timeline, this is subject to change as
115 115
 requirements dictate. The latest information will always be available
116 116
 on the Django project wiki:
117 117
 
118  
-    http://code.djangoproject.com/wiki/VersionOneRoadmap
  118
+* http://code.djangoproject.com/wiki/VersionOneRoadmap
119 119
 
120 120
 
121 121
 What you can do to help
@@ -128,7 +128,7 @@ codebase in a safe test environment and reporting any bugs or issues
128 128
 you encounter. The Django ticket tracker is the central place to
129 129
 search for open issues:
130 130
 
131  
-    http://code.djangoproject.com/timeline
  131
+* http://code.djangoproject.com/timeline
132 132
 
133 133
 Please open new tickets if no existing ticket corresponds to a problem
134 134
 you're running into.
@@ -137,7 +137,7 @@ Additionally, discussion of Django development, including progress
137 137
 toward the 1.0 release, takes place daily on the django-developers
138 138
 mailing list:
139 139
 
140  
-    http://groups.google.com/group/django-developers
  140
+* http://groups.google.com/group/django-developers
141 141
 
142 142
 ...and in the ``#django-dev`` IRC channel on ``irc.freenode.net``. If
143 143
 you're interested in helping out with Django's development, feel free
@@ -146,7 +146,7 @@ to join the discussions there.
146 146
 Django's online documentation also includes pointers on how to
147 147
 contribute to Django:
148 148
 
149  
-    :doc:`contributing to Django </internals/contributing/index>`
  149
+* :doc:`contributing to Django </internals/contributing/index>`
150 150
 
151 151
 Contributions on any level -- developing code, writing
152 152
 documentation or simply triaging tickets and helping to test proposed
2  docs/releases/1.0.txt
@@ -57,7 +57,7 @@ there.
57 57
 In fact, new documentation is one of our favorite features of Django 1.0, so we
58 58
 might as well start there. First, there's a new documentation site:
59 59
 
60  
-    http://docs.djangoproject.com/
  60
+* http://docs.djangoproject.com/
61 61
 
62 62
 The documentation has been greatly improved, cleaned up, and generally made
63 63
 awesome. There's now dedicated search, indexes, and more.
2  docs/topics/auth.txt
@@ -663,7 +663,7 @@ Manually managing a user's password
663 663
 
664 664
 .. function:: is_password_usable()
665 665
 
666  
-    .. versionadded:: 1.4
  666
+   .. versionadded:: 1.4
667 667
 
668 668
    Checks if the given string is a hashed password that has a chance
669 669
    of being verified against :func:`django.contrib.auth.utils.check_password`.
2  docs/topics/templates.txt
@@ -420,6 +420,8 @@ With this name value, the template would be rendered as::
420 420
 
421 421
 Similarly, what if the name contained a ``'<'`` symbol, like this?
422 422
 
  423
+.. code-block:: html
  424
+
423 425
     <b>username
424 426
 
425 427
 That would result in a rendered template like this::

0 notes on commit af244e4

Please sign in to comment.
Something went wrong with that request. Please try again.