diff options
| author | Per Andersson <avtobiff@gmail.com> | 2014-01-30 01:25:15 +0100 |
|---|---|---|
| committer | Per Andersson <avtobiff@gmail.com> | 2014-01-30 01:25:15 +0100 |
| commit | c084fbcb2e2f2f167c8d65ca1ecfee406f14c24b (patch) | |
| tree | 6c5ca20a48eb50ea000748abb5374247d6de1888 /docs/index.rst | |
| parent | 973d326d7847161827a8f75b5f589008a83a342d (diff) | |
| parent | 6cff86ce6de27fbd4f9fc07716fb1205b14ffae4 (diff) | |
| download | python-bleach-c084fbcb2e2f2f167c8d65ca1ecfee406f14c24b.tar python-bleach-c084fbcb2e2f2f167c8d65ca1ecfee406f14c24b.tar.gz | |
Merge tag 'upstream/1.4'
Upstream version 1.4
# gpg: Signature made Thu 30 Jan 2014 01:25:12 AM CET using RSA key ID 79F492F8
# gpg: Good signature from "Per Andersson <avtobiff@fripost.org>"
# gpg: aka "Per Andersson <avtobiff@debian.org>"
# gpg: aka "Per Andersson <avtobiff@gmail.com>"
# gpg: aka "Per Andersson <avtobiff@foo.nu>"
Diffstat (limited to 'docs/index.rst')
| -rw-r--r-- | docs/index.rst | 12 |
1 files changed, 3 insertions, 9 deletions
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 |