The following commit has been merged in the jessie branch: commit aae31d6d17622a7b16dcac0f9771793b2c00f23a Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun Jul 14 04:11:58 2013 +0200
Fix hyphen-used-as-minus-sign in man pages by always marking options as such. diff --git a/debian/man/legend.1.xml b/debian/man/legend.1.xml index c1f334c..e3aa39b 100644 --- a/debian/man/legend.1.xml +++ b/debian/man/legend.1.xml @@ -51,7 +51,7 @@ </varlistentry> <varlistentry> - <term>-v</term> + <term><option>-v</option></term> <listitem> <para>Display mapserver version and build options.</para> </listitem> diff --git a/debian/man/mapserv.1.xml b/debian/man/mapserv.1.xml index e51c575..fcff007 100644 --- a/debian/man/mapserv.1.xml +++ b/debian/man/mapserv.1.xml @@ -79,7 +79,7 @@ <informalexample> <para> - To suppress the HTTP headers, you can use the "-nh" switch, such as: + To suppress the HTTP headers, you can use the "<option>-nh</option>" switch, such as: </para> <screen> diff --git a/debian/man/mapserver-config.1.xml b/debian/man/mapserver-config.1.xml index a75a8f4..ba6ef7c 100644 --- a/debian/man/mapserver-config.1.xml +++ b/debian/man/mapserver-config.1.xml @@ -15,12 +15,12 @@ <refsynopsisdiv id='synopsis'> <cmdsynopsis> <command>mapserver-config</command> - <arg choice='opt'>--libs</arg> - <arg choice='opt'>--dep-libs</arg> - <arg choice='opt'>--cflags</arg> - <arg choice='opt'>--defines</arg> - <arg choice='opt'>--includes</arg> - <arg choice='opt'>--version</arg> + <arg choice='opt'><option>--libs</option></arg> + <arg choice='opt'><option>--dep-libs</option></arg> + <arg choice='opt'><option>--cflags</option></arg> + <arg choice='opt'><option>--defines</option></arg> + <arg choice='opt'><option>--includes</option></arg> + <arg choice='opt'><option>--version</option></arg> </cmdsynopsis> </refsynopsisdiv> diff --git a/debian/man/msencrypt.1.xml b/debian/man/msencrypt.1.xml index f321f57..61f4d51 100644 --- a/debian/man/msencrypt.1.xml +++ b/debian/man/msencrypt.1.xml @@ -16,8 +16,8 @@ <cmdsynopsis> <command>msencrypt</command> <group> - <arg choice='plain'>-keygen <replaceable>file</replaceable></arg> - <arg choice='plain'>-key <replaceable>file</replaceable> <replaceable>string</replaceable></arg> + <arg choice='plain'><option>-keygen</option> <replaceable>file</replaceable></arg> + <arg choice='plain'><option>-key</option> <replaceable>file</replaceable> <replaceable>string</replaceable></arg> </group> </cmdsynopsis> </refsynopsisdiv> diff --git a/debian/man/scalebar.1.xml b/debian/man/scalebar.1.xml index 5202263..09c2f9b 100644 --- a/debian/man/scalebar.1.xml +++ b/debian/man/scalebar.1.xml @@ -19,7 +19,7 @@ <arg choice='plain'><replaceable>mapfile</replaceable> <arg choice='plain'><replaceable>outputimage</replaceable></arg> </arg> - <arg choice='opt'>-v</arg> + <arg choice='opt'><option>-v</option></arg> </group> </cmdsynopsis> </refsynopsisdiv> @@ -52,7 +52,7 @@ </varlistentry> <varlistentry> - <term>-v</term> + <term><option>-v</option></term> <listitem> <para>Display mapserver version and build options.</para> </listitem> diff --git a/debian/man/shp2img.1.xml b/debian/man/shp2img.1.xml index c553339..b3d1459 100644 --- a/debian/man/shp2img.1.xml +++ b/debian/man/shp2img.1.xml @@ -15,18 +15,18 @@ <refsynopsisdiv id='synopsis'> <cmdsynopsis> <command>shp2img</command> - <arg choice='plain'>-m <replaceable>mapfile</replaceable></arg> - <arg choice='opt'>-o <replaceable>image</replaceable></arg> - <arg choice='opt'>-e <replaceable>minx</replaceable> <replaceable>miny</replaceable> <replaceable>maxx</replaceable> <replaceable>maxy</replaceable></arg> - <arg choice='opt'>-s <replaceable>sizex</replaceable> <replaceable>sizey</replaceable></arg> - <arg choice='opt'>-l "<replaceable>layer1</replaceable> <arg choice='opt'><replaceable>layer2</replaceable>...</arg>"</arg> - <arg choice='opt'>-i <replaceable>format</replaceable></arg> - <arg choice='opt'>-all_debug <replaceable>n</replaceable></arg> - <arg choice='opt'>-map_debug <replaceable>n</replaceable></arg> - <arg choice='opt'>-layer_debug <replaceable>layername</replaceable> <replaceable>n</replaceable></arg> - <arg choice='opt'>-p <replaceable>n</replaceable></arg> - <arg choice='opt'>-c <replaceable>n</replaceable></arg> - <arg choice='opt'>-d <replaceable>layername</replaceable> <replaceable>datavalue</replaceable></arg> + <arg choice='plain'><option>-m</option> <replaceable>mapfile</replaceable></arg> + <arg choice='opt'><option>-o</option> <replaceable>image</replaceable></arg> + <arg choice='opt'><option>-e</option> <replaceable>minx</replaceable> <replaceable>miny</replaceable> <replaceable>maxx</replaceable> <replaceable>maxy</replaceable></arg> + <arg choice='opt'><option>-s</option> <replaceable>sizex</replaceable> <replaceable>sizey</replaceable></arg> + <arg choice='opt'><option>-l</option> "<replaceable>layer1</replaceable> <arg choice='opt'><replaceable>layer2</replaceable>...</arg>"</arg> + <arg choice='opt'><option>-i</option> <replaceable>format</replaceable></arg> + <arg choice='opt'><option>-all_debug</option> <replaceable>n</replaceable></arg> + <arg choice='opt'><option>-map_debug</option> <replaceable>n</replaceable></arg> + <arg choice='opt'><option>-layer_debug</option> <replaceable>layername</replaceable> <replaceable>n</replaceable></arg> + <arg choice='opt'><option>-p</option> <replaceable>n</replaceable></arg> + <arg choice='opt'><option>-c</option> <replaceable>n</replaceable></arg> + <arg choice='opt'><option>-d</option> <replaceable>layername</replaceable> <replaceable>datavalue</replaceable></arg> </cmdsynopsis> </refsynopsisdiv> diff --git a/debian/man/shptree.1.xml b/debian/man/shptree.1.xml index a1ab446..b0f5779 100644 --- a/debian/man/shptree.1.xml +++ b/debian/man/shptree.1.xml @@ -21,7 +21,7 @@ <arg choice='opt'><replaceable>depth</replaceable></arg> <arg choice='opt'><replaceable>index_format</replaceable></arg> </arg> - <arg choice='opt'>-v</arg> + <arg choice='opt'><option>-v</option></arg> </group> </cmdsynopsis> </refsynopsisdiv> @@ -124,7 +124,7 @@ </varlistentry> <varlistentry> - <term>-v</term> + <term><option>-v</option></term> <listitem> <para>Display mapserver version and build options.</para> </listitem> diff --git a/debian/man/sortshp.1.xml b/debian/man/sortshp.1.xml index 23ed129..5ee1d5a 100644 --- a/debian/man/sortshp.1.xml +++ b/debian/man/sortshp.1.xml @@ -24,9 +24,8 @@ <arg choice='plain'><replaceable>ascending</replaceable></arg> <arg choice='plain'><replaceable>descending</replaceable></arg> </group> - <arg choice='plain'><replaceable></replaceable></arg> </arg> - <arg choice='opt'>-v</arg> + <arg choice='opt'><option>-v</option></arg> </group> </cmdsynopsis> </refsynopsisdiv> @@ -72,7 +71,7 @@ </varlistentry> <varlistentry> - <term>-v</term> + <term><option>-v</option></term> <listitem> <para>Display mapserver version and build options.</para> </listitem> diff --git a/debian/man/tile4ms.1.xml b/debian/man/tile4ms.1.xml index 2a71d2c..fa17d7e 100644 --- a/debian/man/tile4ms.1.xml +++ b/debian/man/tile4ms.1.xml @@ -19,9 +19,9 @@ <arg choice='plain'> <replaceable>metafile</replaceable> <arg choice='plain'><replaceable>tilefile</replaceable></arg> - <arg choice='opt'>-tile-path-only</arg> + <arg choice='opt'><option>-tile-path-only</option></arg> </arg> - <arg choice='plain'>-h</arg> + <arg choice='plain'><option>-h</option></arg> </group> </cmdsynopsis> </refsynopsisdiv> -- Mapserver _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel