summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/build/changelog.rst11
-rw-r--r--doc/build/conf.py2
-rw-r--r--doc/build/unreleased/267.rst8
3 files changed, 11 insertions, 10 deletions
diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst
index a52b084..c0ff8e4 100644
--- a/doc/build/changelog.rst
+++ b/doc/build/changelog.rst
@@ -8,7 +8,16 @@ Changelog
.. changelog::
:version: 1.1.3
- :include_notes_from: unreleased
+ :released: Fri May 29 2020
+
+ .. change::
+ :tags: bug, templates
+ :tickets: 267
+
+ The default template encoding is now utf-8. Previously, the encoding was
+ "ascii", which was standard throughout Python 2. This allows that
+ "magic encoding comment" for utf-8 templates is no longer required.
+
.. changelog::
:version: 1.1.2
diff --git a/doc/build/conf.py b/doc/build/conf.py
index cac17bb..a6e95a8 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.2"
+release = "1.1.3"
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/doc/build/unreleased/267.rst b/doc/build/unreleased/267.rst
deleted file mode 100644
index 83a54a5..0000000
--- a/doc/build/unreleased/267.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
- :tags: bug, templates
- :tickets: 267
-
- The default template encoding is now utf-8. Previously, the encoding was
- "ascii", which was standard throughout Python 2. This allows that
- "magic encoding comment" for utf-8 templates is no longer required.
-