diff options
| author | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-04-30 15:32:29 +0000 |
|---|---|---|
| committer | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-04-30 15:32:29 +0000 |
| commit | 5a7802586d117a75f91df04c032fd249808a877d (patch) | |
| tree | 0750adbf26c907344f018eb2a73b77ae31c383cc /docs | |
| parent | 3b479bfc563d3b3d768640ff5963947c56ee042b (diff) | |
boulder-oracle-sprint: Merged to [5127]
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@5128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/db-api.txt | 8 | ||||
| -rw-r--r-- | docs/email.txt | 15 | ||||
| -rw-r--r-- | docs/settings.txt | 5 |
3 files changed, 14 insertions, 14 deletions
diff --git a/docs/db-api.txt b/docs/db-api.txt index d2aa6b8bb3..9d2f09daf3 100644 --- a/docs/db-api.txt +++ b/docs/db-api.txt @@ -112,7 +112,7 @@ the previous record in the database:: b4 = Blog(id=3, name='Not Cheddar', tagline='Anything but cheese.') b4.save() # Overrides the previous blog with ID=3! -See _`How Django knows to UPDATE vs. INSERT`, below, for the reason this +See `How Django knows to UPDATE vs. INSERT`_, below, for the reason this happens. Explicitly specifying auto-primary-key values is mostly useful for bulk-saving @@ -714,7 +714,7 @@ QuerySet methods that do not return QuerySets The following ``QuerySet`` methods evaluate the ``QuerySet`` and return something *other than* a ``QuerySet``. -These methods do not use a cache (see _`Caching and QuerySets` below). Rather, +These methods do not use a cache (see `Caching and QuerySets`_ below). Rather, they query the database each time they're called. ``get(**kwargs)`` @@ -906,8 +906,8 @@ The database API supports the following lookup types: exact ~~~~~ -Exact match. If the value provided for comparison is ``None``, it will -be interpreted as an SQL ``NULL`` (See isnull_ for more details). +Exact match. If the value provided for comparison is ``None``, it will +be interpreted as an SQL ``NULL`` (See isnull_ for more details). Examples:: diff --git a/docs/email.txt b/docs/email.txt index cbe909c03c..8ebdaa8136 100644 --- a/docs/email.txt +++ b/docs/email.txt @@ -21,20 +21,19 @@ In two lines:: ['to@example.com'], fail_silently=False) Mail will be sent using the SMTP host and port specified in the `EMAIL_HOST`_ -and `EMAIL_PORT`_ settings. The `EMAIL_HOST_USER`_ and `EMAIL_HOST_PASSWORD`_ -settings, if set, will be used to authenticate to the -SMTP server. +and `EMAIL_PORT`_ settings. The `EMAIL_HOST_USER`_ and `EMAIL_HOST_PASSWORD`_ +settings, if set, will be used to authenticate to the SMTP server. .. 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 -.. _EMAIL_HOST: ../settings/#EMAIL_HOST -.. _EMAIL_PORT: ../settings/#EMAIL_PORT -.. _EMAIL_HOST_USER: ../settings/#EMAIL_HOST_USER -.. _EMAIL_HOST_PASSWORD: ../settings/#EMAIL_HOST_PASSWORD +.. _DEFAULT_CHARSET setting: ../settings/#default-charset +.. _EMAIL_HOST: ../settings/#email-host +.. _EMAIL_PORT: ../settings/#email-port +.. _EMAIL_HOST_USER: ../settings/#email-host-user +.. _EMAIL_HOST_PASSWORD: ../settings/#email-host-password send_mail() diff --git a/docs/settings.txt b/docs/settings.txt index 583c258bd3..8cc400dfde 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -396,8 +396,9 @@ EMAIL_HOST_PASSWORD Default: ``''`` (Empty string) Password to use for the SMTP server defined in ``EMAIL_HOST``. This setting is -used in conjunction with EMAIL_HOST_USER when authenticating to the SMTP server. -If either of these settings is empty, Django won't attempt authenticaion. +used in conjunction with ``EMAIL_HOST_USER`` when authenticating to the SMTP +server. If either of these settings is empty, Django won't attempt +authenticaion. See also ``EMAIL_HOST_USER``. |