summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-01-20 15:01:54 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-01-20 15:01:54 (GMT)
commit152b6571a92e26a6a516aa99bc25ca889b52e4a7 (patch)
tree57981f6df2978425e1f790ea95d32b226e261b93
parente0c904111bfa29f394f2d16d4d7cbf4177be4a1f (diff)
downloadcpython-152b6571a92e26a6a516aa99bc25ca889b52e4a7.zip
cpython-152b6571a92e26a6a516aa99bc25ca889b52e4a7.tar.gz
cpython-152b6571a92e26a6a516aa99bc25ca889b52e4a7.tar.bz2
Merged revisions 68797,68801 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r68797 | raymond.hettinger | 2009-01-20 01:11:47 -0600 (Tue, 20 Jan 2009) | 11 lines Don't disrupt automatic url target name generation with manually specified, conflicting names. Before: http://docs.python.org/dev/library/collections.html#id1 After: http://docs.python.org/dev/library/collections.html#counter-objects ........ r68801 | raymond.hettinger | 2009-01-20 04:46:23 -0600 (Tue, 20 Jan 2009) | 5 lines Use Georg's new permalinks to documentation by version number. That assures that IDLE's help always points to the correct version and the latest update with all bug fixes. ........
-rw-r--r--Lib/idlelib/EditorWindow.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 6ce166d..1512c46 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -82,7 +82,7 @@ class EditorWindow(object):
# Safari requires real file:-URLs
EditorWindow.help_url = 'file://' + EditorWindow.help_url
else:
- EditorWindow.help_url = "http://docs.python.org/dev/3.0/"
+ EditorWindow.help_url = "http://docs.python.org/%d.%d" % sys.version_info[:2]
currentTheme=idleConf.CurrentTheme()
self.flist = flist
root = root or flist.root