From ffd2bc89fca10edb8733127eedb1b93dd599470f Mon Sep 17 00:00:00 2001 From: Chris Warrick Date: Mon, 17 Aug 2015 14:14:41 +0200 Subject: [PATCH] v1.3.6: patch URLs, really add the descriptions Signed-off-by: Chris Warrick --- CHANGELOG.rst | 6 +++++- CONTRIBUTING.rst | 2 +- coil/__init__.py | 2 +- docs/CHANGELOG.rst | 6 +++++- docs/CONTRIBUTING.rst | 2 +- docs/conf.py | 4 ++-- setup.py | 2 +- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5b3c346..7159035 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,7 +2,11 @@ Appendix A. Changelog ===================== -:Version: 1.3.5 +:Version: 1.3.6 + +1.3.6 + * Patch URLs for HTTPS sites + * Really add descriptions for icons (got lost between branches) 1.3.5 * Add icon descriptions for the navigation bar diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 353dcf6..474ce3a 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -6,7 +6,7 @@ Appendix A. Contribution rules :Copyright: © 2015, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2015-08-17 -:Version: 1.3.5 +:Version: 1.3.6 .. index:: contributing diff --git a/coil/__init__.py b/coil/__init__.py index 6374162..1382a84 100644 --- a/coil/__init__.py +++ b/coil/__init__.py @@ -29,4 +29,4 @@ __all__ = ['__version__'] -__version__ = '1.3.5' +__version__ = '1.3.6' diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 5b3c346..7159035 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,7 +2,11 @@ Appendix A. Changelog ===================== -:Version: 1.3.5 +:Version: 1.3.6 + +1.3.6 + * Patch URLs for HTTPS sites + * Really add descriptions for icons (got lost between branches) 1.3.5 * Add icon descriptions for the navigation bar diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst index 353dcf6..474ce3a 100644 --- a/docs/CONTRIBUTING.rst +++ b/docs/CONTRIBUTING.rst @@ -6,7 +6,7 @@ Appendix A. Contribution rules :Copyright: © 2015, Chris Warrick. :License: BSD (see /LICENSE or :doc:`Appendix B `.) :Date: 2015-08-17 -:Version: 1.3.5 +:Version: 1.3.6 .. index:: contributing diff --git a/docs/conf.py b/docs/conf.py index b04ed59..91e7a94 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,9 +55,9 @@ # built documents. # # The short X.Y version. -version = '1.3.5' +version = '1.3.6' # The full version, including alpha/beta/rc tags. -release = '1.3.5' +release = '1.3.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 5b5fd04..9727e44 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ dependencies = [l.strip() for l in fh] setup(name='coil', - version='1.3.5', + version='1.3.6', description='A user-friendly CMS frontend for Nikola.', keywords='coil,nikola,cms', author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',