From 1b03eb68b6420b9f6b9be426afcce7b1a68036cf Mon Sep 17 00:00:00 2001 From: mhagger Date: Tue, 8 Jan 2013 09:19:35 +0000 Subject: [PATCH] Remove Subversionisms from the cvs2git generated man page. Clean up several small cvs2svn-specific reference fossils that were appearing in the manpages of cvs2git etc. Left untouched is the big one, the "SUBVERSION PROPERTIES" section; that will require another patch. Original patch by: Eric S. Raymond Patch split up by me. git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5413 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- cvs2svn_lib/run_options.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cvs2svn_lib/run_options.py b/cvs2svn_lib/run_options.py index 5d98fcdc..4b4ac024 100644 --- a/cvs2svn_lib/run_options.py +++ b/cvs2svn_lib/run_options.py @@ -360,11 +360,11 @@ class RunOptions(object): help=( 'if a file appears both in and out of ' 'the CVS Attic, then leave the attic version in a ' - 'SVN directory called "Attic"' + 'subdirectory called "Attic"' ), man_help=( - 'If a file appears both inside an outside of the CVS attic, ' - 'retain the attic version in an SVN subdirectory called ' + 'If a file appears both inside and outside of the CVS attic, ' + 'retain the attic version in a subdirectory called ' '\'Attic\'. (Normally this situation is treated as a fatal ' 'error.)' ), @@ -384,8 +384,8 @@ class RunOptions(object): 'respectively. P must match the whole symbol name' ), man_help=( - 'Transform RCS/CVS symbol names before entering them into ' - 'Subversion. \\fIpattern\\fR is a Python regexp pattern that ' + 'Transform RCS/CVS symbol names before entering them into the ' + 'output history. \\fIpattern\\fR is a Python regexp pattern that ' 'is matches against the entire symbol name; \\fIreplacement\\fR ' 'is a replacement using Python\'s regexp reference syntax. ' 'You may specify any number of these options; they will be ' @@ -500,9 +500,9 @@ class RunOptions(object): group.add_option(ContextOption( '--username', type='string', action='store', - help='username for cvs2svn-synthesized commits', + help='username for synthesized commits', man_help=( - 'Set the default username to \\fIname\\fR when cvs2svn needs ' + 'Set the default username to \\fIname\\fR when this program needs ' 'to generate a commit for which CVS does not record the ' 'original username. This happens when a branch or tag is ' 'created. The default is to use no author at all for such ' -- 2.11.4.GIT