diff options
| author | Tim Graham <timograham@gmail.com> | 2016-01-11 20:59:34 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-02-01 11:25:42 -0500 |
| commit | d7a6086825d4a308955e792f65fdd9b5f714a505 (patch) | |
| tree | 18d8ce5d96a3fe188ff1c6f7227baa56269befa9 /docs/howto | |
| parent | 0495f44b8d7f971f228a5e180ab9bc4b08cf57c6 (diff) | |
[1.9.x] 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.
Backport of e519aab43a419589e92fe284e4ce2f2e034aec6a from master
Diffstat (limited to 'docs/howto')
| -rw-r--r-- | docs/howto/custom-management-commands.txt | 9 | ||||
| -rw-r--r-- | docs/howto/deployment/checklist.txt | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/docs/howto/custom-management-commands.txt b/docs/howto/custom-management-commands.txt index 238f61662d..f8dc7b89fa 100644 --- a/docs/howto/custom-management-commands.txt +++ b/docs/howto/custom-management-commands.txt @@ -139,8 +139,8 @@ parameter of the handle method. See the :py:mod:`argparse` Python documentation for more about ``add_argument`` usage. In addition to being able to add custom command line options, all -:doc:`management commands</ref/django-admin>` can accept some -default options such as :djadminopt:`--verbosity` and :djadminopt:`--traceback`. +:doc:`management commands</ref/django-admin>` can accept some default options +such as :option:`--verbosity` and :option:`--traceback`. .. _management-commands-and-locales: @@ -314,9 +314,8 @@ All attributes can be set in your derived class and can be used in see the available styles (use uppercased versions of the "roles" described in that section). - If you pass the :djadminopt:`--no-color` option when running your - command, all ``self.style()`` calls will return the original string - uncolored. + If you pass the :option:`--no-color` option when running your command, all + ``self.style()`` calls will return the original string uncolored. Methods ------- diff --git a/docs/howto/deployment/checklist.txt b/docs/howto/deployment/checklist.txt index 1331670a13..59717193dd 100644 --- a/docs/howto/deployment/checklist.txt +++ b/docs/howto/deployment/checklist.txt @@ -32,10 +32,9 @@ module for production. Run ``manage.py check --deploy`` ================================ -Some of the checks described below can be automated using the -:djadminopt:`--deploy` option of the :djadmin:`check` command. Be sure to run it -against your production settings file as described in the option's -documentation. +Some of the checks described below can be automated using the :option:`check +--deploy` option. Be sure to run it against your production settings file as +described in the option's documentation. Critical settings ================= |