diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.6.2.txt | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 26258eaf6b..95104afacf 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2516,7 +2516,7 @@ Settings for :mod:`django.contrib.staticfiles`. STATIC_ROOT ----------- -Default: ``''`` (Empty string) +Default: ``None`` The absolute path to the directory where :djadmin:`collectstatic` will collect static files for deployment. diff --git a/docs/releases/1.6.2.txt b/docs/releases/1.6.2.txt index 41bc86e906..6043d21815 100644 --- a/docs/releases/1.6.2.txt +++ b/docs/releases/1.6.2.txt @@ -14,3 +14,8 @@ Bug fixes * Fixed a crash when executing the :djadmin:`changepassword` command when the user object representation contained non-ASCII characters (#21627). + +* The :djadmin:`collectstatic` command will raise an error rather than + default to using the current working directory if :setting:`STATIC_ROOT` is + not set. Combined with the ``--clear`` option, the previous behavior could + wipe anything below the current working directory. |