[1.5.x] Fixed typos in docs and comments

Backport of ee26797cff from master
This commit is contained in:
Tim Graham 2013-01-29 08:45:40 -07:00
parent f6075b0596
commit 5da6ce11ed
15 changed files with 20 additions and 17 deletions

View file

@ -116,7 +116,7 @@ Practicality beats purity, so it is up to each committer to decide how much
history mangling to do for a pull request. The main points are engaging the
community, getting work done, and having a usable commit history.
.. _committing-guidlines:
.. _committing-guidelines:
Committing guidelines
---------------------

View file

@ -81,7 +81,7 @@ commit them::
git commit
When writing the commit message, follow the :ref:`commit message
guidelines <committing-guidlines>` to ease the work of the committer. If
guidelines <committing-guidelines>` to ease the work of the committer. If
you're uncomfortable with English, try at least to describe precisely what the
commit does.
@ -121,7 +121,7 @@ a pull request at GitHub. A good pull request means:
* well-formed messages for each commit: a summary line and then paragraphs
wrapped at 72 characters thereafter -- see the :ref:`committing guidelines
<committing-guidlines>` for more details,
<committing-guidelines>` for more details,
* documentation and tests, if needed -- actually tests are always needed,
except for documentation changes.

View file

@ -56,7 +56,9 @@ Enjoy the free API
==================
With that, you've got a free, and rich, :doc:`Python API </topics/db/queries>` to
access your data. The API is created on the fly, no code generation necessary::
access your data. The API is created on the fly, no code generation necessary:
.. code-block:: python
# Import the models we created from our "news" app
>>> from news.models import Reporter, Article

View file

@ -118,7 +118,8 @@ Security fixes
If we become aware of a security problem -- hopefully by someone following our
:ref:`security reporting policy <reporting-security-issues>` -- we'll do
everything necessary to fix it. This might mean breaking backwards compatibility; security trumps the compatibility guarantee.
everything necessary to fix it. This might mean breaking backwards
compatibility; security trumps the compatibility guarantee.
Contributed applications (``django.contrib``)
---------------------------------------------

View file

@ -840,7 +840,7 @@ subclass::
added last after all editable fields.
A read-only field can not only display data from a model's field, it can
also display the output of a a model's method or a method of the
also display the output of a model's method or a method of the
``ModelAdmin`` class itself. This is very similar to the way
:attr:`ModelAdmin.list_display` behaves. This provides an easy way to use
the admin interface to provide feedback on the status of the objects being

View file

@ -330,7 +330,7 @@ described above, ``psycopg2`` may be installed using the following command::
.. note::
If you don't have ``pip``, follow the the :ref:`installation instructions
If you don't have ``pip``, follow the :ref:`installation instructions
<installing-official-release>` to install it.
.. _fink:

View file

@ -82,7 +82,7 @@ Changing passwords
Django does not store raw (clear text) passwords on the user model, but only
a hash (see :doc:`documentation of how passwords are managed
</topics/auth/passwords>` for full details). Because of this, do not attempt to
manipulate the password attribute of the user directly. This is why a a helper
manipulate the password attribute of the user directly. This is why a helper
function is used when creating a user.
To change a user's password, you have several options: