summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/build/changelog.rst10
-rw-r--r--doc/build/conf.py2
-rw-r--r--doc/build/unreleased/283.rst7
3 files changed, 10 insertions, 9 deletions
diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst
index 343ba19..539c317 100644
--- a/doc/build/changelog.rst
+++ b/doc/build/changelog.rst
@@ -8,7 +8,15 @@ Changelog
.. changelog::
:version: 1.1.2
- :include_notes_from: unreleased
+ :released: Sun Mar 1 2020
+
+ .. change::
+ :tags: feature, commands
+ :tickets: 283
+
+ Added --output-file argument to the Mako command line runner, which allows
+ a specific output file to be selected. Pull request courtesy Björn
+ Dahlgren.
.. changelog::
:version: 1.1.1
diff --git a/doc/build/conf.py b/doc/build/conf.py
index 80dd1e7..cac17bb 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.1"
+release = "1.1.2"
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/doc/build/unreleased/283.rst b/doc/build/unreleased/283.rst
deleted file mode 100644
index f8cb585..0000000
--- a/doc/build/unreleased/283.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
- :tags: feature, commands
- :tickets: 283
-
- Added --output-file argument to the Mako command line runner, which allows
- a specific output file to be selected. Pull request courtesy Björn
- Dahlgren.