From 3f8583a2c8978096be177bc7c95955e65eebee5f Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Wed, 13 Nov 2013 07:38:03 -0500
Subject: [1.6.x] Added a warning regarding risks in serving user uploaded
 media.

Thanks Preston Holmes for the draft text.

Backport of df6760f12c from master
---
 docs/ref/settings.txt | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docs/ref')

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index b4c85967c2..26258eaf6b 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1440,6 +1440,12 @@ to a non-empty value.
 
 Example: ``"http://media.example.com/"``
 
+.. warning::
+
+    There are security risks if you are accepting uploaded content from
+    untrusted users! See the security guide's topic on
+    :ref:`user-uploaded-content-security` for mitigation details.
+
 .. warning::
 
     :setting:`MEDIA_URL` and :setting:`STATIC_URL` must have different
-- 
cgit v1.3