summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-10-31 15:17:40 -0400
committerTim Graham <timograham@gmail.com>2016-10-31 15:19:21 -0400
commit052578879d4edf2c79b9c727e9458e4df8ffbff8 (patch)
treef2f96cd6603bf59ef79dcb66f81227a66fb8b3ed
parenta7dabe421684e6cb2f2abce659d60fa3bb1bb71b (diff)
[1.10.x] Fixed #27410 -- Clarified when static files is enabled in STATIC_ROOT docs.
Backport of de91c172cfda624451fab9a87be92cc0d32e1fcf from master
-rw-r--r--docs/ref/settings.txt7
-rw-r--r--docs/spelling_wordlist1
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index a20a5173b6..7619e4d827 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -3086,9 +3086,10 @@ static files for deployment.
Example: ``"/var/www/example.com/static/"``
If the :doc:`staticfiles</ref/contrib/staticfiles>` contrib app is enabled
-(default) the :djadmin:`collectstatic` management command will collect static
-files into this directory. See the howto on :doc:`managing static
-files</howto/static-files/index>` for more details about usage.
+(as in the default project template), the :djadmin:`collectstatic` management
+command will collect static files into this directory. See the how-to on
+:doc:`managing static files</howto/static-files/index>` for more details about
+usage.
.. warning::
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index a8a11f5d95..38ac5d27ce 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -339,7 +339,6 @@ honeypot
Honza
hostname
hostnames
-howto
hstore
html
http