[GRASS-SVN] r63873 - in grass-addons/grass7: general/g.copyall general/g.isis3mt gui/wxpython/wx.metadata/r.info.iso gui/wxpython/wx.metadata/v.info.iso imagery/i.fusion.brovey imagery/i.segment.hierarchical raster/r.convert raster/r.droka raster/r.forestfrag raster/r.hazard.flood raster/r.mcda.input raster/r.mcda.output raster/r.mcda.roughset raster/r.random.weight raster/r.rock.stability raster/r.shalstab raster/r.soillossbare raster/r.threshold raster/r.to.vect.lines raster/r.to.vect.tiled vector/v.civil/v.civil.river vector/v.civil/v.civil.road vector/v.civil/v.civil.tools vector/v.civil/v.civil.topo vector/v.class.ml vector/v.class.mlpy vector/v.out.png vector/v.stats

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Dec 29 13:19:02 PST 2014


Author: neteler
Date: 2014-12-29 13:19:02 -0800 (Mon, 29 Dec 2014)
New Revision: 63873

Modified:
   grass-addons/grass7/general/g.copyall/g.copyall.py
   grass-addons/grass7/general/g.isis3mt/g.isis3mt.py
   grass-addons/grass7/gui/wxpython/wx.metadata/r.info.iso/r.info.iso.py
   grass-addons/grass7/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.py
   grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.py
   grass-addons/grass7/imagery/i.segment.hierarchical/i.segment.hierarchical.py
   grass-addons/grass7/raster/r.convert/r.convert
   grass-addons/grass7/raster/r.convert/r.convert.all
   grass-addons/grass7/raster/r.droka/r.droka.py
   grass-addons/grass7/raster/r.forestfrag/r.forestfrag
   grass-addons/grass7/raster/r.hazard.flood/r.hazard.flood.py
   grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py
   grass-addons/grass7/raster/r.mcda.output/r.mcda.output.py
   grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py
   grass-addons/grass7/raster/r.random.weight/r.random.weight.py
   grass-addons/grass7/raster/r.random.weight/r.random.weight_legacy.py
   grass-addons/grass7/raster/r.rock.stability/r.rock.stability.py
   grass-addons/grass7/raster/r.shalstab/r.shalstab.py
   grass-addons/grass7/raster/r.soillossbare/r.soillossbare.py
   grass-addons/grass7/raster/r.threshold/r.threshold.py
   grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.py
   grass-addons/grass7/raster/r.to.vect.tiled/r.to.vect.tiled.py
   grass-addons/grass7/vector/v.civil/v.civil.river/v.civil.river.py
   grass-addons/grass7/vector/v.civil/v.civil.road/v.civil.road.py
   grass-addons/grass7/vector/v.civil/v.civil.tools/v.civil.tools.py
   grass-addons/grass7/vector/v.civil/v.civil.topo/v.civil.topo.py
   grass-addons/grass7/vector/v.class.ml/v.class.ml.py
   grass-addons/grass7/vector/v.class.mlpy/v.class.mlpy.py
   grass-addons/grass7/vector/v.out.png/v.out.png.py
   grass-addons/grass7/vector/v.stats/v.stats.py
Log:
Addons: keywords white space and no comma standardization

Modified: grass-addons/grass7/general/g.copyall/g.copyall.py
===================================================================
--- grass-addons/grass7/general/g.copyall/g.copyall.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/general/g.copyall/g.copyall.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -19,43 +19,43 @@
 #############################################################################
 
 #%Module
-#%  description: Copies all or a filtered subset of files of selected type from another mapset to the current working mapset
-#%  keywords: copy
-#%  keywords: general
-#%  overwrite: yes
+#% description: Copies all or a filtered subset of files of selected type from another mapset to the current working mapset
+#% keywords: copy
+#% keywords: general
+#% overwrite: yes
 #%End
 #%option G_OPT_M_MAPSET
-#%  key: mapset
-#%  description: Mapset to copy files from
-#%  required: yes
+#% key: mapset
+#% description: Mapset to copy files from
+#% required: yes
 #%end
 #%option
-#%  key: datatype
-#%  type: string
-#%  description: Choose type of GRASS data to copy
-#%  options: rast,vect,labels,rast3d,region,group
-#%  answer: rast
-#%  required: yes
+#% key: datatype
+#% type: string
+#% description: Choose type of GRASS data to copy
+#% options: rast,vect,labels,rast3d,region,group
+#% answer: rast
+#% required: yes
 #%end
 #%option
-#%  key: filter
-#%  type: string
-#%  description: Search pattern to filter data files to copy
-#%  required : no
+#% key: filter
+#% type: string
+#% description: Search pattern to filter data files to copy
+#% required : no
 #%end
 #%option
-#%  key: filter_type
-#%  type: string
-#%  description: Type of search pattern to use
-#%  options: select all, wildcards,regular expressions,extended regular expressions
-#%  answer: select all
-#%  required : no
+#% key: filter_type
+#% type: string
+#% description: Type of search pattern to use
+#% options: select all, wildcards,regular expressions,extended regular expressions
+#% answer: select all
+#% required : no
 #%end
 #%option
-#%  key: output_prefix
-#%  type: string
-#%  description: Optional prefix for output raster maps
-#%  required : no
+#% key: output_prefix
+#% type: string
+#% description: Optional prefix for output raster maps
+#% required : no
 #%end
 #% Flag
 #% key: t

Modified: grass-addons/grass7/general/g.isis3mt/g.isis3mt.py
===================================================================
--- grass-addons/grass7/general/g.isis3mt/g.isis3mt.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/general/g.isis3mt/g.isis3mt.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -21,9 +21,9 @@
 #  Add a note to the user to use  matchmap=yes in cam2map
  
 #%module
-#%  description: Generates an ISIS3 map template file according to the current GRASS coordinate reference system
-#%  keywords: coordinates
-#%  keywords: projection
+#% description: Generates an ISIS3 map template file according to the current GRASS coordinate reference system
+#% keywords: coordinates
+#% keywords: projection
 #%end
 
 #%option

Modified: grass-addons/grass7/gui/wxpython/wx.metadata/r.info.iso/r.info.iso.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.metadata/r.info.iso/r.info.iso.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/r.info.iso/r.info.iso.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -13,7 +13,9 @@
 
 #%module
 #% description: Creates metadata based on ISO standard for specified raster map.
-#% keywords: raster, metadata, iso
+#% keywords: raster
+#% keywords: metadata
+#% keywords: iso
 #%end
 
 #%option G_OPT_R_MAP

Modified: grass-addons/grass7/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -13,7 +13,9 @@
 
 #%module
 #% description: Creates metadata based on ISO standard for specified vector map.
-#% keywords: vector, metadata, iso
+#% keywords: vector
+#% keywords: metadata
+#% keywords: iso
 #%end
 
 #%option G_OPT_V_MAP

Modified: grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.py
===================================================================
--- grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -28,25 +28,25 @@
 #############################################################################
 
 #%Module
-#%  description: Brovey transform to merge multispectral and high-res panchromatic channels
-#%  keywords: imagery
-#%  keywords: fusion
-#%  keywords: Brovey
+#% description: Brovey transform to merge multispectral and high-res panchromatic channels
+#% keywords: imagery
+#% keywords: fusion
+#% keywords: Brovey
 #%End
 #%Flag
-#%  key: l
-#%  description: LANDSAT sensor
-#%  guisection: Sensor
+#% key: l
+#% description: LANDSAT sensor
+#% guisection: Sensor
 #%END
 #%Flag
-#%  key: q
-#%  description: QuickBird sensor
-#%  guisection: Sensor
+#% key: q
+#% description: QuickBird sensor
+#% guisection: Sensor
 #%END
 #%Flag
-#%  key: s
-#%  description: SPOT sensor
-#%  guisection: Sensor
+#% key: s
+#% description: SPOT sensor
+#% guisection: Sensor
 #%END
 #%option G_OPT_R_INPUT
 #% key: ms1

Modified: grass-addons/grass7/imagery/i.segment.hierarchical/i.segment.hierarchical.py
===================================================================
--- grass-addons/grass7/imagery/i.segment.hierarchical/i.segment.hierarchical.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/imagery/i.segment.hierarchical/i.segment.hierarchical.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -16,123 +16,123 @@
 #############################################################################
 
 #%Module
-#%  description: Hierarchical segmentation
-#%  keywords: imagery
-#%  keywords: segment
-#%  overwrite: yes
+#% description: Hierarchical segmentation
+#% keywords: imagery
+#% keywords: segment
+#% overwrite: yes
 #%End
 #%option G_OPT_I_GROUP
-#%  key: group
-#%  description: Name of input imagery group
-#%  required: yes
+#% key: group
+#% description: Name of input imagery group
+#% required: yes
 #%end
 #%option
-#%  key: thresholds
-#%  type: double
-#%  multiple: yes
-#%  description: Segment thresholds
-#%  required: yes
-#%  answer: 0.02,0.05
+#% key: thresholds
+#% type: double
+#% multiple: yes
+#% description: Segment thresholds
+#% required: yes
+#% answer: 0.02,0.05
 #%end
 #%option G_OPT_R_OUTPUT
-#%  key: output
-#%  description: Name of output sement raster map
-#%  required: yes
+#% key: output
+#% description: Name of output sement raster map
+#% required: yes
 #%end
 #%option
-#%  key: outputs_prefix
-#%  type: string
-#%  description: Name for output raster maps from segment
-#%  required: no
-#%  answer: seg__%.2f
+#% key: outputs_prefix
+#% type: string
+#% description: Name for output raster maps from segment
+#% required: no
+#% answer: seg__%.2f
 #%end
 #%option
-#%  key: method
-#%  type: string
-#%  description: Segmentation method
-#%  required: no
-#%  answer: region_growing
-#%  guisection: Segment
+#% key: method
+#% type: string
+#% description: Segmentation method
+#% required: no
+#% answer: region_growing
+#% guisection: Segment
 #%end
 #%option
-#%  key: similarity
-#%  type: string
-#%  description: Similarity calculation method
-#%  required: no
-#%  answer: euclidean
-#%  guisection: Segment
+#% key: similarity
+#% type: string
+#% description: Similarity calculation method
+#% required: no
+#% answer: euclidean
+#% guisection: Segment
 #%end
 #%option
-#%  key: minsizes
-#%  type: integer
-#%  description: Minimum number of cells in a segment
-#%  multiple: yes
-#%  required: no
-#%  guisection: Segment
+#% key: minsizes
+#% type: integer
+#% description: Minimum number of cells in a segment
+#% multiple: yes
+#% required: no
+#% guisection: Segment
 #%end
 #%option
-#%  key: memory
-#%  type: integer
-#%  description: Memory in MB
-#%  required: no
-#%  answer: 300
-#%  guisection: Segment
+#% key: memory
+#% type: integer
+#% description: Memory in MB
+#% required: no
+#% answer: 300
+#% guisection: Segment
 #%end
 #%option
-#%  key: iterations
-#%  type: integer
-#%  description: Maximum number of iterations
-#%  required: no
-#%  answer: 20
-#%  guisection: Segment
+#% key: iterations
+#% type: integer
+#% description: Maximum number of iterations
+#% required: no
+#% answer: 20
+#% guisection: Segment
 #%end
 #%option G_OPT_R_INPUT
-#%  key: seeds
-#%  description: Name for input raster map with starting seeds
-#%  required: no
-#%  guisection: Segment
+#% key: seeds
+#% description: Name for input raster map with starting seeds
+#% required: no
+#% guisection: Segment
 #%end
 #%option G_OPT_R_INPUT
-#%  key: bounds
-#%  description: Name of input bounding/constraining raster map
-#%  required: no
-#%  guisection: Segment
+#% key: bounds
+#% description: Name of input bounding/constraining raster map
+#% required: no
+#% guisection: Segment
 #%end
 #%option
-#%  key: width
-#%  description: Tile width in pixels
-#%  type: integer
-#%  required: no
-#%  guisection: Grid
+#% key: width
+#% description: Tile width in pixels
+#% type: integer
+#% required: no
+#% guisection: Grid
 #%end
 #%option
-#%  key: height
-#%  description: Tile height in pixels
-#%  type: integer
-#%  required: no
-#%  guisection: Grid
+#% key: height
+#% description: Tile height in pixels
+#% type: integer
+#% required: no
+#% guisection: Grid
 #%end
 #%option
-#%  key: overlap
-#%  description: Tile overlap in pixels
-#%  type: integer
-#%  required: no
-#%  answer: 0
-#%  guisection: Grid
+#% key: overlap
+#% description: Tile overlap in pixels
+#% type: integer
+#% required: no
+#% answer: 0
+#% guisection: Grid
 #%end
 #%option
-#%  key: processes
-#%  description: Number of concurrent processes
-#%  type: integer
-#%  required: no
-#%  guisection: Grid
+#% key: processes
+#% description: Number of concurrent processes
+#% type: integer
+#% required: no
+#% guisection: Grid
 #%end
 #%option
-#%  key: move
-#%  description: Path where move and copy the mapset
-#%  type: string
-#%  required: no
-#%  guisection: Grid
+#% key: move
+#% description: Path where move and copy the mapset
+#% type: string
+#% required: no
+#% guisection: Grid
 #%end
 
 

Modified: grass-addons/grass7/raster/r.convert/r.convert
===================================================================
--- grass-addons/grass7/raster/r.convert/r.convert	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.convert/r.convert	2014-12-29 21:19:02 UTC (rev 63873)
@@ -15,8 +15,10 @@
 #############################################################################
 
 #%Module
-#% description: Converts a GRASS 4-6 raster map to a GRASS 7 raster map format
-#% keywords: raster, import, conversion
+#% description: Converts a GRASS Version 4-6 raster map to a GRASS 7 raster map format
+#% keywords: raster
+#% keywords: import
+#% keywords: conversion
 #%end
 #%option
 #% key: map

Modified: grass-addons/grass7/raster/r.convert/r.convert.all
===================================================================
--- grass-addons/grass7/raster/r.convert/r.convert.all	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.convert/r.convert.all	2014-12-29 21:19:02 UTC (rev 63873)
@@ -13,8 +13,11 @@
 #############################################################################
 
 #%Module
-#% description: Converts all GRASS 4-6 raster maps in current mapset to GRASS 7 raster map format
-#% keywords: raster, import, conversion, bulk
+#% description: Converts all GRASS Version 4-6 raster maps in current mapset to GRASS 7 raster map format
+#% keywords: raster
+#% keywords: import
+#% keywords: conversion
+#% keywords: bulk
 #%end
 #%flag
 #%  key: m

Modified: grass-addons/grass7/raster/r.droka/r.droka.py
===================================================================
--- grass-addons/grass7/raster/r.droka/r.droka.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.droka/r.droka.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -16,8 +16,9 @@
 #
 #############################################################################
 #%Module
-#%  description: Calculates run-out distance of a falling rock mass
-#%  keywords: rock mass, rockfall
+#% description: Calculates run-out distance of a falling rock mass
+#% keywords: rock mass
+#% keywords: rockfall
 #%End
 #%option
 #% key: dem

Modified: grass-addons/grass7/raster/r.forestfrag/r.forestfrag
===================================================================
--- grass-addons/grass7/raster/r.forestfrag/r.forestfrag	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.forestfrag/r.forestfrag	2014-12-29 21:19:02 UTC (rev 63873)
@@ -27,7 +27,10 @@
 
 #%Module
 #% description: creates forest fragmentation index from a GRASS raster map (where forest=1, non-forest=0) based on a method developed by Riitters et. al (2000). The index is computed using a moving window of user-defined size (default=3).
-#% keywords: raster, forest, fragmentation-index, Riitters
+#% keywords: raster
+#% keywords: forest
+#% keywords: fragmentation index
+#% keywords: Riitters
 #%End
 
 #%Option

Modified: grass-addons/grass7/raster/r.hazard.flood/r.hazard.flood.py
===================================================================
--- grass-addons/grass7/raster/r.hazard.flood/r.hazard.flood.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.hazard.flood/r.hazard.flood.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -17,32 +17,32 @@
 #############################################################################
 
 #%module
-#%  description: Fast procedure to detect flood prone areas
-#%  keywords: raster
+#% description: Fast procedure to detect flood prone areas
+#% keywords: raster
 #%end
 #%option
-#%  key: map
-#%  type: string
-#%  gisprompt: old,raster,raster
-#%  key_desc: elevation
-#%  description: Name of elevation raster map 
-#%  required: yes
+#% key: map
+#% type: string
+#% gisprompt: old,raster,raster
+#% key_desc: elevation
+#% description: Name of elevation raster map 
+#% required: yes
 #%end
 #%option
-#%  key: flood
-#%  type: string
-#%  gisprompt: new,raster,raster
-#%  key_desc: flood
-#%  description: Name of output flood raster map 
-#%  required: yes
+#% key: flood
+#% type: string
+#% gisprompt: new,raster,raster
+#% key_desc: flood
+#% description: Name of output flood raster map 
+#% required: yes
 #%end
 #%option
-#%  key: mti
-#%  type: string
-#%  gisprompt: new,raster,raster
-#%  key_desc: MTI
-#%  description: Name of output MTI raster map 
-#%  required: yes
+#% key: mti
+#% type: string
+#% gisprompt: new,raster,raster
+#% key_desc: MTI
+#% description: Name of output MTI raster map 
+#% required: yes
 #%END
 
 import sys

Modified: grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py
===================================================================
--- grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -16,7 +16,8 @@
 
 #%Module
 #% description: Generate a raster map classified with Dominance Rough Set Approach. Use *.rls file from JAMM, 4eMka2 etc.
-#% keywords: raster, Dominance Rough Set Approach
+#% keywords: raster
+#% keywords: Dominance Rough Set Approach
 #% keywords: Multi Criteria Decision Analysis (MCDA)
 #%End
 #%option

Modified: grass-addons/grass7/raster/r.mcda.output/r.mcda.output.py
===================================================================
--- grass-addons/grass7/raster/r.mcda.output/r.mcda.output.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.mcda.output/r.mcda.output.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -15,7 +15,8 @@
 
 #%Module
 #% description: Export criteria raster maps and decision raster map in a *.isf file (e.g. 4eMka2, jMAF) for dominance rough set approach analysis
-#% keywords: raster, Dominance Rough Set Approach
+#% keywords: raster
+#% keywords: Dominance Rough Set Approach
 #% keywords: Multi Criteria Decision Analysis (MCDA)
 #%End
 #%option

Modified: grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py
===================================================================
--- grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -14,7 +14,8 @@
 
 #%Module
 #% description: Generate a MCDA map from several criteria maps using Dominance Rough Set Approach.
-#% keywords: raster, Dominance Rough Set Approach 
+#% keywords: raster
+#% keywords: Dominance Rough Set Approach 
 #% keywords: Multi Criteria Decision Analysis (MCDA)
 #%End
 #%option

Modified: grass-addons/grass7/raster/r.random.weight/r.random.weight.py
===================================================================
--- grass-addons/grass7/raster/r.random.weight/r.random.weight.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.random.weight/r.random.weight.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -17,7 +17,8 @@
 
 #%module
 #% description: Weighted sample
-#% keywords: raster, sample
+#% keywords: raster
+#% keywords: sample
 #%end
 
 #%option

Modified: grass-addons/grass7/raster/r.random.weight/r.random.weight_legacy.py
===================================================================
--- grass-addons/grass7/raster/r.random.weight/r.random.weight_legacy.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.random.weight/r.random.weight_legacy.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -17,7 +17,8 @@
 
 #%module
 #% description: Weighted sample
-#% keywords: raster, sample
+#% keywords: raster
+#% keywords: sample
 #%end
 
 #%option

Modified: grass-addons/grass7/raster/r.rock.stability/r.rock.stability.py
===================================================================
--- grass-addons/grass7/raster/r.rock.stability/r.rock.stability.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.rock.stability/r.rock.stability.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -16,7 +16,9 @@
 ##############################################################################
 #%Module
 #% description: Calculates SMR index for a slope area.
-#% keywords: rock mass, planar failure, toppling
+#% keywords: rock mass
+#% keywords: planar failure
+#% keywords: toppling
 #% overwrite: yes
 #%End
 #%option

Modified: grass-addons/grass7/raster/r.shalstab/r.shalstab.py
===================================================================
--- grass-addons/grass7/raster/r.shalstab/r.shalstab.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.shalstab/r.shalstab.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -16,66 +16,66 @@
 ##############################################################################
 
 #%module
-#%  description: A model for shallow landslide susceptibility.
-#%  keywords: raster
-#%  keywords: critical rainfall
-#%  keywords: landslide
+#% description: A model for shallow landslide susceptibility.
+#% keywords: raster
+#% keywords: critical rainfall
+#% keywords: landslide
 #%end
 #%option
-#%  key: dem
-#%  type: string
-#%  gisprompt: old,raster,raster
-#%  key_desc: name
-#%  description: Name of input elevation raster map
-#%  required: yes
+#% key: dem
+#% type: string
+#% gisprompt: old,raster,raster
+#% key_desc: name
+#% description: Name of input elevation raster map
+#% required: yes
 #%end
 #%option
-#%  key: phy
-#%  type: string
-#%  gisprompt: old,raster,raster
-#%  key_desc: name
-#%  description: Soil friction angle (angle)
-#%  required: yes
+#% key: phy
+#% type: string
+#% gisprompt: old,raster,raster
+#% key_desc: name
+#% description: Soil friction angle (angle)
+#% required: yes
 #%end
 #%option
-#%  key: c_soil
-#%  type: string
-#%  gisprompt: old,raster,raster
-#%  key_desc: name
-#%  description: Soil cohesion (N/m^2)
-#%  required: yes
+#% key: c_soil
+#% type: string
+#% gisprompt: old,raster,raster
+#% key_desc: name
+#% description: Soil cohesion (N/m^2)
+#% required: yes
 #%end
 #%option
-#%  key: gamma
-#%  type: string
-#%  gisprompt: old,raster,raster
-#%  key_desc: name
-#%  description: Soil density(Kg/m^3)
-#%  required: yes
+#% key: gamma
+#% type: string
+#% gisprompt: old,raster,raster
+#% key_desc: name
+#% description: Soil density(Kg/m^3)
+#% required: yes
 #%end
 #%option
-#%  key: z
-#%  type: string
-#%  gisprompt: old,raster,raster
-#%  key_desc: name
-#%  description: Vertical thickness of soil (m)
-#%  required: yes
+#% key: z
+#% type: string
+#% gisprompt: old,raster,raster
+#% key_desc: name
+#% description: Vertical thickness of soil (m)
+#% required: yes
 #%end
 #%option
-#%  key: k
-#%  type: string
-#%  gisprompt: old,raster,raster
-#%  key_desc: name
-#%  description: hydraulic conductivity (m/h)
-#%  required: yes
+#% key: k
+#% type: string
+#% gisprompt: old,raster,raster
+#% key_desc: name
+#% description: hydraulic conductivity (m/h)
+#% required: yes
 #%end
 #%option
-#%  key: root
-#%  type: string
-#%  gisprompt: old,raster,raster
-#%  key_desc: name
-#%  description: Root cohesion k (N/m^2)
-#%  required: no
+#% key: root
+#% type: string
+#% gisprompt: old,raster,raster
+#% key_desc: name
+#% description: Root cohesion k (N/m^2)
+#% required: no
 #%end
 ##############################################################################
 # output 

Modified: grass-addons/grass7/raster/r.soillossbare/r.soillossbare.py
===================================================================
--- grass-addons/grass7/raster/r.soillossbare/r.soillossbare.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.soillossbare/r.soillossbare.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -25,9 +25,11 @@
 '''
 
 #%Module
-#%  description: Calculate annual soil loss [t/(ha*a)] for bare soil.
-#                Use r.soillosscropland.py afterwards for grown soil.
-#%    keywords: erosion,raster,bare soil, potential soilloss
+#% description: Calculate annual soil loss [t/(ha*a)] for bare soil. Use r.soillosscropland.py afterwards for grown soil.
+#% keywords: erosion
+#% keywords: raster
+#% keywords: bare soil
+#% keywords: potential soilloss
 #%end
 
 #%option

Modified: grass-addons/grass7/raster/r.threshold/r.threshold.py
===================================================================
--- grass-addons/grass7/raster/r.threshold/r.threshold.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.threshold/r.threshold.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -19,7 +19,8 @@
 #%module
 #% description: Find optimal threshold for stream extraction
 #% keywords: raster
-#% keywords: hydrology, threshold
+#% keywords: hydrology
+#% keywords: threshold
 #%end
 
 #%option

Modified: grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.py
===================================================================
--- grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -22,7 +22,9 @@
 
 #%module
 #% description: Convert raster rows to vector lines.
-#% keywords: raster, conversion, wiggles
+#% keywords: raster
+#% keywords: conversion
+#% keywords: wiggles
 #%end
 #%option
 #% key: input

Modified: grass-addons/grass7/raster/r.to.vect.tiled/r.to.vect.tiled.py
===================================================================
--- grass-addons/grass7/raster/r.to.vect.tiled/r.to.vect.tiled.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/raster/r.to.vect.tiled/r.to.vect.tiled.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -20,7 +20,11 @@
 
 #%module
 #% description: Converts a raster map into vector tiles.
-#% keywords: raster, conversion, geometry, vectorization, tiling
+#% keywords: raster
+#% keywords: conversion
+#% keywords: geometry
+#% keywords: vectorization
+#% keywords: tiling
 #% overwrite: yes
 #%end
 #%option G_OPT_R_INPUT

Modified: grass-addons/grass7/vector/v.civil/v.civil.river/v.civil.river.py
===================================================================
--- grass-addons/grass7/vector/v.civil/v.civil.river/v.civil.river.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/vector/v.civil/v.civil.river/v.civil.river.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -20,7 +20,10 @@
 
 #%Module
 #% description: Export - Import geometry data to/from an 1-D hydrodynamic model.
-#% keywords: vector, Hec-Ras, hydraulic, river
+#% keywords: vector
+#% keywords: Hec-Ras
+#% keywords: hydraulic
+#% keywords: river
 #%End
 
 #### Required section ####

Modified: grass-addons/grass7/vector/v.civil/v.civil.road/v.civil.road.py
===================================================================
--- grass-addons/grass7/vector/v.civil/v.civil.road/v.civil.road.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/vector/v.civil/v.civil.road/v.civil.road.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -19,8 +19,11 @@
 #############################################################################
 
 #%Module
-#% description: Generate a alignment for desing roads, channels, ports...
-#% keywords: vector, ROADS, CHANNELS, PORTS.
+#% description: Generate an alignment for desired roads, channels, ports...
+#% keywords: vector
+#% keywords: road
+#% keywords: channel
+#% keywords: port
 #%End
 
 #### Required section ####

Modified: grass-addons/grass7/vector/v.civil/v.civil.tools/v.civil.tools.py
===================================================================
--- grass-addons/grass7/vector/v.civil/v.civil.tools/v.civil.tools.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/vector/v.civil/v.civil.tools/v.civil.tools.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -20,7 +20,9 @@
 
 #%module
 #% description: Road tool for use with v.civil.road
-#% keywords: vector, Road, civil
+#% keywords: vector
+#% keywords: road
+#% keywords: civil
 #%end
 
 #### Input section ####

Modified: grass-addons/grass7/vector/v.civil/v.civil.topo/v.civil.topo.py
===================================================================
--- grass-addons/grass7/vector/v.civil/v.civil.topo/v.civil.topo.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/vector/v.civil/v.civil.topo/v.civil.topo.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -20,8 +20,10 @@
 #############################################################################
 
 #%module
-#% description: Create and modific Points-Breaklines maps, and triangulate, with triangle with v.triangle and nn with r.surf.nnbathy
-#% keywords: vector, TOPO, topography
+#% description: Create and modify Points-Breaklines maps, and triangulate, with triangle with v.triangle and nn with r.surf.nnbathy
+#% keywords: vector
+#% keywords: TOPO
+#% keywords: topography
 #%end
 
 #### Input section ####

Modified: grass-addons/grass7/vector/v.class.ml/v.class.ml.py
===================================================================
--- grass-addons/grass7/vector/v.class.ml/v.class.ml.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/vector/v.class.ml/v.class.ml.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -16,347 +16,347 @@
 #############################################################################
 
 #%Module
-#%  description: Vector
-#%  keywords: machine learning
-#%  keywords: classification
-#%  overwrite: yes
+#% description: Vector
+#% keywords: machine learning
+#% keywords: classification
+#% overwrite: yes
 #%End
 #%option G_OPT_V_MAP
-#%  key: vector
-#%  description: Name of input vector map
-#%  required: yes
+#% key: vector
+#% description: Name of input vector map
+#% required: yes
 #%end
 #%option G_OPT_V_MAP
-#%  key: vtraining
-#%  description: Name of training vector map
-#%  required: no
+#% key: vtraining
+#% description: Name of training vector map
+#% required: no
 #%end
 #%option
-#%  key: vlayer
-#%  type: string
-#%  multiple: no
-#%  description: layer name or number to use for data
-#%  required: no
+#% key: vlayer
+#% type: string
+#% multiple: no
+#% description: layer name or number to use for data
+#% required: no
 #%end
 #%option
-#%  key: tlayer
-#%  type: string
-#%  multiple: no
-#%  description: layer number/name for the training layer
-#%  required: no
+#% key: tlayer
+#% type: string
+#% multiple: no
+#% description: layer number/name for the training layer
+#% required: no
 #%end
 #%option
-#%  key: rlayer
-#%  type: string
-#%  multiple: no
-#%  description: layer number/name for the ML results
-#%  required: no
+#% key: rlayer
+#% type: string
+#% multiple: no
+#% description: layer number/name for the ML results
+#% required: no
 #%end
 #%option
-#%  key: npy_data
-#%  type: string
-#%  multiple: no
-#%  description: Data with statistics in npy format.
-#%  answer: data.npy
-#%  required: no
+#% key: npy_data
+#% type: string
+#% multiple: no
+#% description: Data with statistics in npy format.
+#% answer: data.npy
+#% required: no
 #%end
 #%option
-#%  key: npy_cats
-#%  type: string
-#%  multiple: no
-#%  description: Numpy array with vector cats.
-#%  answer: cats.npy
-#%  required: no
+#% key: npy_cats
+#% type: string
+#% multiple: no
+#% description: Numpy array with vector cats.
+#% answer: cats.npy
+#% required: no
 #%end
 #%option
-#%  key: npy_cols
-#%  type: string
-#%  multiple: no
-#%  description: Numpy array with columns names.
-#%  answer: cols.npy
-#%  required: no
+#% key: npy_cols
+#% type: string
+#% multiple: no
+#% description: Numpy array with columns names.
+#% answer: cols.npy
+#% required: no
 #%end
 #%option
-#%  key: npy_index
-#%  type: string
-#%  multiple: no
-#%  description: Boolean numpy array with training indexes.
-#%  answer: indx.npy
-#%  required: no
+#% key: npy_index
+#% type: string
+#% multiple: no
+#% description: Boolean numpy array with training indexes.
+#% answer: indx.npy
+#% required: no
 #%end
 #%option
-#%  key: npy_tdata
-#%  type: string
-#%  multiple: no
-#%  description: training npy file with training set, default: training_data.npy
-#%  answer: training_data.npy
-#%  required: no
+#% key: npy_tdata
+#% type: string
+#% multiple: no
+#% description: training npy file with training set, default: training_data.npy
+#% answer: training_data.npy
+#% required: no
 #%end
 #%option
-#%  key: npy_tclasses
-#%  type: string
-#%  multiple: no
-#%  description: training npy file with the classes, default: training_classes.npy
-#%  answer: training_classes.npy
-#%  required: no
+#% key: npy_tclasses
+#% type: string
+#% multiple: no
+#% description: training npy file with the classes, default: training_classes.npy
+#% answer: training_classes.npy
+#% required: no
 #%end
 #%option
-#%  key: npy_btdata
-#%  type: string
-#%  multiple: no
-#%  description: training npy file with training set, default: training_data.npy
-#%  answer: Xbt.npy
-#%  required: no
+#% key: npy_btdata
+#% type: string
+#% multiple: no
+#% description: training npy file with training set, default: training_data.npy
+#% answer: Xbt.npy
+#% required: no
 #%end
 #%option
-#%  key: npy_btclasses
-#%  type: string
-#%  multiple: no
-#%  description: training npy file with the classes, default: training_classes.npy
-#%  answer: Ybt.npy
-#%  required: no
+#% key: npy_btclasses
+#% type: string
+#% multiple: no
+#% description: training npy file with the classes, default: training_classes.npy
+#% answer: Ybt.npy
+#% required: no
 #%end
 #%option
-#%  key: imp_csv
-#%  type: string
-#%  multiple: no
-#%  description: CSV file name with the feature importances rank using extra tree algorithms
-#%  answer: features_importances.csv
-#%  required: no
+#% key: imp_csv
+#% type: string
+#% multiple: no
+#% description: CSV file name with the feature importances rank using extra tree algorithms
+#% answer: features_importances.csv
+#% required: no
 #%end
 #%option
-#%  key: imp_fig
-#%  type: string
-#%  multiple: no
-#%  description: Figure file name with feature importances rank using extra tree algorithms
-#%  answer: features_importances.png
-#%  required: no
+#% key: imp_fig
+#% type: string
+#% multiple: no
+#% description: Figure file name with feature importances rank using extra tree algorithms
+#% answer: features_importances.png
+#% required: no
 #%end
 #%option
-#%  key: scalar
-#%  type: string
-#%  multiple: yes
-#%  description: scaler method, center the data before scaling, if no, not scale at all
-#%  required: no
-#%  answer: with_mean,with_std
+#% key: scalar
+#% type: string
+#% multiple: yes
+#% description: scaler method, center the data before scaling, if no, not scale at all
+#% required: no
+#% answer: with_mean,with_std
 #%end
 #%option
-#%  key: decomposition
-#%  type: string
-#%  multiple: no
-#%  description: choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to separate the decomposition method from the parameters like: PCA|n_components=98
-#%  required: no
-#%  answer:
+#% key: decomposition
+#% type: string
+#% multiple: no
+#% description: choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to separate the decomposition method from the parameters like: PCA|n_components=98
+#% required: no
+#% answer:
 #%end
 #%option
-#%  key: n_training
-#%  type: integer
-#%  multiple: no
-#%  description: Number of random training per class to training the machine learning algorithms
-#%  required: no
+#% key: n_training
+#% type: integer
+#% multiple: no
+#% description: Number of random training per class to training the machine learning algorithms
+#% required: no
 #%end
 #%option
-#%  key: pyclassifiers
-#%  type: string
-#%  multiple: no
-#%  description: a python file with classifiers
-#%  required: no
+#% key: pyclassifiers
+#% type: string
+#% multiple: no
+#% description: a python file with classifiers
+#% required: no
 #%end
 #%option
-#%  key: pyvar
-#%  type: string
-#%  multiple: no
-#%  description: name of the python variable that must be a list of dictionary
-#%  required: no
+#% key: pyvar
+#% type: string
+#% multiple: no
+#% description: name of the python variable that must be a list of dictionary
+#% required: no
 #%end
 #%option
-#%  key: pyindx
-#%  type: string
-#%  multiple: no
-#%  description: specify the index or range of index of the classifiers that you want to use
-#%  required: no
+#% key: pyindx
+#% type: string
+#% multiple: no
+#% description: specify the index or range of index of the classifiers that you want to use
+#% required: no
 #%end
 #%option
-#%  key: pyindx_optimize
-#%  type: string
-#%  multiple: no
-#%  description: Index of the classifiers to optimize the training set
-#%  required: no
+#% key: pyindx_optimize
+#% type: string
+#% multiple: no
+#% description: Index of the classifiers to optimize the training set
+#% required: no
 #%end
 #%option
-#%  key: nan
-#%  type: string
-#%  multiple: yes
-#%  description: Column pattern:Value or Numpy funtion to use to substitute NaN values
-#%  required: no
-#%  answer: *_skewness:nanmean,*_kurtosis:nanmean
+#% key: nan
+#% type: string
+#% multiple: yes
+#% description: Column pattern:Value or Numpy funtion to use to substitute NaN values
+#% required: no
+#% answer: *_skewness:nanmean,*_kurtosis:nanmean
 #%end
 #%option
-#%  key: inf
-#%  type: string
-#%  multiple: yes
-#%  description: Key:Value or Numpy funtion to use to substitute Inf values
-#%  required: no
-#%  answer: *_skewness:nanmean,*_kurtosis:nanmean
+#% key: inf
+#% type: string
+#% multiple: yes
+#% description: Key:Value or Numpy funtion to use to substitute Inf values
+#% required: no
+#% answer: *_skewness:nanmean,*_kurtosis:nanmean
 #%end
 #%option
-#%  key: neginf
-#%  type: string
-#%  multiple: yes
-#%  description: Key:Value or Numpy funtion to use to substitute neginf values
-#%  required: no
-#%  answer:
+#% key: neginf
+#% type: string
+#% multiple: yes
+#% description: Key:Value or Numpy funtion to use to substitute neginf values
+#% required: no
+#% answer:
 #%end
 #%option
-#%  key: posinf
-#%  type: string
-#%  multiple: yes
-#%  description: Key:Value or Numpy funtion to use to substitute posinf values
-#%  required: no
-#%  answer:
+#% key: posinf
+#% type: string
+#% multiple: yes
+#% description: Key:Value or Numpy funtion to use to substitute posinf values
+#% required: no
+#% answer:
 #%end
 #%option
-#%  key: csv_test_cls
-#%  type: string
-#%  multiple: no
-#%  description: csv file name with results of different machine learning scores
-#%  required: no
-#%  answer: test_classifiers.csv
+#% key: csv_test_cls
+#% type: string
+#% multiple: no
+#% description: csv file name with results of different machine learning scores
+#% required: no
+#% answer: test_classifiers.csv
 #%end
 #%option
-#%  key: report_class
-#%  type: string
-#%  multiple: no
-#%  description: text file name with the report of different machine learning algorithms
-#%  required: no
-#%  answer: classification_report.txt
+#% key: report_class
+#% type: string
+#% multiple: no
+#% description: text file name with the report of different machine learning algorithms
+#% required: no
+#% answer: classification_report.txt
 #%end
 #%option
-#%  key: svc_c_range
-#%  type: double
-#%  multiple: yes
-#%  description: C value range list to explore SVC domain
-#%  required: no
-#%  answer: 1e-2,1e-1,1e0,1e1,1e2,1e3,1e4,1e5,1e6,1e7,1e8
+#% key: svc_c_range
+#% type: double
+#% multiple: yes
+#% description: C value range list to explore SVC domain
+#% required: no
+#% answer: 1e-2,1e-1,1e0,1e1,1e2,1e3,1e4,1e5,1e6,1e7,1e8
 #%end
 #%option
-#%  key: svc_gamma_range
-#%  type: double
-#%  multiple: yes
-#%  description: gamma value range list to explore SVC domain
-#%  required: no
-#%  answer: 1e-6,1e-5,1e-4,1e-3,1e-2,1e-1,1e0,1e1,1e2,1e3,1e4
+#% key: svc_gamma_range
+#% type: double
+#% multiple: yes
+#% description: gamma value range list to explore SVC domain
+#% required: no
+#% answer: 1e-6,1e-5,1e-4,1e-3,1e-2,1e-1,1e0,1e1,1e2,1e3,1e4
 #%end
 #%option
-#%  key: svc_kernel_range
-#%  type: string
-#%  multiple: yes
-#%  description: kernel value range list to explore SVC domain
-#%  required: no
-#%  answer: linear,poly,rbf,sigmoid
+#% key: svc_kernel_range
+#% type: string
+#% multiple: yes
+#% description: kernel value range list to explore SVC domain
+#% required: no
+#% answer: linear,poly,rbf,sigmoid
 #%end
 #%option
-#%  key: svc_poly_range
-#%  type: string
-#%  multiple: yes
-#%  description: polynomial order list to explore SVC domain
-#%  required: no
-#%  answer:
+#% key: svc_poly_range
+#% type: string
+#% multiple: yes
+#% description: polynomial order list to explore SVC domain
+#% required: no
+#% answer:
 #%end
 #%option
-#%  key: svc_n_jobs
-#%  type: integer
-#%  multiple: no
-#%  description: number of jobs to use during the domain exploration
-#%  required: no
-#%  answer: 1
+#% key: svc_n_jobs
+#% type: integer
+#% multiple: no
+#% description: number of jobs to use during the domain exploration
+#% required: no
+#% answer: 1
 #%end
 #%option
-#%  key: svc_c
-#%  type: double
-#%  multiple: no
-#%  description: definitive C value
-#%  required: no
+#% key: svc_c
+#% type: double
+#% multiple: no
+#% description: definitive C value
+#% required: no
 #%end
 #%option
-#%  key: svc_gamma
-#%  type: double
-#%  multiple: no
-#%  description: definitive gamma value
-#%  required: no
+#% key: svc_gamma
+#% type: double
+#% multiple: no
+#% description: definitive gamma value
+#% required: no
 #%end
 #%option
-#%  key: svc_kernel
-#%  type: string
-#%  multiple: no
-#%  description: definitive kernel value. Available kernel are: ‘linear’, ‘poly’, ‘rbf’, ‘sigmoid’, ‘precomputed’
-#%  required: no
-#%  answer: rbf
+#% key: svc_kernel
+#% type: string
+#% multiple: no
+#% description: definitive kernel value. Available kernel are: ‘linear’, ‘poly’, ‘rbf’, ‘sigmoid’, ‘precomputed’
+#% required: no
+#% answer: rbf
 #%end
 #%option
-#%  key: svc_img
-#%  type: string
-#%  multiple: no
-#%  description: filename pattern with the image of SVC parameter
-#%  required: no
-#%  answer: domain_%s.svg
+#% key: svc_img
+#% type: string
+#% multiple: no
+#% description: filename pattern with the image of SVC parameter
+#% required: no
+#% answer: domain_%s.svg
 #%end
 #%option
-#%  key: rst_names
-#%  type: string
-#%  multiple: no
-#%  description: filename pattern for raster
-#%  required: no
-#%  answer: %s
+#% key: rst_names
+#% type: string
+#% multiple: no
+#% description: filename pattern for raster
+#% required: no
+#% answer: %s
 #%end
 #-----------------------------------------------------
 #%flag
-#%  key: e
-#%  description: Extract the training set from the vtraining map
+#% key: e
+#% description: Extract the training set from the vtraining map
 #%end
 #%flag
-#%  key: n
-#%  description: Export to numpy files
+#% key: n
+#% description: Export to numpy files
 #%end
 #%flag
-#%  key: f
-#%  description: Feature importances using extra trees algorithm
+#% key: f
+#% description: Feature importances using extra trees algorithm
 #%end
 #%flag
-#%  key: b
-#%  description: Balance the training using the class with the minor number of data
+#% key: b
+#% description: Balance the training using the class with the minor number of data
 #%end
 #%flag
-#%  key: o
-#%  description: Optimize the training samples
+#% key: o
+#% description: Optimize the training samples
 #%end
 #%flag
-#%  key: c
-#%  description: Classify the whole dataset
+#% key: c
+#% description: Classify the whole dataset
 #%end
 #%flag
-#%  key: r
-#%  description: Export the classify results to raster maps
+#% key: r
+#% description: Export the classify results to raster maps
 #%end
 #%flag
-#%  key: t
-#%  description: Test different classification methods
+#% key: t
+#% description: Test different classification methods
 #%end
 #%flag
-#%  key: v
-#%  description: add to test to compute the Bias variance
+#% key: v
+#% description: add to test to compute the Bias variance
 #%end
 #%flag
-#%  key: x
-#%  description: add to test to compute extra parameters like: confusion matrix, ROC, PR
+#% key: x
+#% description: add to test to compute extra parameters like: confusion matrix, ROC, PR
 #%end
 #%flag
-#%  key: d
-#%  description: Explore the SVC domain
+#% key: d
+#% description: Explore the SVC domain
 #%end
 #%flag
-#%  key: a
-#%  description: append the classification results
+#% key: a
+#% description: append the classification results
 #%end
 #-----------------------------------------------------
 from __future__ import (absolute_import, division, print_function,

Modified: grass-addons/grass7/vector/v.class.mlpy/v.class.mlpy.py
===================================================================
--- grass-addons/grass7/vector/v.class.mlpy/v.class.mlpy.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/vector/v.class.mlpy/v.class.mlpy.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -2,7 +2,7 @@
 
 ############################################################################
 #
-# MODULE:    Map Swipe
+# MODULE:    v.class.mlpy
 # AUTHOR(S): Vaclav Petras
 # PURPOSE:   Classifies features in vecor map.
 # COPYRIGHT: (C) 2012 by Vaclav Petras, and the GRASS Development Team
@@ -20,8 +20,10 @@
 ############################################################################
 
 #%module
-#%  description: Vector supervised classification tool which uses attributes as classification parametres (order of columns matters, names not), cat column identifies feature, class_column is excluded from classification parametres.
-#%  keywords: vector, classification, supervised
+#% description: Vector supervised classification tool which uses attributes as classification parametres (order of columns matters, names not), cat column identifies feature, class_column is excluded from classification parametres.
+#% keywords: vector
+#% keywords: classification
+#% keywords: supervised
 #%end
 #%option G_OPT_V_MAP
 #%  key: input

Modified: grass-addons/grass7/vector/v.out.png/v.out.png.py
===================================================================
--- grass-addons/grass7/vector/v.out.png/v.out.png.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/vector/v.out.png/v.out.png.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -16,7 +16,9 @@
 
 #%module
 #% description: Export vector map as PNG
-#% keywords: vector, export, PNG
+#% keywords: vector
+#% keywords: export
+#% keywords: PNG
 #%end
 #%option G_OPT_V_INPUT
 #%end

Modified: grass-addons/grass7/vector/v.stats/v.stats.py
===================================================================
--- grass-addons/grass7/vector/v.stats/v.stats.py	2014-12-29 21:06:44 UTC (rev 63872)
+++ grass-addons/grass7/vector/v.stats/v.stats.py	2014-12-29 21:19:02 UTC (rev 63873)
@@ -16,122 +16,122 @@
 #############################################################################
 
 #%Module
-#%  description: Vector stats
-#%  keywords: vector
-#%  keywords: statistics
-#%  keywords: shape
-#%  overwrite: yes
+#% description: Vector stats
+#% keywords: vector
+#% keywords: statistics
+#% keywords: shape
+#% overwrite: yes
 #%End
 #%option G_OPT_V_MAP
-#%  key: vector
-#%  description: Name of input vector map
-#%  required: yes
+#% key: vector
+#% description: Name of input vector map
+#% required: yes
 #%end
 #%option
-#%  key: layer
-#%  type: integer
-#%  description: Vector layer
-#%  multiple: no
-#%  required: no
-#%  answer: 1
+#% key: layer
+#% type: integer
+#% description: Vector layer
+#% multiple: no
+#% required: no
+#% answer: 1
 #%end
 #%option G_OPT_R_INPUTS
-#%  key: rasters
-#%  description: Name of input raster maps
-#%  multiple: yes
-#%  required: no
+#% key: rasters
+#% description: Name of input raster maps
+#% multiple: yes
+#% required: no
 #%end
 #%option G_OPT_R_INPUT
-#%  key: zones
-#%  description: Name of raster zones map
-#%  multiple: no
-#%  required: no
+#% key: zones
+#% description: Name of raster zones map
+#% multiple: no
+#% required: no
 #%end
 #%option
-#%  key: rprefix
-#%  description: Raster prefixes
-#%  multiple: yes
-#%  required: no
+#% key: rprefix
+#% description: Raster prefixes
+#% multiple: yes
+#% required: no
 #%end
 #%option
-#%  key: skipshape
-#%  type: string
-#%  multiple: yes
-#%  description: Skip shape columns
-#%  required: no
-#%  answer: area_id
+#% key: skipshape
+#% type: string
+#% multiple: yes
+#% description: Skip shape columns
+#% required: no
+#% answer: area_id
 #%end
 #%option
-#%  key: skipunivar
-#%  type: string
-#%  multiple: yes
-#%  description: Skip shape columns
-#%  required: no
-#%  answer: label,all_cells,non_null_cells,null_cells,mean_of_abs,sum,sum_abs
+#% key: skipunivar
+#% type: string
+#% multiple: yes
+#% description: Skip shape columns
+#% required: no
+#% answer: label,all_cells,non_null_cells,null_cells,mean_of_abs,sum,sum_abs
 #%end
 #%option
-#%  key: shpcsv
-#%  type: string
-#%  multiple: no
-#%  description: CSV with the vector statistics of the shape
-#%  required: no
+#% key: shpcsv
+#% type: string
+#% multiple: no
+#% description: CSV with the vector statistics of the shape
+#% required: no
 #%end
 #%option
-#%  key: rstcsv
-#%  type: string
-#%  multiple: yes
-#%  description: CSV with the statistics of the raster maps
-#%  required: no
+#% key: rstcsv
+#% type: string
+#% multiple: yes
+#% description: CSV with the statistics of the raster maps
+#% required: no
 #%end
 #%option
-#%  key: rstpercentile
-#%  type: integer
-#%  multiple: no
-#%  description: Raster percentile to use
-#%  required: no
-#%  answer: 90
+#% key: rstpercentile
+#% type: integer
+#% multiple: no
+#% description: Raster percentile to use
+#% required: no
+#% answer: 90
 #%end
 #%option
-#%  key: newlayer
-#%  type: integer
-#%  description: New vector layer that will be add to the vector map
-#%  multiple: no
-#%  required: no
-#%  answer: 2
+#% key: newlayer
+#% type: integer
+#% description: New vector layer that will be add to the vector map
+#% multiple: no
+#% required: no
+#% answer: 2
 #%end
 #%option
-#%  key: newlayername
-#%  type: string
-#%  description: New vector layer that will be add to the vector map
-#%  multiple: no
-#%  required: no
+#% key: newlayername
+#% type: string
+#% description: New vector layer that will be add to the vector map
+#% multiple: no
+#% required: no
 #%end
 #%option
-#%  key: newtabname
-#%  type: string
-#%  description: New vector layer that will be add to the vector map
-#%  multiple: no
-#%  required: no
+#% key: newtabname
+#% type: string
+#% description: New vector layer that will be add to the vector map
+#% multiple: no
+#% required: no
 #%end
 #%option
-#%  key: separator
-#%  type: string
-#%  description: New vector layer that will be add to the vector map
-#%  multiple: no
-#%  required: no
-#%  answer: ;
+#% key: separator
+#% type: string
+#% description: New vector layer that will be add to the vector map
+#% multiple: no
+#% required: no
+#% answer: ;
 #%end
 #%option
-#%  key: nprocs
-#%  type: integer
-#%  description: Number of process that will be used
-#%  multiple: no
-#%  required: no
-#%  answer: 1
+#% key: nprocs
+#% type: integer
+#% description: Number of process that will be used
+#% multiple: no
+#% required: no
+#% answer: 1
 #%end
 #%flag
-#%  key: r
-#%  description: Read from existing CSV files
+#% key: r
+#% description: Read from existing CSV files
 #%end
 #-----------------------------------------------------
 import sys



More information about the grass-commit mailing list