[SCM] mapserver branch, master, updated. upstream/6.2.1-74-gb4096fc

2013-07-05 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit b4096fc118aa8c2e3f51784ce1a80bc91e525409
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Jul 6 01:19:20 2013 +0200

Fix scalebar options.

diff --git a/debian/man/scalebar.1.xml b/debian/man/scalebar.1.xml
index b729f0e..5202263 100644
--- a/debian/man/scalebar.1.xml
+++ b/debian/man/scalebar.1.xml
@@ -9,14 +9,16 @@
 
   refnamediv
 refnamescalebar/refname
-refpurposecreate a scalebar from a mapfile/refpurpose
+refpurposecreate a scalebar image from a mapfile/refpurpose
   /refnamediv
 
   refsynopsisdiv id='synopsis'
 cmdsynopsis
   commandscalebar/command
   group
-arg choice='plain'replaceablemapfile/replaceable 
replaceableoutputimage/replaceable/arg
+arg choice='plain'replaceablemapfile/replaceable
+  arg choice='plain'replaceableoutputimage/replaceable/arg
+/arg
 arg choice='opt'-v/arg
   /group
 /cmdsynopsis
@@ -25,8 +27,9 @@
   refsect1 id='description'
 titleDESCRIPTION/title
 para
-  commandscalebar/command creates a scalebar from a mapfile. Output is
-  either PNG or GIF depending on what version of the GD library used.
+  commandscalebar/command creates a scalebar image from a mapfile.
+  Output is either PNG or GIF depending on what version of the GD library
+  used.
 /para
   /refsect1
 
@@ -35,9 +38,16 @@
 variablelist
 
   varlistentry
-termreplaceablemapfile/replaceable 
replaceableoutputimage/replaceable/term
+termreplaceablemapfile/replaceable/term
 listitem
-  paraCreates a scalebar from a mapfile./para
+  paraPath to the mapfile./para
+/listitem
+  /varlistentry
+
+  varlistentry
+termreplaceableoutputimage/replaceable/term
+listitem
+  paraPath to the output image file./para
 /listitem
   /varlistentry
 

-- 
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


[SCM] mapserver branch, master, updated. upstream/6.2.1-74-gb4096fc

2013-07-05 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 942a8d289d1f689d0536740063a729009062c258
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Jul 6 01:08:21 2013 +0200

Also document legend -v option.

diff --git a/debian/man/legend.1.xml b/debian/man/legend.1.xml
index 39bf6f3..c1f334c 100644
--- a/debian/man/legend.1.xml
+++ b/debian/man/legend.1.xml
@@ -9,14 +9,18 @@
 
   refnamediv
 refnamelegend/refname
-refpurposegenerate legend image for mapfile/refpurpose
+refpurposecreate a legend image from a mapfile/refpurpose
   /refnamediv
 
   refsynopsisdiv id='synopsis'
 cmdsynopsis
   commandlegend/command
-  arg choice='plain'replaceablemapfile/replaceable/arg
-  arg choice='plain'replaceableoutputfile/replaceable/arg
+  group
+arg choice='plain'replaceablemapfile/replaceable
+  arg choice='plain'replaceableoutputimage/replaceable/arg
+/arg
+arg choice='plain'option-v/option/arg
+  /group
 /cmdsynopsis
   /refsynopsisdiv
 
@@ -40,9 +44,16 @@
   /varlistentry
 
   varlistentry
-termreplaceableoutputfile/replaceable/term
+termreplaceableoutputimage/replaceable/term
 listitem
-  paraPath for the output image file./para
+  paraPath to the output image file./para
+/listitem
+  /varlistentry
+
+  varlistentry
+term-v/term
+listitem
+  paraDisplay mapserver version and build options./para
 /listitem
   /varlistentry
 

-- 
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