Commit 20b94061 authored by Gabriel Hurley's avatar Gabriel Hurley
Browse files

Added crossref targets for a couple of Django exceptions and cleaned up related reST markup.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent d50f59ee
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ MySQLdb 1.2.1p2 or 1.2.2, you should still use ``utf8_collation_ci_swedish``
table (usually called ``django_session``) and the
:class:`django.contrib.admin.models.LogEntry` table (usually called
``django_admin_log``). Those are the two standard tables that use
:class:`~django.db.model.TextField` internally.
:class:`~django.db.models.TextField` internally.

.. _fixed in MySQLdb 1.2.2: http://sourceforge.net/tracker/index.php?func=detail&aid=1495765&group_id=22307&atid=374932

+15 −0
Original line number Diff line number Diff line
@@ -104,6 +104,18 @@ ValidationError
    :ref:`Model Field Validation <validating-objects>` and the
    :doc:`Validator Reference </ref/validators>`.

.. currentmodule:: django.core.urlresolvers

NoReverseMatch
--------------
.. exception:: NoReverseMatch

    The :exc:`NoReverseMatch` exception is raised by
    :mod:`django.core.urlresolvers` when a matching URL in your URLconf
    cannot be identified based on the parameters supplied.

.. currentmodule:: django.db

Database Exceptions
===================

@@ -112,6 +124,9 @@ Django wraps the standard database exceptions :exc:`DatabaseError` and
implementation of these classes. These database exceptions are
provided in :mod:`django.db`.

.. exception:: DatabaseError
.. exception:: IntegrityError

The Django wrappers for database exceptions behave exactly the same as
the underlying database exceptions. See `PEP 249 - Python Database API
Specification v2.0`_ for further information.
+6 −5
Original line number Diff line number Diff line
@@ -660,8 +660,8 @@ load

Load a custom template tag set.

For example, the following template would load all the tags and filters registered
in ``somelibrary`` and ``otherlibrary``::
For example, the following template would load all the tags and filters
registered in ``somelibrary`` and ``otherlibrary``::

    {% load somelibrary otherlibrary %}

@@ -671,7 +671,8 @@ and ``bar`` will be loaded from ``somelibrary``::

    {% load foo bar from somelibrary %}

See :doc:`Custom tag and filter libraries </howto/custom-template-tags>` for more information.
See :doc:`Custom tag and filter libraries </howto/custom-template-tags>` for
more information.

.. templatetag:: now

@@ -968,8 +969,8 @@ refer to the name of the pattern in the ``url`` tag instead of using the
path to the view.

Note that if the URL you're reversing doesn't exist, you'll get an
:exc:`NoReverseMatch` exception raised, which will cause your site to display an
error page.
:exc:`~django.core.urlresolvers.NoReverseMatch` exception raised, which will
cause your site to display an error page.

If you'd like to retrieve a URL without displaying it, you can use a slightly
different call::
+2 −0
Original line number Diff line number Diff line
Models and databases
====================

.. module:: django.db

A model is the single, definitive source of data about your data. It contains
the essential fields and behaviors of the data you're storing. Generally, each
model maps to a single database table.