From 7226d951583391f17354a64efb2d1624473ce9f6 Mon Sep 17 00:00:00 2001 From: Roberto Alsina Date: Fri, 20 Sep 2013 20:07:10 -0300 Subject: [PATCH] v6.0.4 --- CHANGES.txt | 2 +- docs/extending.txt | 2 +- docs/man/nikola.1 | 7 +++++-- docs/manual.txt | 2 +- docs/social_buttons.txt | 2 +- docs/theming.txt | 2 +- docs/upgrading-to-v6.txt | 2 +- nikola/__init__.py | 2 +- setup.py | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 6f70b21e00..17735d98e9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -New in Master +New in 6.0.4 ========================================== Bugfixes diff --git a/docs/extending.txt b/docs/extending.txt index bc9020c8d3..3343dc378a 100644 --- a/docs/extending.txt +++ b/docs/extending.txt @@ -8,7 +8,7 @@ Extending Nikola ================ -:Version: 6.0.3 +:Version: 6.0.4 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/docs/man/nikola.1 b/docs/man/nikola.1 index a5613949fd..cf37b69823 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.43.3. -.TH NIKOLA "1" "September 2013" "nikola 6.0.3" "User Commands" +.TH NIKOLA "1" "September 2013" "nikola 6.0.4" "User Commands" .SH NAME -nikola \- manual page for nikola 6.0.3 +nikola \- manual page for nikola 6.0.4 .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:" @@ -63,6 +63,9 @@ apply mincss to the generated site nikola new_post create a new blog post or site page .TP +nikola run +run tasks +.TP nikola serve start the test webserver .TP diff --git a/docs/manual.txt b/docs/manual.txt index 214a84c553..48fa66a739 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -8,7 +8,7 @@ The Nikola Handbook =================== -:Version: 6.0.3 +:Version: 6.0.4 .. class:: alert alert-info pull-right diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt index a976eab37f..1516d4f032 100644 --- a/docs/social_buttons.txt +++ b/docs/social_buttons.txt @@ -8,7 +8,7 @@ Using Alternative Social Buttons with Nikola ============================================ -:Version: 6.0.3 +:Version: 6.0.4 .. class:: alert alert-info pull-right diff --git a/docs/theming.txt b/docs/theming.txt index 958970f1f4..e6036ac4f7 100644 --- a/docs/theming.txt +++ b/docs/theming.txt @@ -8,7 +8,7 @@ Theming Nikola ============== -:Version: 6.0.3 +:Version: 6.0.4 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/docs/upgrading-to-v6.txt b/docs/upgrading-to-v6.txt index b4ba86b256..07cf1d40e8 100644 --- a/docs/upgrading-to-v6.txt +++ b/docs/upgrading-to-v6.txt @@ -8,7 +8,7 @@ Upgrading to v6 =============== -:Version: 6.0.3 +:Version: 6.0.4 Nikola tries fairly hard to be compatible between versions. However, there were a few areas which were getting clunky, and needed fxing. So, here's what you may diff --git a/nikola/__init__.py b/nikola/__init__.py index b53681069e..21df3e4747 100644 --- a/nikola/__init__.py +++ b/nikola/__init__.py @@ -5,4 +5,4 @@ from .nikola import Nikola # NOQA from . import plugins # NOQA -__version__ = "6.0.3" +__version__ = "6.0.4" diff --git a/setup.py b/setup.py index fca657e2e2..280b5d60aa 100755 --- a/setup.py +++ b/setup.py @@ -213,7 +213,7 @@ def find_package_data( setup(name='Nikola', - version='6.0.3', + version='6.0.4', description='A modular, fast, simple, static website generator', long_description=open('README.rst').read(), author='Roberto Alsina and others',