summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDavid D Lowe <daviddlowe.flimm@gmail.com>2016-05-02 18:27:41 +0100
committerTim Graham <timograham@gmail.com>2016-05-03 12:53:55 -0400
commit3c6b9f0bbd5e37099c4751cdd2a08db508d66e54 (patch)
tree04ec5e626c13b8d1e21e2eb2560f569a6fa03a5b /docs
parentcb33e553ee537da4915f9055f8cdf9bf32113aed (diff)
[1.9.x] Clarified that setting names must be uppercase.
Backport of c9c5ccbd413332aafb45c47749fb6e8ede70eef4 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/settings.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/settings.txt b/docs/topics/settings.txt
index 8b14d3ba52..25b3f94fe3 100644
--- a/docs/topics/settings.txt
+++ b/docs/topics/settings.txt
@@ -161,9 +161,9 @@ Creating your own settings
==========================
There's nothing stopping you from creating your own settings, for your own
-Django apps. Just follow these conventions:
+Django apps. Just follow these guidelines:
-* Setting names are in all uppercase.
+* Setting names must be all uppercase.
* Don't reinvent an already-existing setting.
For settings that are sequences, Django itself uses lists, but this is only