From b0b24795b24ee6809397fbbadf42f31f310a219f Mon Sep 17 00:00:00 2001 From: Agustin Henze Date: Wed, 8 Jul 2015 07:35:02 -0300 Subject: Imported Upstream version 7.6.0 --- docs/sphinx/conf.py | 6 +++--- docs/sphinx/index.txt | 3 +-- docs/sphinx/upgrading-to-v6.txt | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 120000 docs/sphinx/upgrading-to-v6.txt (limited to 'docs/sphinx') diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py index 359cf1c..36cf31b 100644 --- a/docs/sphinx/conf.py +++ b/docs/sphinx/conf.py @@ -47,16 +47,16 @@ master_doc = 'index' # General information about the project. project = 'Nikola' -copyright = '2012-2014, The Nikola Contributors' +copyright = '2012-2015, The Nikola Contributors' # The version info for the project yo're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '7.1.0' +version = '7.6.0' # The full version, including alpha/beta/rc tags. -release = '7.1.0' +release = '7.6.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/sphinx/index.txt b/docs/sphinx/index.txt index 1275b6c..c677caf 100644 --- a/docs/sphinx/index.txt +++ b/docs/sphinx/index.txt @@ -3,13 +3,12 @@ Nikola Documentation Those are the docs for the current GitHub master. It might be incompatible with the stable release. The docs for the stable release are available `on -the Nikola website `_. +the Nikola website `_. .. toctree:: :maxdepth: 5 manual - upgrading-to-v6 creating-a-site creating-a-theme theming diff --git a/docs/sphinx/upgrading-to-v6.txt b/docs/sphinx/upgrading-to-v6.txt deleted file mode 120000 index 1c7e16f..0000000 --- a/docs/sphinx/upgrading-to-v6.txt +++ /dev/null @@ -1 +0,0 @@ -../upgrading-to-v6.txt \ No newline at end of file -- cgit v1.2.3