Merged revisions 68797,68801 via svnmerge from

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.
........