Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit 20b940614e62c1b71c7a438c686fe6a387746f28 1 parent d50f59e
authored March 03, 2011
2  docs/ref/databases.txt
@@ -246,7 +246,7 @@ MySQLdb 1.2.1p2 or 1.2.2, you should still use ``utf8_collation_ci_swedish``
246 246
 table (usually called ``django_session``) and the
247 247
 :class:`django.contrib.admin.models.LogEntry` table (usually called
248 248
 ``django_admin_log``). Those are the two standard tables that use
249  
-:class:`~django.db.model.TextField` internally.
  249
+:class:`~django.db.models.TextField` internally.
250 250
 
251 251
 .. _fixed in MySQLdb 1.2.2: http://sourceforge.net/tracker/index.php?func=detail&aid=1495765&group_id=22307&atid=374932
252 252
 
15  docs/ref/exceptions.txt
@@ -104,6 +104,18 @@ ValidationError
104 104
     :ref:`Model Field Validation <validating-objects>` and the
105 105
     :doc:`Validator Reference </ref/validators>`.
106 106
 
  107
+.. currentmodule:: django.core.urlresolvers
  108
+
  109
+NoReverseMatch
  110
+--------------
  111
+.. exception:: NoReverseMatch
  112
+
  113
+    The :exc:`NoReverseMatch` exception is raised by
  114
+    :mod:`django.core.urlresolvers` when a matching URL in your URLconf
  115
+    cannot be identified based on the parameters supplied.
  116
+
  117
+.. currentmodule:: django.db
  118
+
107 119
 Database Exceptions
108 120
 ===================
109 121
 
@@ -112,6 +124,9 @@ Django wraps the standard database exceptions :exc:`DatabaseError` and
112 124
 implementation of these classes. These database exceptions are
113 125
 provided in :mod:`django.db`.
114 126
 
  127
+.. exception:: DatabaseError
  128
+.. exception:: IntegrityError
  129
+
115 130
 The Django wrappers for database exceptions behave exactly the same as
116 131
 the underlying database exceptions. See `PEP 249 - Python Database API
117 132
 Specification v2.0`_ for further information.
11  docs/ref/templates/builtins.txt
@@ -660,8 +660,8 @@ load
660 660
 
661 661
 Load a custom template tag set.
662 662
 
663  
-For example, the following template would load all the tags and filters registered
664  
-in ``somelibrary`` and ``otherlibrary``::
  663
+For example, the following template would load all the tags and filters
  664
+registered in ``somelibrary`` and ``otherlibrary``::
665 665
 
666 666
     {% load somelibrary otherlibrary %}
667 667
 
@@ -671,7 +671,8 @@ and ``bar`` will be loaded from ``somelibrary``::
671 671
 
672 672
     {% load foo bar from somelibrary %}
673 673
 
674  
-See :doc:`Custom tag and filter libraries </howto/custom-template-tags>` for more information.
  674
+See :doc:`Custom tag and filter libraries </howto/custom-template-tags>` for
  675
+more information.
675 676
 
676 677
 .. templatetag:: now
677 678
 
@@ -968,8 +969,8 @@ refer to the name of the pattern in the ``url`` tag instead of using the
968 969
 path to the view.
969 970
 
970 971
 Note that if the URL you're reversing doesn't exist, you'll get an
971  
-:exc:`NoReverseMatch` exception raised, which will cause your site to display an
972  
-error page.
  972
+:exc:`~django.core.urlresolvers.NoReverseMatch` exception raised, which will
  973
+cause your site to display an error page.
973 974
 
974 975
 If you'd like to retrieve a URL without displaying it, you can use a slightly
975 976
 different call::
2  docs/topics/db/index.txt
... ...
@@ -1,6 +1,8 @@
1 1
 Models and databases
2 2
 ====================
3 3
 
  4
+.. module:: django.db
  5
+
4 6
 A model is the single, definitive source of data about your data. It contains
5 7
 the essential fields and behaviors of the data you're storing. Generally, each
6 8
 model maps to a single database table.

0 notes on commit 20b9406

Please sign in to comment.
Something went wrong with that request. Please try again.