Commit 2b555fc1 authored by Terry Jan Reedy's avatar Terry Jan Reedy Committed by GitHub

bpo-35088: Update idlelib.help.copy_string docstring (#10164)

We now use git and backporting instead of hg and forward merging.
parent db40cb50
...@@ -240,25 +240,25 @@ class HelpWindow(Toplevel): ...@@ -240,25 +240,25 @@ class HelpWindow(Toplevel):
def copy_strip(): def copy_strip():
"""Copy idle.html to idlelib/help.html, stripping trailing whitespace. """Copy idle.html to idlelib/help.html, stripping trailing whitespace.
Files with trailing whitespace cannot be pushed to the hg cpython Files with trailing whitespace cannot be pushed to the git cpython
repository. For 3.x (on Windows), help.html is generated, after repository. For 3.x (on Windows), help.html is generated, after
editing idle.rst in the earliest maintenance version, with editing idle.rst on the master branch, with
sphinx-build -bhtml . build/html sphinx-build -bhtml . build/html
python_d.exe -c "from idlelib.help import copy_strip; copy_strip()" python_d.exe -c "from idlelib.help import copy_strip; copy_strip()"
After refreshing TortoiseHG workshop to generate a diff, Check build/html/library/idle.html, the help.html diff, and the text
check both the diff and displayed text. Push the diff along with displayed by Help => IDLE Help. Add a blurb and create a PR.
the idle.rst change and merge both into default (or an intermediate
maintenance version). It can be worthwhile to occasionally generate help.html without
touching idle.rst. Changes to the master version and to the doc
When the 'earlist' version gets its final maintenance release, build system may result in changes that should not changed
do an update as described above, without editing idle.rst, to the displayed text, but might break HelpParser.
rebase help.html on the next version of idle.rst. Do not worry
about version changes as version is not displayed. Examine other As long as master and maintenance versions of idle.rst remain the
changes and the result of Help -> IDLE Help. same, help.html can be backported. The internal Python version
number is not displayed. If maintenance idle.rst diverges from
If maintenance and default versions of idle.rst diverge, and the master version, then instead of backporting help.html from
merging does not go smoothly, then consider generating master, repeat the proceedure above to generate a maintenance
separate help.html files from separate idle.htmls. version.
""" """
src = join(abspath(dirname(dirname(dirname(__file__)))), src = join(abspath(dirname(dirname(dirname(__file__)))),
'Doc', 'build', 'html', 'library', 'idle.html') 'Doc', 'build', 'html', 'library', 'idle.html')
......
Update idlelib.help.copy_string docstring. We now use git and backporting
instead of hg and forward merging.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment