diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/authentication.txt | 6 | ||||
| -rw-r--r-- | docs/cache.txt | 2 | ||||
| -rw-r--r-- | docs/db-api.txt | 6 | ||||
| -rw-r--r-- | docs/email.txt | 7 | ||||
| -rw-r--r-- | docs/transactions.txt | 2 | ||||
| -rw-r--r-- | docs/tutorial03.txt | 2 |
6 files changed, 16 insertions, 9 deletions
diff --git a/docs/authentication.txt b/docs/authentication.txt index 0d2a7f5e51..668ca10247 100644 --- a/docs/authentication.txt +++ b/docs/authentication.txt @@ -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``. @@ -445,7 +445,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 @@ -492,7 +492,7 @@ Methods ~~~~~~~ ``Permission`` objects have the standard data-access methods like any other -`Django model`_: +`Django model`_. Authentication data in templates ================================ diff --git a/docs/cache.txt b/docs/cache.txt index 12bd811284..2c54f60456 100644 --- a/docs/cache.txt +++ b/docs/cache.txt @@ -339,7 +339,7 @@ Here are a few examples of upstream caches: somedomain.com, your ISP would send you the page without having to access somedomain.com directly. - * Your Django Web site may site behind a Squid Web proxy + * Your Django Web site may sit behind a Squid Web proxy (http://www.squid-cache.org/) that caches pages for performance. In this case, each request first would be handled by Squid, and it'd only be passed to your application if needed. diff --git a/docs/db-api.txt b/docs/db-api.txt index 0a400b2c93..e2173afe16 100644 --- a/docs/db-api.txt +++ b/docs/db-api.txt @@ -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') @@ -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 @@ -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/ diff --git a/docs/email.txt b/docs/email.txt index b38b855cb3..37a4f38a5e 100644 --- a/docs/email.txt +++ b/docs/email.txt @@ -19,6 +19,13 @@ In two lines:: send_mail('Subject here', 'Here is the message.', 'from@example.com', ['to@example.com'], fail_silently=False) + +.. note:: + + The character set of email sent with ``django.core.mail`` will be set to + the value of your `DEFAULT_CHARSET setting`_. + +.. _DEFAULT_CHARSET setting: ../settings/#DEFAULT_CHARSET send_mail() =========== diff --git a/docs/transactions.txt b/docs/transactions.txt index 6b2e6fda8f..378aa959d1 100644 --- a/docs/transactions.txt +++ b/docs/transactions.txt @@ -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 diff --git a/docs/tutorial03.txt b/docs/tutorial03.txt index 6433831a73..9dce729d24 100644 --- a/docs/tutorial03.txt +++ b/docs/tutorial03.txt @@ -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 |