From 17d26415de204dd66bd379ebec70cca6322fe3a6 Mon Sep 17 00:00:00 2001 From: Roberto Alsina Date: Sun, 6 Oct 2013 09:27:58 -0300 Subject: [PATCH] set version to 6.1.1 --- CHANGES.txt | 4 ++-- docs/extending.txt | 2 +- docs/man/nikola.1 | 4 ++-- docs/manual.txt | 2 +- docs/social_buttons.txt | 2 +- docs/sphinx/conf.py | 2 +- docs/theming.txt | 2 +- docs/upgrading-to-v6.txt | 2 +- nikola/__init__.py | 2 +- setup.py | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index e72368b4f4..36d23b20b8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,5 @@ -New in master -======================================= +New in 6.1.1 +============ Bugfixes -------- diff --git a/docs/extending.txt b/docs/extending.txt index ad07b99724..3e81578d42 100644 --- a/docs/extending.txt +++ b/docs/extending.txt @@ -8,7 +8,7 @@ Extending Nikola ================ -:Version: 6.1.0 +:Version: 6.1.1 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/docs/man/nikola.1 b/docs/man/nikola.1 index 79c0df4ecc..3d7a3cb500 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" "October 2013" "nikola 6.1.0" "User Commands" +.TH NIKOLA "1" "October 2013" "nikola 6.1.1" "User Commands" .SH NAME -nikola \- manual page for nikola 6.1.0 +nikola \- manual page for nikola 6.1.1 .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:" diff --git a/docs/manual.txt b/docs/manual.txt index 68fd952fef..6d6d601fc0 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -8,7 +8,7 @@ The Nikola Handbook =================== -:Version: 6.1.0 +:Version: 6.1.1 .. class:: alert alert-info pull-right diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt index dc6c803e4c..0baef0eb8a 100644 --- a/docs/social_buttons.txt +++ b/docs/social_buttons.txt @@ -8,7 +8,7 @@ Using Alternative Social Buttons with Nikola ============================================ -:Version: 6.1.0 +:Version: 6.1.1 .. class:: alert alert-info pull-right diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py index efadb7280f..2e74b1c9da 100644 --- a/docs/sphinx/conf.py +++ b/docs/sphinx/conf.py @@ -50,7 +50,7 @@ # built documents. # # The short X.Y version. -version = '6.1.0' +version = '6.1.1' # The full version, including alpha/beta/rc tags. release = '6.1.0' diff --git a/docs/theming.txt b/docs/theming.txt index e69e0ede1c..e57e8711e3 100644 --- a/docs/theming.txt +++ b/docs/theming.txt @@ -8,7 +8,7 @@ Theming Nikola ============== -:Version: 6.1.0 +:Version: 6.1.1 :Author: Roberto Alsina .. class:: alert alert-info pull-right diff --git a/docs/upgrading-to-v6.txt b/docs/upgrading-to-v6.txt index 4ae7526613..678e14258b 100644 --- a/docs/upgrading-to-v6.txt +++ b/docs/upgrading-to-v6.txt @@ -8,7 +8,7 @@ Upgrading to v6 =============== -:Version: 6.1.0 +:Version: 6.1.1 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 6bd814de41..1e2887bd71 100644 --- a/nikola/__init__.py +++ b/nikola/__init__.py @@ -5,4 +5,4 @@ from .nikola import Nikola # NOQA from . import plugins # NOQA -__version__ = "6.1.0" +__version__ = "6.1.1" diff --git a/setup.py b/setup.py index 73744bd276..059975767a 100755 --- a/setup.py +++ b/setup.py @@ -228,7 +228,7 @@ def find_package_data( setup(name='Nikola', - version='6.1.0', + version='6.1.1', description='A modular, fast, simple, static website generator', long_description=open('README.rst').read(), author='Roberto Alsina and others',