diff options
| author | Adam Johnson <me@adamj.eu> | 2022-03-06 10:08:05 +0000 |
|---|---|---|
| committer | Carlton Gibson <carlton.gibson@noumenal.es> | 2022-03-08 14:50:06 +0100 |
| commit | a45f28f0ecd830c4e5683d46d6b454861ba912b3 (patch) | |
| tree | 3d87cce1f867e5974b300adcfce6c21135b63381 /docs | |
| parent | a8c15481f4be93700f6e4a8f794de26744e6db20 (diff) | |
Rewrote strip_tags test file to lorem ipsum.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 6 | ||||
| -rw-r--r-- | docs/man/django-admin.1 | 8 | ||||
| -rw-r--r-- | docs/requirements.txt | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/docs/conf.py b/docs/conf.py index 578bb62627..2711eb9c89 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -94,8 +94,8 @@ source_suffix = ".txt" # The encoding of source files. # source_encoding = 'utf-8-sig' -# The root document. -root_doc = "contents" +# The master toctree document. +master_doc = "contents" # General substitutions. project = "Django" @@ -347,7 +347,7 @@ man_pages = [ # description, category, toctree_only) texinfo_documents = [ ( - root_doc, + master_doc, "django", "", "", diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1 index 74a03c872b..616eb780ae 100644 --- a/docs/man/django-admin.1 +++ b/docs/man/django-admin.1 @@ -870,9 +870,9 @@ If you\(aqre in a multi\-database setup, you might have fixture data that you want to load onto one database, but not onto another. In this situation, you can add a database identifier into the names of your fixtures. .sp -For example, if your \fBDATABASES\fP setting has a \(aqusers\(aq database -defined, name the fixture \fBmydata.users.json\fP or -\fBmydata.users.json.gz\fP and the fixture will only be loaded when you +For example, if your \fBDATABASES\fP setting has a \(aqmaster\(aq database +defined, name the fixture \fBmydata.master.json\fP or +\fBmydata.master.json.gz\fP and the fixture will only be loaded when you specify you want to load data into the \fBmaster\fP database. .SS Loading fixtures from \fBstdin\fP .sp @@ -1815,7 +1815,7 @@ zip files, you can use a URL like: .sp .nf .ft C -django\-admin startapp \-\-template=https://github.com/githubuser/django\-app\-template/archive/main.zip myapp +django\-admin startapp \-\-template=https://github.com/githubuser/django\-app\-template/archive/master.zip myapp .ft P .fi .UNINDENT diff --git a/docs/requirements.txt b/docs/requirements.txt index 408a6d7d44..6ea1372680 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ pyenchant -Sphinx>=4.0.0 +Sphinx>=3.1.0 sphinxcontrib-spelling |