diff options
| author | Per Andersson <avtobiff@gmail.com> | 2014-01-30 01:25:11 +0100 |
|---|---|---|
| committer | Per Andersson <avtobiff@gmail.com> | 2014-01-30 01:25:11 +0100 |
| commit | 6cff86ce6de27fbd4f9fc07716fb1205b14ffae4 (patch) | |
| tree | 15d1f032fcf000801b69307d2463c10004489ee4 /docs | |
| parent | fac84c6d90e0875e6c1b10c5ef02d577ee008af4 (diff) | |
| download | python-bleach-6cff86ce6de27fbd4f9fc07716fb1205b14ffae4.tar python-bleach-6cff86ce6de27fbd4f9fc07716fb1205b14ffae4.tar.gz | |
Imported Upstream version 1.4upstream/1.4
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/clean.rst | 2 | ||||
| -rw-r--r-- | docs/conf.py | 4 | ||||
| -rw-r--r-- | docs/index.rst | 12 |
3 files changed, 6 insertions, 12 deletions
diff --git a/docs/clean.rst b/docs/clean.rst index a31dc89..2fb888b 100644 --- a/docs/clean.rst +++ b/docs/clean.rst @@ -85,7 +85,7 @@ allowed but no values will be. For example, to allow users to set the color and font-weight of text:: attrs = { - '*': 'style' + '*': ['style'] } tags = ['p', 'em', 'strong'] styles = ['color', 'font-weight'] diff --git a/docs/conf.py b/docs/conf.py index a63aedf..96b2fc8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,9 +48,9 @@ copyright = u'2012, James Socol' # built documents. # # The short X.Y version. -version = '1.2' +version = '1.3' # The full version, including alpha/beta/rc tags. -release = '1.2.0' +release = '1.3.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/index.rst b/docs/index.rst index 0929e53..0439786 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -16,14 +16,9 @@ regular-expression-based sanitizers. Bleach's ``linkify`` function is highly configurable and can be used to find, edit, and filter links most other auto-linkers can't. -The version of bleach on GitHub_ is the always the most up-to-date and the +The version of bleach on GitHub_ is always the most up-to-date and the ``master`` branch should always work. -.. warn:: - - Bleach is currently incompatible with html5lib 1.0b and any versions below - 0.9.5. - Installing Bleach ================= @@ -56,7 +51,6 @@ Contents: goals - Indices and tables ================== @@ -64,6 +58,6 @@ Indices and tables * :ref:`modindex` * :ref:`search` -.. _html5lib: http://code.google.com/p/html5lib/ +.. _html5lib: https://github.com/html5lib/html5lib-python .. _GitHub: https://github.com/jsocol/bleach -.. _PyPI: http://pypi.python.org/pypi/bleach +.. _PyPI: https://pypi.python.org/pypi/bleach |