From: Georg Brandl Date: Sun, 28 Oct 2012 07:04:38 +0000 (+0100) Subject: #8040: port versionswitcher patch to 2.6. X-Git-Tag: v2.6.9rc1~19 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55f23c4233b95955a3233284f9f0aa988457a7a7;p=thirdparty%2FPython%2Fcpython.git #8040: port versionswitcher patch to 2.6. --- diff --git a/Doc/Makefile b/Doc/Makefile index f904e5fbeadf..5c17eed33e5c 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -164,7 +164,7 @@ check: # for development releases: always build autobuild-dev: make update - make dist SPHINXOPTS='-A daily=1' + make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1' # for stable releases: only build if not in pre-release stage (alpha, beta, rc) autobuild-stable: diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html index a2561811305b..4d9d4355fe15 100644 --- a/Doc/tools/sphinxext/layout.html +++ b/Doc/tools/sphinxext/layout.html @@ -2,17 +2,26 @@ {% block rootrellink %}
  • -
  • {{ shorttitle }}{{ reldelim1 }}
  • +
  • Python{{ reldelim1 }}
  • +
  • + {%- if versionswitcher is defined %} + {{ release }} + Documentation{{ reldelim1 }} + {%- else %} + {{ shorttitle }}{{ reldelim1 }} + {%- endif %} +
  • {% endblock %} {% block extrahead %} + {% if versionswitcher is defined and not embedded %}{% endif %} {{ super() }} {% endblock %} {% block footer %}