diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2014-10-21 10:33:17 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2014-10-21 10:33:17 -0300 |
| commit | 2d14c4b384c7000e264674a92b16e010a510ac05 (patch) | |
| tree | 7676db09f338e46e053170b1c9f7594120b9d434 /docs/sphinx | |
| parent | 2d2e97ac540c94e15ac5eccc7d32f3dfb3eea1bc (diff) | |
| parent | 5ec02211214350ee558fd9f6bb052264fd24f75e (diff) | |
Merge tag 'upstream/7.1.0'
Upstream version 7.1.0
Diffstat (limited to 'docs/sphinx')
| -rw-r--r-- | docs/sphinx/conf.py | 4 | ||||
| -rw-r--r-- | docs/sphinx/index.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py index 20a0578..359cf1c 100644 --- a/docs/sphinx/conf.py +++ b/docs/sphinx/conf.py @@ -54,9 +54,9 @@ copyright = '2012-2014, The Nikola Contributors' # built documents. # # The short X.Y version. -version = '7.0.1' +version = '7.1.0' # The full version, including alpha/beta/rc tags. -release = '7.0.1' +release = '7.1.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 9395e67..1275b6c 100644 --- a/docs/sphinx/index.txt +++ b/docs/sphinx/index.txt @@ -6,7 +6,7 @@ with the stable release. The docs for the stable release are available `on the Nikola website <http://getnikola.com/documentation.html>`_. .. toctree:: - :maxdepth: 2 + :maxdepth: 5 manual upgrading-to-v6 |