diff options
| author | Paul McMillan <Paul@McMillan.ws> | 2012-03-14 19:06:23 +0000 |
|---|---|---|
| committer | Paul McMillan <Paul@McMillan.ws> | 2012-03-14 19:06:23 +0000 |
| commit | 14df122f865e5c050a26c619f616d4983d6a4ed2 (patch) | |
| tree | 73ab9bc38ebbcda829683df4e32445cc78c66577 /docs/ref | |
| parent | eb9eaa6d7182e8156699a692916af4b167cdc363 (diff) | |
Fixed #17837. Improved markdown safety.
Markdown enable_attributes is now False when safe_mode is enabled. Documented
the markdown "safe" argument. Added warnings when the safe argument is
passed to versions of markdown which cannot be made safe. Deprecated
versions of markdown < 2.1. Many thanks to ptone for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/markup.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/docs/ref/contrib/markup.txt b/docs/ref/contrib/markup.txt index d671e46e2c..3abc27bf5d 100644 --- a/docs/ref/contrib/markup.txt +++ b/docs/ref/contrib/markup.txt @@ -47,3 +47,19 @@ override the default writer settings. See the `restructuredtext writer settings`_ for details on what these settings are. .. _restructuredtext writer settings: http://docutils.sourceforge.net/docs/user/config.html#html4css1-writer + +Markdown +-------- + +The Python Markdown library supports options named "safe_mode" and +"enable_attributes". Both relate to the security of the output. To enable both +options in tandem, the markdown filter supports the "safe" argument. + + {{ markdown_content_var|markdown:"safe" }} + +.. warning:: + + Versions of the Python-Markdown library prior to 2.1 do not support the + optional disabling of attributes and by default they will be included in + any output from the markdown filter - a warning is issued if this is the + case. |