mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-03 18:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed #23868 -- Added support for non-unique django-admin-options in docs.

Browse source 
Also documented missing short command line options to fix #24134. This bumps
the minimum sphinx version required to build the docs to 1.3.4.

Thanks Simon Charette for review.
This commit is contained in:
Tim Graham 2016-01-11 20:59:34 -05:00
parent fd1c5bb041
commit e519aab43a
31 changed files with 543 additions and 616 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/internals/contributing/writing-documentation.txt
View file

@ -241,7 +241,8 @@ __ http://sphinx-doc.org/markup/
.. django-admin-option:: --traceback
To link, use ``:djadminopt:`--traceback```.
To link, use ``:option:`command_name --traceback``` (or omit ``command_name``
for the options shared by all commands like ``--verbosity``).
* Links to Trac tickets (typically reserved for patch release notes)::

3
docs/internals/deprecation.txt
View file

@ -372,10 +372,9 @@ details on these changes.
``get_backend_timeout()`` will be removed.
* The ``--natural`` and ``-n`` options for :djadmin:`dumpdata` will be removed.
Use :djadminopt:`--natural-foreign` instead.
* The ``use_natural_keys`` argument for ``serializers.serialize()`` will be
removed. Use ``use_natural_foreign_keys`` instead.
removed.
* Private API ``django.forms.forms.get_declared_fields()`` will be removed.