From e519aab43a419589e92fe284e4ce2f2e034aec6a Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 11 Jan 2016 20:59:34 -0500 Subject: 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. --- docs/internals/contributing/writing-documentation.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/internals/contributing/writing-documentation.txt') 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):: -- cgit v1.3