diff --git a/CHANGES.txt b/CHANGES.txt index 3751249c87..3fe7766502 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -New in master +New in v7.4.0 ============= Features diff --git a/docs/extending.txt b/docs/extending.txt index 51c9f7d2be..635c5b54eb 100644 --- a/docs/extending.txt +++ b/docs/extending.txt @@ -8,7 +8,7 @@ Extending Nikola ================ -:Version: 7.3.1 +:Version: 7.4.0 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/docs/getting-help.txt b/docs/getting-help.txt index cc0b3a7619..de339bd7e2 100644 --- a/docs/getting-help.txt +++ b/docs/getting-help.txt @@ -3,7 +3,7 @@ .. date: 1970-01-01 15:00:00 .. description: Get help using Nikola, or contact us. -:Version: 7.3.1 +:Version: 7.4.0 .. class:: alert alert-info pull-right diff --git a/docs/man/nikola.1.gz b/docs/man/nikola.1.gz index 3dfaebb6fd..ba5e842904 100644 Binary files a/docs/man/nikola.1.gz and b/docs/man/nikola.1.gz differ diff --git a/docs/manual.txt b/docs/manual.txt index 19112e825e..8177aa3ac1 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -8,7 +8,7 @@ The Nikola Handbook =================== -:Version: 7.3.1 +:Version: 7.4.0 .. class:: alert alert-info pull-right diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt index 63ff897c31..517f6acdab 100644 --- a/docs/social_buttons.txt +++ b/docs/social_buttons.txt @@ -8,7 +8,7 @@ Using Alternative Social Buttons with Nikola ============================================ -:Version: 7.3.1 +:Version: 7.4.0 .. class:: alert alert-info pull-right diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py index 0fdfe77805..cefc91ef56 100644 --- a/docs/sphinx/conf.py +++ b/docs/sphinx/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = '7.3.1' +version = '7.4.0' # The full version, including alpha/beta/rc tags. -release = '7.3.1' +release = '7.4.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/theming.txt b/docs/theming.txt index 7e5d700ad2..24af099003 100644 --- a/docs/theming.txt +++ b/docs/theming.txt @@ -8,7 +8,7 @@ Theming Nikola ============== -:Version: 7.3.1 +:Version: 7.4.0 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/docs/upgrading-to-v6.txt b/docs/upgrading-to-v6.txt index b0a9aad78a..6fc1958460 100644 --- a/docs/upgrading-to-v6.txt +++ b/docs/upgrading-to-v6.txt @@ -8,7 +8,7 @@ Upgrading to v6 =============== -:Version: 7.3.1 +:Version: 7.4.0 .. class:: lead diff --git a/nikola/__init__.py b/nikola/__init__.py index 226ed20395..e35fedad67 100644 --- a/nikola/__init__.py +++ b/nikola/__init__.py @@ -27,7 +27,7 @@ from __future__ import absolute_import import os -__version__ = "7.3.1" +__version__ = "7.4.0" DEBUG = bool(os.getenv('NIKOLA_DEBUG')) from .nikola import Nikola # NOQA diff --git a/setup.py b/setup.py index b9a131a9c8..398bf21cf2 100755 --- a/setup.py +++ b/setup.py @@ -112,7 +112,7 @@ def run(self): setup(name='Nikola', - version='7.3.1.1', + version='7.4.0', description='A modular, fast, simple, static website generator', long_description=open('README.rst').read(), author='Roberto Alsina and others',