summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Wiesmann <yellowcap@users.noreply.github.com>2018-07-13 21:48:19 +0100
committerTim Graham <timograham@gmail.com>2018-07-13 16:48:19 -0400
commit8f75d21a2e6d255848ae441d858c6ea819e3d100 (patch)
tree9e78cbbcc99557d324332618d27ec4be0227af0e /docs
parentc28bf990d71a8befb954482e3d6a925e89f3176f (diff)
Fixed #28566 -- Added path matching to collectstatic ignore patterns.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/staticfiles.txt9
-rw-r--r--docs/releases/2.2.txt3
2 files changed, 9 insertions, 3 deletions
diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt
index 2c300a1d03..ce8d157ff2 100644
--- a/docs/ref/contrib/staticfiles.txt
+++ b/docs/ref/contrib/staticfiles.txt
@@ -94,8 +94,13 @@ Some commonly used options are:
.. django-admin-option:: --ignore PATTERN, -i PATTERN
- Ignore files or directories matching this glob-style pattern. Use multiple
- times to ignore more.
+ Ignore files, directories, or paths matching this glob-style pattern. Use
+ multiple times to ignore more. When specifying a path, always use forward
+ slashes, even on Windows.
+
+ .. versionchanged:: 2.2
+
+ Path matching was added.
.. django-admin-option:: --dry-run, -n
diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt
index 29a6f54f9d..3d1f2783ab 100644
--- a/docs/releases/2.2.txt
+++ b/docs/releases/2.2.txt
@@ -105,7 +105,8 @@ Minor features
:mod:`django.contrib.staticfiles`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* ...
+* Added path matching to the :option:`collectstatic --ignore` option so that
+ patterns like ``/vendor/*.js`` can be used.
:mod:`django.contrib.syndication`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~