On Wed, 30 Nov 2011 11:11:47 +0900
Charles Plessy <ple...@debian.org> wrote:
> thank you for your patches. It would be most helpful for us if they
> were targetted at the source packages, because:
>
> 1) It will tell us if we need to forward the patch upstream, or if
> the manpage is specific to Debian;
>
> 2) It will help you to patch the manpage's source when there is one.
>
> In the case of /usr/share/man/man1/boxshade.1.gz, its source is
> debian/boxshade.1.xml in the source package. Could you revise your
> patch (and possibly others ?).
Thanks very much for the feedback. Apologies for the non-source 'diff',
my typo checker script should have only looked at "pure" man pages
without external sources. Clearly, 'DocBook' sources got past my
current filters. So I'll add another filter to prevent that.
(Checking sources is a "one of these days" job, tho'.)
Meanwhile, I can provide a short term kludge (terminal output not included):
# found out this address by browsing
wget -O boxshade.1.xml
'http://anonscm.debian.org/viewvc/debian-med/trunk/packages/boxshade/trunk/debian/boxshade.1.xml?view=co&revision=217&content-type=text%2Fplain'
# 'sed' one-liner autogenerated from earlier man page 'diff', mostly...
sed
's/POSTCRIPT/POSTSCRIPT/;s/accomodate/accommodate/;s/paramters/parameters/;s/paramters\./parameters\./;s/beween/between/;s/respecitve/respective/;s/(blank\/point\/asterisc)/\(blank\/point\/asterisk\)/;s/asterisc,/asterisk,/;s/asteriscs/asterisks/;'
boxshade.1.xml > boxshade.1.xml.new
diff -u boxshade.1.xml boxshade.1.xml.new > boxshade.1.xml.diff
See attached 'diff' file.
Could you advise what the first two lines of this 'diff' ought to be?
The filenames & paths in particular:
head -n 2 boxshade.1.xml.diff
--- boxshade.1.xml 2011-11-29 23:45:18.435037204 -0500
+++ boxshade.1.xml.new 2011-11-29 23:46:08.847590614 -0500
HTH...
--- boxshade.1.xml 2011-11-29 23:45:18.435037204 -0500
+++ boxshade.1.xml.new 2011-11-29 23:46:08.847590614 -0500
@@ -190,7 +190,7 @@
<refsect2>
<title>Output devices</title>
<para>POSTSCRIPT/EPS creates POSTSCRIPT(TM) files for printing on
-a Laserprinter or for further conversion with a POSTCRIPT interpreter
+a Laserprinter or for further conversion with a POSTSCRIPT interpreter
(like GHOSTSCRIPT) + HPGL for export to various graphics programs or
for conversion/printing with the shareware program PRINTGL. Plotting
BOXSHADE output on a plotter is generally not recommended + RTF for
@@ -247,7 +247,7 @@
one choice of colors for the output. I therefore added a management of
default parameters allowing two levels of assistance to the user. 1) all
default parameters are contained in an ASCII file that can be modified
-easily to accomodate the users taste. The format is roughly documented
+easily to accommodate the users taste. The format is roughly documented
within the file-header, it resembles the keyboard input one has to make
if using the program interactively. There are two such files supplied
with this release of BOXSHADE, BOX_DNA.PAR and BOX_PEP.PAR , holding
@@ -256,7 +256,7 @@
DNA-comparisons one doesn't care of "similar" residues. 2) to run the
program with minimal user interaction, I have added the possibility to
use command line parameters. At the moment, you can use: /check : list
-all allowed command line paramters (this list) and allows parameters to
+all allowed command line parameters (this list) and allows parameters to
be added. /def : program runs without questions, BOX_PEP.PAR is used as
default /dna : makes the program use BOX_DNA.PAR as parameter file /pep :
makes the program use BOX_PEP.PAR as parameter file /in=xxx : makes the
@@ -276,7 +276,7 @@
the native style of the machine is used.
</para>
<note><title>ATTENTION</title>
-<para>on unix systems, the dash (-) instead of the slash (/) has to be used as separation character for command line paramters. For example, a valid unix command line is: <command>boxshade -def -numdef -cons -symbcons=" .*"</command>
+<para>on unix systems, the dash (-) instead of the slash (/) has to be used as separation character for command line parameters. For example, a valid unix command line is: <command>boxshade -def -numdef -cons -symbcons=" .*"</command>
</para></note>
</refsect2>
@@ -324,7 +324,7 @@
of the alignment and consecutively that sequence is taken to be the
'consensus'. Only those residues become shaded that are identical or
similar to the chosen sequence. Output obtained with this option tends
-to be less shaded and neglects similarities beween the other (non-chosen)
+to be less shaded and neglects similarities between the other (non-chosen)
sequences. Starting in V2.7, this 'master sequence' can be hidden. Thus,
it only influences the shading of the other sequences without being
shown itself.
@@ -338,7 +338,7 @@
symbol. This line can either be obtained by using the command line
qualifier /CONS or interactively by answering the question ' create
consensus? '. The way this consensus line is displayed can be modified
-by the command line parameter SYMBCONS=xyz, by editing the respecitve
+by the command line parameter SYMBCONS=xyz, by editing the respective
entry in the .PAR file or interactively. Since the SYMBCONS syntax is
not intuitive, here a brief description: The SYMBCONS parameter consist
of exactly three symbols: + the first one stands for 'normal' sequence
@@ -347,14 +347,14 @@
of the alignment. See the files BOX_PEP.SIM and BOX_DNA.SIM to see
what residues are considered similar. + the third symbol represents
positions that are identical in all sequences of the alignment. A
-SYMBCONS parameter string " .*" (blank/point/asterisc) means: label
+SYMBCONS parameter string " .*" (blank/point/asterisk) means: label
all positions in the alignment with totally identical residues by an
-asterisc, all positions with all similar residues by a point and do not
+asterisk, all positions with all similar residues by a point and do not
mark the other positions. The letter 'B' can be used instead of the blank,
this is necessary e.g. when using the command line option /SYMBCONS=B.*
which gives the same result as the above example. The option /SYMBCONS=
.* would result in an unexpected behaviour because MSDOS squeezes blanks
-out of the command line. Besides points, asteriscs and other symbols,
+out of the command line. Besides points, asterisks and other symbols,
there are two special characters when they appear in the SYMBCONS string:
'L' and 'U'. An 'L' means, that a lowercase representation of the
most abundant residue at that position is to be used instead of a fixed
