Code

Ticket #14667: media-settings.diff

File media-settings.diff, 1.4 KB (added by adamv, 4 years ago)
Line 
1diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
2index 78b5fd9..e5be2eb 100644
3--- a/docs/ref/settings.txt
4+++ b/docs/ref/settings.txt
5@@ -1104,8 +1104,12 @@ MEDIA_ROOT
6 
7 Default: ``''`` (Empty string)
8 
9-Absolute path to the directory that holds media for this installation.
10-Example: ``"/home/media/media.lawrence.com/"`` See also ``MEDIA_URL``.
11+Absolute path to the directory that holds media for this installation, used
12+for :doc:`managing files </topics/files>`.
13+
14+Example: ``"/home/media/media.lawrence.com/"``
15+
16+See also ``MEDIA_URL``.
17 
18 .. setting:: MEDIA_URL
19 
20@@ -1114,15 +1118,16 @@ MEDIA_URL
21 
22 Default: ``''`` (Empty string)
23 
24-URL that handles the media served from ``MEDIA_ROOT``.
25+URL that handles the media served from ``MEDIA_ROOT``, used
26+for :doc:`managing files </topics/files>`.
27+
28 Example: ``"http://media.lawrence.com"``
29 
30 Note that this should have a trailing slash if it has a path component.
31 
32-Good: ``"http://www.example.com/static/"``
33-Bad: ``"http://www.example.com/static"``
34+ * Good: ``"http://www.example.com/static/"``
35+ * Bad: ``"http://www.example.com/static"``
36 
37-.. setting:: MIDDLEWARE_CLASSES
38 
39 MESSAGE_LEVEL
40 -------------
41@@ -1161,6 +1166,8 @@ Default::
42 Sets the mapping of message levels to message tags. See the
43 :doc:`messages documentation </ref/contrib/messages>` for more details.
44 
45+.. setting:: MIDDLEWARE_CLASSES
46+
47 MIDDLEWARE_CLASSES
48 ------------------
49