diff options
| author | Tim Graham <timograham@gmail.com> | 2016-01-11 20:59:34 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-01-14 18:21:33 -0500 |
| commit | e519aab43a419589e92fe284e4ce2f2e034aec6a (patch) | |
| tree | e1af3c01ca87ff9b639ac45ec97ac9869d273c43 /docs/internals | |
| parent | fd1c5bb041abb617dc58c336a8461fb3a7af4508 (diff) | |
Fixed #23868 -- Added support for non-unique django-admin-options in docs.
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.
Diffstat (limited to 'docs/internals')
| -rw-r--r-- | docs/internals/contributing/writing-documentation.txt | 3 | ||||
| -rw-r--r-- | docs/internals/deprecation.txt | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt index 13bfe88290..c48248fb79 100644 --- a/docs/internals/contributing/writing-documentation.txt +++ b/docs/internals/contributing/writing-documentation.txt @@ -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):: diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index c03da8fd47..d5add78423 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -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. |