Merge lp:~jordi/intltool/manpage-fixes into lp:intltool

Proposed by Jordi Mallach
Status: Merged
Merged at revision: 740
Proposed branch: lp:~jordi/intltool/manpage-fixes
Merge into: lp:intltool
Diff against target: 211 lines (+33/-33)
4 files modified
doc/intltool-extract.8 (+9/-9)
doc/intltool-merge.8 (+15/-15)
doc/intltool-update.8 (+4/-4)
doc/intltoolize.8 (+5/-5)
To merge this branch: bzr merge lp:~jordi/intltool/manpage-fixes
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+94696@code.launchpad.net

Description of the change

This fixes a few manpage errors (hyphens vs dashes), as pointed out by
Debian's Lintian tool.

See http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html for more
information.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/intltool-extract.8'
--- doc/intltool-extract.8 2011-10-08 19:24:23 +0000
+++ doc/intltool-extract.8 2012-02-26 22:05:21 +0000
@@ -21,19 +21,19 @@
21.SH OPTIONS21.SH OPTIONS
22.IP "\fB\-l\fR" 422.IP "\fB\-l\fR" 4
23.PD 023.PD 0
24.IP "\fB\--local\fR" 424.IP "\fB\-\-local\fR" 4
25.PD25.PD
26Creates a subdirectory under current working directory (named "\fBtmp/\fR")26Creates a subdirectory under current working directory (named "\fBtmp/\fR")
27and writes files there. This option can't be used with \fB\--update\fR option.27and writes files there. This option can't be used with \fB\-\-update\fR option.
28.IP "\fB\--update\fR" 428.IP "\fB\-\-update\fR" 4
29.PD29.PD
30Writes header file into the same directory the source file is in. New file30Writes header file into the same directory the source file is in. New file
31name is the source file name appending ".h" extension. This option can't be31name is the source file name appending ".h" extension. This option can't be
32used with32used with
33.BR \-l / \--local33.BR \-l / \-\-local
34option. Besides, this option is the default option if neither \fB\--local\fR34option. Besides, this option is the default option if neither \fB\-\-local\fR
35nor \fB\--update\fR is specified.35nor \fB\-\-update\fR is specified.
36.IP "\fB\--type\fR=\fITYPE\fR" 436.IP "\fB\-\-type\fR=\fITYPE\fR" 4
37.PD37.PD
38Specify the type of source file. Currently supported types are:38Specify the type of source file. Currently supported types are:
39.br39.br
@@ -56,7 +56,7 @@
56"gettext/xml" (Generic XML file)56"gettext/xml" (Generic XML file)
57.IP "\fB\-v\fR" 457.IP "\fB\-v\fR" 4
58.PD 058.PD 0
59.IP "\fB\--version\fR" 459.IP "\fB\-\-version\fR" 4
60.PD60.PD
61Show version information.61Show version information.
62.IP "\fB\-h\fR" 462.IP "\fB\-h\fR" 4
@@ -66,7 +66,7 @@
66Show usage and basic help information.66Show usage and basic help information.
67.IP "\fB\-q\fR" 467.IP "\fB\-q\fR" 4
68.PD 068.PD 0
69.IP "\fB\--quiet\fR" 469.IP "\fB\-\-quiet\fR" 4
70.PD70.PD
71Be quiet while running.71Be quiet while running.
7272
7373
=== modified file 'doc/intltool-merge.8'
--- doc/intltool-merge.8 2009-07-16 02:39:26 +0000
+++ doc/intltool-merge.8 2012-02-26 22:05:21 +0000
@@ -25,36 +25,36 @@
25.\" -------------------------------------------------------25.\" -------------------------------------------------------
26.IP "\fB\-b\fR" 426.IP "\fB\-b\fR" 4
27.PD 027.PD 0
28.IP "\fB\--ba-style\fR" 428.IP "\fB\-\-ba-style\fR" 4
29.PD29.PD
30Merge files in bonobo-activation style, which is used for bonobo servers.30Merge files in bonobo-activation style, which is used for bonobo servers.
31.IP "\fB\-d\fR" 431.IP "\fB\-d\fR" 4
32.PD 032.PD 0
33.IP "\fB\--desktop-style\fR" 433.IP "\fB\-\-desktop-style\fR" 4
34.PD34.PD
35Merge files in desktop style, which is similar to the Windows .ini file format.35Merge files in desktop style, which is similar to the Windows .ini file format.
36.IP "\fB\-k\fR" 436.IP "\fB\-k\fR" 4
37.PD 037.PD 0
38.IP "\fB\--keys-style\fR" 438.IP "\fB\-\-keys-style\fR" 4
39.PD39.PD
40Merge files in keys style, which is used for metadata.40Merge files in keys style, which is used for metadata.
41.IP "\fB\-o\fR" 441.IP "\fB\-o\fR" 4
42.PD 042.PD 0
43.IP "\fB\--oaf-style\fR" 443.IP "\fB\-\-oaf-style\fR" 4
44.PD44.PD
45(OBSOLETE) Same as45(OBSOLETE) Same as
46.BR \-b / \--ba-style "."46.BR \-b / \-\-ba-style "."
47.IP "\fB\-r\fR" 447.IP "\fB\-r\fR" 4
48.PD 048.PD 0
49.IP "\fB\--rfc822deb-style\fR" 449.IP "\fB\-\-rfc822deb-style\fR" 4
50.PD50.PD
51Merge files in RFC 822 style, which is usually used in Debian configuration files.51Merge files in RFC 822 style, which is usually used in Debian configuration files.
52.IP "\fB\--quoted-style\fR" 452.IP "\fB\-\-quoted-style\fR" 4
53.PD53.PD
54Merge files in quoted string style, which just translates any strings within "".54Merge files in quoted string style, which just translates any strings within "".
55.IP "\fB\-x\fR" 455.IP "\fB\-x\fR" 4
56.PD 056.PD 0
57.IP "\fB\--xml-style\fR" 457.IP "\fB\-\-xml-style\fR" 4
58.PD58.PD
59Merge files in standard XML style, both as attributes and as raw pcdata.59Merge files in standard XML style, both as attributes and as raw pcdata.
6060
@@ -63,33 +63,33 @@
63.\" -------------------------------------------------------63.\" -------------------------------------------------------
64.IP "\fB\-u\fR" 464.IP "\fB\-u\fR" 4
65.PD 065.PD 0
66.IP "\fB\--utf8\fR" 466.IP "\fB\-\-utf8\fR" 4
67.PD67.PD
68Convert all strings to UTF-8 before merging.68Convert all strings to UTF-8 before merging.
69.IP "\fB\-p\fR" 469.IP "\fB\-p\fR" 4
70.PD 070.PD 0
71.IP "\fB\--pass-through\fR" 471.IP "\fB\-\-pass-through\fR" 4
72.PD72.PD
73Use strings as is in .po files without conversion (STRONGLY unrecommended73Use strings as is in .po files without conversion (STRONGLY unrecommended
74with -x).74with \-x).
75.IP "\fB\-c\fR" 475.IP "\fB\-c\fR" 4
76.PD 076.PD 0
77.IP "\fB\--cache\fR" 477.IP "\fB\-\-cache\fR" 4
78.PD78.PD
79(TBD)79(TBD)
80.IP "\fB\-q\fR" 480.IP "\fB\-q\fR" 4
81.PD 081.PD 0
82.IP "\fB\--quiet\fR" 482.IP "\fB\-\-quiet\fR" 4
83.PD83.PD
84Be quiet while running.84Be quiet while running.
85.IP "\fB\-v\fR" 485.IP "\fB\-v\fR" 4
86.PD 086.PD 0
87.IP "\fB\--version\fR" 487.IP "\fB\-\-version\fR" 4
88.PD88.PD
89Show version information.89Show version information.
90.IP "\fB\-h\fR" 490.IP "\fB\-h\fR" 4
91.PD 091.PD 0
92.IP "\fB\--help\fR" 492.IP "\fB\-\-help\fR" 4
93.PD93.PD
94Show usage and basic help information.94Show usage and basic help information.
9595
9696
=== modified file 'doc/intltool-update.8'
--- doc/intltool-update.8 2009-07-16 02:39:26 +0000
+++ doc/intltool-update.8 2012-02-26 22:05:21 +0000
@@ -53,7 +53,7 @@
53Display a status report for all translations in the software.53Display a status report for all translations in the software.
54.IP "\fB\-d \fILANGCODE\fR" 454.IP "\fB\-d \fILANGCODE\fR" 4
55.PD 055.PD 0
56.IP "\fB\-\-dist \fILANGCODE \fR" 456.IP "\fB\-\-dist \fILANGCODE\fR" 4
57.PD57.PD
58Merge58Merge
59.BR LANGCODE .po59.BR LANGCODE .po
@@ -96,7 +96,7 @@
96.nf96.nf
97.ft CW97.ft CW
98.ne 198.ne 1
99intltool-update \-\-pot \-\-gettext\-package=foo99intltool-update \-\-pot \-\-gettext-package=foo
100.ft R100.ft R
101.fi101.fi
102.RE102.RE
@@ -108,7 +108,7 @@
108.nf108.nf
109.ft CW109.ft CW
110.ne 1110.ne 1
111intltool-update --dist --gettext-package=bar --output-file=xy1.po xy111intltool-update \-\-dist \-\-gettext-package=bar \-\-output-file=xy1.po xy
112.ft R112.ft R
113.fi113.fi
114.RE114.RE
@@ -123,7 +123,7 @@
123intltool-update xy123intltool-update xy
124.ft R124.ft R
125.fi125.fi
126(same as \fBintltool-update --pot && intltool-update --dist xy\fR)126(same as \fBintltool-update \-\-pot && intltool-update \-\-dist xy\fR)
127.RE127.RE
128128
129.SH FILES129.SH FILES
130130
=== modified file 'doc/intltoolize.8'
--- doc/intltoolize.8 2009-07-16 02:39:26 +0000
+++ doc/intltoolize.8 2012-02-26 22:05:21 +0000
@@ -17,23 +17,23 @@
1717
1818
19.SH OPTIONS19.SH OPTIONS
20.IP "\fB\--automake\fR" 420.IP "\fB\-\-automake\fR" 4
21Work silently and assume that \fIautomake\fR is being used in software.21Work silently and assume that \fIautomake\fR is being used in software.
22.IP "\fB\-c\fR" 422.IP "\fB\-c\fR" 4
23.PD 023.PD 0
24.IP "\fB\--copy\fR" 424.IP "\fB\-\-copy\fR" 4
25.PD25.PD
26Copy files rather than creating symbolic links to them.26Copy files rather than creating symbolic links to them.
27.IP "\fB\--debug\fR" 427.IP "\fB\-\-debug\fR" 4
28Enable verbose shell tracing.28Enable verbose shell tracing.
29.IP "\fB\-n\fR" 429.IP "\fB\-n\fR" 4
30.PD 030.PD 0
31.IP "\fB\--dry-run\fR" 431.IP "\fB\-\-dry-run\fR" 4
32.PD32.PD
33Print commands only, instead of executing them.33Print commands only, instead of executing them.
34.IP "\fB\-f\fR" 434.IP "\fB\-f\fR" 4
35.PD 035.PD 0
36.IP "\fB\--force\fR" 436.IP "\fB\-\-force\fR" 4
37.PD37.PD
38Replace existing files if they exist.38Replace existing files if they exist.
39.IP "\fB\-\-help\fR" 439.IP "\fB\-\-help\fR" 4

Subscribers

People subscribed via source and target branches