summaryrefslogtreecommitdiff
path: root/docs/ref/django-admin.txt
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/ref/django-admin.txt
parentd4fd31684ad5a7b9be8a9d26c5a8796f96c8d80b (diff)
Rewrote some references to "master".
Following d9a266d657f66b8c4fa068408002a4e3709ee669.
Diffstat (limited to 'docs/ref/django-admin.txt')
-rw-r--r--docs/ref/django-admin.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 326611d786..fc1f6b7257 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -632,10 +632,10 @@ If you're 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.
-For example, if your :setting:`DATABASES` setting has a 'master' database
-defined, name the fixture ``mydata.master.json`` or
-``mydata.master.json.gz`` and the fixture will only be loaded when you
-specify you want to load data into the ``master`` database.
+For example, if your :setting:`DATABASES` setting has a 'users' database
+defined, name the fixture ``mydata.users.json`` or
+``mydata.users.json.gz`` and the fixture will only be loaded when you
+specify you want to load data into the ``users`` database.
.. _loading-fixtures-stdin:
@@ -1311,7 +1311,7 @@ fly.
For example, taking advantage of GitHub's feature to expose repositories as
zip files, you can use a URL like::
- 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
.. django-admin-option:: --extension EXTENSIONS, -e EXTENSIONS