summaryrefslogtreecommitdiff
path: root/docs/man/django-admin.1
diff options
context:
space:
mode:
authorAdam Johnson <me@adamj.eu>2021-11-22 10:47:38 +0000
committerCarlton Gibson <carlton.gibson@noumenal.es>2022-03-08 14:50:06 +0100
commita8c15481f4be93700f6e4a8f794de26744e6db20 (patch)
tree1fd9a909f28d32133b6f4b6d903411491385bb25 /docs/man/django-admin.1
parentd4fd31684ad5a7b9be8a9d26c5a8796f96c8d80b (diff)
Rewrote some references to "master".
Following d9a266d657f66b8c4fa068408002a4e3709ee669.
Diffstat (limited to 'docs/man/django-admin.1')
-rw-r--r--docs/man/django-admin.18
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1
index 616eb780ae..74a03c872b 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 \(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
+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
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/master.zip myapp
+django\-admin startapp \-\-template=https://github.com/githubuser/django\-app\-template/archive/main.zip myapp
.ft P
.fi
.UNINDENT