- 1.1.1rel_1_1_1

4 files changed, 24 insertions, 22 deletions

diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst
index 38ea9ed..ef20d2e 100644
--- a/doc/build/changelog.rst
+++ b/doc/build/changelog.rst
@@ -8,7 +8,29 @@ Changelog
 
 .. changelog::
     :version: 1.1.1
-    :include_notes_from: unreleased
+    :released: Mon Jan 20 2020
+
+    .. change::
+        :tags: bug, py3k
+        :tickets: 310
+
+        Replaced usage of the long-superseded "parser.suite" module in the
+        mako.util package for parsing the python magic encoding comment with the
+        "ast.parse" function introduced many years ago in Python 2.5, as
+        "parser.suite" is emitting deprecation warnings in Python 3.9.
+
+
+
+    .. change::
+        :tags: bug, ext
+        :tickets: 304
+
+        Added "babel" and "lingua" dependency entries to the setuptools entrypoints
+        for the babel and lingua extensions, so that pkg_resources can check that
+        these extra dependencies are available, raising an informative
+        exception if not.  Pull request courtesy sinoroc.
+
+
 
 .. changelog::
     :version: 1.1.0
diff --git a/doc/build/conf.py b/doc/build/conf.py
index 15256f4..80dd1e7 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -88,7 +88,7 @@ copyright = u"the Mako authors and contributors"
 # The short X.Y version.
 version = mako.__version__
 # The full version, including alpha/beta/rc tags.
-release = "1.1.0"
+release = "1.1.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/build/unreleased/304.rst b/doc/build/unreleased/304.rst
deleted file mode 100644
index 79921d7..0000000
--- a/doc/build/unreleased/304.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, ext
-    :tickets: 304
-
-    Added "babel" and "lingua" dependency entries to the setuptools entrypoints
-    for the babel and lingua extensions, so that pkg_resources can check that
-    these extra dependencies are available, raising an informative
-    exception if not.  Pull request courtesy sinoroc.
-
-
diff --git a/doc/build/unreleased/310.rst b/doc/build/unreleased/310.rst
deleted file mode 100644
index e824924..0000000
--- a/doc/build/unreleased/310.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, py3k
-    :tickets: 310
-
-    Replaced usage of the long-superseded "parser.suite" module in the
-    mako.util package for parsing the python magic encoding comment with the
-    "ast.parse" function introduced many years ago in Python 2.5, as
-    "parser.suite" is emitting deprecation warnings in Python 3.9.
-
-