summaryrefslogtreecommitdiff
path: root/docs/internals/contributing/writing-documentation.txt
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-01-11 20:59:34 -0500
committerTim Graham <timograham@gmail.com>2016-01-14 18:21:33 -0500
commite519aab43a419589e92fe284e4ce2f2e034aec6a (patch)
treee1af3c01ca87ff9b639ac45ec97ac9869d273c43 /docs/internals/contributing/writing-documentation.txt
parentfd1c5bb041abb617dc58c336a8461fb3a7af4508 (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/contributing/writing-documentation.txt')
-rw-r--r--docs/internals/contributing/writing-documentation.txt3
1 files changed, 2 insertions, 1 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)::