Skip to content

Commit

Permalink
Fixed #1815: More documentation proof-reading from nico@teknico.net.
Browse files Browse the repository at this point in the history
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
malcolmt committed May 15, 2006
1 parent d16215f commit 34b798c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions docs/authentication.txt
Expand Up @@ -215,7 +215,7 @@ Anonymous users
---------------

``django.contrib.auth.models.AnonymousUser`` is a class that implements
the ``django.contirb.auth.models.User`` interface, with these differences:
the ``django.contrib.auth.models.User`` interface, with these differences:

* ``id`` is always ``None``.
* ``is_anonymous()`` returns ``True`` instead of ``False``.
Expand Down Expand Up @@ -437,7 +437,7 @@ permissions are added to the ``auth_permission`` database table when you run
Note that if your model doesn't have ``class Admin`` set when you run
``syncdb``, the permissions won't be created. If you initialize your database
and add ``class Admin`` to models after the fact, you'll need to run
``django-admin.py syncdb`` again. It will create any missing permissions for
``manage.py syncdb`` again. It will create any missing permissions for
all of your installed apps.

Custom permissions
Expand Down Expand Up @@ -484,7 +484,7 @@ Methods
~~~~~~~

``Permission`` objects have the standard data-access methods like any other
`Django model`_:
`Django model`_.

Authentication data in templates
================================
Expand Down
6 changes: 3 additions & 3 deletions docs/db-api.txt
Expand Up @@ -1085,7 +1085,7 @@ This spanning can be as deep as you'd like.
It works backwards, too. To refer to a "reverse" relationship, just use the
lowercase name of the model.

This example retrieves all ``Blog`` objects who have at least one ``Entry``
This example retrieves all ``Blog`` objects which have at least one ``Entry``
whose ``headline`` contains ``'Lennon'``::

Blog.objects.filter(entry__headline__contains='Lennon')
Expand Down Expand Up @@ -1168,7 +1168,7 @@ Complex lookups with Q objects
==============================

Keyword argument queries -- in ``filter()``, etc. -- are "AND"ed together. If
you need to execute more more complex queries (for example, queries with ``OR``
you need to execute more complex queries (for example, queries with ``OR``
statements), you can use ``Q`` objects.

A ``Q`` object (``django.db.models.Q``) is an object used to encapsulate a
Expand Down Expand Up @@ -1534,7 +1534,7 @@ described in `Field lookups`_ above.

Note that in the case of identical date values, these methods will use the ID
as a fallback check. This guarantees that no records are skipped or duplicated.
For a full example, see the `lookup API sample model_`.
For a full example, see the `lookup API sample model`_.

.. _lookup API sample model: http://www.djangoproject.com/documentation/models/lookup/

Expand Down
2 changes: 1 addition & 1 deletion docs/transactions.txt
Expand Up @@ -122,7 +122,7 @@ Manual transaction management looks like this::
else:
transaction.commit()

..admonition:: An important note to users of earlier Django releases:
.. admonition:: An important note to users of earlier Django releases:

The database ``connection.commit()`` and ``connection.rollback()`` methods
(called ``db.commit()`` and ``db.rollback()`` in 0.91 and earlier) no longer
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorial03.txt
Expand Up @@ -112,7 +112,7 @@ If you need help with regular expressions, see `Wikipedia's entry`_ and the
`Python documentation`_. Also, the O'Reilly book "Mastering Regular
Expressions" by Jeffrey Friedl is fantastic.

Finally, a performance note: These regular expressions are compiled the first
Finally, a performance note: these regular expressions are compiled the first
time the URLconf module is loaded. They're super fast.

.. _Wikipedia's entry: http://en.wikipedia.org/wiki/Regular_expression
Expand Down

0 comments on commit 34b798c

Please sign in to comment.