From 11b8160e584470439c8c0b3ab51012c9300f6788 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sun, 6 Dec 2015 13:31:51 +0000
Subject: Imported Upstream version 1.4.2

---
 docs/conf.py   | 6 +++---
 docs/goals.rst | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'docs')

diff --git a/docs/conf.py b/docs/conf.py
index 96b2fc8..78bee32 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,16 +41,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Bleach'
-copyright = u'2012, James Socol'
+copyright = u'2012-2104, James Socol'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.3'
+version = '1.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.1'
+release = '1.4.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/goals.rst b/docs/goals.rst
index 5477f9c..d62d54b 100644
--- a/docs/goals.rst
+++ b/docs/goals.rst
@@ -66,6 +66,9 @@ non-goal use cases include:
   you have to allow so many tags that a blacklist approach (e.g. forbidding
   ``<script>`` or ``<object>``) may be more appropriate.
 
+* **Removing *all* HTML.** There are much faster tools available if you want to
+  remove or escape all HTML from a document.
+
 * **Cleaning up after trusted users.** Bleach is powerful but it is not fast.
   If you trust your users, trust them and don't rely on Bleach to clean up
   their mess.
-- 
cgit v1.2.3