diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/contrib/staticfiles.txt | 24 | ||||
| -rw-r--r-- | docs/releases/1.4.txt | 3 |
2 files changed, 22 insertions, 5 deletions
diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt index 4c243a349a..5ab3c1e02f 100644 --- a/docs/ref/contrib/staticfiles.txt +++ b/docs/ref/contrib/staticfiles.txt @@ -143,20 +143,34 @@ specified by the :setting:`INSTALLED_APPS` setting. Some commonly used options are: -``--noinput`` +.. django-admin-option:: --noinput + Do NOT prompt the user for input of any kind. -``-i PATTERN`` or ``--ignore=PATTERN`` +.. django-admin-option:: -i <pattern> +.. django-admin-option:: --ignore <pattern> + Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more. -``-n`` or ``--dry-run`` +.. django-admin-option:: -n +.. django-admin-option:: --dry-run + Do everything except modify the filesystem. -``-l`` or ``--link`` +.. django-admin-option:: -c +.. django-admin-option:: --clear +.. versionadded:: 1.4 + + Clear the existing files before trying to copy or link the original file. + +.. django-admin-option:: -l +.. django-admin-option:: --link + Create a symbolic link to each file instead of copying. -``--no-default-ignore`` +.. django-admin-option:: --no-default-ignore + Don't ignore the common private glob-style patterns ``'CVS'``, ``'.*'`` and ``'*~'``. diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt index 781093123c..55d845305c 100644 --- a/docs/releases/1.4.txt +++ b/docs/releases/1.4.txt @@ -213,6 +213,9 @@ Django 1.4 also includes several smaller improvements worth noting: to the :mod:`django.contrib.auth.utils` module. Importing it from the old location will still work, but you should update your imports. +* The :djadmin:`collectstatic` management command gained a ``--clear`` option + to delete all files at the destination before copying or linking the static + files. .. _backwards-incompatible-changes-1.4: |