diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_ext/djangodocs.py | 12 | ||||
| -rw-r--r-- | docs/conf.py | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py index 3d85147952..6c0e1892f4 100644 --- a/docs/_ext/djangodocs.py +++ b/docs/_ext/djangodocs.py @@ -65,19 +65,13 @@ class VersionDirective(Directive): def run(self): env = self.state.document.settings.env - arg0 = self.arguments[0] - is_nextversion = env.config.django_next_version == arg0 ret = [] node = addnodes.versionmodified() ret.append(node) - if not is_nextversion: - if len(self.arguments) == 1: - linktext = 'Please see the release notes </releases/%s>' % (arg0) - xrefs = roles.XRefRole()('doc', linktext, linktext, self.lineno, self.state) - node.extend(xrefs[0]) - node['version'] = arg0 - else: + if self.arguments[0] == env.config.django_next_version: node['version'] = "Development version" + else: + node['version'] = self.arguments[0] node['type'] = self.name if len(self.arguments) == 2: inodes, messages = self.state.inline_text(self.arguments[1], self.lineno+1) diff --git a/docs/conf.py b/docs/conf.py index e651000f8b..a654e3c4d6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -70,8 +70,8 @@ else: release = django_release() -# The next version to be released -django_next_version = '1.7' +# The "development version" of Django +django_next_version = '1.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |