Kaydet (Commit) 2b6436e2 authored tarafından Rodolfo Carvalho's avatar Rodolfo Carvalho Kaydeden (comit) Tim Graham

Fixed some typos and formatting issues in docs.

üst 0d912258
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
{%- endmacro %} {%- endmacro %}
{% block extrahead %} {% block extrahead %}
{# When building htmlhelp (CHM format) disable JQuery inclusion, #} {# When building htmlhelp (CHM format) disable jQuery inclusion, #}
{# as it causes problems in compiled CHM files. #} {# as it causes problems in compiled CHM files. #}
{% if builder != "htmlhelp" %} {% if builder != "htmlhelp" %}
{{ super() }} {{ super() }}
<script type="text/javascript" src="{{ pathto('templatebuiltins.js', 1) }}"></script> <script type="text/javascript" src="{{ pathto('templatebuiltins.js', 1) }}"></script>
......
...@@ -463,7 +463,7 @@ Jeremy Dunck ...@@ -463,7 +463,7 @@ Jeremy Dunck
.. _Preston Holmes: http://www.ptone.com/ .. _Preston Holmes: http://www.ptone.com/
`Simon Charette`_ `Simon Charette`_
Simon is a mathematic student who discovered Django while searching for a Simon is a mathematics student who discovered Django while searching for a
replacement framework to an in-house PHP entity. Since that faithful day replacement framework to an in-house PHP entity. Since that faithful day
Django has been a big part of his life. So far, he's been involved in some Django has been a big part of his life. So far, he's been involved in some
ORM and forms API fixes. ORM and forms API fixes.
......
...@@ -112,7 +112,7 @@ or ought to be closed for any of the various reasons. ...@@ -112,7 +112,7 @@ or ought to be closed for any of the various reasons.
Accepted Accepted
~~~~~~~~ ~~~~~~~~
The big grey area! The absolute meaning of "accepted" is that the issue The big gray area! The absolute meaning of "accepted" is that the issue
described in the ticket is valid and is in some stage of being worked on. described in the ticket is valid and is in some stage of being worked on.
Beyond that there are several considerations: Beyond that there are several considerations:
......
...@@ -7,7 +7,7 @@ be driving a release, you should follow these instructions to get the ...@@ -7,7 +7,7 @@ be driving a release, you should follow these instructions to get the
package out. package out.
**Please, keep these instructions up-to-date if you make changes!** The point **Please, keep these instructions up-to-date if you make changes!** The point
here is to be descriptive, not proscriptive, so feel free to streamline or here is to be descriptive, not prescriptive, so feel free to streamline or
otherwise make changes, but **update this document accordingly!** otherwise make changes, but **update this document accordingly!**
Overview Overview
......
...@@ -165,7 +165,7 @@ For example:: ...@@ -165,7 +165,7 @@ For example::
.. warning:: .. warning::
There's a `known bug`_ in Safari/Webkit which causes the named anchor to be There's a `known bug`_ in Safari/WebKit which causes the named anchor to be
forgotten following a redirect. The practical impact for comments is that forgotten following a redirect. The practical impact for comments is that
the Safari/webkit browsers will arrive at the correct page but will not the Safari/webkit browsers will arrive at the correct page but will not
scroll to the named anchor. scroll to the named anchor.
......
...@@ -132,7 +132,7 @@ Troubleshooting ...@@ -132,7 +132,7 @@ Troubleshooting
If you can't find the solution to your problem here then participate in the If you can't find the solution to your problem here then participate in the
community! You can: community! You can:
* Join the ``#geodjango`` IRC channel on FreeNode. Please be patient and polite * Join the ``#geodjango`` IRC channel on Freenode. Please be patient and polite
-- while you may not get an immediate response, someone will attempt to answer -- while you may not get an immediate response, someone will attempt to answer
your question as soon as they see it. your question as soon as they see it.
* Ask your question on the `GeoDjango`__ mailing list. * Ask your question on the `GeoDjango`__ mailing list.
......
...@@ -125,8 +125,8 @@ untar:: ...@@ -125,8 +125,8 @@ untar::
$ tar xzf pysqlite-2.6.3.tar.gz $ tar xzf pysqlite-2.6.3.tar.gz
$ cd pysqlite-2.6.3 $ cd pysqlite-2.6.3
Next, use a text editor (e.g., ``emacs`` or ``vi``) to edit the ``setup.cfg`` file Next, use a text editor to edit the ``setup.cfg`` file to look like the
to look like the following: following:
.. code-block:: ini .. code-block:: ini
......
...@@ -603,7 +603,7 @@ Version 3.6.2 ...@@ -603,7 +603,7 @@ Version 3.6.2
-------------- --------------
SQLite version 3.6.2 (released August 30, 2008) introduced a bug into ``SELECT SQLite version 3.6.2 (released August 30, 2008) introduced a bug into ``SELECT
DISTINCT`` handling that is triggered by, amongst other things, Django's DISTINCT`` handling that is triggered by, among other things, Django's
``DateQuerySet`` (returned by the ``dates()`` method on a queryset). ``DateQuerySet`` (returned by the ``dates()`` method on a queryset).
You should avoid using this version of SQLite with Django. Either upgrade to You should avoid using this version of SQLite with Django. Either upgrade to
......
...@@ -84,7 +84,7 @@ GZip middleware ...@@ -84,7 +84,7 @@ GZip middleware
Security researchers recently revealed that when compression techniques Security researchers recently revealed that when compression techniques
(including ``GZipMiddleware``) are used on a website, the site becomes (including ``GZipMiddleware``) are used on a website, the site becomes
exposed to a number of possible attacks. These approaches can be used to exposed to a number of possible attacks. These approaches can be used to
compromise, amongst other things, Django's CSRF protection. Before using compromise, among other things, Django's CSRF protection. Before using
``GZipMiddleware`` on your site, you should consider very carefully whether ``GZipMiddleware`` on your site, you should consider very carefully whether
you are subject to these attacks. If you're in *any* doubt about whether you are subject to these attacks. If you're in *any* doubt about whether
you're affected, you should avoid using ``GZipMiddleware``. For more you're affected, you should avoid using ``GZipMiddleware``. For more
......
...@@ -641,7 +641,7 @@ will be displayed if the value has not changed:: ...@@ -641,7 +641,7 @@ will be displayed if the value has not changed::
{% ifchanged match.ballot_id %} {% ifchanged match.ballot_id %}
{% cycle "red" "blue" %} {% cycle "red" "blue" %}
{% else %} {% else %}
grey gray
{% endifchanged %} {% endifchanged %}
">{{ match }}</div> ">{{ match }}</div>
{% endfor %} {% endfor %}
......
This diff is collapsed.
...@@ -219,7 +219,7 @@ processing to work on a particular object, identified from the URL, ...@@ -219,7 +219,7 @@ processing to work on a particular object, identified from the URL,
we'll want the functionality provided by we'll want the functionality provided by
:class:`~django.views.generic.detail.SingleObjectMixin`. :class:`~django.views.generic.detail.SingleObjectMixin`.
We'll demonstrate this with the publisher modeling we used in the We'll demonstrate this with the ``Author`` model we used in the
:doc:`generic class-based views introduction<generic-display>`. :doc:`generic class-based views introduction<generic-display>`.
.. code-block:: python .. code-block:: python
......
...@@ -29,7 +29,7 @@ Essentially, Django does two things: ...@@ -29,7 +29,7 @@ Essentially, Django does two things:
their preferences. their preferences.
Obviously, translation depends on the target language, and formatting usually Obviously, translation depends on the target language, and formatting usually
depends on the target country. These informations are provided by browsers in depends on the target country. This information is provided by browsers in
the ``Accept-Language`` header. However, the time zone isn't readily available. the ``Accept-Language`` header. However, the time zone isn't readily available.
Definitions Definitions
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment