Skip to content

Commit

Permalink
[1.2.X] Fixed #14307 -- Added a new crossref target to model field re…
Browse files Browse the repository at this point in the history
…ference 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
  • Loading branch information
Gabriel Hurley committed Oct 15, 2010
1 parent 560f58a commit ac16c59
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 2 additions & 4 deletions docs/ref/forms/fields.txt
Expand Up @@ -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``
~~~~~~~~~~~~~~~~~~~~
Expand Down
2 changes: 2 additions & 0 deletions docs/ref/models/fields.txt
Expand Up @@ -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``
-----------

Expand Down

0 comments on commit ac16c59

Please sign in to comment.