diff options
| -rw-r--r-- | doc/build/changelog.rst | 12 | ||||
| -rw-r--r-- | doc/build/conf.py | 2 | ||||
| -rw-r--r-- | doc/build/unreleased/346.rst | 9 |
3 files changed, 12 insertions, 11 deletions
diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst index 7b0f5d9..13fa599 100644 --- a/doc/build/changelog.rst +++ b/doc/build/changelog.rst @@ -8,7 +8,17 @@ Changelog .. changelog:: :version: 1.1.6 - :include_notes_from: unreleased + :released: Wed Nov 17 2021 + + .. change:: + :tags: bug, lexer + :tickets: 346 + :versions: 1.2.0, 1.1.6 + + Fixed issue where control statements on multi lines with a backslash would + not parse correctly if the template itself contained CR/LF pairs as on + Windows. Pull request courtesy Charles Pigott. + .. changelog:: :version: 1.1.5 diff --git a/doc/build/conf.py b/doc/build/conf.py index 8fc794e..fc991ce 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.5" +release = "1.1.6" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/build/unreleased/346.rst b/doc/build/unreleased/346.rst deleted file mode 100644 index 329116c..0000000 --- a/doc/build/unreleased/346.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. change:: - :tags: bug, lexer - :tickets: 346 - :versions: 1.2.0, 1.1.6 - - Fixed issue where control statements on multi lines with a backslash would - not parse correctly if the template itself contained CR/LF pairs as on - Windows. Pull request courtesy Charles Pigott. - |