scripts/parser: keywords -> keyword (old style remains accepted) (trunk, https://trac.osgeo.org/grass/changeset/63871)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63872 15284696-431f-4ddb-bdfa-cd5b030d7da7

doc/gui/wxpython/example/g.gui.example.py

@@ -20,9 +20,9 @@
 
 #%module
 #% description: Example GUI application which displays raster map and further information
-#% keywords: example
-#% keywords: GUI
-#% keywords: raster
+#% keyword: example
+#% keyword: GUI
+#% keyword: raster
 #%end
 #%option G_OPT_R_INPUT
 #% description: Name of raster map to load

doc/python/m.distance.py

@@ -26,7 +26,9 @@
 #%module
 #% label: Finds the distance between two or more points.
 #% description: If the projection is latitude-longitude, this distance is measured along the geodesic.
-#% keywords: miscellaneous, distance, measure
+#% keyword: miscellaneous
+#% keyword: distance
+#% keyword: measure
 #%end
 #%option
 #% key: coord

general/g.parser/g.parser.html

@@ -392,7 +392,8 @@ use strict;
 
 #%module
 #%  description: g.parser test script (perl) 
-#%  keywords: keyword1, keyword2
+#%  keyword: keyword1
+#%  keyword: keyword2
 #%end
 #%flag
 #%  key: f

general/g.parser/parse.c

@@ -84,7 +84,8 @@ void parse_module(struct context *ctx, const char *cmd, const char *arg)
 	return;
     }
 
-    if (G_strcasecmp(cmd, "keywords") == 0) {
+    if (G_strcasecmp(cmd, "keyword") == 0 || G_strcasecmp(cmd, "keywords") == 0) {
+	/* (still) accept 'keywords' for backward compatibility */
 	G_add_keyword(translate(xstrdup(arg)));
 	return;
     }

general/g.parser/test.pl

@@ -1,14 +1,15 @@
 #!/usr/bin/perl -w
 use strict;
-# g.parser demo script
+# g.parser demo script for perl programing
 
 #%Module
-#%  description: g.parser test script (perl)
-#%  keywords: keyword1, keyword2
+#% description: g.parser test script (perl)
+#% keyword: keyword1
+#% keyword: keyword2
 #%End
 #%flag
-#%  key: f
-#%  description: A flag
+#% key: f
+#% description: A flag
 #%end
 #%option
 #% key: raster
@@ -28,7 +29,7 @@ use strict;
 #% key: option1
 #% type: string
 #% description: An option
-#% required : yes
+#% required : no
 #%end
 
 if ( !$ENV{'GISBASE'} ) {

general/g.parser/test.py

@@ -2,32 +2,34 @@
 
 # g.parser demo script for python programing
 
-#%module
-#%  description: g.parser test script (python)
-#%end
+#%Module
+#% description: g.parser test script (python)
+#% keyword: keyword1
+#% keyword: keyword2
+#%End
 #%flag
-#%  key: f
-#%  description: A flag
+#% key: f
+#% description: A flag
 #%end
 #%option
-#%  key: raster
-#%  type: string
-#%  gisprompt: old,cell,raster
-#%  description: Raster input map
-#%  required : yes
+#% key: raster
+#% type: string
+#% gisprompt: old,cell,raster
+#% description: Raster input map
+#% required : yes
 #%end
 #%option
-#%  key: vector
-#%  type: string
-#%  gisprompt: old,vector,vector
-#%  description: Vector input map
-#%  required : yes
+#% key: vector
+#% type: string
+#% gisprompt: old,vector,vector
+#% description: Vector input map
+#% required : yes
 #%end
 #%option
-#%  key: option1
-#%  type: string
-#%  description: An option
-#%  required : no
+#% key: option1
+#% type: string
+#% description: An option
+#% required : no
 #%end
 
 import os

general/g.parser/test.sh

@@ -1,14 +1,15 @@
 #!/bin/sh
 
-# g.parser demo script
+# g.parser demo script for shell programing
 
 #%Module
-#%  description: g.parser test script
-#%  keywords: keyword1, keyword2
+#% description: g.parser test script (shell)
+#% keyword: keyword1
+#% keyword: keyword2
 #%End
 #%flag
-#%  key: f
-#%  description: A flag
+#% key: f
+#% description: A flag
 #%end
 #%option
 #% key: raster
@@ -28,7 +29,7 @@
 #% key: option1
 #% type: string
 #% description: An option
-#% required : yes
+#% required : no
 #%end
 
 if [ -z "$GISBASE" ] ; then
@@ -52,4 +53,4 @@ echo "Value of GIS_OPT_option1: '$GIS_OPT_option1'"
 echo "Value of GIS_OPT_raster: '$GIS_OPT_raster'"
 echo "Value of GIS_OPT_vect: '$GIS_OPT_vector'"
 
-#add your code here
+#end of your code

gui/scripts/d.rast3d.py

@@ -17,8 +17,9 @@
 #############################################################################
 
 #%module
-#% description: Displays 3D raster map layer.
-#% keywords: display, raster3d
+#% description: Displays a 3D raster map layer.
+#% keyword: display
+#% keyword: raster3d
 #%end
 
 #%option

gui/scripts/d.wms.py

@@ -17,11 +17,11 @@
 
 #%module
 #% description: Downloads and displays data from WMS/WMTS/NASA OnEarth server.
-#% keywords: raster
-#% keywords: import
-#% keywords: WMS
-#% keywords: WMTS 
-#% keywords: OnEarth
+#% keyword: raster
+#% keyword: import
+#% keyword: WMS
+#% keyword: WMTS 
+#% keyword: OnEarth
 #%end
 
 #%option

gui/wxpython/animation/g.gui.animation.py

@@ -21,10 +21,10 @@
 
 #%module
 #% description: Tool for animating a series of raster and vector maps or a space time raster or vector dataset.
-#% keywords: general
-#% keywords: GUI
-#% keywords: display
-#% keywords: animation
+#% keyword: general
+#% keyword: GUI
+#% keyword: display
+#% keyword: animation
 #%end
 #%option G_OPT_R_INPUTS
 #% key: raster

gui/wxpython/dbmgr/g.gui.dbmgr.py

@@ -20,10 +20,10 @@
 
 #%module
 #% description: Launches graphical attribute table manager.
-#% keywords: general
-#% keywords: GUI
-#% keywords: attribute table
-#% keywords: database
+#% keyword: general
+#% keyword: GUI
+#% keyword: attribute table
+#% keyword: database
 #%end
 #%option G_OPT_V_MAP
 #%end

gui/wxpython/gcp/g.gui.gcp.py

@@ -21,10 +21,10 @@
 
 #%module
 #% description: Georectifies a map and allows to manage Ground Control Points.
-#% keywords: general
-#% keywords: GUI
-#% keywords: georectification
-#% keywords: GCP
+#% keyword: general
+#% keyword: GUI
+#% keyword: georectification
+#% keyword: GCP
 #%end
 
 """

gui/wxpython/gmodeler/g.gui.gmodeler.py

@@ -21,10 +21,10 @@
 #%module
 #% label: Graphical Modeler.
 #% description: Allows to interactively create, edit and manage models.
-#% keywords: general
-#% keywords: GUI
-#% keywords: graphical modeler
-#% keywords: workflow
+#% keyword: general
+#% keyword: GUI
+#% keyword: graphical modeler
+#% keyword: workflow
 #%end
 #%option G_OPT_F_INPUT
 #% key: file

gui/wxpython/iclass/g.gui.iclass.py

@@ -22,11 +22,11 @@
 #%module
 #% label: Tool for supervised classification of imagery data.
 #% description: Generates spectral signatures for an image by allowing the user to outline regions of interest.
-#% keywords: general
-#% keywords: GUI
-#% keywords: classification
-#% keywords: supervised classification
-#% keywords: signatures
+#% keyword: general
+#% keyword: GUI
+#% keyword: classification
+#% keyword: supervised classification
+#% keyword: signatures
 #%end
 #%flag
 #% key: m

gui/wxpython/mapdisp/test_mapdisp.py

@@ -21,9 +21,9 @@
 
 #%module
 #% description: Georectifies a map and allows to manage Ground Control Points.
-#% keywords: general
-#% keywords: GUI
-#% keywords: georectification
+#% keyword: general
+#% keyword: GUI
+#% keyword: georectification
 #%end
 #%option
 #% key: test

gui/wxpython/mapswipe/g.gui.mapswipe.py

@@ -21,9 +21,9 @@
 
 #%module
 #% description: Interactively compares two maps by swiping a visibility bar.
-#% keywords: general
-#% keywords: GUI
-#% keywords: display
+#% keyword: general
+#% keyword: GUI
+#% keyword: display
 #%end
 #%option G_OPT_R_INPUT
 #% key: first

gui/wxpython/psmap/g.gui.psmap.py

@@ -20,9 +20,9 @@
 
 #%module
 #% description: Tool for creating hardcopy map outputs.
-#% keywords: general
-#% keywords: GUI
-#% keywords: printing
+#% keyword: general
+#% keyword: GUI
+#% keyword: printing
 #%end
 #%option G_OPT_F_INPUT
 #% key: file

gui/wxpython/rlisetup/g.gui.rlisetup.py

@@ -20,10 +20,10 @@
 
 #%module
 #% description: Configuration tool for r.li modules.
-#% keywords: general
-#% keywords: GUI
-#% keywords: raster
-#% keywords: landscape structure analysis
+#% keyword: general
+#% keyword: GUI
+#% keyword: raster
+#% keyword: landscape structure analysis
 #%end
 
 import os

gui/wxpython/timeline/g.gui.timeline.py

@@ -21,9 +21,9 @@
 
 #%module
 #% description: Allows to compare temporal datasets by displaying their temporal extents in a plot.
-#% keywords: general
-#% keywords: GUI
-#% keywords: temporal
+#% keyword: general
+#% keyword: GUI
+#% keyword: temporal
 #%end
 #%option G_OPT_STDS_INPUTS
 #% required: no

lib/gis/parser_script.c

@@ -62,7 +62,7 @@ void G__script(void)
     if (st->module_info.description)
 	fprintf(fp, "#%% description: %s\n", st->module_info.description);
     if (st->module_info.keywords) {
-	fprintf(fp, "#%% keywords: ");
+	fprintf(fp, "#%% keyword: ");
 	G__print_keywords(fp, NULL);
 	fprintf(fp, "\n");
     }

scripts/d.correlate/d.correlate.py

@@ -17,11 +17,11 @@
 
 #%module
 #% description: Prints a graph of the correlation between raster maps (in pairs).
-#% keywords: display
-#% keywords: statistics
-#% keywords: raster
-#% keywords: diagram
-#% keywords: correlation
+#% keyword: display
+#% keyword: statistics
+#% keyword: raster
+#% keyword: diagram
+#% keyword: correlation
 #%end
 #%option G_OPT_R_MAPS
 #%end

scripts/d.out.file/d.out.file.py

@@ -15,8 +15,8 @@
 
 #%module
 #% description: Saves the contents of the active display monitor to a graphics file.
-#% keywords: display
-#% keywords: export
+#% keyword: display
+#% keyword: export
 #%end
 #%option G_OPT_F_OUTPUT
 #% description: Name for output file

scripts/d.polar/d.polar.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+#
 ############################################################################
 #
 # MODULE:       d.polar
@@ -19,9 +20,9 @@
 #############################################################################
 
 #%Module
-#%  description: Draws polar diagram of angle map such as aspect or flow directions
-#%  keywords: display
-#%  keywords: diagram
+#% description: Draws polar diagram of angle map such as aspect or flow directions
+#% keyword: display
+#% keyword: diagram
 #%End
 #%option G_OPT_R_MAP
 #% description: Name of raster angle map

scripts/d.rast.edit/d.rast.edit.py

@@ -20,9 +20,9 @@
 
 #%module
 #% description: Edits cell values in a raster map.
-#% keywords: display
-#% keywords: editing
-#% keywords: raster
+#% keyword: display
+#% keyword: editing
+#% keyword: raster
 #%end
 #%option G_OPT_R_INPUT
 #%end

scripts/d.rast.leg/d.rast.leg.py

@@ -30,9 +30,9 @@
 
 #%module
 #% description: Displays a raster map and its legend on a graphics window
-#% keywords: display
-#% keywords: cartography
-#% keywords: legend
+#% keyword: display
+#% keyword: cartography
+#% keyword: legend
 #%end
 #%flag
 #%  key: f

scripts/d.redraw/d.redraw.py

@@ -15,9 +15,9 @@
 
 #%module
 #% description: Redraws the content of currently selected monitor.
-#% keywords: display
-#% keywords: graphics
-#% keywords: monitors
+#% keyword: display
+#% keyword: graphics
+#% keyword: monitors
 #%end
 
 import sys

scripts/d.shade/d.shade.py

@@ -16,11 +16,11 @@
 
 #%module
 #% description: Drapes a color raster over an shaded relief or aspect map.
-#% keywords: display
-#% keywords: elevation
-#% keywords: relief
-#% keywords: hillshade
-#% keywords: visualization
+#% keyword: display
+#% keyword: elevation
+#% keyword: relief
+#% keyword: hillshade
+#% keyword: visualization
 #%end
 #%option G_OPT_R_INPUT
 #% key: shade

scripts/d.to.rast/d.to.rast.py

@@ -15,9 +15,9 @@
 
 #%module
 #% description: Saves the contents of the active display monitor to a raster map.
-#% keywords: display
-#% keywords: export
-#% keywords: raster
+#% keyword: display
+#% keyword: export
+#% keyword: raster
 #%end
 #%option G_OPT_R_OUTPUT
 #%end

scripts/d.vect.thematic/d.vect.thematic.py

@@ -18,11 +18,11 @@
 
 #%module
 #% description: Displays thematic vector map
-#% keywords: display
-#% keywords: cartography
-#% keywords: vector
-#% keywords: thematic
-#% keywords: legend
+#% keyword: display
+#% keyword: cartography
+#% keyword: vector
+#% keyword: thematic
+#% keyword: legend
 #%end
 #%option G_OPT_V_MAP
 #%end

scripts/d.what.rast/d.what.rast.py

@@ -15,8 +15,8 @@
 
 #%module
 #% description: Allows the user to interactively query raster map layers at user-selected locations.
-#% keywords: display
-#% keywords: vector
+#% keyword: display
+#% keyword: vector
 #%end
 #%option G_OPT_R_INPUTS
 #% key: map

scripts/d.what.vect/d.what.vect.py

@@ -15,8 +15,8 @@
 
 #%module
 #% description: Allows the user to interactively query vector map layers at user-selected locations.
-#% keywords: display
-#% keywords: vector
+#% keyword: display
+#% keyword: vector
 #%end
 #%option G_OPT_V_INPUTS
 #% key: map

scripts/db.dropcolumn/db.dropcolumn.py

@@ -18,8 +18,8 @@
 
 #%module
 #% description: Drops a column from selected attribute table.
-#% keywords: database
-#% keywords: attribute table
+#% keyword: database
+#% keyword: attribute table
 #%End
 
 #%flag

scripts/db.droptable/db.droptable.py

@@ -16,8 +16,8 @@
 
 #%module
 #% description: Drops an attribute table.
-#% keywords: database
-#% keywords: attribute table
+#% keyword: database
+#% keyword: attribute table
 #%end
 
 #%flag

scripts/db.in.ogr/db.in.ogr.py

@@ -16,9 +16,9 @@
 
 #%Module
 #% description: Imports attribute tables in various formats.
-#% keywords: database
-#% keywords: import
-#% keywords: attribute table
+#% keyword: database
+#% keyword: import
+#% keyword: attribute table
 #%End
 
 #%option G_OPT_F_BIN_INPUT

scripts/db.out.ogr/db.out.ogr.py

@@ -16,9 +16,9 @@
 
 #%module
 #% description: Exports attribute tables into various formats.
-#% keywords: database
-#% keywords: export
-#% keywords: attribute table
+#% keyword: database
+#% keyword: export
+#% keyword: attribute table
 #%end
 
 #%option G_OPT_V_INPUT

scripts/db.test/db.test.py

@@ -15,8 +15,8 @@
 
 #%module
 #% description: Test database driver, database must exist and set by db.connect.
-#% keywords: database
-#% keywords: attribute table
+#% keyword: database
+#% keyword: attribute table
 #%end
 #%option
 #% key: test

scripts/db.univar/db.univar.py

@@ -18,9 +18,9 @@
 
 #%module
 #% description: Calculates univariate statistics on selected table column.
-#% keywords: database
-#% keywords: statistics
-#% keywords: attribute table
+#% keyword: database
+#% keyword: statistics
+#% keyword: attribute table
 #%end
 #%option G_OPT_DB_TABLE
 #% key: table

scripts/g.extension.all/g.extension.all.py

@@ -19,9 +19,9 @@
 #%module
 #% label: Rebuilds or removes all locally installed GRASS Addons extensions.
 #% description: By default only extensions built against different GIS Library are rebuilt.
-#% keywords: general
-#% keywords: installation
-#% keywords: extensions
+#% keyword: general
+#% keyword: installation
+#% keyword: extensions
 #%end
 #%option
 #% key: operation

scripts/g.extension/g.extension.py

@@ -20,9 +20,9 @@
 #%module
 #% label: Maintains GRASS Addons extensions in local GRASS installation.
 #% description: Downloads, installs extensions from GRASS Addons SVN repository into local GRASS installation or removes installed extensions.
-#% keywords: general
-#% keywords: installation
-#% keywords: extensions
+#% keyword: general
+#% keyword: installation
+#% keyword: extensions
 #%end
 
 #%option

scripts/g.manual/g.manual.py

@@ -16,9 +16,9 @@
 
 #%module
 #% description: Displays the manual pages of GRASS modules.
-#% keywords: general
-#% keywords: manual
-#% keywords: help
+#% keyword: general
+#% keyword: manual
+#% keyword: help
 #%end
 #%flag
 #% key: i

scripts/i.colors.enhance/i.colors.enhance.py

@@ -22,10 +22,10 @@
 
 #%module
 #% description: Performs auto-balancing of colors for RGB images.
-#% keywords: imagery
-#% keywords: RGB
-#% keywords: satellite
-#% keywords: colors
+#% keyword: imagery
+#% keyword: RGB
+#% keyword: satellite
+#% keyword: colors
 #%end
 #%option G_OPT_R_INPUT
 #% key: red

scripts/i.image.mosaic/i.image.mosaic.py

@@ -24,9 +24,9 @@
 
 #%module
 #% description: Mosaics several images and extends colormap.
-#% keywords: imagery
-#% keywords: geometry
-#% keywords: mosaicking
+#% keyword: imagery
+#% keyword: geometry
+#% keyword: mosaicking
 #%end
 #%option G_OPT_R_INPUTS
 #%end

scripts/i.in.spotvgt/i.in.spotvgt.py

@@ -31,8 +31,8 @@
 
 #%module
 #% description: Imports SPOT VGT NDVI data into a raster map.
-#% keywords: imagery
-#% keywords: import
+#% keyword: imagery
+#% keyword: import
 #%end
 #%flag
 #% key: a

scripts/i.oif/i.oif.py

@@ -21,9 +21,9 @@
 
 #% Module
 #% description: Calculates Optimum-Index-Factor table for spectral bands
-#% keywords: imagery
-#% keywords: multispectral
-#% keywords: statistics
+#% keyword: imagery
+#% keyword: multispectral
+#% keyword: statistics
 #% End
 #% option G_OPT_R_INPUTS
 #% end

scripts/i.pansharpen/i.pansharpen.py

@@ -36,48 +36,48 @@
 #############################################################################
 
 #%Module
-#%  description: Image fusion algorithms to sharpen multispectral with high-res panchromatic channels
-#%  keywords: imagery
-#%  keywords: fusion
-#%  keywords: sharpen
-#%  keywords: Brovey
-#%  keywords: IHS
-#%  keywords: HIS
-#%  keywords: PCA
-#%  overwrite: yes
+#% description: Image fusion algorithms to sharpen multispectral with high-res panchromatic channels
+#% keyword: imagery
+#% keyword: fusion
+#% keyword: sharpen
+#% keyword: Brovey
+#% keyword: IHS
+#% keyword: HIS
+#% keyword: PCA
+#% overwrite: yes
 #%End
 #%option G_OPT_R_INPUT
-#%  key: red
-#%  description: Name of raster map to be used for <red>
+#% key: red
+#% description: Name of raster map to be used for <red>
 #%end
 #%option G_OPT_R_INPUT
-#%  key: green
-#%  description: Name of raster map to be used for <green>
+#% key: green
+#% description: Name of raster map to be used for <green>
 #%end
 #%option G_OPT_R_INPUT
-#%  key: blue
-#%  description: Name of raster map to be used for <blue>
+#% key: blue
+#% description: Name of raster map to be used for <blue>
 #%end
-#%  option G_OPT_R_INPUT
-#%  key: pan
-#%  description: Name of raster map to be used for high resolution panchromatic channel
+#% option G_OPT_R_INPUT
+#% key: pan
+#% description: Name of raster map to be used for high resolution panchromatic channel
 #%end
 #%option G_OPT_R_BASENAME_OUTPUT
 #%end
 #%option
-#%  key: method
-#%  description: Method for pan sharpening
-#%  options: brovey,ihs,pca
-#%  answer: ihs
-#%  required: yes
+#% key: method
+#% description: Method for pan sharpening
+#% options: brovey,ihs,pca
+#% answer: ihs
+#% required: yes
 #%end
 #%flag
-#%  key: s
-#%  description: Serial processing rather than parallel processing
+#% key: s
+#% description: Serial processing rather than parallel processing
 #%end
 #%flag
-#%  key: l
-#%  description: Rebalance blue channel for LANDSAT
+#% key: l
+#% description: Rebalance blue channel for LANDSAT
 #%end
 
 import os

scripts/i.spectral/i.spectral.py

@@ -27,10 +27,10 @@
 
 #%Module
 #% description: Displays spectral response at user specified locations in group or images.
-#% keywords: imagery
-#% keywords: querying
-#% keywords: raster
-#% keywords: multispectral
+#% keyword: imagery
+#% keyword: querying
+#% keyword: raster
+#% keyword: multispectral
 #%End
 #%option G_OPT_I_GROUP
 #% required : no

scripts/i.tasscap/i.tasscap.py

@@ -46,11 +46,11 @@
 #
 #%Module
 #% description: Performs Tasseled Cap (Kauth Thomas) transformation.
-#% keywords: imagery
-#% keywords: transformation
-#% keywords: Landsat
-#% keywords: MODIS
-#% keywords: Tasseled Cap transformation
+#% keyword: imagery
+#% keyword: transformation
+#% keyword: Landsat
+#% keyword: MODIS
+#% keyword: Tasseled Cap transformation
 #%end
 #%option G_OPT_R_INPUTS
 #% description: For Landsat4-7: bands 1, 2, 3, 4, 5, 7; for Landsat8: bands 2, 3, 4, 5, 6, 7; for MODIS: bands 1, 2, 3, 4, 5, 6, 7

scripts/m.proj/m.proj.py

@@ -26,8 +26,8 @@
 
 #%module
 #% description: Converts coordinates from one projection to another (cs2cs frontend).
-#% keywords: miscellaneous
-#% keywords: projection
+#% keyword: miscellaneous
+#% keyword: projection
 #%end
 #%option G_OPT_M_COORDS
 #% description: Input coordinates to reproject

scripts/r.blend/r.blend.py

@@ -16,8 +16,8 @@
 
 #%module
 #% description: Blends color components of two raster maps by a given ratio.
-#% keywords: raster
-#% keywords: composite
+#% keyword: raster
+#% keyword: composite
 #%end
 #%option G_OPT_R_INPUT
 #% key: first

scripts/r.buffer.lowmem/r.buffer.lowmem.py

@@ -17,8 +17,8 @@
 #%module
 #% label: Creates a raster map showing buffer zones surrounding cells that contain non-NULL category values.
 #% description: This is the low-memory alternative to the classic r.buffer module.
-#% keywords: raster
-#% keywords: buffer
+#% keyword: raster
+#% keyword: buffer
 #%end
 #%flag
 #% key: z

scripts/r.colors.stddev/r.colors.stddev.py

@@ -16,8 +16,8 @@
 
 #%module
 #% description: Sets color rules based on stddev from a raster map's mean value.
-#% keywords: raster
-#% keywords: color table
+#% keyword: raster
+#% keyword: color table
 #%end
 #% option G_OPT_R_MAP
 #%end

scripts/r.fillnulls/r.fillnulls.py

@@ -25,9 +25,9 @@
 
 #%module
 #% description: Fills no-data areas in raster maps using spline interpolation.
-#% keywords: raster
-#% keywords: elevation
-#% keywords: interpolation
+#% keyword: raster
+#% keyword: elevation
+#% keyword: interpolation
 #%end
 #%option G_OPT_R_INPUT
 #%end

scripts/r.grow/r.grow.py

@@ -16,7 +16,7 @@
 
 #%Module
 #% description: Generates a raster map layer with contiguous areas grown by one cell.
-#% keywords: raster
+#% keyword: raster
 #%end
 #%flag
 #% key: m

scripts/r.in.aster/r.in.aster.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+#
 ############################################################################
 #
 # MODULE:    r_in_aster.py
@@ -21,32 +22,32 @@
 #   gdal compiled with HDF4 support
 
 #%Module
-#%  description: Georeference, rectify, and import Terra-ASTER imagery and relative DEMs using gdalwarp.
-#%  keywords: raster
-#%  keywords: import
-#%  keywords: imagery
-#%  keywords: Terra-ASTER
+#% description: Georeference, rectify, and import Terra-ASTER imagery and relative DEMs using gdalwarp.
+#% keyword: raster
+#% keyword: import
+#% keyword: imagery
+#% keyword: Terra-ASTER
 #%End
 #%option G_OPT_F_INPUT
-#%  description: Name of input ASTER image
+#% description: Name of input ASTER image
 #%end
 #%option
-#%  key: proctype
-#%  type: string
-#%  description: ASTER imagery processing type (Level 1A, Level 1B, or relative DEM)
-#%  options: L1A,L1B,DEM
-#%  answer: L1B
-#%  required: yes
+#% key: proctype
+#% type: string
+#% description: ASTER imagery processing type (Level 1A, Level 1B, or relative DEM)
+#% options: L1A,L1B,DEM
+#% answer: L1B
+#% required: yes
 #%end
 #%option
-#%  key: band
-#%  type: string
-#%  description: List L1A or L1B band to translate (1,2,3n,...), or enter 'all' to translate all bands
-#%  answer: all
-#%  required: yes
+#% key: band
+#% type: string
+#% description: List L1A or L1B band to translate (1,2,3n,...), or enter 'all' to translate all bands
+#% answer: all
+#% required: yes
 #%end
 #%option G_OPT_R_OUTPUT
-#%  description: Base name for output raster map (band number will be appended to base name)
+#% description: Base name for output raster map (band number will be appended to base name)
 #%end
 
 import sys

scripts/r.in.srtm/r.in.srtm.py

@@ -1,7 +1,12 @@
 #!/usr/bin/env python
-
-#import of SRTM hgt files into GRASS
-# written by Markus Neteler 11/2003 neteler AT itc it
+#
+############################################################################
+#
+# MODULE:    r_in_aster.py
+# AUTHOR(S): Markus Neteler 11/2003 neteler AT itc it
+#            Hamish Bowman
+#            Glynn Clements
+# PURPOSE:   import of SRTM hgt files into GRASS
 #
 # COPYRIGHT:	(C) 2004, 2006 by the GRASS Development Team
 #
@@ -44,9 +49,9 @@
 #########################
 
 #%Module
-#%  description: Imports SRTM HGT files into raster map.
-#%  keywords: raster
-#%  keywords: import
+#% description: Imports SRTM HGT files into raster map.
+#% keyword: raster
+#% keyword: import
 #%End
 #%option G_OPT_F_INPUT
 #% description: Name of SRTM input tile (file without .hgt.zip extension)
@@ -56,8 +61,8 @@
 #% required : no
 #%end
 #%flag
-#%  key: 1
-#%  description: Input is a 1-arcsec tile (default: 3-arcsec)
+#% key: 1
+#% description: Input is a 1-arcsec tile (default: 3-arcsec)
 #%end
 
 tmpl1sec = """BYTEORDER M

scripts/r.in.wms/r.in.wms.py

@@ -14,9 +14,9 @@ This program is free software under the GNU General Public License
 
 #%module
 #% description: Downloads and imports data from WMS/WMTS/NASA OnEarth server.
-#% keywords: raster
-#% keywords: import
-#% keywords: OGC web services
+#% keyword: raster
+#% keyword: import
+#% keyword: OGC web services
 #%end
 
 #%option

scripts/r.mask/r.mask.py

@@ -18,8 +18,8 @@
 
 #%module
 #% description: Creates a MASK for limiting raster operation.
-#% keywords: raster
-#% keywords: mask
+#% keyword: raster
+#% keyword: mask
 #% overwrite: yes
 #%end
 #%option G_OPT_R_INPUT

scripts/r.out.xyz/r.out.xyz.py

@@ -18,10 +18,10 @@
 
 #%module
 #% description: Exports a raster map to a text file as x,y,z values based on cell centers.
-#% keywords: raster
-#% keywords: export
-#% keywords: ASCII
-#% keywords: conversion
+#% keyword: raster
+#% keyword: export
+#% keyword: ASCII
+#% keyword: conversion
 #%end
 #%option G_OPT_R_INPUTS
 #% multiple: yes

scripts/r.pack/r.pack.py

@@ -15,9 +15,9 @@
 
 #%module
 #% description: Packs up a raster map and support files for copying.
-#% keywords: raster
-#% keywords: export
-#% keywords: copying
+#% keyword: raster
+#% keyword: export
+#% keyword: copying
 #%end
 #%option G_OPT_R_INPUT
 #% description: Name of raster map to pack up

scripts/r.plane/r.plane.py

@@ -18,8 +18,8 @@
 
 #%module
 #% description: Creates raster plane map given dip (inclination), aspect (azimuth) and one point.
-#% keywords: raster
-#% keywords: elevation
+#% keyword: raster
+#% keyword: elevation
 #%end
 #%option G_OPT_R_OUTPUT
 #%end

scripts/r.reclass.area/r.reclass.area.py

@@ -25,9 +25,9 @@
 
 #%module
 #% description: Reclasses a raster map greater or less than user specified area size (in hectares).
-#% keywords: raster
-#% keywords: statistics
-#% keywords: aggregation
+#% keyword: raster
+#% keyword: statistics
+#% keyword: aggregation
 #%end
 
 #%option G_OPT_R_INPUT

scripts/r.rgb/r.rgb.py

@@ -15,8 +15,8 @@
 
 #%module
 #% description: Splits a raster map into red, green and blue maps.
-#% keywords: raster
-#% keywords: RGB
+#% keyword: raster
+#% keyword: RGB
 #%end
 #%option G_OPT_R_INPUT
 #%end

scripts/r.shade/r.shade.py

@@ -17,11 +17,11 @@
 
 #%module
 #% description: Drapes a color raster over an shaded relief or aspect map.
-#% keywords: raster
-#% keywords: elevation
-#% keywords: relief
-#% keywords: hillshade
-#% keywords: visualization
+#% keyword: raster
+#% keyword: elevation
+#% keyword: relief
+#% keyword: hillshade
+#% keyword: visualization
 #%end
 #%option G_OPT_R_INPUT
 #% key: shade

scripts/r.tileset/r.tileset.py

@@ -37,8 +37,8 @@
 
 #%module
 #% description: Produces tilings of the source projection for use in the destination region and projection.
-#% keywords: raster
-#% keywords: tiling
+#% keyword: raster
+#% keyword: tiling
 #%end
 #%flag
 #% key: g

scripts/r.unpack/r.unpack.py

@@ -15,9 +15,9 @@
 
 #%module
 #% description: Unpacks a raster map packed with r.pack.
-#% keywords: raster
-#% keywords: import
-#% keywords: copying
+#% keyword: raster
+#% keyword: import
+#% keyword: copying
 #%end
 #%option G_OPT_F_BIN_INPUT
 #% description: Name of input pack file

scripts/r3.in.xyz/r3.in.xyz.py

@@ -22,10 +22,10 @@
 
 #%Module
 #% description: Create a 3D raster map from an assemblage of many coordinates using univariate statistics
-#% keywords: raster3d
-#% keywords: import
-#% keywords: voxel
-#% keywords: LIDAR
+#% keyword: raster3d
+#% keyword: import
+#% keyword: voxel
+#% keyword: LIDAR
 #%End
 #%Flag
 #% key: s

scripts/v.build.all/v.build.all.py

@@ -14,8 +14,8 @@
 
 #%module
 #% description: Rebuilds topology on all vector maps in the current mapset.
-#% keywords: vector
-#% keywords: topology
+#% keyword: vector
+#% keyword: topology
 #%end
 
 import sys

scripts/v.centroids/v.centroids.py

@@ -13,9 +13,9 @@
 
 #%Module
 #% description: Adds missing centroids to closed boundaries.
-#% keywords: vector
-#% keywords: centroid
-#% keywords: area
+#% keyword: vector
+#% keyword: centroid
+#% keyword: area
 #%End
 
 #%option G_OPT_V_INPUT

scripts/v.convert.all/v.convert.all.py

@@ -16,9 +16,9 @@
 
 #%module
 #% description: Converts all older versions of GRASS vector maps in current mapset to current format.
-#% keywords: vector
-#% keywords: import
-#% keywords: conversion
+#% keyword: vector
+#% keyword: import
+#% keyword: conversion
 #%end
 
 import sys

scripts/v.db.addcolumn/v.db.addcolumn.py

@@ -18,9 +18,9 @@
 
 #%module
 #% description: Adds one or more columns to the attribute table connected to a given vector map.
-#% keywords: vector
-#% keywords: attribute table
-#% keywords: database
+#% keyword: vector
+#% keyword: attribute table
+#% keyword: database
 #%end
 
 #%option G_OPT_V_MAP

scripts/v.db.addtable/v.db.addtable.py

@@ -17,9 +17,9 @@
 
 #%module
 #% description: Creates and connects a new attribute table to a given layer of an existing vector map.
-#% keywords: vector
-#% keywords: attribute table
-#% keywords: database
+#% keyword: vector
+#% keyword: attribute table
+#% keyword: database
 #%end
 #%option G_OPT_V_MAP
 #%end

scripts/v.db.dropcolumn/v.db.dropcolumn.py

@@ -20,9 +20,9 @@
 
 #%module
 #% description: Drops a column from the attribute table connected to a given vector map.
-#% keywords: vector
-#% keywords: attribute table
-#% keywords: database
+#% keyword: vector
+#% keyword: attribute table
+#% keyword: database
 #%end
 
 #%option G_OPT_V_MAP

scripts/v.db.droprow/v.db.droprow.py

@@ -17,9 +17,9 @@
 
 #%module
 #% description: Removes a vector feature from a vector map through attribute selection.
-#% keywords: vector
-#% keywords: attribute table
-#% keywords: database
+#% keyword: vector
+#% keyword: attribute table
+#% keyword: database
 #%end
 
 #%option G_OPT_V_INPUT

scripts/v.db.droptable/v.db.droptable.py

@@ -17,9 +17,9 @@
 
 #%Module
 #% description: Removes existing attribute table of a vector map.
-#% keywords: vector
-#% keywords: attribute table
-#% keywords: database
+#% keyword: vector
+#% keyword: attribute table
+#% keyword: database
 #%End
 #%flag
 #% key: f

scripts/v.db.join/v.db.join.py

@@ -16,9 +16,9 @@
 
 #%module
 #% description: Joins a database table to a vector map table.
-#% keywords: vector
-#% keywords: attribute table
-#% keywords: database
+#% keyword: vector
+#% keyword: attribute table
+#% keyword: database
 #%end
 
 #%option G_OPT_V_MAP

scripts/v.db.reconnect.all/v.db.reconnect.all.py

@@ -16,9 +16,9 @@
 
 #%module
 #% description: Reconnects attribute tables for all vector maps from the current mapset to a new database.
-#% keywords: vector
-#% keywords: attribute table
-#% keywords: database
+#% keyword: vector
+#% keyword: attribute table
+#% keyword: database
 #%end
 #%flag
 #% key: c

scripts/v.db.renamecolumn/v.db.renamecolumn.py

@@ -22,9 +22,9 @@
 
 #%module
 #% description: Renames a column in the attribute table connected to a given vector map.
-#% keywords: vector
-#% keywords: attribute table
-#% keywords: database
+#% keyword: vector
+#% keyword: attribute table
+#% keyword: database
 #%end
 #%option G_OPT_V_MAP
 #%end

scripts/v.db.univar/v.db.univar.py

@@ -18,9 +18,9 @@
 
 #%module
 #% description: Calculates univariate statistics on selected table column for a GRASS vector map.
-#% keywords: vector
-#% keywords: statistics
-#% keywords: attribute table
+#% keyword: vector
+#% keyword: statistics
+#% keyword: attribute table
 #%end
 #%option G_OPT_V_MAP
 #% required: yes

scripts/v.db.update/v.db.update.py

@@ -17,9 +17,9 @@
 
 #%module
 #% description: Updates a column in the attribute table connected to a vector map.
-#% keywords: vector
-#% keywords: attribute table
-#% keywords: database
+#% keyword: vector
+#% keyword: attribute table
+#% keyword: database
 #%end
 #%option G_OPT_V_MAP
 #%end

scripts/v.dissolve/v.dissolve.py

@@ -17,10 +17,10 @@
 
 #%module
 #% description: Dissolves boundaries between adjacent areas sharing a common category number or attribute.
-#% keywords: vector
-#% keywords: dissolve
-#% keywords: area
-#% keywords: line
+#% keyword: vector
+#% keyword: dissolve
+#% keyword: area
+#% keyword: line
 #%end
 #%option G_OPT_V_INPUT
 #%end

scripts/v.in.e00/v.in.e00.py

@@ -23,8 +23,8 @@
 
 #%module
 #% description: Imports E00 file into a vector map.
-#% keywords: vector
-#% keywords: import
+#% keyword: vector
+#% keyword: import
 #%end
 #%option G_OPT_F_INPUT
 #% description: Name of input E00 file

scripts/v.in.geonames/v.in.geonames.py

@@ -24,9 +24,9 @@
 
 #%module
 #% description: Imports geonames.org country files into a vector points map.
-#% keywords: vector
-#% keywords: import
-#% keywords: gazetteer
+#% keyword: vector
+#% keyword: import
+#% keyword: gazetteer
 #%end
 #%option G_OPT_F_INPUT
 #% description: Name of uncompressed geonames file (with .txt extension)

scripts/v.in.gps/v.in.gps.py

@@ -34,30 +34,30 @@
 #############################################################################
 
 #%Module
-#%  description: Import waypoints, routes, and tracks from a GPS receiver or GPS download file into a vector map.
-#%  keywords: vector
-#%  keywords: import
-#%  keywords: GPS
+#% description: Import waypoints, routes, and tracks from a GPS receiver or GPS download file into a vector map.
+#% keyword: vector
+#% keyword: import
+#% keyword: GPS
 #%End
 #%flag
-#%  key: w
-#%  description: Import as waypoints
+#% key: w
+#% description: Import as waypoints
 #%end
 #%flag
-#%  key: r
-#%  description: Import as routes
+#% key: r
+#% description: Import as routes
 #%end
 #%flag
-#%  key: t
-#%  description: Import as tracks
+#% key: t
+#% description: Import as tracks
 #%end
 #%flag
-#%  key: p
-#%  description: Force vertices of track or route data as points
+#% key: p
+#% description: Force vertices of track or route data as points
 #%end
 #%flag
-#%  key: k
-#%  description: Do not attempt projection transform from WGS84
+#% key: k
+#% description: Do not attempt projection transform from WGS84
 #%end
 #%option G_OPT_F_INPUT
 #% description: Device or file used to import data

scripts/v.in.lines/v.in.lines.py

@@ -17,8 +17,8 @@
 #############################################################################
 #%module
 #% description: Imports ASCII x,y[,z] coordinates as a series of lines.
-#% keywords: vector
-#% keywords: import
+#% keyword: vector
+#% keyword: import
 #%end
 #%flag
 #% key: z

scripts/v.in.mapgen/v.in.mapgen.py

@@ -25,8 +25,8 @@
 
 #%module
 #% description: Imports Mapgen or Matlab-ASCII vector maps into GRASS.
-#% keywords: vector
-#% keywords: import
+#% keyword: vector
+#% keyword: import
 #%end
 #%flag
 #% key: f

scripts/v.in.wfs/v.in.wfs.py

@@ -24,9 +24,9 @@
 
 #%Module
 #% description: Imports GetFeature from a WFS server.
-#% keywords: vector
-#% keywords: import
-#% keywords: OGC web services
+#% keyword: vector
+#% keyword: import
+#% keyword: OGC web services
 #%end
 #%option
 #% key: url

scripts/v.krige/v.krige.py

@@ -19,10 +19,10 @@ for details.
 
 #%module
 #% description: Performs ordinary or block kriging for vector maps.
-#% keywords: vector
-#% keywords: interpolation
-#% keywords: raster
-#% keywords: kriging
+#% keyword: vector
+#% keyword: interpolation
+#% keyword: raster
+#% keyword: kriging
 #%end
 
 #%option G_OPT_V_INPUT

scripts/v.out.gps/v.out.gps.py

@@ -33,27 +33,27 @@
 #############################################################################
 
 #%Module
-#%  description: Exports a vector map to a GPS receiver or file format supported by GPSBabel.
-#%  keywords: vector
-#%  keywords: export
-#%  keywords: GPS
+#% description: Exports a vector map to a GPS receiver or file format supported by GPSBabel.
+#% keyword: vector
+#% keyword: export
+#% keyword: GPS
 #%End
 #%flag
-#%  key: w
-#%  description: Export as waypoints
+#% key: w
+#% description: Export as waypoints
 #%end
 #%flag
-#%  key: r
-#%  description: Export as routes
+#% key: r
+#% description: Export as routes
 #%end
 #%flag
-#%  key: t
-#%  description: Export as tracks
+#% key: t
+#% description: Export as tracks
 #%end
 ############ TODO:
 ##%flag
-##%  key: z
-##%  description: Export altitude from 3D vector's z-coordinate
+##% key: z
+##% description: Export altitude from 3D vector's z-coordinate
 ##%end
 ############
 #%option G_OPT_V_INPUT

scripts/v.pack/v.pack.py

@@ -16,9 +16,9 @@
 
 #%module
 #% description: Packs up a vector map and support files for copying.
-#% keywords: vector
-#% keywords: export
-#% keywords: copying
+#% keyword: vector
+#% keyword: export
+#% keyword: copying
 #%end
 #%option G_OPT_V_INPUT
 #% label: Name of vector map to pack up

scripts/v.rast.stats/v.rast.stats.py

@@ -19,11 +19,11 @@
 
 #%module
 #% description: Calculates univariate statistics from a raster map based on a vector map and uploads statistics to new attribute columns.
-#% keywords: vector
-#% keywords: statistics
-#% keywords: raster
-#% keywords: univariate statistics
-#% keywords: zonal statistics
+#% keyword: vector
+#% keyword: statistics
+#% keyword: raster
+#% keyword: univariate statistics
+#% keyword: zonal statistics
 #%end
 #%flag
 #% key: c

scripts/v.report/v.report.py

@@ -16,9 +16,9 @@
 
 #%module
 #% description: Reports geometry statistics for vector maps.
-#% keywords: vector
-#% keywords: geometry
-#% keywords: statistics
+#% keyword: vector
+#% keyword: geometry
+#% keyword: statistics
 #%end
 #%option G_OPT_V_MAP
 #%end

scripts/v.to.lines/v.to.lines.py

@@ -18,11 +18,11 @@
 
 #%module
 #% description: Converts vector polygons or points to lines.
-#% keywords: vector
-#% keywords: geometry
-#% keywords: area
-#% keywords: line
-#% keywords: point
+#% keyword: vector
+#% keyword: geometry
+#% keyword: area
+#% keyword: line
+#% keyword: point
 #%end
 
 #%option G_OPT_V_INPUT

scripts/v.unpack/v.unpack.py

@@ -16,9 +16,9 @@
 
 #%module
 #% description: Unpacks a vector map packed with v.pack.
-#% keywords: vector
-#% keywords: import
-#% keywords: copying
+#% keyword: vector
+#% keyword: import
+#% keyword: copying
 #%end
 #%option G_OPT_F_INPUT
 #% description: Name of input pack file

scripts/v.what.vect/v.what.vect.py

@@ -15,12 +15,12 @@
 
 #%module
 #% description: Uploads vector values at positions of vector points to the table.
-#% keywords: vector
-#% keywords: sampling
-#% keywords: database
-#% keywords: position
-#% keywords: querying
-#% keywords: attribute table
+#% keyword: vector
+#% keyword: sampling
+#% keyword: database
+#% keyword: position
+#% keyword: querying
+#% keyword: attribute table
 #%end
 
 #%option G_OPT_V_MAP

scripts/wxpyimgview/wxpyimgview.py

@@ -20,9 +20,9 @@
 
 #%module
 #% description: Views BMP images from the PNG driver.
-#% keywords: display
-#% keywords: graphics
-#% keywords: raster
+#% keyword: display
+#% keyword: graphics
+#% keyword: raster
 #%end
 #%option G_OPT_F_INPUT
 #% key: image

scripts/wxpyimgview/wxpyimgview_gui.py

@@ -20,8 +20,8 @@
 
 #%module
 #% description: Views BMP images from the PNG driver.
-#% keywords: display
-#% keywords: raster
+#% keyword: display
+#% keyword: raster
 #%end
 #%option G_OPT_F_INPUT
 #% key: image

temporal/t.create/t.create.py

@@ -16,9 +16,9 @@
 
 #%module
 #% description: Creates a space time dataset.
-#% keywords: temporal
-#% keywords: map management
-#% keywords: create
+#% keyword: temporal
+#% keyword: map management
+#% keyword: create
 #%end
 
 #%option G_OPT_STDS_OUTPUT

temporal/t.info/t.info.py

@@ -16,9 +16,9 @@
 
 #%module
 #% description: Lists information about space time datasets and maps.
-#% keywords: temporal
-#% keywords: metadata
-#% keywords: extent
+#% keyword: temporal
+#% keyword: metadata
+#% keyword: extent
 #%end
 
 #%option G_OPT_STDS_INPUT

temporal/t.list/t.list.py

@@ -16,9 +16,9 @@
 
 #%module
 #% description: Lists space time datasets and maps registered in the temporal database.
-#% keywords: temporal
-#% keywords: map management
-#% keywords: list
+#% keyword: temporal
+#% keyword: map management
+#% keyword: list
 #%end
 
 #%option