diff --git a/CHANGES.txt b/CHANGES.txt index f9d677304b..81f713ac64 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -New in master +New in v7.2.0 ============= Features diff --git a/docs/extending.txt b/docs/extending.txt index e580b998b5..078b34b7bf 100644 --- a/docs/extending.txt +++ b/docs/extending.txt @@ -8,7 +8,7 @@ Extending Nikola ================ -:Version: 7.1.0 +:Version: 7.2.0 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/docs/getting-help.txt b/docs/getting-help.txt index 567ab667dc..1d244a5fbc 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.1.0 +:Version: 7.2.0 .. class:: alert alert-info pull-right diff --git a/docs/man/nikola.1 b/docs/man/nikola.1 index a0c2c0549c..a771fc2d5a 100644 --- a/docs/man/nikola.1 +++ b/docs/man/nikola.1 @@ -1,7 +1,7 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. -.TH NIKOLA "1" "September 2014" "nikola 7.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. +.TH NIKOLA "1" "November 2014" "nikola 7.2.0" "User Commands" .SH NAME -nikola \- manual page for nikola 7.1.0 +nikola \- manual page for nikola 7.2.0 .SH DESCRIPTION Nikola is a tool to create static websites and blogs. For full documentation and more information, please visit http://getnikola.com/ .SS "Available commands:" @@ -48,6 +48,9 @@ ignore task (skip) on subsequent runs nikola import_wordpress import a WordPress dump .TP +nikola info +show info about a task +.TP nikola init create a Nikola site in the specified folder .TP diff --git a/docs/manual.txt b/docs/manual.txt index 947da8ce95..de35dc6645 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -8,7 +8,7 @@ The Nikola Handbook =================== -:Version: 7.1.0 +:Version: 7.2.0 .. class:: alert alert-info pull-right diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt index 0f039aaa83..cec7217cb8 100644 --- a/docs/social_buttons.txt +++ b/docs/social_buttons.txt @@ -8,7 +8,7 @@ Using Alternative Social Buttons with Nikola ============================================ -:Version: 7.1.0 +:Version: 7.2.0 .. class:: alert alert-info pull-right diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py index 359cf1cf99..9e568594b8 100644 --- a/docs/sphinx/conf.py +++ b/docs/sphinx/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = '7.1.0' +version = '7.2.0' # The full version, including alpha/beta/rc tags. -release = '7.1.0' +release = '7.2.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 2e2a516fff..b7a9182118 100644 --- a/docs/theming.txt +++ b/docs/theming.txt @@ -8,7 +8,7 @@ Theming Nikola ============== -:Version: 7.1.0 +:Version: 7.2.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 271d98e035..f5011c90c0 100644 --- a/docs/upgrading-to-v6.txt +++ b/docs/upgrading-to-v6.txt @@ -8,7 +8,7 @@ Upgrading to v6 =============== -:Version: 7.1.0 +:Version: 7.2.0 .. class:: lead diff --git a/nikola/__init__.py b/nikola/__init__.py index 4cb5427caa..2b64c765ef 100644 --- a/nikola/__init__.py +++ b/nikola/__init__.py @@ -27,7 +27,7 @@ from __future__ import absolute_import import os -__version__ = "7.1.0" +__version__ = "7.2.0" DEBUG = bool(os.getenv('NIKOLA_DEBUG')) from .nikola import Nikola # NOQA diff --git a/setup.py b/setup.py index baf561e7fd..83a6bdb729 100755 --- a/setup.py +++ b/setup.py @@ -146,7 +146,7 @@ def run(self): setup(name='Nikola', - version='7.1.0', + version='7.2.0', description='A modular, fast, simple, static website generator', long_description=open('README.rst').read(), author='Roberto Alsina and others',