[1.2.X] Fixed #14307 -- Added a new crossref target to model field reference docs and fixed broken relative link in form field reference docs. Thanks to adamv for the report.

Backport of [14234] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14235 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 4 insertions, 4 deletions

diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index 4171e60da6..cd32e10eed 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -353,10 +353,8 @@ Takes one extra required argument:
 
     An iterable (e.g., a list or tuple) of 2-tuples to use as choices for this
     field. This argument accepts the same formats as the ``choices`` argument
-    to a model field. See the `model field reference documentation on choices`_
-    for more details.
-    
-    .. _model field reference documentation on choices: ../models/fields#choices
+    to a model field. See the :ref:`model field reference documentation on
+    choices <field-choices>` for more details.
 
 ``TypedChoiceField``
 ~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index e107f41454..02ed60833f 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -69,6 +69,8 @@ purely database-related, whereas :attr:`~Field.blank` is validation-related. If
 a field has ``blank=True``, validation on Django's admin site will allow entry
 of an empty value. If a field has ``blank=False``, the field will be required.
 
+.. _field-choices:
+
 ``choices``
 -----------