Mon Dec 29 13:26:52 PST 2014

Author: neteler
Date: 2014-12-29 13:26:52 -0800 (Mon, 29 Dec 2014)
New Revision: 63874

Modified:
   grass-addons/grass7/display/d.frame/d.frame.py
   grass-addons/grass7/display/d.mon2/d.mon2.py
   grass-addons/grass7/general/g.cloud/g.cloud.py
   grass-addons/grass7/general/g.compare.md5/g.compare.md5.py
   grass-addons/grass7/general/g.copyall/g.copyall.py
   grass-addons/grass7/general/g.isis3mt/g.isis3mt.py
   grass-addons/grass7/general/g.proj.all/g.proj.all.py
   grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.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.histo.match/i.histo.match.py
   grass-addons/grass7/imagery/i.segment.hierarchical/i.segment.hierarchical.py
   grass-addons/grass7/raster/r.basin/r.basin.py
   grass-addons/grass7/raster/r.bioclim/r.bioclim.py
   grass-addons/grass7/raster/r.convert/r.convert
   grass-addons/grass7/raster/r.convert/r.convert.all
   grass-addons/grass7/raster/r.diversity/r.diversity.py
   grass-addons/grass7/raster/r.droka/r.droka.py
   grass-addons/grass7/raster/r.fidimo/r.fidimo.py
   grass-addons/grass7/raster/r.forestfrag/r.forestfrag
   grass-addons/grass7/raster/r.gradient/r.gradient.py
   grass-addons/grass7/raster/r.hazard.flood/r.hazard.flood.py
   grass-addons/grass7/raster/r.hypso/r.hypso.py
   grass-addons/grass7/raster/r.in.srtm.region/r.in.srtm.region.py
   grass-addons/grass7/raster/r.in.wcs/r.in.wcs.py
   grass-addons/grass7/raster/r.lake.series/r.lake.series.py
   grass-addons/grass7/raster/r.lfp/r.lfp.py
   grass-addons/grass7/raster/r.local.relief/r.local.relief.py
   grass-addons/grass7/raster/r.mcda.ahp/r.mcda.ahp.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.modis/r.modis.download/r.modis.download.py
   grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py
   grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.py
   grass-addons/grass7/raster/r.popgrowth/r.popgrowth.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.roughness.vector/r.roughness.vector.py
   grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.py
   grass-addons/grass7/raster/r.shalstab/r.shalstab.py
   grass-addons/grass7/raster/r.skyview/r.skyview.py
   grass-addons/grass7/raster/r.soillossbare/r.soillossbare.py
   grass-addons/grass7/raster/r.sun.daily/r.sun.daily.py
   grass-addons/grass7/raster/r.sun.hourly/r.sun.hourly.py
   grass-addons/grass7/raster/r.surf.nnbathy/r.surf.nnbathy.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/raster/r.valley.bottom/r.valley.bottom.py
   grass-addons/grass7/raster/r.width.funct/r.width.funct.py
   grass-addons/grass7/vector/v.area.weigh/v.area.weigh.py
   grass-addons/grass7/vector/v.build.pg/v.build.pg.py
   grass-addons/grass7/vector/v.centerline/v.centerline.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.colors2/v.colors2.py
   grass-addons/grass7/vector/v.concave.hull/v.concave.hull.py
   grass-addons/grass7/vector/v.external.all/v.external.all.py
   grass-addons/grass7/vector/v.fixed.segmentpoints/v.fixed.segmentpoints.py
   grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py
   grass-addons/grass7/vector/v.in.geopaparazzi/v.in.geopaparazzi.py
   grass-addons/grass7/vector/v.in.gns/v.in.gns.py
   grass-addons/grass7/vector/v.in.wfs2/v.in.wfs2.py
   grass-addons/grass7/vector/v.isochrones/v.isochrones.py
   grass-addons/grass7/vector/v.lfp/v.lfp.py
   grass-addons/grass7/vector/v.lidar.mcc/v.lidar.mcc.py
   grass-addons/grass7/vector/v.median/v.median.py
   grass-addons/grass7/vector/v.neighborhoodmatrix/v.neighborhoodmatrix.py
   grass-addons/grass7/vector/v.out.png/v.out.png.py
   grass-addons/grass7/vector/v.ply.rectify/v.ply.rectify.py
   grass-addons/grass7/vector/v.stats/v.stats.py
   grass-addons/grass7/vector/v.surf.icw/v.surf.icw.py
   grass-addons/grass7/vector/v.surf.nnbathy/v.surf.nnbathy.py
   grass-addons/grass7/vector/v.what.strds/v.what.strds.py
Log:
Addons scripts/parser: keywords -> keyword (old style remains accepted) (trunk, r63871)

Modified: grass-addons/grass7/display/d.frame/d.frame.py
===================================================================

--- grass-addons/grass7/display/d.frame/d.frame.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/display/d.frame/d.frame.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -21,10 +21,10 @@
 ############################################################################
 #%module
 #% description: Manages display frames on the user's graphics monitor.
-#% keywords: display
-#% keywords: graphics
-#% keywords: monitors
-#% keywords: frame
+#% keyword: display
+#% keyword: graphics
+#% keyword: monitors
+#% keyword: frame
 #% overwrite: yes
 #%end
 #%flag

Modified: grass-addons/grass7/display/d.mon2/d.mon2.py
===================================================================
--- grass-addons/grass7/display/d.mon2/d.mon2.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/display/d.mon2/d.mon2.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -13,8 +13,8 @@
 
 #%Module
 #% description: Starts a graphics display monitor which can be controlled from the command line.
-#% keywords: display
-#% keywords: CLI
+#% keyword: display
+#% keyword: CLI
 #%End
 #%Option
 #% key: width

Modified: grass-addons/grass7/general/g.cloud/g.cloud.py
===================================================================
--- grass-addons/grass7/general/g.cloud/g.cloud.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/general/g.cloud/g.cloud.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,8 +17,8 @@
 #############################################################################
 #%module
 #% description: Connects GRASS session with another one in a cluster system.
-#% keywords: general
-#% keywords: cloud computing
+#% keyword: general
+#% keyword: cloud computing
 #%end
 #%flag
 #% key: c

Modified: grass-addons/grass7/general/g.compare.md5/g.compare.md5.py
===================================================================
--- grass-addons/grass7/general/g.compare.md5/g.compare.md5.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/general/g.compare.md5/g.compare.md5.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -18,9 +18,9 @@
 
 #%module
 #% description: Checks if two GRASS GIS maps are identical.
-#% keywords: general
-#% keywords: map management
-#% keywords: list
+#% keyword: general
+#% keyword: map management
+#% keyword: list
 #%end
 #%flag
 #% key: g

Modified: grass-addons/grass7/general/g.copyall/g.copyall.py
===================================================================
--- grass-addons/grass7/general/g.copyall/g.copyall.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/general/g.copyall/g.copyall.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -20,8 +20,8 @@
 
 #%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
+#% keyword: copy
+#% keyword: general
 #% overwrite: yes
 #%End
 #%option G_OPT_M_MAPSET

Modified: grass-addons/grass7/general/g.isis3mt/g.isis3mt.py
===================================================================
--- grass-addons/grass7/general/g.isis3mt/g.isis3mt.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/general/g.isis3mt/g.isis3mt.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -22,8 +22,8 @@
  
 #%module
 #% description: Generates an ISIS3 map template file according to the current GRASS coordinate reference system
-#% keywords: coordinates
-#% keywords: projection
+#% keyword: coordinates
+#% keyword: projection
 #%end
 
 #%option

Modified: grass-addons/grass7/general/g.proj.all/g.proj.all.py
===================================================================
--- grass-addons/grass7/general/g.proj.all/g.proj.all.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/general/g.proj.all/g.proj.all.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,9 +17,9 @@
 
 #%module
 #% description: Reprojects raster and vector maps from given location and mapset to current mapset.
-#% keywords: general
-#% keywords: projection
-#% keywords: transformation
+#% keyword: general
+#% keyword: projection
+#% keyword: transformation
 #%end
 #%option
 #% key: location

Modified: grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -23,9 +23,9 @@
 
 #%module
 #% description: Tool for creating and modifying map's metadata.
-#% keywords: general
-#% keywords: GUI
-#% keywords: metadata
+#% keyword: general
+#% keyword: GUI
+#% keyword: metadata
 #%end
 
 import os

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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/r.info.iso/r.info.iso.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -13,9 +13,9 @@
 
 #%module
 #% description: Creates metadata based on ISO standard for specified raster map.
-#% keywords: raster
-#% keywords: metadata
-#% keywords: iso
+#% keyword: raster
+#% keyword: metadata
+#% keyword: 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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -13,9 +13,9 @@
 
 #%module
 #% description: Creates metadata based on ISO standard for specified vector map.
-#% keywords: vector
-#% keywords: metadata
-#% keywords: iso
+#% keyword: vector
+#% keyword: metadata
+#% keyword: 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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/imagery/i.fusion.brovey/i.fusion.brovey.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -29,9 +29,9 @@
 
 #%Module
 #% description: Brovey transform to merge multispectral and high-res panchromatic channels
-#% keywords: imagery
-#% keywords: fusion
-#% keywords: Brovey
+#% keyword: imagery
+#% keyword: fusion
+#% keyword: Brovey
 #%End
 #%Flag
 #% key: l

Modified: grass-addons/grass7/imagery/i.histo.match/i.histo.match.py
===================================================================
--- grass-addons/grass7/imagery/i.histo.match/i.histo.match.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/imagery/i.histo.match/i.histo.match.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -20,8 +20,8 @@
 #############################################################################
 #%module
 #% description: Calculate histogram matching of several images.
-#% keywords: imagery
-#% keywords: histogram matching
+#% keyword: imagery
+#% keyword: histogram matching
 #%end
 #%option G_OPT_R_INPUTS
 #% description: Name of raster maps to analize

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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/imagery/i.segment.hierarchical/i.segment.hierarchical.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,8 +17,8 @@
 
 #%Module
 #% description: Hierarchical segmentation
-#% keywords: imagery
-#% keywords: segment
+#% keyword: imagery
+#% keyword: segment
 #% overwrite: yes
 #%End
 #%option G_OPT_I_GROUP

Modified: grass-addons/grass7/raster/r.basin/r.basin.py
===================================================================
--- grass-addons/grass7/raster/r.basin/r.basin.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.basin/r.basin.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -19,9 +19,9 @@
 
 #%module
 #% description: Morphometric characterization of river basins
-#% keywords: raster
-#% keywords: hydrology
-#% keywords: watershed
+#% keyword: raster
+#% keyword: hydrology
+#% keyword: watershed
 #% overwrite: yes
 #%end
 

Modified: grass-addons/grass7/raster/r.bioclim/r.bioclim.py
===================================================================
--- grass-addons/grass7/raster/r.bioclim/r.bioclim.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.bioclim/r.bioclim.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -15,8 +15,8 @@
 
 #%module
 #% description: Calcuates bioclimatic indices.
-#% keywords: raster
-#% keywords: time series
+#% keyword: raster
+#% keyword: time series
 #% overwrite: yes
 #%end
 #%option G_OPT_R_INPUTS

Modified: grass-addons/grass7/raster/r.convert/r.convert
===================================================================
--- grass-addons/grass7/raster/r.convert/r.convert	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.convert/r.convert	2014-12-29 21:26:52 UTC (rev 63874)
@@ -16,9 +16,9 @@
 
 #%Module
 #% description: Converts a GRASS Version 4-6 raster map to a GRASS 7 raster map format
-#% keywords: raster
-#% keywords: import
-#% keywords: conversion
+#% keyword: raster
+#% keyword: import
+#% keyword: 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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.convert/r.convert.all	2014-12-29 21:26:52 UTC (rev 63874)
@@ -14,10 +14,10 @@
 
 #%Module
 #% 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
+#% keyword: raster
+#% keyword: import
+#% keyword: conversion
+#% keyword: bulk
 #%end
 #%flag
 #%  key: m

Modified: grass-addons/grass7/raster/r.diversity/r.diversity.py
===================================================================
--- grass-addons/grass7/raster/r.diversity/r.diversity.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.diversity/r.diversity.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -18,7 +18,7 @@
 
 #%module
 #% description: Calculate diversity indices based on a moving window using r.li packages
-#% keywords: raster
+#% keyword: raster
 #%end
 #%option
 #% key: input

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

Modified: grass-addons/grass7/raster/r.fidimo/r.fidimo.py
===================================================================
--- grass-addons/grass7/raster/r.fidimo/r.fidimo.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.fidimo/r.fidimo.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -13,7 +13,7 @@
 #############################################################################
 #%Module
 #% description: Calculating fish dispersal in a river network from source populations with species specific dispersal parameters
-#% keywords: Fish Dispersal Model
+#% keyword: Fish Dispersal Model
 #%End
 #%option
 #% key: river

Modified: grass-addons/grass7/raster/r.forestfrag/r.forestfrag
===================================================================
--- grass-addons/grass7/raster/r.forestfrag/r.forestfrag	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.forestfrag/r.forestfrag	2014-12-29 21:26:52 UTC (rev 63874)
@@ -27,10 +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
-#% keywords: forest
-#% keywords: fragmentation index
-#% keywords: Riitters
+#% keyword: raster
+#% keyword: forest
+#% keyword: fragmentation index
+#% keyword: Riitters
 #%End
 
 #%Option

Modified: grass-addons/grass7/raster/r.gradient/r.gradient.py
===================================================================
--- grass-addons/grass7/raster/r.gradient/r.gradient.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.gradient/r.gradient.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,8 +17,8 @@
 
 #%module
 #% description: Create a gradient map
-#% keywords: raster
-#% keywords: gradient
+#% keyword: raster
+#% keyword: gradient
 #%end
 
 #%option G_OPT_R_OUTPUT

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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.hazard.flood/r.hazard.flood.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -18,7 +18,7 @@
 
 #%module
 #% description: Fast procedure to detect flood prone areas
-#% keywords: raster
+#% keyword: raster
 #%end
 #%option
 #% key: map

Modified: grass-addons/grass7/raster/r.hypso/r.hypso.py
===================================================================
--- grass-addons/grass7/raster/r.hypso/r.hypso.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.hypso/r.hypso.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -21,7 +21,7 @@
 ################################################################################
 #%module
 #% description: Outputs a hypsometric and hypsographic graph.
-#% keywords: raster
+#% keyword: raster
 #%end
 
 #%option G_OPT_R_ELEV

Modified: grass-addons/grass7/raster/r.in.srtm.region/r.in.srtm.region.py
===================================================================
--- grass-addons/grass7/raster/r.in.srtm.region/r.in.srtm.region.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.in.srtm.region/r.in.srtm.region.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -18,8 +18,8 @@
 
 #%module
 #% description: Creates a DEM from 3 arcsec SRTM v2.1 or v3 tiles.
-#% keywords: raster
-#% keywords: import
+#% keyword: raster
+#% keyword: import
 #%end
 #%option G_OPT_R_OUTPUT
 #% description: Name for output raster map

Modified: grass-addons/grass7/raster/r.in.wcs/r.in.wcs.py
===================================================================
--- grass-addons/grass7/raster/r.in.wcs/r.in.wcs.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.in.wcs/r.in.wcs.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -21,9 +21,9 @@
 
 #%module
 #% description: Downloads and imports coverage from WCS server.
-#% keywords: raster
-#% keywords: import
-#% keywords: OGC web services
+#% keyword: raster
+#% keyword: import
+#% keyword: OGC web services
 #%end
 
 #%option

Modified: grass-addons/grass7/raster/r.lake.series/r.lake.series.py
===================================================================
--- grass-addons/grass7/raster/r.lake.series/r.lake.series.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.lake.series/r.lake.series.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -18,10 +18,10 @@
 
 #%module
 #% description: Fills lake at given point(s) to given levels.
-#% keywords: raster
-#% keywords: hydrology
-#% keywords: hazard
-#% keywords: flood
+#% keyword: raster
+#% keyword: hydrology
+#% keyword: hazard
+#% keyword: flood
 #%end
 #%option G_OPT_R_ELEV
 #%end

Modified: grass-addons/grass7/raster/r.lfp/r.lfp.py
===================================================================
--- grass-addons/grass7/raster/r.lfp/r.lfp.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.lfp/r.lfp.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -15,8 +15,8 @@
 
 #%module
 #% description: Calculates the longest flow path for a given outlet point.
-#% keywords: hydrology
-#% keywords: watershed
+#% keyword: hydrology
+#% keyword: watershed
 #%end
 #%option G_OPT_R_INPUT
 #% description: Name of input drainage direction raster map

Modified: grass-addons/grass7/raster/r.local.relief/r.local.relief.py
===================================================================
--- grass-addons/grass7/raster/r.local.relief/r.local.relief.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.local.relief/r.local.relief.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -16,12 +16,12 @@
 
 #%module
 #% description: Creates a local relief model from elevation map.
-#% keywords: raster
-#% keywords: elevation
-#% keywords: terrain
-#% keywords: relief
-#% keywords: LRM
-#% keywords: visualization
+#% keyword: raster
+#% keyword: elevation
+#% keyword: terrain
+#% keyword: relief
+#% keyword: LRM
+#% keyword: visualization
 #%end
 #%option
 #% type: string

Modified: grass-addons/grass7/raster/r.mcda.ahp/r.mcda.ahp.py
===================================================================
--- grass-addons/grass7/raster/r.mcda.ahp/r.mcda.ahp.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.mcda.ahp/r.mcda.ahp.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -14,9 +14,9 @@
 
 #%Module
 #% description: Generate a raster map classified with analytic hierarchy process (AHP).
-#% keywords: raster
-#% keywords: Analytic Hierarchy Process (AHP)
-#% keywords: Multi Criteria Decision Analysis (MCDA)
+#% keyword: raster
+#% keyword: Analytic Hierarchy Process (AHP)
+#% keyword: Multi Criteria Decision Analysis (MCDA)
 #%End
 #%option
 #% key: criteria

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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.mcda.input/r.mcda.input.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -16,9 +16,9 @@
 
 #%Module
 #% description: Generate a raster map classified with Dominance Rough Set Approach. Use *.rls file from JAMM, 4eMka2 etc.
-#% keywords: raster
-#% keywords: Dominance Rough Set Approach
-#% keywords: Multi Criteria Decision Analysis (MCDA)
+#% keyword: raster
+#% keyword: Dominance Rough Set Approach
+#% keyword: Multi Criteria Decision Analysis (MCDA)
 #%End
 #%option
 #% key: input

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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.mcda.output/r.mcda.output.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -15,9 +15,9 @@
 
 #%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
-#% keywords: Dominance Rough Set Approach
-#% keywords: Multi Criteria Decision Analysis (MCDA)
+#% keyword: raster
+#% keyword: Dominance Rough Set Approach
+#% keyword: Multi Criteria Decision Analysis (MCDA)
 #%End
 #%option
 #% key: attributes

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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.mcda.roughset/r.mcda.roughset.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -14,9 +14,9 @@
 
 #%Module
 #% description: Generate a MCDA map from several criteria maps using Dominance Rough Set Approach.
-#% keywords: raster
-#% keywords: Dominance Rough Set Approach 
-#% keywords: Multi Criteria Decision Analysis (MCDA)
+#% keyword: raster
+#% keyword: Dominance Rough Set Approach 
+#% keyword: Multi Criteria Decision Analysis (MCDA)
 #%End
 #%option
 #% key: criteria

Modified: grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py
===================================================================
--- grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -18,8 +18,8 @@
 
 #%module
 #% description: Download several tiles of MODIS products using pyModis
-#% keywords: raster
-#% keywords: import
+#% keyword: raster
+#% keyword: import
 #%end
 #%flag
 #% key: d

Modified: grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py
===================================================================
--- grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -23,8 +23,8 @@
 
 #%module
 #% description: Import single or multiple tiles of MODIS products using pyModis/MRT
-#% keywords: raster
-#% keywords: MODIS
+#% keyword: raster
+#% keyword: MODIS
 #%end
 #%flag
 #% key: m

Modified: grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.py
===================================================================
--- grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.northerness.easterness/r.northerness.easterness.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -16,11 +16,11 @@
 
 #%module
 #% description: Calculation of northerness, easterness and the interaction between northerness and slope
-#% keywords: raster
-#% keywords: terrain
-#% keywords: aspect
-#% keywords: slope
-#% keywords: sun
+#% keyword: raster
+#% keyword: terrain
+#% keyword: aspect
+#% keyword: slope
+#% keyword: sun
 #%end
 
 #%option G_OPT_R_ELEV

Modified: grass-addons/grass7/raster/r.popgrowth/r.popgrowth.py
===================================================================
--- grass-addons/grass7/raster/r.popgrowth/r.popgrowth.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.popgrowth/r.popgrowth.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -13,7 +13,7 @@
 #############################################################################
 #%Module
 #% description: Set of population models (fisheries science)
-#% keywords: Population growth model
+#% keyword: Population growth model
 #%End
 #%option
 #% key: n_initial

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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.random.weight/r.random.weight.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,8 +17,8 @@
 
 #%module
 #% description: Weighted sample
-#% keywords: raster
-#% keywords: sample
+#% keyword: raster
+#% keyword: 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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.random.weight/r.random.weight_legacy.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,8 +17,8 @@
 
 #%module
 #% description: Weighted sample
-#% keywords: raster
-#% keywords: sample
+#% keyword: raster
+#% keyword: 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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.rock.stability/r.rock.stability.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -16,9 +16,9 @@
 ##############################################################################
 #%Module
 #% description: Calculates SMR index for a slope area.
-#% keywords: rock mass
-#% keywords: planar failure
-#% keywords: toppling
+#% keyword: rock mass
+#% keyword: planar failure
+#% keyword: toppling
 #% overwrite: yes
 #%End
 #%option

Modified: grass-addons/grass7/raster/r.roughness.vector/r.roughness.vector.py
===================================================================
--- grass-addons/grass7/raster/r.roughness.vector/r.roughness.vector.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.roughness.vector/r.roughness.vector.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -37,11 +37,11 @@
 #
 #%Module
 #% description: Calculates surface roughness in a moving-window, as the orientation of vectors normal to surface planes.
-#% keywords: raster
-#% keywords: terrain
-#% keywords: aspect
-#% keywords: slope
-#% keywords: roughness
+#% keyword: raster
+#% keyword: terrain
+#% keyword: aspect
+#% keyword: slope
+#% keyword: roughness
 #%end
 #%option G_OPT_R_ELEV
 #% key: elevation

Modified: grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.py
===================================================================
--- grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -15,10 +15,10 @@
 
 #%module
 #% description: Creates shades from various directions and combines then into RGB composition.
-#% keywords: raster
-#% keywords: elevation
-#% keywords: terrain
-#% keywords: visualization
+#% keyword: raster
+#% keyword: elevation
+#% keyword: terrain
+#% keyword: visualization
 #%end
 #%option
 #% type: string

Modified: grass-addons/grass7/raster/r.shalstab/r.shalstab.py
===================================================================
--- grass-addons/grass7/raster/r.shalstab/r.shalstab.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.shalstab/r.shalstab.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,9 +17,9 @@
 
 #%module
 #% description: A model for shallow landslide susceptibility.
-#% keywords: raster
-#% keywords: critical rainfall
-#% keywords: landslide
+#% keyword: raster
+#% keyword: critical rainfall
+#% keyword: landslide
 #%end
 #%option
 #% key: dem

Modified: grass-addons/grass7/raster/r.skyview/r.skyview.py
===================================================================
--- grass-addons/grass7/raster/r.skyview/r.skyview.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.skyview/r.skyview.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -18,8 +18,8 @@
 
 #%module
 #% description: Computes Sky-View Factor visualization technique
-#% keywords: raster
-#% keywords: visualization
+#% keyword: raster
+#% keyword: visualization
 #%end
 #%option G_OPT_R_INPUT
 #%end

Modified: grass-addons/grass7/raster/r.soillossbare/r.soillossbare.py
===================================================================
--- grass-addons/grass7/raster/r.soillossbare/r.soillossbare.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.soillossbare/r.soillossbare.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -26,10 +26,10 @@
 
 #%Module
 #% 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
+#% keyword: erosion
+#% keyword: raster
+#% keyword: bare soil
+#% keyword: potential soilloss
 #%end
 
 #%option

Modified: grass-addons/grass7/raster/r.sun.daily/r.sun.daily.py
===================================================================
--- grass-addons/grass7/raster/r.sun.daily/r.sun.daily.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.sun.daily/r.sun.daily.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -16,8 +16,8 @@
 
 #%module
 #% description: Runs r.sun for multiple days in loop (mode 2)
-#% keywords: raster
-#% keywords: sun
+#% keyword: raster
+#% keyword: sun
 #%end
 #%option
 #% type: string

Modified: grass-addons/grass7/raster/r.sun.hourly/r.sun.hourly.py
===================================================================
--- grass-addons/grass7/raster/r.sun.hourly/r.sun.hourly.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.sun.hourly/r.sun.hourly.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -15,8 +15,8 @@
 
 #%module
 #% description: Runs r.sun in loop for given time range (mode 1)
-#% keywords: raster
-#% keywords: sun
+#% keyword: raster
+#% keyword: sun
 #% overwrite: yes
 #%end
 #%option

Modified: grass-addons/grass7/raster/r.surf.nnbathy/r.surf.nnbathy.py
===================================================================
--- grass-addons/grass7/raster/r.surf.nnbathy/r.surf.nnbathy.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.surf.nnbathy/r.surf.nnbathy.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -29,11 +29,11 @@
 
 #%Module
 #% description: Interpolates a raster map using the nnbathy natural neighbor interpolation program.
-#% keywords: vector
-#% keywords: surface
-#% keywords: interpolation
-#% keywords: natural
-#% keywords: neighbor
+#% keyword: vector
+#% keyword: surface
+#% keyword: interpolation
+#% keyword: natural
+#% keyword: neighbor
 #%end
 #%option G_OPT_R_INPUT
 #% key: input

Modified: grass-addons/grass7/raster/r.threshold/r.threshold.py
===================================================================
--- grass-addons/grass7/raster/r.threshold/r.threshold.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.threshold/r.threshold.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -18,9 +18,9 @@
 
 #%module
 #% description: Find optimal threshold for stream extraction
-#% keywords: raster
-#% keywords: hydrology
-#% keywords: threshold
+#% keyword: raster
+#% keyword: hydrology
+#% keyword: 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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.to.vect.lines/r.to.vect.lines.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -22,9 +22,9 @@
 
 #%module
 #% description: Convert raster rows to vector lines.
-#% keywords: raster
-#% keywords: conversion
-#% keywords: wiggles
+#% keyword: raster
+#% keyword: conversion
+#% keyword: 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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.to.vect.tiled/r.to.vect.tiled.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -20,11 +20,11 @@
 
 #%module
 #% description: Converts a raster map into vector tiles.
-#% keywords: raster
-#% keywords: conversion
-#% keywords: geometry
-#% keywords: vectorization
-#% keywords: tiling
+#% keyword: raster
+#% keyword: conversion
+#% keyword: geometry
+#% keyword: vectorization
+#% keyword: tiling
 #% overwrite: yes
 #%end
 #%option G_OPT_R_INPUT

Modified: grass-addons/grass7/raster/r.valley.bottom/r.valley.bottom.py
===================================================================
--- grass-addons/grass7/raster/r.valley.bottom/r.valley.bottom.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.valley.bottom/r.valley.bottom.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -21,8 +21,8 @@
 
 #%module
 #% description: Calculation of Multi-resolution Valley Bottom Flatness (MrVBF) index
-#% keywords: raster
-#% keywords: terrain
+#% keyword: raster
+#% keyword: terrain
 #%end
 
 #%option G_OPT_R_ELEV

Modified: grass-addons/grass7/raster/r.width.funct/r.width.funct.py
===================================================================
--- grass-addons/grass7/raster/r.width.funct/r.width.funct.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/raster/r.width.funct/r.width.funct.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -23,7 +23,7 @@
 ################################################################################
 #%module
 #% description: 
-#% keywords: raster
+#% keyword: raster
 #%end
 
 #%option G_OPT_R_INPUT

Modified: grass-addons/grass7/vector/v.area.weigh/v.area.weigh.py
===================================================================
--- grass-addons/grass7/vector/v.area.weigh/v.area.weigh.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.area.weigh/v.area.weigh.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -15,9 +15,9 @@
 
 #%module
 #% description: Rasterize vector areas using weights
-#% keywords: vector
-#% keywords: interpolation
-#% keywords: raster
+#% keyword: vector
+#% keyword: interpolation
+#% keyword: raster
 #%end
 #%option G_OPT_V_INPUT
 #% key: vector

Modified: grass-addons/grass7/vector/v.build.pg/v.build.pg.py
===================================================================
--- grass-addons/grass7/vector/v.build.pg/v.build.pg.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.build.pg/v.build.pg.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -14,10 +14,10 @@
 
 #%module
 #% description: Builds PostGIS topology for vector map linked via v.external.
-#% keywords: vector
-#% keywords: external
-#% keywords: PostGIS
-#% keywords: topology
+#% keyword: vector
+#% keyword: external
+#% keyword: PostGIS
+#% keyword: topology
 #% overwrite: yes
 #%end
 #%option G_OPT_V_MAP

Modified: grass-addons/grass7/vector/v.centerline/v.centerline.py
===================================================================
--- grass-addons/grass7/vector/v.centerline/v.centerline.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.centerline/v.centerline.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -15,8 +15,8 @@
 
 #%module
 #% description: Creates a central line of a map of lines
-#% keywords: vector
-#% keywords: lines central
+#% keyword: vector
+#% keyword: lines central
 #%end
 #%option G_OPT_V_INPUT
 #%end

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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.civil/v.civil.river/v.civil.river.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -20,10 +20,10 @@
 
 #%Module
 #% description: Export - Import geometry data to/from an 1-D hydrodynamic model.
-#% keywords: vector
-#% keywords: Hec-Ras
-#% keywords: hydraulic
-#% keywords: river
+#% keyword: vector
+#% keyword: Hec-Ras
+#% keyword: hydraulic
+#% keyword: 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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.civil/v.civil.road/v.civil.road.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -20,10 +20,10 @@
 
 #%Module
 #% description: Generate an alignment for desired roads, channels, ports...
-#% keywords: vector
-#% keywords: road
-#% keywords: channel
-#% keywords: port
+#% keyword: vector
+#% keyword: road
+#% keyword: channel
+#% keyword: 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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.civil/v.civil.tools/v.civil.tools.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -20,9 +20,9 @@
 
 #%module
 #% description: Road tool for use with v.civil.road
-#% keywords: vector
-#% keywords: road
-#% keywords: civil
+#% keyword: vector
+#% keyword: road
+#% keyword: 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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.civil/v.civil.topo/v.civil.topo.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -21,9 +21,9 @@
 
 #%module
 #% 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
+#% keyword: vector
+#% keyword: TOPO
+#% keyword: 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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.class.ml/v.class.ml.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,8 +17,8 @@
 
 #%Module
 #% description: Vector
-#% keywords: machine learning
-#% keywords: classification
+#% keyword: machine learning
+#% keyword: classification
 #% overwrite: yes
 #%End
 #%option G_OPT_V_MAP

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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.class.mlpy/v.class.mlpy.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -21,9 +21,9 @@
 
 #%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
-#% keywords: classification
-#% keywords: supervised
+#% keyword: vector
+#% keyword: classification
+#% keyword: supervised
 #%end
 #%option G_OPT_V_MAP
 #%  key: input

Modified: grass-addons/grass7/vector/v.colors2/v.colors2.py
===================================================================
--- grass-addons/grass7/vector/v.colors2/v.colors2.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.colors2/v.colors2.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,8 +17,8 @@
 
 #%module
 #% description: Sets color rules for features in a vector map using a numeric attribute column.
-#% keywords: vector
-#% keywords: color table
+#% keyword: vector
+#% keyword: color table
 #%end
 #% option G_OPT_V_MAP
 #%end

Modified: grass-addons/grass7/vector/v.concave.hull/v.concave.hull.py
===================================================================
--- grass-addons/grass7/vector/v.concave.hull/v.concave.hull.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.concave.hull/v.concave.hull.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -16,8 +16,8 @@
 
 #%module
 #% description: Creates a concave hull around points.
-#% keywords: vector
-#% keywords: geometry
+#% keyword: vector
+#% keyword: geometry
 #%end
 #%option G_OPT_V_INPUT
 #% label: Input points

Modified: grass-addons/grass7/vector/v.external.all/v.external.all.py
===================================================================
--- grass-addons/grass7/vector/v.external.all/v.external.all.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.external.all/v.external.all.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -14,8 +14,8 @@
 
 #%module
 #% description: Links all OGR layers available in given OGR datasource.
-#% keywords: vector
-#% keywords: external
+#% keyword: vector
+#% keyword: external
 #% overwrite: yes
 #%end
 #%flag

Modified: grass-addons/grass7/vector/v.fixed.segmentpoints/v.fixed.segmentpoints.py
===================================================================
--- grass-addons/grass7/vector/v.fixed.segmentpoints/v.fixed.segmentpoints.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.fixed.segmentpoints/v.fixed.segmentpoints.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,8 +17,8 @@
 
 #%module
 #% description: segment points along a vector line with fixed distances
-#% keywords: vector
-#% keywords: geometry
+#% keyword: vector
+#% keyword: geometry
 #%end
 
 #%option G_OPT_V_INPUT

Modified: grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py
===================================================================
--- grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -16,12 +16,12 @@
 
 #%module
 #% description: DEM derived characteristics of habitats
-#% keywords: vector
-#% keywords: raster
-#% keywords: terrain
-#% keywords: statistics
-#% keywords: sun
-#% keywords: zonal statistics
+#% keyword: vector
+#% keyword: raster
+#% keyword: terrain
+#% keyword: statistics
+#% keyword: sun
+#% keyword: zonal statistics
 #%end
 
 #%option G_OPT_R_ELEV

Modified: grass-addons/grass7/vector/v.in.geopaparazzi/v.in.geopaparazzi.py
===================================================================
--- grass-addons/grass7/vector/v.in.geopaparazzi/v.in.geopaparazzi.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.in.geopaparazzi/v.in.geopaparazzi.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -15,7 +15,7 @@
 #############################################################################
 #%module
 #% description: Return the barycenter of a cloud of point.
-#% keywords: vector
+#% keyword: vector
 #%end
 #%flag
 #% key: b

Modified: grass-addons/grass7/vector/v.in.gns/v.in.gns.py
===================================================================
--- grass-addons/grass7/vector/v.in.gns/v.in.gns.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.in.gns/v.in.gns.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -26,9 +26,9 @@
 
 #%module
 #% description: Imports US-NGA GEOnet Names Server (GNS) country files into a GRASS vector points map.
-#% keywords: vector
-#% keywords: import
-#% keywords: gazetteer
+#% keyword: vector
+#% keyword: import
+#% keyword: gazetteer
 #%end
 #%option G_OPT_F_INPUT
 #% description: Name of input uncompressed GNS file from NGA (with .txt extension)

Modified: grass-addons/grass7/vector/v.in.wfs2/v.in.wfs2.py
===================================================================
--- grass-addons/grass7/vector/v.in.wfs2/v.in.wfs2.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.in.wfs2/v.in.wfs2.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -14,9 +14,9 @@
 
 #%module
 #% description: Downloads and imports data from WFS server.
-#% keywords: vector
-#% keywords: import
-#% keywords: wfs
+#% keyword: vector
+#% keyword: import
+#% keyword: wfs
 #%end
 
 #%option

Modified: grass-addons/grass7/vector/v.isochrones/v.isochrones.py
===================================================================
--- grass-addons/grass7/vector/v.isochrones/v.isochrones.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.isochrones/v.isochrones.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -15,8 +15,8 @@
 
 #%module
 #% description: Creates isochrones from a road map and starting points
-#% keywords: vector
-#% keywords: isochrones
+#% keyword: vector
+#% keyword: isochrones
 #%end
 #%option G_OPT_V_MAP
 #% label: Roads with speed attribute

Modified: grass-addons/grass7/vector/v.lfp/v.lfp.py
===================================================================
--- grass-addons/grass7/vector/v.lfp/v.lfp.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.lfp/v.lfp.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -16,8 +16,8 @@
 
 #%module
 #% description: Converts a longest flow path raster map created by r.lfp to a vector map.
-#% keywords: hydrology
-#% keywords: watershed
+#% keyword: hydrology
+#% keyword: watershed
 #%end
 #%option G_OPT_R_INPUT
 #% description: Name of input longest flow path raster map

Modified: grass-addons/grass7/vector/v.lidar.mcc/v.lidar.mcc.py
===================================================================
--- grass-addons/grass7/vector/v.lidar.mcc/v.lidar.mcc.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.lidar.mcc/v.lidar.mcc.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -15,9 +15,9 @@
 
 #%module
 #% description: Reclassify points of a LiDAR point cloud as ground / non-ground sing a multiscale curvature based classification algorithm.
-#% keywords: vector
-#% keywords: lidar
-#% keywords: classification
+#% keyword: vector
+#% keyword: lidar
+#% keyword: classification
 #%end
 #%flag
 #% key: n

Modified: grass-addons/grass7/vector/v.median/v.median.py
===================================================================
--- grass-addons/grass7/vector/v.median/v.median.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.median/v.median.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -15,7 +15,7 @@
 #############################################################################
 #%module
 #% description: Return the barycenter of a cloud of point.
-#% keywords: vector
+#% keyword: vector
 #%end
 #%option
 #% key: input

Modified: grass-addons/grass7/vector/v.neighborhoodmatrix/v.neighborhoodmatrix.py
===================================================================
--- grass-addons/grass7/vector/v.neighborhoodmatrix/v.neighborhoodmatrix.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.neighborhoodmatrix/v.neighborhoodmatrix.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -14,8 +14,8 @@
 
 #%module
 #% description: Exports the neighborhood matrix of polygons in a vector map
-#% keywords: vector
-#% keywords: neighborhood matrix
+#% keyword: vector
+#% keyword: neighborhood matrix
 #%end
 #%option G_OPT_V_INPUT
 #%end

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:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.out.png/v.out.png.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -16,9 +16,9 @@
 
 #%module
 #% description: Export vector map as PNG
-#% keywords: vector
-#% keywords: export
-#% keywords: PNG
+#% keyword: vector
+#% keyword: export
+#% keyword: PNG
 #%end
 #%option G_OPT_V_INPUT
 #%end

Modified: grass-addons/grass7/vector/v.ply.rectify/v.ply.rectify.py
===================================================================
--- grass-addons/grass7/vector/v.ply.rectify/v.ply.rectify.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.ply.rectify/v.ply.rectify.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,10 +17,10 @@
 #############################################################################
 #%module
 #% description: Imports PLY points, georeferences and exports them.
-#% keywords: vector
-#% keywords: import
-#% keywords: export
-#% keywords: rectify
+#% keyword: vector
+#% keyword: import
+#% keyword: export
+#% keyword: rectify
 #%end
 #%option G_OPT_F_INPUT
 #% description: Name of input PLY file

Modified: grass-addons/grass7/vector/v.stats/v.stats.py
===================================================================
--- grass-addons/grass7/vector/v.stats/v.stats.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.stats/v.stats.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -17,9 +17,9 @@
 
 #%Module
 #% description: Vector stats
-#% keywords: vector
-#% keywords: statistics
-#% keywords: shape
+#% keyword: vector
+#% keyword: statistics
+#% keyword: shape
 #% overwrite: yes
 #%End
 #%option G_OPT_V_MAP

Modified: grass-addons/grass7/vector/v.surf.icw/v.surf.icw.py
===================================================================
--- grass-addons/grass7/vector/v.surf.icw/v.surf.icw.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.surf.icw/v.surf.icw.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -39,10 +39,10 @@
 
 #%Module
 #% description: IDW interpolation, but distance is cost to get to any other site.
-#% keywords: vector
-#% keywords: surface
-#% keywords: interpolation
-#% keywords: ICW
+#% keyword: vector
+#% keyword: surface
+#% keyword: interpolation
+#% keyword: ICW
 #%End
 #%option
 #% key: input

Modified: grass-addons/grass7/vector/v.surf.nnbathy/v.surf.nnbathy.py
===================================================================
--- grass-addons/grass7/vector/v.surf.nnbathy/v.surf.nnbathy.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.surf.nnbathy/v.surf.nnbathy.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -29,11 +29,11 @@
 
 #%Module
 #% description: Interpolates a raster map using the nnbathy natural neighbor interpolation program.
-#% keywords: vector
-#% keywords: surface
-#% keywords: interpolation
-#% keywords: natural
-#% keywords: neighbor
+#% keyword: vector
+#% keyword: surface
+#% keyword: interpolation
+#% keyword: natural
+#% keyword: neighbor
 #%end
 #%option G_OPT_V_INPUT
 #% key: input

Modified: grass-addons/grass7/vector/v.what.strds/v.what.strds.py
===================================================================
--- grass-addons/grass7/vector/v.what.strds/v.what.strds.py	2014-12-29 21:19:02 UTC (rev 63873)
+++ grass-addons/grass7/vector/v.what.strds/v.what.strds.py	2014-12-29 21:26:52 UTC (rev 63874)
@@ -16,12 +16,12 @@
 
 #%module
 #% description: Uploads space time raster dataset values at positions of vector points to the table.
-#% keywords: vector
-#% keywords: temporal
-#% keywords: sampling
-#% keywords: position
-#% keywords: querying
-#% keywords: attribute table
+#% keyword: vector
+#% keyword: temporal
+#% keyword: sampling
+#% keyword: position
+#% keyword: querying
+#% keyword: attribute table
 #%end
 
 #%option G_OPT_V_INPUT

