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/topics/db | |
| 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/topics/db')
| -rw-r--r-- | docs/topics/db/multi-db.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/topics/db/multi-db.txt b/docs/topics/db/multi-db.txt index f4b6367033..ca35d1f933 100644 --- a/docs/topics/db/multi-db.txt +++ b/docs/topics/db/multi-db.txt @@ -76,7 +76,7 @@ Synchronizing your databases The :djadmin:`migrate` management command operates on one database at a time. By default, it operates on the ``default`` database, but by -providing a :djadminopt:`--database` argument, you can tell :djadmin:`migrate` +providing the :option:`--database <migrate --database>` option, you can tell it to synchronize a different database. So, to synchronize all models onto all databases in our example, you would need to call:: @@ -91,10 +91,9 @@ constraining the availability of particular models. Using other management commands ------------------------------- -The other ``django-admin`` commands that interact with the database -operate in the same way as :djadmin:`migrate` -- they only ever operate -on one database at a time, using :djadminopt:`--database` to control -the database used. +The other ``django-admin`` commands that interact with the database operate in +the same way as :djadmin:`migrate` -- they only ever operate on one database at +a time, using ``--database`` to control the database used. .. _topics-db-multi-db-routing: |