summaryrefslogtreecommitdiff
path: root/docs/_ext/djangodocs.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-02-09 09:16:10 -0500
committerTim Graham <timograham@gmail.com>2013-02-09 09:16:10 -0500
commitd93edffa896a68fc74c9a414c6beee289d176798 (patch)
tree77a224049e1f8e29b3bfe3e3b39655b4d5418677 /docs/_ext/djangodocs.py
parent0201b9d6d89ea277383e1fc0007bfaa33351b60b (diff)
downloaddjango-d93edffa896a68fc74c9a414c6beee289d176798.tar.gz
Fixed #19699 - Removed "Please see the release notes" from versionadded/changed directives
Also bumped django_next_version back to 1.6 so those annotations are described as "the development version" in the docs. Thanks Aymeric for the patch.
Diffstat (limited to 'docs/_ext/djangodocs.py')
-rw-r--r--docs/_ext/djangodocs.py12
1 files changed, 3 insertions, 9 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)