summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt8
-rw-r--r--docs/releases/1.11.txt3
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 12c43f3dab..2ecf082575 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -416,6 +416,14 @@ originally generated.
Specifies a single app to look for fixtures in rather than looking in all apps.
+.. django-admin-option:: --exclude EXCLUDE, -e EXCLUDE
+
+.. versionadded:: 1.11
+
+Excludes loading the fixtures from the given applications and/or models (in the
+form of ``app_label`` or ``app_label.ModelName``). Use the option multiple
+times to exclude more than one app or model.
+
What's a "fixture"?
~~~~~~~~~~~~~~~~~~~
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index e8cf5ae0f3..ed4620ec44 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -169,7 +169,8 @@ Internationalization
Management Commands
~~~~~~~~~~~~~~~~~~~
-* ...
+* The new :option:`loaddata --exclude` option allows excluding models and apps
+ while loading data from fixtures.
Migrations
~~~~~~~~~~