Ticket #14667: media-settings.diff

docs/ref/settings.txt

@@ -1104 +1104 @@
 
 Default: ``''`` (Empty string)
 
-Absolute path to the directory that holds media for this installation.
-Example: ``"/home/media/media.lawrence.com/"`` See also ``MEDIA_URL``.
+Absolute path to the directory that holds media for this installation, used
+for :doc:`managing files </topics/files>`.
+
+Example: ``"/home/media/media.lawrence.com/"``
+
+See also ``MEDIA_URL``.
 
 .. setting:: MEDIA_URL
 
@@ -1114 +1118 @@
 
 Default: ``''`` (Empty string)
 
-URL that handles the media served from ``MEDIA_ROOT``.
+URL that handles the media served from ``MEDIA_ROOT``, used
+for :doc:`managing files </topics/files>`.
+
 Example: ``"http://media.lawrence.com"``
 
 Note that this should have a trailing slash if it has a path component.
 
-Good: ``"http://www.example.com/static/"``
-Bad: ``"http://www.example.com/static"``
+ * Good: ``"http://www.example.com/static/"``
+ * Bad: ``"http://www.example.com/static"``
 
-.. setting:: MIDDLEWARE_CLASSES
 
 MESSAGE_LEVEL
 -------------
@@ -1161 +1166 @@
 Sets the mapping of message levels to message tags. See the
 :doc:`messages documentation </ref/contrib/messages>` for more details.
 
+.. setting:: MIDDLEWARE_CLASSES
+
 MIDDLEWARE_CLASSES
 ------------------