diff --git a/CHANGES.txt b/CHANGES.txt index 81fe6dbd6a..40942cc757 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -New in master +New in v7.8.5 ============= Math support changes diff --git a/docs/extending.txt b/docs/extending.txt index 03c0c07101..1bbf0f487b 100644 --- a/docs/extending.txt +++ b/docs/extending.txt @@ -9,7 +9,7 @@ Extending Nikola ================ -:Version: 7.8.4 +:Version: 7.8.6 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/docs/man/nikola.1.gz b/docs/man/nikola.1.gz index 19d51cfbd0..bb63c65523 100644 Binary files a/docs/man/nikola.1.gz and b/docs/man/nikola.1.gz differ diff --git a/docs/man/nikola.rst b/docs/man/nikola.rst index aebd6b13e6..cf2dac9ef7 100644 --- a/docs/man/nikola.rst +++ b/docs/man/nikola.rst @@ -6,7 +6,7 @@ Nikola A Static Site and Blog Generator -------------------------------- -:Version: Nikola 7.8.4 +:Version: Nikola 7.8.6 :Manual section: 1 :Manual group: User Commands diff --git a/docs/manual.txt b/docs/manual.txt index a6427816b9..dbb3df7beb 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -9,7 +9,7 @@ The Nikola Handbook =================== -:Version: 7.8.4 +:Version: 7.8.6 .. class:: alert alert-info pull-right diff --git a/docs/path_handlers.txt b/docs/path_handlers.txt index b9fd9166fb..16fe5a2d63 100644 --- a/docs/path_handlers.txt +++ b/docs/path_handlers.txt @@ -150,7 +150,7 @@ index_rss link://rss => /blog/rss.xml listing - A link to a listing. + Return a link to a listing. It will try to use the file name if it's not ambiguous, or the file path. @@ -162,7 +162,7 @@ listing listing_source - A link to the source code for a listing. + Return a link to the source code for a listing. It will try to use the file name if it's not ambiguous, or the file path. @@ -220,7 +220,7 @@ section_index_rss link://section_index_rss/cars => /cars/rss.xml slug - A link to a post with given slug, if not ambiguous. + Return a link to a post with given slug, if not ambiguous. Example: diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt index 491d2ce81d..a57a0415cb 100644 --- a/docs/social_buttons.txt +++ b/docs/social_buttons.txt @@ -9,7 +9,7 @@ Using Alternative Social Buttons with Nikola ============================================ -:Version: 7.8.4 +:Version: 7.8.6 .. class:: alert alert-info pull-right diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py index 7b2091d59f..4d9edb3a05 100644 --- a/docs/sphinx/conf.py +++ b/docs/sphinx/conf.py @@ -51,9 +51,9 @@ # built documents. # # The short X.Y version. -version = '7.8.4' +version = '7.8.6' # The full version, including alpha/beta/rc tags. -release = '7.8.4' +release = '7.8.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/support.rst b/docs/support.rst index 136ab017d1..f2b7d0a6a4 100644 --- a/docs/support.rst +++ b/docs/support.rst @@ -4,7 +4,7 @@ .. description: Get help using Nikola, or contact us. .. author: The Nikola Team -:Version: 7.8.4 +:Version: 7.8.6 .. class:: alert alert-info pull-right diff --git a/docs/template-variables.rst b/docs/template-variables.rst index b6169e47ee..20e1439bd2 100644 --- a/docs/template-variables.rst +++ b/docs/template-variables.rst @@ -3,7 +3,7 @@ .. date: 2017-04-13 12:00:00 .. author: The Nikola Team -:Version: 7.8.4 +:Version: 7.8.6 :Author: Chris Warrick Variables available in templates are listed below. diff --git a/docs/theming.txt b/docs/theming.txt index e469c75450..31553b03d1 100644 --- a/docs/theming.txt +++ b/docs/theming.txt @@ -9,7 +9,7 @@ Theming Nikola ============== -:Version: 7.8.4 +:Version: 7.8.6 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/nikola/__init__.py b/nikola/__init__.py index 727c79fa83..ad68cbf57f 100644 --- a/nikola/__init__.py +++ b/nikola/__init__.py @@ -29,7 +29,7 @@ from __future__ import absolute_import import os -__version__ = '7.8.4' +__version__ = '7.8.6' DEBUG = bool(os.getenv('NIKOLA_DEBUG')) from .nikola import Nikola # NOQA diff --git a/nikola/data/symlinked.txt b/nikola/data/symlinked.txt index c0d37ebaf8..e488b21d32 100644 --- a/nikola/data/symlinked.txt +++ b/nikola/data/symlinked.txt @@ -5,6 +5,7 @@ docs/sphinx/internals.txt docs/sphinx/manual.txt docs/sphinx/path_handlers.txt docs/sphinx/social_buttons.txt +docs/sphinx/template-variables.txt docs/sphinx/theming.txt nikola/data/samplesite/pages/creating-a-theme.rst nikola/data/samplesite/pages/extending.txt diff --git a/setup.py b/setup.py index 173801644b..3f9d291df7 100755 --- a/setup.py +++ b/setup.py @@ -116,7 +116,7 @@ def run(self): setup(name='Nikola', - version='7.8.4', + version='7.8.6', description='A modular, fast, simple, static website and blog generator', long_description=open('README.rst').read(), author='Roberto Alsina and others', diff --git a/snapcraft/nikola.py b/snapcraft/nikola.py index 9e931ea162..1148916c4a 100755 --- a/snapcraft/nikola.py +++ b/snapcraft/nikola.py @@ -1,6 +1,6 @@ #!/snap/nikola/current/usr/bin/python3 -# EASY-INSTALL-ENTRY-SCRIPT: 'Nikola==7.8.4' -__requires__ = 'Nikola==7.8.4' +# EASY-INSTALL-ENTRY-SCRIPT: 'Nikola==7.8.6' +__requires__ = 'Nikola==7.8.6' import sys from pkg_resources import load_entry_point diff --git a/snapcraft/stable/snapcraft.yaml b/snapcraft/stable/snapcraft.yaml index 55cc89b0c2..e0acfe1035 100644 --- a/snapcraft/stable/snapcraft.yaml +++ b/snapcraft/stable/snapcraft.yaml @@ -1,5 +1,5 @@ name: nikola -version: 7.8.4 +version: 7.8.6 summary: A static website generator description: A static website generator confinement: strict @@ -16,7 +16,7 @@ parts: source: script nikola: source: git://github.com/getnikola/nikola.git - source-tag: v7.8.4 + source-tag: v7.8.6 stage-packages: - locales - libc-bin