Fri Dec 19 13:17:37 PST 2014

Author: neteler
Date: 2014-12-19 13:17:36 -0800 (Fri, 19 Dec 2014)
New Revision: 63628

Modified:
   grass/trunk/display/d.barscale/thumbnails/README
   grass/trunk/display/d.geodesic/d.geodesic.html
   grass/trunk/display/d.his/d.his.html
   grass/trunk/display/d.path/d.path.html
   grass/trunk/display/d.rhumbline/d.rhumbline.html
   grass/trunk/display/d.vect.chart/d.vect.chart.html
   grass/trunk/display/d.vect/d.vect.html
   grass/trunk/general/g.list/g.list.html
   grass/trunk/general/g.region/g.region.html
   grass/trunk/general/g.region/main.c
   grass/trunk/gui/wxpython/gcp/manager.py
   grass/trunk/gui/wxpython/mapdisp/frame.py
   grass/trunk/gui/wxpython/psmap/instructions.py
   grass/trunk/gui/wxpython/rlisetup/functions.py
   grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.html
   grass/trunk/gui/wxpython/rlisetup/sampling_frame.py
   grass/trunk/gui/wxpython/rlisetup/wizard.py
   grass/trunk/imagery/i.atcorr/i.atcorr.html
   grass/trunk/imagery/i.atcorr/test_suite/README.txt
   grass/trunk/imagery/i.cluster/i.cluster.html
   grass/trunk/imagery/i.fft/i.fft.html
   grass/trunk/imagery/i.pca/i.pca.html
   grass/trunk/imagery/i.segment/i.segment.html
   grass/trunk/imagery/i.smap/i.smap.html
   grass/trunk/imagery/i.vi/i.vi.html
   grass/trunk/lib/cairodriver/cairodriver.html
   grass/trunk/lib/pngdriver/pngdriver.html
   grass/trunk/lib/psdriver/psdriver.html
   grass/trunk/lib/python/docs/src/gunittest_testing.rst
   grass/trunk/lib/python/gunittest/testsuite/test_assertions.py
   grass/trunk/lib/python/pygrass/modules/grid/grid.py
   grass/trunk/lib/python/script/testsuite/test_start_command_functions.py
   grass/trunk/lib/python/script/testsuite/test_start_command_functions_nc.py
   grass/trunk/lib/python/temporal/stds_import.py
   grass/trunk/misc/m.nviz.image/m.nviz.image.html
   grass/trunk/misc/m.nviz.script/m.nviz.script.html
   grass/trunk/ps/ps.map/ps.map.html
   grass/trunk/raster/r.carve/r.carve.html
   grass/trunk/raster/r.clump/r.clump.html
   grass/trunk/raster/r.contour/r.contour.html
   grass/trunk/raster/r.cost/r.cost.html
   grass/trunk/raster/r.cost/test_suite/profile.sh
   grass/trunk/raster/r.drain/tests/test.r.drain.sh
   grass/trunk/raster/r.external/r.external.html
   grass/trunk/raster/r.grow.distance/r.grow.distance.html
   grass/trunk/raster/r.his/r.his.html
   grass/trunk/raster/r.horizon/r.horizon.html
   grass/trunk/raster/r.in.lidar/r.in.lidar.html
   grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py
   grass/trunk/raster/r.kappa/r.kappa.html
   grass/trunk/raster/r.lake/r.lake.html
   grass/trunk/raster/r.latlong/r.latlong.html
   grass/trunk/raster/r.li/TODO
   grass/trunk/raster/r.li/r.li.daemon/daemon.c
   grass/trunk/raster/r.li/r.li.dominance/r.li.dominance.html
   grass/trunk/raster/r.li/r.li.edgedensity/r.li.edgedensity.html
   grass/trunk/raster/r.li/r.li.html
   grass/trunk/raster/r.li/r.li.mpa/r.li.mpa.html
   grass/trunk/raster/r.li/r.li.mps/r.li.mps.html
   grass/trunk/raster/r.li/r.li.padcv/r.li.padcv.html
   grass/trunk/raster/r.li/r.li.padrange/r.li.padrange.html
   grass/trunk/raster/r.li/r.li.padsd/r.li.padsd.html
   grass/trunk/raster/r.li/r.li.patchdensity/r.li.patchdensity.html
   grass/trunk/raster/r.li/r.li.patchnum/r.li.patchnum.html
   grass/trunk/raster/r.li/r.li.pielou/r.li.pielou.html
   grass/trunk/raster/r.li/r.li.renyi/r.li.renyi.html
   grass/trunk/raster/r.li/r.li.richness/r.li.richness.html
   grass/trunk/raster/r.li/r.li.shannon/r.li.shannon.html
   grass/trunk/raster/r.li/r.li.shape/r.li.shape.html
   grass/trunk/raster/r.li/r.li.simpson/r.li.simpson.html
   grass/trunk/raster/r.li/r.li.testing_nc_asc.sh
   grass/trunk/raster/r.li/r.li.testing_sp_mov.sh
   grass/trunk/raster/r.mapcalc/test_suite/README
   grass/trunk/raster/r.mode/r.mode.html
   grass/trunk/raster/r.out.gdal/r.out.gdal.html
   grass/trunk/raster/r.out.ppm/r.out.ppm.html
   grass/trunk/raster/r.out.ppm3/r.out.ppm3.html
   grass/trunk/raster/r.param.scale/r.param.scale.html
   grass/trunk/raster/r.patch/r.patch.html
   grass/trunk/raster/r.profile/testsuite/test_profile_ncspm.py
   grass/trunk/raster/r.proj/r.proj.html
   grass/trunk/raster/r.quantile/r.quantile.html
   grass/trunk/raster/r.random/r.random.html
   grass/trunk/raster/r.reclass/r.reclass.html
   grass/trunk/raster/r.recode/testsuite/test_rrecode_ncspm.py
   grass/trunk/raster/r.regression.line/r.regression.line.html
   grass/trunk/raster/r.regression.multi/r.regression.multi.html
   grass/trunk/raster/r.relief/r.relief.html
   grass/trunk/raster/r.resamp.bspline/r.resamp.bspline.html
   grass/trunk/raster/r.resamp.interp/r.resamp.interp.html
   grass/trunk/raster/r.resamp.rst/BUGS
   grass/trunk/raster/r.resamp.rst/r.resamp.rst.html
   grass/trunk/raster/r.resamp.stats/r.resamp.stats.html
   grass/trunk/raster/r.sim/r.sim.water/r.sim.water.html
   grass/trunk/raster/r.sim/r.sim.water/spearfish.sh
   grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py
   grass/trunk/raster/r.stats/test_suite/profile.sh
   grass/trunk/raster/r.stream.extract/r.stream.extract.html
   grass/trunk/raster/r.sun/r.sun.html
   grass/trunk/raster/r.sunmask/r.sunmask.html
   grass/trunk/raster/r.surf.area/r.surf.area.html
   grass/trunk/raster/r.surf.contour/r.surf.contour.html
   grass/trunk/raster/r.surf.fractal/r.surf.fractal.html
   grass/trunk/raster/r.terraflow/r.terraflow.html
   grass/trunk/raster/r.texture/r.texture.html
   grass/trunk/raster/r.thin/r.thin.html
   grass/trunk/raster/r.tile/r.tile.html
   grass/trunk/raster/r.to.rast3elev/r.to.rast3elev.html
   grass/trunk/raster/r.to.vect/r.to.vect.html
   grass/trunk/raster/r.univar/r.univar.html
   grass/trunk/raster/r.viewshed/r.viewshed.html
   grass/trunk/raster/r.volume/r.volume.html
   grass/trunk/raster/r.water.outlet/r.water.outlet.html
   grass/trunk/raster/r.what/r.what.html
   grass/trunk/scripts/d.correlate/d.correlate.html
   grass/trunk/scripts/d.polar/d.polar.html
   grass/trunk/scripts/d.shade/d.shade.html
   grass/trunk/scripts/d.to.rast/d.to.rast.html
   grass/trunk/scripts/d.vect.thematic/d.vect.thematic.html
   grass/trunk/scripts/db.univar/db.univar.html
   grass/trunk/scripts/i.colors.enhance/i.colors.enhance.html
   grass/trunk/scripts/i.oif/i.oif.html
   grass/trunk/scripts/i.pansharpen/i.pansharpen.html
   grass/trunk/scripts/i.pansharpen/i.pansharpen.py
   grass/trunk/scripts/i.spectral/i.spectral.html
   grass/trunk/scripts/i.tasscap/i.tasscap.html
   grass/trunk/scripts/r.blend/r.blend.html
   grass/trunk/scripts/r.colors.stddev/r.colors.stddev.html
   grass/trunk/scripts/r.fillnulls/r.fillnulls.html
   grass/trunk/scripts/r.grow/r.grow.html
   grass/trunk/scripts/r.mask/r.mask.html
   grass/trunk/scripts/r.out.xyz/r.out.xyz.html
   grass/trunk/scripts/r.reclass.area/r.reclass.area.html
   grass/trunk/scripts/r.rgb/r.rgb.html
   grass/trunk/scripts/r.shade/r.shade.html
   grass/trunk/scripts/v.db.droprow/v.db.droprow.html
   grass/trunk/scripts/v.db.univar/v.db.univar.html
   grass/trunk/scripts/v.db.update/v.db.update.html
   grass/trunk/scripts/v.krige/v.krige.html
   grass/trunk/scripts/v.rast.stats/v.rast.stats.html
   grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html
   grass/trunk/vector/v.drape/spearfish.pov
   grass/trunk/vector/v.label.sa/v.label.sa.html
   grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html
   grass/trunk/vector/v.lrs/v.lrs.label/v.lrs.label.html
   grass/trunk/vector/v.lrs/v.lrs.segment/v.lrs.segment.html
   grass/trunk/vector/v.lrs/v.lrs.where/v.lrs.where.html
   grass/trunk/vector/v.mkgrid/v.mkgrid.html
   grass/trunk/vector/v.neighbors/v.neighbors.html
   grass/trunk/vector/v.net.alloc/v.net.alloc.html
   grass/trunk/vector/v.net.path/v.net.path.html
   grass/trunk/vector/v.net.salesman/v.net.salesman.html
   grass/trunk/vector/v.net.steiner/v.net.steiner.html
   grass/trunk/vector/v.net.visibility/v.net.visibility.html
   grass/trunk/vector/v.normal/v.normal.html
   grass/trunk/vector/v.overlay/v.overlay.html
   grass/trunk/vector/v.random/v.random.html
   grass/trunk/vector/v.sample/v.sample.html
   grass/trunk/vector/v.surf.rst/v.surf.rst.html
   grass/trunk/vector/v.to.db/v.to.db.html
   grass/trunk/vector/v.transform/v.transform.html
   grass/trunk/vector/v.univar/v.univar.html
   grass/trunk/vector/v.voronoi/v.voronoi.html
   grass/trunk/vector/v.what.rast/v.what.rast.html
   grass/trunk/vector/v.what.rast3/v.what.rast3.html
Log:
update g.region calls to use new element names (#2409)

Modified: grass/trunk/display/d.barscale/thumbnails/README
===================================================================

--- grass/trunk/display/d.barscale/thumbnails/README	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/display/d.barscale/thumbnails/README	2014-12-19 21:17:36 UTC (rev 63628)
@@ -7,7 +7,7 @@
 export GRASS_RENDER_TRUECOLOR=TRUE
 export GRASS_RENDER_WIDTH=300
 export GRASS_RENDER_HEIGHT=300
-g.region rast=elevation
+g.region raster=elevation
 
 for STYLE in classic line solid hollow full_checker part_checker mixed_checker tail_checker up_ticks down_ticks both_ticks arrow_ends
 do

Modified: grass/trunk/display/d.geodesic/d.geodesic.html
===================================================================
--- grass/trunk/display/d.geodesic/d.geodesic.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/display/d.geodesic/d.geodesic.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -30,7 +30,7 @@
 (demolocation dataset):
 
 <div class="code"><pre>
-g.region vect=country_boundaries -p
+g.region vector=country_boundaries -p
 d.mon wx0
 d.vect country_boundaries type=area
 d.geodesic coordinates=55:58W,33:18S,26:43E,60:37N \

Modified: grass/trunk/display/d.his/d.his.html
===================================================================
--- grass/trunk/display/d.his/d.his.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/display/d.his/d.his.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -106,7 +106,7 @@
 <h2>EXAMPLE</h2>
 
 <div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
 r.relief input=elevation output=elevation_shaded_relief
 
 d.mon wx0

Modified: grass/trunk/display/d.path/d.path.html
===================================================================
--- grass/trunk/display/d.path/d.path.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/display/d.path/d.path.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -24,7 +24,7 @@
 
 Interactive shortest path routing on road network (North Carolina sample dataset):
 <div class="code"><pre>
-g.region vect=roadsmajor -p
+g.region vector=roadsmajor -p
 d.vect roadsmajor
 d.path roadsmajor coordinates=668646.15,224447.16,668348.83,235894.02
 </pre></div>

Modified: grass/trunk/display/d.rhumbline/d.rhumbline.html
===================================================================
--- grass/trunk/display/d.rhumbline/d.rhumbline.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/display/d.rhumbline/d.rhumbline.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -24,7 +24,7 @@
 (demolocation dataset):
 
 <div class="code"><pre>
-g.region vect=country_boundaries -p
+g.region vector=country_boundaries -p
 d.mon wx0
 d.vect country_boundaries type=area
 d.rhumbline coordinates=55:58W,33:18S,26:43E,60:37N \

Modified: grass/trunk/display/d.vect/d.vect.html
===================================================================
--- grass/trunk/display/d.vect/d.vect.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/display/d.vect/d.vect.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -83,7 +83,7 @@
 
 <p>3D points, 3D lines and 3D polygons colorized according to z height:
 <div class="code"><pre>
-g.region rast=elevation.10m
+g.region raster=elevation.10m
 r.random input=elevation.10m n=5000 vector=random3d -d
 d.mon start=x0
 # display as black points

Modified: grass/trunk/display/d.vect.chart/d.vect.chart.html
===================================================================
--- grass/trunk/display/d.vect.chart/d.vect.chart.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/display/d.vect.chart/d.vect.chart.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -48,7 +48,7 @@
 sample dataset:
 
 <div class="code"><pre>
-g.region rast=erode.index -p
+g.region raster=erode.index -p
 r.to.vect -s input=erode.index output=erode_index type=area 
 v.extract input=erode_index output=erode_index_ctrds type=centroid 
 d.rast aspect

Modified: grass/trunk/general/g.list/g.list.html
===================================================================
--- grass/trunk/general/g.list/g.list.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/general/g.list/g.list.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -161,7 +161,7 @@
 List all raster maps starting with "tmp_" whose region overlaps with
 the region of "test" raster map:
 <div class="code"><pre>
-g.region rast=test save=test_region
+g.region raster=test save=test_region
 g.list type=rast pattern='tmp_*' region=test_region
 </pre></div>
 

Modified: grass/trunk/general/g.region/g.region.html
===================================================================
--- grass/trunk/general/g.region/g.region.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/general/g.region/g.region.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -126,19 +126,14 @@
 <h3>Additional parameter information:</h3>
 
 <dl>
-<dt><b>3dview=</b><em>name</em> 
-<dd>Make current region settings same as those in the named
-3dview file, which holds the region that was current when
-the 3dview was saved.
 
-
 <dt><b>zoom=</b><em>name</em>
 <dd>Shrink current region settings to the smallest region
 encompassing all non-NULL data in the named raster map
 layer that fall inside the user's current region. In this
 way you can tightly zoom in on isolated clumps within a
 bigger map.
-<p>If the user also includes the <b>rast=</b><em>name</em>
+<p>If the user also includes the <b>raster=</b><em>name</em>
 option on the command line, <b>zoom=</b><em>name</em> will
 set the current region settings to the smallest region
 encompassing all non-NULL data in the named <b>zoom</b> map
@@ -154,7 +149,7 @@
 existing region edges outward to the edges of the next
 nearest cell in the named raster map - not to the named
 map's edges.  To perform the latter function, use the
-<b>rast=</b><em>name</em> option.
+<b>raster=</b><em>name</em> option.
 </dl>
 
 
@@ -222,7 +217,7 @@
 
 
 <dt><span class="code"><tt>
-g.region rast=soils
+g.region raster=soils
 </tt></span>
 
 <dd> This form will make the current region settings
@@ -232,7 +227,7 @@
 <p>
 
 <dt><span class="code"><tt>
-g.region rast=soils zoom=soils
+g.region raster=soils zoom=soils
 </tt></span>
 
 <dd> This form will first look up the cell header file for
@@ -240,7 +235,7 @@
 current region setting, and then shrink the region down to
 the smallest region which still encompasses all non-NULL
 data in the map layer <em>soils</em>.  Note that if the
-parameter <em>rast=soils</em> were not specified, the
+parameter <em>raster=soils</em> were not specified, the
 zoom would shrink to encompass all non-NULL data values in
 the soils map that were located within the <i>current region</i>
 settings.
@@ -248,7 +243,7 @@
 <p>
 
 <dt><span class="code"><tt>
-g.region -up rast=soils
+g.region -up raster=soils
 </tt></span>
 
 <dd> The <b>-u</b> option suppresses the re-setting of the

Modified: grass/trunk/general/g.region/main.c
===================================================================
--- grass/trunk/general/g.region/main.c	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/general/g.region/main.c	2014-12-19 21:17:36 UTC (rev 63628)
@@ -450,7 +450,7 @@
 	Rast3d_region_to_cell_head(&win, &window);
     }
 
-    /* vect= */
+    /* vector= */
     if (parm.vect->answer) {
 	int first = 0;
 

Modified: grass/trunk/gui/wxpython/gcp/manager.py
===================================================================
--- grass/trunk/gui/wxpython/gcp/manager.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/gui/wxpython/gcp/manager.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -15,7 +15,7 @@
  - manager::EditGCP
  - manager::GrSettingsDialog
 
-(C) 2006-2012 by the GRASS Development Team
+(C) 2006-2014 by the GRASS Development Team
 
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.
@@ -673,9 +673,9 @@
         try:
         # set computational region to match selected map and zoom display to region
             if maptype == 'raster':
-                p = RunCommand('g.region', 'rast=src_map')
+                p = RunCommand('g.region', 'raster=src_map')
             elif maptype == 'vector':
-                p = RunCommand('g.region', 'vect=src_map')
+                p = RunCommand('g.region', 'vector=src_map')
             
             if p.returncode == 0:
                 print 'returncode = ', str(p.returncode)

Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -688,7 +688,7 @@
             return
         # set region for composite
         grass.use_temp_region()
-        returncode, messages = RunCommand('g.region', rast=tmpName + '.red',
+        returncode, messages = RunCommand('g.region', raster=tmpName + '.red',
                                           quiet=True, getErrorMsg=True)
         if not returncode == 0:
             grass.del_temp_region()

Modified: grass/trunk/gui/wxpython/psmap/instructions.py
===================================================================
--- grass/trunk/gui/wxpython/psmap/instructions.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/gui/wxpython/psmap/instructions.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -551,9 +551,9 @@
         if self.instruction['scaleType'] == 0: #match map
             map = self.instruction['map']
             if self.instruction['mapType'] == 'raster':
-                comment = "# g.region rast=%s nsres=%s ewres=%s\n" % (map, region['nsres'], region['ewres'])
+                comment = "# g.region raster=%s nsres=%s ewres=%s\n" % (map, region['nsres'], region['ewres'])
             else:
-                comment = "# g.region vect=%s\n" % (map)
+                comment = "# g.region vector=%s\n" % (map)
         elif self.instruction['scaleType'] == 1:# saved region
             region = self.instruction['region']
             comment = "# g.region region=%s\n" % region

Modified: grass/trunk/gui/wxpython/rlisetup/functions.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/functions.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/gui/wxpython/rlisetup/functions.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -84,8 +84,8 @@
     grass.run_command('v.extract', input=vect, cats=cat, type='area',
                       layer=layer, output=tmp_vect, flags='d',
                       overwrite=overwrite, quiet=True)
-    grass.run_command('g.region', rast=origrast)
-    grass.run_command('g.region', vect=tmp_vect)
+    grass.run_command('g.region', rastor=origrast)
+    grass.run_command('g.region', vector=tmp_vect)
     grass.run_command('g.region', align=origrast)
     grass.run_command('v.to.rast', input=tmp_vect, type='area',
                       layer=layer, use='val', value=cat, output=outrast,

Modified: grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.html
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -276,7 +276,7 @@
 <p>
 Now an anaysis can be performed using one of the analytical modules, e.g.
 <div class="code"><pre>
-g.region rast=forests -p
+g.region raster=forests -p
 r.li.patchdensity input=forests conf=movwindow7 output=forests_p_dens7
 r.univar forests_p_dens7
 </pre></div>
@@ -314,7 +314,7 @@
 <p>
 Now an anaysis can be performed using one of the analytical modules, e.g.
 <div class="code"><pre>
-g.region rast=lsat7_2002_40 -p
+g.region raster=lsat7_2002_40 -p
 r.li.shannon input=lsat7_2000_40 conf=whole_region output=lsat7_2000_40_shannon
 </pre></div>
 

Modified: grass/trunk/gui/wxpython/rlisetup/sampling_frame.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/sampling_frame.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/gui/wxpython/rlisetup/sampling_frame.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -258,7 +258,7 @@
                    value=1, use='val')
         wx.EndBusyCursor()
         grass.use_temp_region()
-        grass.run_command('g.region', vect=tmpvector)
+        grass.run_command('g.region', vector=tmpvector)
         region = grass.region()
 
         marea = MaskedArea(region, rasterName)

Modified: grass/trunk/gui/wxpython/rlisetup/wizard.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/wizard.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/gui/wxpython/rlisetup/wizard.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -144,7 +144,7 @@
         grass.use_temp_region()
         # Temporarily aligning region resolution to $RASTER resolution
         # keep boundary settings
-        grass.run_command('g.region', rast=self.startpage.rast)
+        grass.run_command('g.region', raster=self.startpage.rast)
         self.gregion = grass.region()
         self.SF_NSRES = self.gregion['nsres']
         self.SF_EWRES = self.gregion['ewres']
@@ -240,7 +240,7 @@
                           coordinate=[xcenter, ycenter], quiet=True)
         grass.del_temp_region()
         grass.use_temp_region()
-        grass.run_command('g.region', rast=self.startpage.rast)
+        grass.run_command('g.region', raster=self.startpage.rast)
 
     def getSamplingType(self):
         """Obtain the sampling type"""
@@ -353,7 +353,7 @@
                                                     SamplingType.MUNITSC]:
             # get the raster region into rastregion
             grass.use_temp_region()
-            grass.run_command('g.region', rast=self.startpage.rast)
+            grass.run_command('g.region', raster=self.startpage.rast)
             rastregion = grass.region()
             s_n = rastregion['n']
             s_w = rastregion['w']

Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -615,7 +615,7 @@
 The example is based on the North Carolina sample dataset (GMT -5 hours).
 First we set the computational region to the satellite map, e.g. channel 4:
 <div class="code"><pre>
-g.region rast=lsat7_2002_40 -p
+g.region raster=lsat7_2002_40 -p
 </pre></div>
 
 It is important to verify the available metadata for the sun position which

Modified: grass/trunk/imagery/i.atcorr/test_suite/README.txt
===================================================================
--- grass/trunk/imagery/i.atcorr/test_suite/README.txt	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/imagery/i.atcorr/test_suite/README.txt	2014-12-19 21:17:36 UTC (rev 63628)
@@ -11,7 +11,7 @@
 # import raw Landsat channel 4:
 r.in.gdal ETM4_400x400.raw out=ETM4_400x400.raw -o
 # set region to this map
-g.region rast=ETM4_400x400.raw
+g.region raster=ETM4_400x400.raw
 
 # create synthetic DEM, close to sea level
 r.mapcalc "atcorr_dem = 10.0"

Modified: grass/trunk/imagery/i.cluster/i.cluster.html
===================================================================
--- grass/trunk/imagery/i.cluster/i.cluster.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/imagery/i.cluster/i.cluster.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -219,7 +219,7 @@
 a LANDSAT subscene in North Carolina:
 
 <div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 
 # store VIZ, NIR, MIR into group/subgroup
 i.group group=lsat7_2002 subgroup=lsat7_2002 \

Modified: grass/trunk/imagery/i.fft/i.fft.html
===================================================================
--- grass/trunk/imagery/i.fft/i.fft.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/imagery/i.fft/i.fft.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -26,11 +26,11 @@
 North Carolina example:
 
 <div class="code"><pre>
-g.region rast=lsat7_2002_70
+g.region raster=lsat7_2002_70
 i.fft input=lsat7_2002_70 real=lsat7_2002_70.real imaginary=lsat7_2002_70.imag
 
 # set region to resulting FFT output map (due to new FFT coordinate space):
-g.region rast=lsat7_2002_70.real -p
+g.region raster=lsat7_2002_70.real -p
 d.mon x0
 d.rast lsat7_2002_70.real
 d.rast lsat7_2002_70.imag

Modified: grass/trunk/imagery/i.pca/i.pca.html
===================================================================
--- grass/trunk/imagery/i.pca/i.pca.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/imagery/i.pca/i.pca.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -53,7 +53,7 @@
 Using Landsat imagery in the North Carolina sample dataset:
 
 <div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 i.pca in=lsat7_2002_10,lsat7_2002_20,lsat7_2002_30,lsat7_2002_40,lsat7_2002_50,lsat7_2002_70 \
     out=lsat7_2002_pca
 

Modified: grass/trunk/imagery/i.segment/i.segment.html
===================================================================
--- grass/trunk/imagery/i.segment/i.segment.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/imagery/i.segment/i.segment.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -122,7 +122,7 @@
 input ortho photograph).
 
 <div class="code"><pre>
-g.region -p rast=ortho_2001_t792_1m n=220446 s=220075 e=639151 w=638592
+g.region -p raster=ortho_2001_t792_1m n=220446 s=220075 e=639151 w=638592
 </pre></div>
 
 Try out a low threshold and check the results.
@@ -162,7 +162,7 @@
 
 <p>Set the region to match the entire map(s) in the group.
 <div class="code"><pre>
-g.region -p rast=ortho_2001_t792_1m at PERMANENT
+g.region -p raster=ortho_2001_t792_1m at PERMANENT
 </pre></div>
 
 <p>

Modified: grass/trunk/imagery/i.smap/i.smap.html
===================================================================
--- grass/trunk/imagery/i.smap/i.smap.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/imagery/i.smap/i.smap.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -147,7 +147,7 @@
 Supervised classification of LANDSAT
 
 <div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 
 # store VIZ, NIR, MIR into group/subgroup
 i.group group=my_lsat7_2002 subgroup=my_lsat7_2002 \

Modified: grass/trunk/imagery/i.vi/i.vi.html
===================================================================
--- grass/trunk/imagery/i.vi/i.vi.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/imagery/i.vi/i.vi.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -253,7 +253,7 @@
 
 <!-- todo: check if i.landsat.toar use is needed for NC data -->
 <div class="code"><pre>
-g.region rast=lsat5_1987_30 -p
+g.region raster=lsat5_1987_30 -p
 i.vi red=lsat5_1987_30 viname=ndvi output=lsat5_1987.ndvi nir=lsat5_1987_40
 r.colors lsat5_1987.ndvi color=ndvi
 </pre></div>

Modified: grass/trunk/lib/cairodriver/cairodriver.html
===================================================================
--- grass/trunk/lib/cairodriver/cairodriver.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/lib/cairodriver/cairodriver.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -95,7 +95,7 @@
 export GRASS_RENDER_HEIGHT=800
 export GRASS_RENDER_FILE_READ=TRUE
 
-g.region rast=elevation
+g.region raster=elevation
 d.rast map=elevation
 d.vect map=streams width=1 color=blue fcolor=aqua type=area,line
 d.vect map=roadsmajor width=2
@@ -111,7 +111,7 @@
 export GRASS_RENDER_WIDTH=800
 export GRASS_RENDER_HEIGHT=800
 
-g.region vect=roadsmajor
+g.region vector=roadsmajor
 # activate vector font
 d.font Vera
 d.vect map=roadsmajor layer=1 display=shape attrcolumn=ROAD_NAME lcolor=0:90:255
@@ -126,7 +126,7 @@
 export GRASS_RENDER_WIDTH=800
 export GRASS_RENDER_HEIGHT=800
 
-g.region rast=elevation
+g.region raster=elevation
 d.rast map=elevation
 </pre></div>
 

Modified: grass/trunk/lib/pngdriver/pngdriver.html
===================================================================
--- grass/trunk/lib/pngdriver/pngdriver.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/lib/pngdriver/pngdriver.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -67,7 +67,7 @@
 export GRASS_RENDER_IMMEDIATE=png
 export GRASS_RENDER_TRUECOLOR=TRUE
 
-g.region rast=elevation
+g.region raster=elevation
 d.rast elevation
 d.vect roadsmajor color=red
 </pre></div>

Modified: grass/trunk/lib/psdriver/psdriver.html
===================================================================
--- grass/trunk/lib/psdriver/psdriver.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/lib/psdriver/psdriver.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -57,7 +57,7 @@
 export GRASS_RENDER_IMMEDIATE=ps
 export GRASS_RENDER_TRUECOLOR=TRUE
 
-g.region rast=elevation
+g.region raster=elevation
 d.rast elevation
 d.vect roadsmajor color=red
 </pre></div>

Modified: grass/trunk/lib/python/docs/src/gunittest_testing.rst
===================================================================
--- grass/trunk/lib/python/docs/src/gunittest_testing.rst	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/lib/python/docs/src/gunittest_testing.rst	2014-12-19 21:17:36 UTC (rev 63628)
@@ -55,7 +55,7 @@
             # to not override mapset's region (which might be used by other tests)
             cls.use_temp_region()
             # cls.runModule or self.runModule is used for general module calls
-            cls.runModule('g.region', rast='elevation')
+            cls.runModule('g.region', raster='elevation')
             # note that the region set by default for NC location is the same as
             # the elevation raster map, this is an example shows what to do
             # in the general case

Modified: grass/trunk/lib/python/gunittest/testsuite/test_assertions.py
===================================================================
--- grass/trunk/lib/python/gunittest/testsuite/test_assertions.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/lib/python/gunittest/testsuite/test_assertions.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -81,7 +81,7 @@
     @classmethod
     def setUpClass(cls):
         cls.use_temp_region()
-        cls.runModule(SimpleModule('g.region', rast='elevation'))
+        cls.runModule(SimpleModule('g.region', raster='elevation'))
 
     @classmethod
     def tearDownClass(cls):
@@ -123,7 +123,7 @@
     def setUpClass(cls):
         cls.use_temp_region()
         # TODO: here we should actually not call self.runModule but call_module
-        cls.runModule(SimpleModule('g.region', rast='elevation'))
+        cls.runModule(SimpleModule('g.region', raster='elevation'))
 
     @classmethod
     def tearDownClass(cls):

Modified: grass/trunk/lib/python/pygrass/modules/grid/grid.py
===================================================================
--- grass/trunk/lib/python/pygrass/modules/grid/grid.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/lib/python/pygrass/modules/grid/grid.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -353,7 +353,7 @@
             inputs[key] = mapnames[key]
         cmd['inputs'] = inputs.items()
         # set the region to the tile
-        sub.Popen(['g,region', 'rast=%s' % key], env=env).wait()
+        sub.Popen(['g,region', 'raster=%s' % key], env=env).wait()
     else:
         # set the computational region
         lcmd = ['g.region', ]

Modified: grass/trunk/lib/python/script/testsuite/test_start_command_functions.py
===================================================================
--- grass/trunk/lib/python/script/testsuite/test_start_command_functions.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/lib/python/script/testsuite/test_start_command_functions.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -15,27 +15,27 @@
 
     def test_prefixed_underscore(self):
         proc = start_command(
-            'g.region', _rast=self.raster, stderr=PIPE)
+            'g.region', _raster=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
-        self.assertNotIn('_rast', stderr)
+        self.assertNotIn('_raster', stderr)
         self.assertIn(self.raster, stderr,
             msg="Raster map name should appear in the error output")
 
     def test_suffixed_underscore(self):
         proc = start_command(
-            'g.region', rast_=self.raster, stderr=PIPE)
+            'g.region', raster_=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
-        self.assertNotIn('rast_', stderr)
+        self.assertNotIn('raster_', stderr)
         self.assertIn(self.raster, stderr,
             msg="Raster map name should appear in the error output")
 
     def test_multiple_underscores(self):
         proc = start_command(
-            'g.region', _rast_=self.raster, stderr=PIPE)
+            'g.region', _raster_=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         returncode = proc.poll()
         self.assertEquals(returncode, 1)
-        self.assertIn('rast', stderr)
+        self.assertIn('raster', stderr)
 
 if __name__ == '__main__':
     grass.gunittest.test()

Modified: grass/trunk/lib/python/script/testsuite/test_start_command_functions_nc.py
===================================================================
--- grass/trunk/lib/python/script/testsuite/test_start_command_functions_nc.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/lib/python/script/testsuite/test_start_command_functions_nc.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -24,30 +24,30 @@
 
     def test_prefixed_underscore(self):
         proc = start_command(
-            'g.region', _rast=self.raster, stderr=PIPE)
+            'g.region', _raster=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         returncode = proc.poll()
         self.assertEquals(returncode, 0,
-            msg="Undersocre as prefix was not accepted")
-        self.assertNotIn('_rast', stderr)
+            msg="Underscore as prefix was not accepted")
+        self.assertNotIn('_raster', stderr)
 
     def test_suffixed_underscore(self):
         proc = start_command(
-            'g.region', rast_=self.raster, stderr=PIPE)
+            'g.region', raster_=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         returncode = proc.poll()
         self.assertEquals(returncode, 0,
-            msg="Undersocre as suffix was not accepted, stderr is:\n%s" % stderr)
-        self.assertNotIn('rast_', stderr)
+            msg="Underscore as suffix was not accepted, stderr is:\n%s" % stderr)
+        self.assertNotIn('raster_', stderr)
 
     def test_multiple_underscores(self):
         proc = start_command(
-            'g.region', _rast_=self.raster, stderr=PIPE)
+            'g.region', _raster_=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         returncode = proc.poll()
         self.assertEquals(returncode, 1,
-            msg="Undersocre at both sides was accepted")
-        self.assertIn('rast', stderr)
+            msg="Underscore at both sides was accepted")
+        self.assertIn('raster', stderr)
 
 if __name__ == '__main__':
     grass.gunittest.test()

Modified: grass/trunk/lib/python/temporal/stds_import.py
===================================================================
--- grass/trunk/lib/python/temporal/stds_import.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/lib/python/temporal/stds_import.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -97,7 +97,7 @@
 
     # Set the computational region from the last map imported
     if set_current_region is True:
-        gscript.run_command("g.region", rast=name)
+        gscript.run_command("g.region", raster=name)
 
 ############################################################################
 
@@ -121,7 +121,7 @@
 
     # Set the computational region from the last map imported
     if set_current_region is True:
-        gscript.run_command("g.region", rast=name)
+        gscript.run_command("g.region", raster=name)
 
 ############################################################################
 

Modified: grass/trunk/misc/m.nviz.image/m.nviz.image.html
===================================================================
--- grass/trunk/misc/m.nviz.image/m.nviz.image.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/misc/m.nviz.image/m.nviz.image.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -11,7 +11,7 @@
 Render elevation map in a 3D space.
 
 <div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
 m.nviz.image elevation_map=elevation output=elev perspective=15
 </pre></div>
 

Modified: grass/trunk/misc/m.nviz.script/m.nviz.script.html
===================================================================
--- grass/trunk/misc/m.nviz.script/m.nviz.script.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/misc/m.nviz.script/m.nviz.script.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -85,7 +85,7 @@
 the scene, run the following:
 
 <div class="code"><pre>
-g.region rast=elevation.dem
+g.region raster=elevation.dem
 d.rast elevation.dem
 m.nviz.script -ik input=elevation.dem output=nviz.script dist=2400 ht=1220 frames=1000
 </pre></div>

Modified: grass/trunk/ps/ps.map/ps.map.html
===================================================================
--- grass/trunk/ps/ps.map/ps.map.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/ps/ps.map/ps.map.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -1576,7 +1576,7 @@
 
 <div class="code"><pre>
  # First set the region
- g.region rast=soils
+ g.region raster=soils
 
  # Generate comment file (or use text editor)
  echo "Spearfish (SD) soils" > soil.cmt

Modified: grass/trunk/raster/r.carve/r.carve.html
===================================================================
--- grass/trunk/raster/r.carve/r.carve.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.carve/r.carve.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -21,7 +21,7 @@
 North Carolina sample dataset:
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.carve rast=elevation vect=streams out=carve_dem width=20 depth=5
 </pre></div>
 

Modified: grass/trunk/raster/r.clump/r.clump.html
===================================================================
--- grass/trunk/raster/r.clump/r.clump.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.clump/r.clump.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -38,7 +38,7 @@
 report area sizes for each lake individually rather by waterbody type:
 
 <div class="code"><pre>
-g.region rast=lakes -p
+g.region raster=lakes -p
 
 # report sizes by waterbody type
 r.report lakes units=h

Modified: grass/trunk/raster/r.contour/r.contour.html
===================================================================
--- grass/trunk/raster/r.contour/r.contour.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.contour/r.contour.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -40,7 +40,7 @@
 North Carolina example:
 <p>
 <div class="code"><pre>
-g.region rast=elev_lid792_1m -p
+g.region raster=elev_lid792_1m -p
 r.contour input=elev_lid792_1m output=elev_lid792_1m_contours minlevel=100 maxlevel=150 step=10
 </pre></div>
 

Modified: grass/trunk/raster/r.cost/r.cost.html
===================================================================
--- grass/trunk/raster/r.cost/r.cost.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.cost/r.cost.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -217,7 +217,7 @@
 (example for Spearfish region):
 
 <div class="code"><pre>
-  g.region rast=roads -p
+  g.region raster=roads -p
   r.mapcalc "area.one = 1"
   r.cost -k input=area.one output=distance start_rast=roads
   d.rast distance

Modified: grass/trunk/raster/r.cost/test_suite/profile.sh
===================================================================
--- grass/trunk/raster/r.cost/test_suite/profile.sh	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.cost/test_suite/profile.sh	2014-12-19 21:17:36 UTC (rev 63628)
@@ -1,5 +1,5 @@
 # NC dataset
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.mapcalc 'one = 1'
 CMD="r.cost -k in=one start_points=school_copy output=cost.test --o"
 

Modified: grass/trunk/raster/r.drain/tests/test.r.drain.sh
===================================================================
--- grass/trunk/raster/r.drain/tests/test.r.drain.sh	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.drain/tests/test.r.drain.sh	2014-12-19 21:17:36 UTC (rev 63628)
@@ -5,7 +5,7 @@
 export GRASS_OVERWRITE=1
 
 r.in.ascii testascii_nc.asc out=testascii
-g.region rast=testascii -p
+g.region raster=testascii -p
 
 d.mon wx0
 sleep 2

Modified: grass/trunk/raster/r.external/r.external.html
===================================================================
--- grass/trunk/raster/r.external/r.external.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.external/r.external.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -29,7 +29,7 @@
 <div class="code"><pre>
 # import of all channels (each channel will become a GRASS raster map):
 r.external  /home/user/data/maps/059100.tif out=ortho
-g.region rast=ortho.3 -p
+g.region raster=ortho.3 -p
 d.rgb r=ortho.1 g=ortho.2 b=ortho.3
 r.composite r=ortho.1 g=ortho.2 b=ortho.3 output=ortho.rgb
 </pre></div>

Modified: grass/trunk/raster/r.grow.distance/r.grow.distance.html
===================================================================
--- grass/trunk/raster/r.grow.distance/r.grow.distance.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.grow.distance/r.grow.distance.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -64,7 +64,7 @@
 
 A) Distance from the streams network (North Carolina sample dataset):
 <div class="code"><pre>
-g.region rast=streams_derived -p
+g.region raster=streams_derived -p
 r.grow.distance input=streams_derived distance=dist_from_streams
 </pre></div>
 
@@ -76,7 +76,7 @@
 <p>
 B) Distance from sea in meters in latitude-longitude location:
 <div class="code"><pre>
-g.region rast=sea -p
+g.region raster=sea -p
 r.grow.distance -m input=sea distance=dist_from_sea_geodetic metric=geodesic
 </pre></div>
 

Modified: grass/trunk/raster/r.his/r.his.html
===================================================================
--- grass/trunk/raster/r.his/r.his.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.his/r.his.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -92,7 +92,7 @@
 First, create shaded relief and show it.
 
 <div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
 r.relief input=elevation output=elevation_shaded_relief
 
 d.mon wx0

Modified: grass/trunk/raster/r.horizon/r.horizon.html
===================================================================
--- grass/trunk/raster/r.horizon/r.horizon.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.horizon/r.horizon.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -142,7 +142,7 @@
 of horizon angles CCW from East):
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.horizon elevation=elevation direction=215 step=0 bufferzone=200 \
     coordinates=638871.6,223384.4 maxdistance=5000
 </pre></div>

Modified: grass/trunk/raster/r.in.lidar/r.in.lidar.html
===================================================================
--- grass/trunk/raster/r.in.lidar/r.in.lidar.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.in.lidar/r.in.lidar.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -207,7 +207,7 @@
 <div class="code"><pre>
 # set the computational region automatically, resol. for binning is 5m
 r.in.lidar -e -o input=points.las resolution=5 output=lidar_dem_mean
-g.region rast=lidar_dem_mean -p
+g.region raster=lidar_dem_mean -p
 r.univar lidar_dem_mean
 </pre></div>
 

Modified: grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py
===================================================================
--- grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -31,7 +31,7 @@
     @classmethod
     def setUpClass(cls):
         cls.use_temp_region()
-        cls.runModule('g.region', rast='elevation')
+        cls.runModule('g.region', raster='elevation')
 
     @classmethod
     def tearDownClass(cls):

Modified: grass/trunk/raster/r.kappa/r.kappa.html
===================================================================
--- grass/trunk/raster/r.kappa/r.kappa.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.kappa/r.kappa.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -51,7 +51,7 @@
 Example for North Carolina sample dataset:
 
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.kappa -w classification=landuse96_28m reference=landclass96
 </pre></div>
 <p>

Modified: grass/trunk/raster/r.lake/r.lake.html
===================================================================
--- grass/trunk/raster/r.lake/r.lake.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.lake/r.lake.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -86,7 +86,7 @@
 Example of small flooding along a street (North Carolina sample dataset):
 
 <div class="code"><pre>
-g.region rast=elev_lid792_1m -p
+g.region raster=elev_lid792_1m -p
 
 # water accumulation next to street dam
 r.lake elev_lid792_1m coordinates=638759.3,220264.1 water_level=113.4 lake=flooding

Modified: grass/trunk/raster/r.latlong/r.latlong.html
===================================================================
--- grass/trunk/raster/r.latlong/r.latlong.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.latlong/r.latlong.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -14,7 +14,7 @@
 <h2>EXAMPLE</h2>
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.latlong input=elevation output=latitude
 </pre></div>
 

Modified: grass/trunk/raster/r.li/TODO
===================================================================
--- grass/trunk/raster/r.li/TODO	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/TODO	2014-12-19 21:17:36 UTC (rev 63628)
@@ -15,7 +15,7 @@
 # TODO: change the examples to North Carolina wherever possible:
 
 # Spearfish tests
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 d.mon wx0
 d.rast forests
@@ -61,7 +61,7 @@
 echo "SAMPLINGFRAME 0|0|1|1
 SAMPLEAREA 0.0|0.0|1.0|1.0" > $HOME/.grass7/r.li/landsat_test
 
-g.region rast=lsat7_2002_40 -p
+g.region raster=lsat7_2002_40 -p
 r.li.shannon input=lsat7_2002_40 conf=landsat_test output=landsat_shannon
 --> Result written to ASCII file <$HOME/.grass7/r.li/output/landsat_shannon>
 

Modified: grass/trunk/raster/r.li/r.li.daemon/daemon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/daemon.c	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.daemon/daemon.c	2014-12-19 21:17:36 UTC (rev 63628)
@@ -413,7 +413,7 @@
 	char maskname[GNAME_MAX] = {'\0'};
 	msg m;
 
-	/* Get the window setting. g.region rast=<input raster> */
+	/* Get the window setting. g.region raster=<input raster> */
 	/*   ? same as cellhd above ? */
 	/* no. the current window might be different */
 

Modified: grass/trunk/raster/r.li/r.li.dominance/r.li.dominance.html
===================================================================
--- grass/trunk/raster/r.li/r.li.dominance/r.li.dominance.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.dominance/r.li.dominance.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -35,7 +35,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.dominance input=forests conf=movwindow7 out=forests_dominance_mov7
 r.univar forests_dominance_mov7
@@ -44,7 +44,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.dominance input=forests conf=movwindow7 out=forests_dominance_mov7
 

Modified: grass/trunk/raster/r.li/r.li.edgedensity/r.li.edgedensity.html
===================================================================
--- grass/trunk/raster/r.li/r.li.edgedensity/r.li.edgedensity.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.edgedensity/r.li.edgedensity.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -56,7 +56,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.edgedensity input=forests conf=movwindow7 out=forests_edgedens_mov7
 r.univar forests_edgedens_mov7
@@ -65,7 +65,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.edgedensity input=forests conf=movwindow7 out=forests_edgedensity_mov7
 

Modified: grass/trunk/raster/r.li/r.li.html
===================================================================
--- grass/trunk/raster/r.li/r.li.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -81,7 +81,7 @@
   <ol>
   <li> set the region settings to the "<tt>geology</tt>" raster map:
 <div class="code"><pre>
-  g.region rast=geology -p
+  g.region raster=geology -p
 </pre></div>
 
   <li> run <em>r.li.patchdensity</em>:

Modified: grass/trunk/raster/r.li/r.li.mpa/r.li.mpa.html
===================================================================
--- grass/trunk/raster/r.li/r.li.mpa/r.li.mpa.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.mpa/r.li.mpa.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -43,7 +43,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.mpa input=forests conf=movwindow7 out=forests_mpa_mov7
 r.univar forests_mpa_mov7
@@ -52,7 +52,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.mpa input=forests conf=movwindow7 out=forests_mpa_mov7
 

Modified: grass/trunk/raster/r.li/r.li.mps/r.li.mps.html
===================================================================
--- grass/trunk/raster/r.li/r.li.mps/r.li.mps.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.mps/r.li.mps.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -45,7 +45,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.mps input=forests conf=movwindow7 out=forests_mps_mov7
 r.univar forests_mps_mov7
@@ -54,7 +54,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.mps input=forests conf=movwindow7 out=forests_mps_mov7
 

Modified: grass/trunk/raster/r.li/r.li.padcv/r.li.padcv.html
===================================================================
--- grass/trunk/raster/r.li/r.li.padcv/r.li.padcv.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.padcv/r.li.padcv.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -35,7 +35,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.padcv input=forests conf=movwindow7 out=forests_padcv_mov7
 r.univar forests_padcv_mov7
@@ -44,7 +44,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.padcv input=forests conf=movwindow7 out=forests_padcv_mov7
 

Modified: grass/trunk/raster/r.li/r.li.padrange/r.li.padrange.html
===================================================================
--- grass/trunk/raster/r.li/r.li.padrange/r.li.padrange.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.padrange/r.li.padrange.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -37,7 +37,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.padrange input=forests conf=movwindow7 out=forests_padrange_mov7
 r.univar forests_padrange_mov7
@@ -46,7 +46,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.padrange input=forests conf=movwindow7 out=forests_padrange_mov7
 

Modified: grass/trunk/raster/r.li/r.li.padsd/r.li.padsd.html
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/r.li.padsd.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.padsd/r.li.padsd.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -37,7 +37,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.padsd input=forests conf=movwindow7 out=forests_padsd_mov7
 r.univar forests_padsd_mov7
@@ -46,7 +46,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.padsd input=forests conf=movwindow7 out=forests_padsd_mov7
 

Modified: grass/trunk/raster/r.li/r.li.patchdensity/r.li.patchdensity.html
===================================================================
--- grass/trunk/raster/r.li/r.li.patchdensity/r.li.patchdensity.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.patchdensity/r.li.patchdensity.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -40,7 +40,7 @@
 <p>
 Example for Spearfish forest areas:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 # extract forested areas:
 r.category landcover.30m
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43, 1, null())"
@@ -57,7 +57,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.patchdensity input=forests conf=movwindow7 out=forests_patchdensity_mov7
 

Modified: grass/trunk/raster/r.li/r.li.patchnum/r.li.patchnum.html
===================================================================
--- grass/trunk/raster/r.li/r.li.patchnum/r.li.patchnum.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.patchnum/r.li.patchnum.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -31,7 +31,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.patchnum input=forests conf=movwindow7 out=forests_patchnum_mov7
 r.univar forests_patchnum_mov7
@@ -40,7 +40,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.patchnum input=forests conf=movwindow7 out=forests_patchnum_mov7
 

Modified: grass/trunk/raster/r.li/r.li.pielou/r.li.pielou.html
===================================================================
--- grass/trunk/raster/r.li/r.li.pielou/r.li.pielou.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.pielou/r.li.pielou.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -34,7 +34,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.pielou input=forests conf=movwindow7 out=forests_pielou_mov7
 r.univar forests_pielou_mov7
@@ -43,7 +43,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.pielou input=forests conf=movwindow7 out=forests_pielou_mov7
 

Modified: grass/trunk/raster/r.li/r.li.renyi/r.li.renyi.html
===================================================================
--- grass/trunk/raster/r.li/r.li.renyi/r.li.renyi.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.renyi/r.li.renyi.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -37,7 +37,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.renyi input=forests conf=movwindow7 out=forests_renyi_mov7_a06 alpha=0.6
 r.univar forests_renyi_mov7_a06
@@ -46,7 +46,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.renyi input=forests conf=movwindow7 out=forests_renyi_mov7
 

Modified: grass/trunk/raster/r.li/r.li.richness/r.li.richness.html
===================================================================
--- grass/trunk/raster/r.li/r.li.richness/r.li.richness.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.richness/r.li.richness.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -37,7 +37,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.richness input=forests conf=movwindow7 out=forests_richness_mov7
 r.univar forests_richness_mov7
@@ -46,7 +46,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.richness input=forests conf=movwindow7 out=forests_richness_mov7
 

Modified: grass/trunk/raster/r.li/r.li.shannon/r.li.shannon.html
===================================================================
--- grass/trunk/raster/r.li/r.li.shannon/r.li.shannon.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.shannon/r.li.shannon.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -35,7 +35,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.shannon input=forests conf=movwindow7 out=forests_shannon_mov7
 r.univar forests_shannon_mov7
@@ -44,7 +44,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.shannon input=forests conf=movwindow7 out=forests_shannon_mov7
 

Modified: grass/trunk/raster/r.li/r.li.shape/r.li.shape.html
===================================================================
--- grass/trunk/raster/r.li/r.li.shape/r.li.shape.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.shape/r.li.shape.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -36,7 +36,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.shape input=forests conf=movwindow7 out=forests_shape_mov7
 r.univar forests_shape_mov7
@@ -45,7 +45,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.shape input=forests conf=movwindow7 out=forests_shape_mov7
 

Modified: grass/trunk/raster/r.li/r.li.simpson/r.li.simpson.html
===================================================================
--- grass/trunk/raster/r.li/r.li.simpson/r.li.simpson.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.simpson/r.li.simpson.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -34,7 +34,7 @@
 
 Forest map (Spearfish sample dataset) example:
 <div class="code"><pre>
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 r.li.simpson input=forests conf=movwindow7 out=forests_simpson_mov7
 r.univar forests_simpson_mov7
@@ -43,7 +43,7 @@
 
 Forest map (North Carolina sample dataset) example:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 r.mapcalc "forests = if(landclass96 == 5, 1, null() )"
 r.li.simpson input=forests conf=movwindow7 out=forests_simpson_mov7
 

Modified: grass/trunk/raster/r.li/r.li.testing_nc_asc.sh
===================================================================
--- grass/trunk/raster/r.li/r.li.testing_nc_asc.sh	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.testing_nc_asc.sh	2014-12-19 21:17:36 UTC (rev 63628)
@@ -11,7 +11,7 @@
 
 # North Carolina location:
 export GRASS_OVERWRITE=1
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 RASTER_MAP=landclass96
 #r.to.vect in=basin_50K output=basin_50K feature=area
 

Modified: grass/trunk/raster/r.li/r.li.testing_sp_mov.sh
===================================================================
--- grass/trunk/raster/r.li/r.li.testing_sp_mov.sh	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.li/r.li.testing_sp_mov.sh	2014-12-19 21:17:36 UTC (rev 63628)
@@ -14,7 +14,7 @@
 MOVINGWINDOW" > $HOME/.grass7/r.li/movwindow7
 
 export GRASS_OVERWRITE=1
-g.region rast=landcover.30m -p
+g.region raster=landcover.30m -p
 r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43,1,null())"
 
 MEASURE="dominance edgedensity mpa mps padcv padrange padsd patchdensity patchnum pielou richness shannon shape simpson"

Modified: grass/trunk/raster/r.mapcalc/test_suite/README
===================================================================
--- grass/trunk/raster/r.mapcalc/test_suite/README	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.mapcalc/test_suite/README	2014-12-19 21:17:36 UTC (rev 63628)
@@ -4,7 +4,7 @@
 #### r.blend for 3-in-1 testing
 #spearfish
 
-g.region rast=elevation.10m res=5
+g.region raster=elevation.10m res=5
 export GRASS_OVERWRITE=1
 export GRASS_VERBOSE=0
 

Modified: grass/trunk/raster/r.mode/r.mode.html
===================================================================
--- grass/trunk/raster/r.mode/r.mode.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.mode/r.mode.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -33,7 +33,7 @@
 Mode of K-factor (erosion) for Spearfish fields:
 
 <div class="code"><pre>
-g.region rast=fields -p
+g.region raster=fields -p
 r.mode base=fields cover=soils.Kfactor output=K.by.farm.mode
 r.univar K.by.farm.mode
 </pre></div>

Modified: grass/trunk/raster/r.out.gdal/r.out.gdal.html
===================================================================
--- grass/trunk/raster/r.out.gdal/r.out.gdal.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.out.gdal/r.out.gdal.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -19,7 +19,7 @@
 module)
 <p>As with most GRASS raster modules, the current region extents and region
 resolution are used, and a MASK is respected if present.
-Use <em><a href="g.region.html">g.region</a></em>'s "align=", or "rast="
+Use <em><a href="g.region.html">g.region</a></em>'s "align=", or "raster="
 options if you need to realign the region settings to match the original
 map's before export.
 
@@ -164,33 +164,33 @@
 
 <h3>Export the integer raster basin_50K map to GeoTIFF format:</h3>
 <div class="code"><pre>
-g.region rast=basin_50K -p
+g.region raster=basin_50K -p
 r.out.gdal input=basin_50K output=basin_50K.tif
 </pre></div>
 <p>
 <h3>Export a DCELL raster map in GeoTIFF format suitable for ESRI software:</h3>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.out.gdal in=elevation output=elevation.tif createopt="PROFILE=GeoTIFF,TFW=YES"
 </pre></div>
 <p>
 <h3>Export a raster map in "Deflate" compressed GeoTIFF format:</h3>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.out.gdal in=elevation output=elevation.tif createopt="COMPRESS=DEFLATE"
 </pre></div>
 <p>
 <h3>Export R,G,B imagery bands in GeoTIFF format suitable for ESRI software:</h3>
 <div class="code"><pre>
 i.group group=nc_landsat_rgb input=lsat7_2002_30,lsat7_2002_20,lsat7_2002_10
-g.region rast=lsat7_2002_30 -p
+g.region raster=lsat7_2002_30 -p
 r.out.gdal in=nc_landsat_rgb output=nc_landsat_rgb.tif type=Byte \
   createopt="PROFILE=GeoTIFF,INTERLEAVE=PIXEL,TFW=YES"
 </pre></div>
 <p>
 <h3>Export the floating point raster elevation map to ERDAS/IMG format:</h3>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.out.gdal input=elevation output=elelevation.img format=HFA type=Float32
 </pre></div>
 
@@ -199,7 +199,7 @@
 g.list group
 i.group group=tm7 subgroup=tm7 input=tm7_10,tm7_20,tm7_30,tm7_40,tm7_50,tm7_60,tm7_70
 i.group -l tm7
-g.region rast=tm7_10 -p
+g.region raster=tm7_10 -p
 r.out.gdal tm7 output=lsat_multiband.tif
 gdalinfo lsat_multiband.tif
 </pre></div>

Modified: grass/trunk/raster/r.out.ppm/r.out.ppm.html
===================================================================
--- grass/trunk/raster/r.out.ppm/r.out.ppm.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.out.ppm/r.out.ppm.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -4,7 +4,7 @@
 at the pixel resolution of the CURRENTLY DEFINED REGION. 
 To get the resolution and region settings of the raster map, run:<p>
 <div class="code"><pre>
-g.region -p rast=[mapname]
+g.region -p raster=[mapname]
 </pre></div>
 
 <p>

Modified: grass/trunk/raster/r.out.ppm3/r.out.ppm3.html
===================================================================
--- grass/trunk/raster/r.out.ppm3/r.out.ppm3.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.out.ppm3/r.out.ppm3.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -9,7 +9,7 @@
 <p>To get the full area and resolutin of the raster map, run:
 
 <div class="code"><pre>
-g.region rast=[mapname]
+g.region raster=[mapname]
 </pre></div>
 
 <p>before running <em>r.out.ppm3</em>.

Modified: grass/trunk/raster/r.param.scale/r.param.scale.html
===================================================================
--- grass/trunk/raster/r.param.scale/r.param.scale.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.param.scale/r.param.scale.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -73,7 +73,7 @@
 The next commands will create a geomorphological map of the Spearfish region:
 
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.param.scale in=elevation.10m output=morphology param=feature size=9
 </pre></div>
 

Modified: grass/trunk/raster/r.patch/r.patch.html
===================================================================
--- grass/trunk/raster/r.patch/r.patch.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.patch/r.patch.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -63,7 +63,7 @@
 program can be used:
 
 <div class="code"><pre>
-g.region rast=map1[,map2[,...]]
+g.region raster=map1[,map2[,...]]
 </pre></div>
 
 <p>
@@ -104,7 +104,7 @@
 
 <div class="code"><pre>
 MAPS=`g.list type=rast sep=, pat="map_*"`
-g.region rast=$MAPS
+g.region raster=$MAPS
 r.patch in=$MAPS out=mosaic
 </pre></div>
 <br>

Modified: grass/trunk/raster/r.profile/testsuite/test_profile_ncspm.py
===================================================================
--- grass/trunk/raster/r.profile/testsuite/test_profile_ncspm.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.profile/testsuite/test_profile_ncspm.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -134,7 +134,7 @@
     @classmethod
     def setUpClass(cls):
         gcore.use_temp_region()
-        gcore.run_command('g.region', rast='elevation')
+        gcore.run_command('g.region', raster='elevation')
 
     @classmethod
     def tearDownClass(cls):

Modified: grass/trunk/raster/r.proj/r.proj.html
===================================================================
--- grass/trunk/raster/r.proj/r.proj.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.proj/r.proj.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -261,7 +261,7 @@
 # bounds map, and align the resolution to the desired cell resolution of the 
 # final, reprojected raster map:
 
-g.region vect=bounds_reprojected res=5 -a
+g.region vector=bounds_reprojected res=5 -a
 
 # Now reproject the raster into the target location
 

Modified: grass/trunk/raster/r.quantile/r.quantile.html
===================================================================
--- grass/trunk/raster/r.quantile/r.quantile.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.quantile/r.quantile.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -8,14 +8,14 @@
 Calculation of elevation quantiles (printed to standard-out):
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.quantile input=elevation percentiles=0.1,1,10,25,50,75,90,99,99.9
 </pre></div>
 
 The output of <em>r.quantile</em> can be used for quantile classification:
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.quantile elevation quantiles=5 -r --quiet | r.recode elevation \
            out=elev_quant5 rules=-
 </pre></div>

Modified: grass/trunk/raster/r.random/r.random.html
===================================================================
--- grass/trunk/raster/r.random/r.random.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.random/r.random.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -71,7 +71,7 @@
 Spearfish region, result stored in 2D vector map:
 
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.random elevation.10m vector=elevrand n=100
 v.db.select elevrand
 v.univar elevrand col=value type=point
@@ -83,7 +83,7 @@
 result stored in 3D vector map:
 
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.random -d elevation.10m cover=landcover.30m vector=luserand3d n=100
 
 # data output (value: elevation, covervalue: landuse class):

Modified: grass/trunk/raster/r.reclass/r.reclass.html
===================================================================
--- grass/trunk/raster/r.reclass/r.reclass.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.reclass/r.reclass.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -46,7 +46,7 @@
 
 <p>To convert a reclass map to a regular raster map layer, set your
 geographic region settings to match the settings in the header for the
-reclass map (with "<tt>g.region rast=reclass_map</tt>", or
+reclass map (with "<tt>g.region raster=reclass_map</tt>", or
 viewable by running <em><a href="r.info.html">r.info</a></em>) 
 and then run <em><a href="r.resample.html">r.resample</a></em>.
 

Modified: grass/trunk/raster/r.recode/testsuite/test_rrecode_ncspm.py
===================================================================
--- grass/trunk/raster/r.recode/testsuite/test_rrecode_ncspm.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.recode/testsuite/test_rrecode_ncspm.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -39,7 +39,7 @@
     @classmethod
     def setUpClass(cls):
         cls.use_temp_region()
-        cls.runModule('g.region', rast='elevation at PERMANENT')
+        cls.runModule('g.region', raster='elevation at PERMANENT')
         cls.runModule('r.mapcalc', expression="random01 = rand(0, 1.)", seed=1, overwrite=True)
 
     @classmethod

Modified: grass/trunk/raster/r.regression.line/r.regression.line.html
===================================================================
--- grass/trunk/raster/r.regression.line/r.regression.line.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.regression.line/r.regression.line.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -17,14 +17,14 @@
 
 Comparison of the old and the new DEM in Spearfish:
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.regression.line map1=elevation.dem map2=elevation.10m
 </pre></div>
 <p>
 Using the script style flag AND <em>eval</em> to make results
 available in the shell:
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 eval `r.regression.line -g map1=elevation.dem map2=elevation.10m`
 echo $a
 479.615

Modified: grass/trunk/raster/r.regression.multi/r.regression.multi.html
===================================================================
--- grass/trunk/raster/r.regression.multi/r.regression.multi.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.regression.multi/r.regression.multi.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -72,7 +72,7 @@
 Multiple regression with soil K-factor and elevation, aspect, and slope
 (North Carolina dataset). Output maps are the residuals and estimates:
 <div class="code"><pre>
-g.region rast=soils_Kfactor -p
+g.region raster=soils_Kfactor -p
 r.regression.multi mapx=elevation,aspect,slope mapy=soils_Kfactor \
   residuals=soils_Kfactor.resid estimates=soils_Kfactor.estim
 </pre></div>

Modified: grass/trunk/raster/r.relief/r.relief.html
===================================================================
--- grass/trunk/raster/r.relief/r.relief.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.relief/r.relief.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -53,7 +53,7 @@
 dataset location is used to hillshade the elevation map:
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.relief input=elevation output=elevation_shade
 </pre></div>
 

Modified: grass/trunk/raster/r.resamp.bspline/r.resamp.bspline.html
===================================================================
--- grass/trunk/raster/r.resamp.bspline/r.resamp.bspline.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.resamp.bspline/r.resamp.bspline.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -72,7 +72,7 @@
 # interpolate NULL cells
 r.resamp.bspline -n input=input_raster output=interpolated_nulls method=bicubic
 # set region to area with NULL cells, align region to input map
-g.region rast=input -p
+g.region raster=input -p
 # patch original map and interpolated NULLs
 r.patch input=input_raster,interpolated_nulls output=input_raster_gapfilled
 </pre></div>
@@ -85,7 +85,7 @@
 a complete elevation map:
 
 <div class="code"><pre>
-g.region rast=elev_srtm_30m -p
+g.region raster=elev_srtm_30m -p
 d.mon wx0
 d.histogram elev_srtm_30m
 

Modified: grass/trunk/raster/r.resamp.interp/r.resamp.interp.html
===================================================================
--- grass/trunk/raster/r.resamp.interp/r.resamp.interp.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.resamp.interp/r.resamp.interp.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -44,7 +44,7 @@
 North Carolina sample dataset):
 
 <div class="code"><pre>
-g.region rast=elev_state_500m -p
+g.region raster=elev_state_500m -p
 g.region res=250 -ap
 r.resamp.interp input=elev_state_500m output=elev_state_250m
 </pre></div>

Modified: grass/trunk/raster/r.resamp.rst/BUGS
===================================================================
--- grass/trunk/raster/r.resamp.rst/BUGS	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.resamp.rst/BUGS	2014-12-19 21:17:36 UTC (rev 63628)
@@ -5,7 +5,7 @@
 Resolution bug: 
 
 r.resamp.rst N46E011.meters.90 el=N46E011.meters.1425 ew=14.25 ns=14.25
-GRASS 5.7.cvs:/nfsmnt/levi0/ssi/srtm_DEM90m_egm96geoid/original > g.region rast=N46E011.meters.1425 -p
+GRASS 5.7.cvs:/nfsmnt/levi0/ssi/srtm_DEM90m_egm96geoid/original > g.region raster=N46E011.meters.1425 -p
 projection: 1 (UTM)
 zone:       32
 datum:      WGS84

Modified: grass/trunk/raster/r.resamp.rst/r.resamp.rst.html
===================================================================
--- grass/trunk/raster/r.resamp.rst/r.resamp.rst.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.resamp.rst/r.resamp.rst.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -100,13 +100,13 @@
  
 <div class="code"><pre>
 # set computation region to original map (30m)
-g.region rast=elevation.dem -p
+g.region raster=elevation.dem -p
 
 # resample to 15m
 r.resamp.rst input=elevation.dem ew_res=15 ns_res=15 elevation=elev15
 
 # set computation region to resulting map
-g.region rast=elev15 -p
+g.region raster=elev15 -p
 
 # verify
 r.univar elev15 -g

Modified: grass/trunk/raster/r.resamp.stats/r.resamp.stats.html
===================================================================
--- grass/trunk/raster/r.resamp.stats/r.resamp.stats.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.resamp.stats/r.resamp.stats.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -30,7 +30,7 @@
 
 
 <div class="code"><pre>
-g.region rast=el_D782_6m -p
+g.region raster=el_D782_6m -p
 g.region res=20 -ap
 # from 6m to 20m: weighted resampling -w
 r.resamp.stats -w input=el_D782_6m output=el_D782_20m

Modified: grass/trunk/raster/r.sim/r.sim.water/r.sim.water.html
===================================================================
--- grass/trunk/raster/r.sim/r.sim.water/r.sim.water.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.sim/r.sim.water/r.sim.water.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -140,7 +140,7 @@
 Spearfish region:
 
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.slope.aspect elevation=elevation.10m dx=elev_dx dy=elev_dy
 
 # synthetic maps

Modified: grass/trunk/raster/r.sim/r.sim.water/spearfish.sh
===================================================================
--- grass/trunk/raster/r.sim/r.sim.water/spearfish.sh	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.sim/r.sim.water/spearfish.sh	2014-12-19 21:17:36 UTC (rev 63628)
@@ -7,7 +7,7 @@
 
 dem=elevation.10m
 output=simwe
-g.region rast=${output}
+g.region raster=${output}
 g.region n=4920800 s=4917800 w=602500 e=606000
 g.region -p
 

Modified: grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py
===================================================================
--- grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -109,7 +109,7 @@
     @classmethod
     def setUpClass(cls):
         cls.use_temp_region()
-        call_module('g.region', rast='elevation')
+        call_module('g.region', raster='elevation')
 
     @classmethod
     def tearDownClass(cls):
@@ -150,7 +150,7 @@
         aspect = 'small_aspect'
         self.runModule('r.in.ascii', input='-', output=elevation,
                        stdin_=SMALL_MAP)
-        call_module('g.region', rast=elevation)
+        call_module('g.region', raster=elevation)
         self.assertModule('r.slope.aspect', elevation=elevation,
                           slope=slope, aspect=aspect)
         self.assertRasterMinMax(map=slope, refmin=0, refmax=90,

Modified: grass/trunk/raster/r.stats/test_suite/profile.sh
===================================================================
--- grass/trunk/raster/r.stats/test_suite/profile.sh	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.stats/test_suite/profile.sh	2014-12-19 21:17:36 UTC (rev 63628)
@@ -1,6 +1,6 @@
 #spearfish
 MAP=elevation.10m
-g.region rast=$MAP
+g.region raster=$MAP
 CMD="r.stats -a $MAP"
 
 time $CMD

Modified: grass/trunk/raster/r.stream.extract/r.stream.extract.html
===================================================================
--- grass/trunk/raster/r.stream.extract/r.stream.extract.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.stream.extract/r.stream.extract.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -160,7 +160,7 @@
 
 <div class="code"><pre>
 # set region
-g.region -p rast=elev_ned_30m at PERMANENT
+g.region -p raster=elev_ned_30m at PERMANENT
 
 # calculate flow accumulation
 r.watershed ele=elev_ned_30m at PERMANENT acc=elevation.10m.acc

Modified: grass/trunk/raster/r.sun/r.sun.html
===================================================================
--- grass/trunk/raster/r.sun/r.sun.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.sun/r.sun.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -255,7 +255,7 @@
 
 North Carolina example (considering also cast shadows):
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 
 # calculate horizon angles (to speed up the subsequent r.sun calculation)
 r.horizon elevation=elevation step=30 bufferzone=200 basename=horangle \
@@ -277,7 +277,7 @@
 in non-leap years):
 
 <div class="code"><pre>
-g.region rast=elev_ned_30m -p
+g.region raster=elev_ned_30m -p
 
 # considering cast shadows
 r.sun elevation=elev_ned_30m linke_value=2.5 albedo_value=0.2 day=172 \

Modified: grass/trunk/raster/r.sunmask/r.sunmask.html
===================================================================
--- grass/trunk/raster/r.sunmask/r.sunmask.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.sunmask/r.sunmask.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -64,7 +64,7 @@
 
 <div class="code"><pre>
 # set the region to a place near Raleigh (NC)
-g.region rast=elev_lid792_1m -p
+g.region raster=elev_lid792_1m -p
 
 # compute only sun position and no output map
 r.sunmask -s elev_lid792_1m year=2012 month=2 \

Modified: grass/trunk/raster/r.surf.area/r.surf.area.html
===================================================================
--- grass/trunk/raster/r.surf.area/r.surf.area.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.surf.area/r.surf.area.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -43,7 +43,7 @@
 <h2>EXAMPLES</h2>
 
 <div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
 
 r.surf.area map=elevation units=hectares
 Null value area ignored in calculation: 0.000000

Modified: grass/trunk/raster/r.surf.contour/r.surf.contour.html
===================================================================
--- grass/trunk/raster/r.surf.contour/r.surf.contour.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.surf.contour/r.surf.contour.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -71,7 +71,7 @@
 sample data set):
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 
 # get minimum elevation value
 r.univar elevation

Modified: grass/trunk/raster/r.surf.fractal/r.surf.fractal.html
===================================================================
--- grass/trunk/raster/r.surf.fractal/r.surf.fractal.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.surf.fractal/r.surf.fractal.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -19,7 +19,7 @@
 display with shade.
 
 <div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
 
 r.surf.fractal output=fractals
 

Modified: grass/trunk/raster/r.terraflow/r.terraflow.html
===================================================================
--- grass/trunk/raster/r.terraflow/r.terraflow.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.terraflow/r.terraflow.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -151,7 +151,7 @@
 
 Example for small area in NC dataset:
 <div class="code"><pre>
-g.region rast=elev_lid792_1m
+g.region raster=elev_lid792_1m
 r.terraflow elevation=elev_lid792_1m filled=elev_lid792_1m_filled \
     direction=elev_lid792_1m_direction swatershed=elev_lid792_1m_swatershed \
     accumulation=elev_lid792_1m_accumulation tci=elev_lid792_1m_tci
@@ -175,14 +175,14 @@
 Spearfish sample data set:
 
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.terraflow elev=elevation.10m filled=elevation10m.filled \
     dir=elevation10m.mfdir swatershed=elevation10m.watershed \
     accumulation=elevation10m.accu tci=elevation10m.tci
 </pre></div>
 
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 r.terraflow elev=elevation.10m filled=elevation10m.filled \
     dir=elevation10m.mfdir swatershed=elevation10m.watershed \
     accumulation=elevation10m.accu tci=elevation10m.tci d8cut=500 memory=800 \

Modified: grass/trunk/raster/r.texture/r.texture.html
===================================================================
--- grass/trunk/raster/r.texture/r.texture.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.texture/r.texture.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -103,7 +103,7 @@
 Calculation of Angular Second Moment of B/W orthophoto (North Carolina data set):
 
 <div class="code"><pre>
-g.region rast=ortho_2001_t792_1m -p
+g.region raster=ortho_2001_t792_1m -p
 # set grey level color table 0% black 100% white
 r.colors ortho_2001_t792_1m color=grey
 # extract grey levels

Modified: grass/trunk/raster/r.thin/r.thin.html
===================================================================
--- grass/trunk/raster/r.thin/r.thin.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.thin/r.thin.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -67,7 +67,7 @@
 the 10m resolution DEM by <em>r.watershed</em>, run:
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 # create flow accumulation map
 r.watershed elevation=elevation accumulation=accum_50K thresh=50000
 # extract streams from flow accumulation map

Modified: grass/trunk/raster/r.tile/r.tile.html
===================================================================
--- grass/trunk/raster/r.tile/r.tile.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.tile/r.tile.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -17,7 +17,7 @@
 Retiling example for the North Carolina DEM:
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 # rows:       1350
 # cols:       1500
 

Modified: grass/trunk/raster/r.to.rast3elev/r.to.rast3elev.html
===================================================================
--- grass/trunk/raster/r.to.rast3elev/r.to.rast3elev.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.to.rast3elev/r.to.rast3elev.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -25,7 +25,7 @@
 Simple Spearfish sample data set example
 
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 g.region res=200 res3=200 t=2000 b=0 tbres=20 -p
 
 # Write the values of raster map soils based on the elevation of elevation.10m

Modified: grass/trunk/raster/r.to.vect/r.to.vect.html
===================================================================
--- grass/trunk/raster/r.to.vect/r.to.vect.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.to.vect/r.to.vect.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -66,7 +66,7 @@
 <p>
 Random sampling of points:
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 # random sampling of points (note that r.random also writes vector points)
 r.random elevation raster_output=elevrand1000 n=1000
 r.to.vect input=elevrand1000 output=elevrand1000 type=point
@@ -81,7 +81,7 @@
 <p>
 Vectorization of streams in watershed basins map:
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.watershed elev=elevation stream=elev.streams thresh=50000
 r.to.vect -s input=elev.streams output=elev_streams type=line
 # drop "label" column which is superfluous in this example
@@ -96,7 +96,7 @@
 <p>
 Vectorization of simplified landuse class map:
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 # we smooth corners of area features
 r.to.vect -s input=landclass96 output=my_landclass96 type=area
 v.colors my_landclass96 color=random

Modified: grass/trunk/raster/r.univar/r.univar.html
===================================================================
--- grass/trunk/raster/r.univar/r.univar.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.univar/r.univar.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -45,7 +45,7 @@
 
 <div class="code"><pre>
 # set computational region
-g.region rast=basin -p
+g.region raster=basin -p
 
 # check basin IDs
 r.category basin

Modified: grass/trunk/raster/r.viewshed/r.viewshed.html
===================================================================
--- grass/trunk/raster/r.viewshed/r.viewshed.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.viewshed/r.viewshed.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -178,7 +178,7 @@
 above ground:
 
 <div class="code"><pre>
-g.region rast=elev_lid792_1m -p
+g.region raster=elev_lid792_1m -p
 r.viewshed input=elev_lid792_1m output=elev_lid792_1m_viewshed \
   coordinates=638728.087167,220609.261501 observer_elevation=5.0
 </pre></div>
@@ -202,7 +202,7 @@
 of a mountain:
 
 <div class="code"><pre>
-g.region rast=elevation.10m
+g.region raster=elevation.10m
 r.viewshed input=elevation.10m output=viewshed \
   coordinates=598869,4916642 mem=800
 </pre></div>

Modified: grass/trunk/raster/r.volume/r.volume.html
===================================================================
--- grass/trunk/raster/r.volume/r.volume.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.volume/r.volume.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -70,7 +70,7 @@
 
 <div class="code"><pre>
 # set computational region
-g.region rast=elevation
+g.region raster=elevation
 
 # compute volume
 r.volume input=elevation clump=geology_30m

Modified: grass/trunk/raster/r.water.outlet/r.water.outlet.html
===================================================================
--- grass/trunk/raster/r.water.outlet/r.water.outlet.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.water.outlet/r.water.outlet.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -32,7 +32,7 @@
 Carolina sample dataset</a> region:
 
 <div class="code"><pre>
-g.region rast=elev_lid792_1m -p
+g.region raster=elev_lid792_1m -p
 # the watershed outlet position should be placed on a stream (from
 # accumulation map):
 r.watershed elev_lid792_1m thresh=5000 accum=accum_5K drain=draindir_5K output=basin_5K

Modified: grass/trunk/raster/r.what/r.what.html
===================================================================
--- grass/trunk/raster/r.what/r.what.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/raster/r.what/r.what.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -33,7 +33,7 @@
 maximum input line length (e.g. 4096 characters).
 
 <div class="code"><pre>
-g.region rast=landuse96_28m,aspect -p
+g.region raster=landuse96_28m,aspect -p
 r.what map=landuse96_28m,aspect coordinates=633614.08,224125.12,632972.36,225382.87 -f
 
 633614.08|224125.12||2|Low Intensity Developed|209.5939|209 degrees ccw from east
@@ -48,7 +48,7 @@
 each community college:
 
 <div class="code"><pre>
-g.region rast=boundary_county_500m -p
+g.region raster=boundary_county_500m -p
 r.what map=boundary_county_500m points=comm_colleges
 
 145096.859150|154534.264884||39
@@ -65,7 +65,7 @@
 row. Example: query North Carolina county number for each community college:
 
 <div class="code"><pre>
-g.region rast=boundary_county_500m -p
+g.region raster=boundary_county_500m -p
 r.what map=boundary_county_500m points=comm_colleges \
        separator=comma output=result.csv -n
        

Modified: grass/trunk/scripts/d.correlate/d.correlate.html
===================================================================
--- grass/trunk/scripts/d.correlate/d.correlate.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/d.correlate/d.correlate.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -19,7 +19,7 @@
 
 Scatterplot of two LANDSAT TM7 channels (North Carolina sample dataset):
 <p><div class="code"><pre>
-g.region rast=lsat7_2002_30 -p
+g.region raster=lsat7_2002_30 -p
 d.correlate map=lsat7_2002_30,lsat7_2002_40
 </pre></div>
 

Modified: grass/trunk/scripts/d.polar/d.polar.html
===================================================================
--- grass/trunk/scripts/d.polar/d.polar.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/d.polar/d.polar.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -40,7 +40,7 @@
 North Carolina sample dataset location is generated:
 
 <div class="code"><pre>
-g.region rast=aspect -p
+g.region raster=aspect -p
 d.polar aspect
 </pre></div>
 

Modified: grass/trunk/scripts/d.shade/d.shade.html
===================================================================
--- grass/trunk/scripts/d.shade/d.shade.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/d.shade/d.shade.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -30,7 +30,7 @@
 dataset location is used to hillshade the <tt>elevation</tt> map:
 
 <div class="code"><pre>
-g.region rast=aspect -p
+g.region raster=aspect -p
 d.mon wx0
 d.shade reliefmap=aspect drapemap=elevation
 </pre></div>
@@ -58,7 +58,7 @@
 and used to create a colorized hillshade:
 
 <div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
 r.relief input=elevation output=elevation_shaded_relief
 
 d.mon wx1

Modified: grass/trunk/scripts/d.to.rast/d.to.rast.html
===================================================================
--- grass/trunk/scripts/d.to.rast/d.to.rast.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/d.to.rast/d.to.rast.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -11,7 +11,7 @@
 First, we add a couple of maps to layer manager:
 
 <div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
 d.rast map=elevation
 d.rast map=lakes
 d.vect map=roadsmajor width=4

Modified: grass/trunk/scripts/d.vect.thematic/d.vect.thematic.html
===================================================================
--- grass/trunk/scripts/d.vect.thematic/d.vect.thematic.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/d.vect.thematic/d.vect.thematic.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -66,7 +66,7 @@
 
 <div class="code"><pre>
 # random sampling of elevation points:
-g.region rast=elevation -p
+g.region raster=elevation -p
 v.random random npoints=200
 v.db.addtable random column="el10 double precision"
 # transfer elevations to attribute table of random points map:
@@ -89,7 +89,7 @@
 North Carolina sample dataset example:
 
 <div class="code"><pre>
-g.region vect=nc_state
+g.region vector=nc_state
 d.vect.thematic -l precip_30ynormals column=annual type=point
 </pre></div>
 

Modified: grass/trunk/scripts/db.univar/db.univar.html
===================================================================
--- grass/trunk/scripts/db.univar/db.univar.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/db.univar/db.univar.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -17,7 +17,7 @@
 (North Carolina sample dataset) and univariate statistics performed:
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 v.random output=samples n=100
 v.db.addtable samples column="heights double precision"
 v.what.rast samples raster=elevation colum=heights

Modified: grass/trunk/scripts/i.colors.enhance/i.colors.enhance.html
===================================================================
--- grass/trunk/scripts/i.colors.enhance/i.colors.enhance.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/i.colors.enhance/i.colors.enhance.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -34,7 +34,7 @@
 North Carolina sample dataset example with Landsat data:
 
 <div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 d.rgb blue=lsat7_2002_10 green=lsat7_2002_20 red=lsat7_2002_30
 d.barscale at=55.3125,93.125 bcolor=white text_pos=over
 

Modified: grass/trunk/scripts/i.oif/i.oif.html
===================================================================
--- grass/trunk/scripts/i.oif/i.oif.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/i.oif/i.oif.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -54,7 +54,7 @@
 
 North Carolina sample dataset:
 <div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 i.oif input=lsat7_2002_10,lsat7_2002_20,lsat7_2002_30,lsat7_2002_40,lsat7_2002_50,lsat7_2002_70
 </pre></div>
 

Modified: grass/trunk/scripts/i.pansharpen/i.pansharpen.html
===================================================================
--- grass/trunk/scripts/i.pansharpen/i.pansharpen.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/i.pansharpen/i.pansharpen.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -84,7 +84,7 @@
 
 <div class="code"><pre>
 # R, G, B composite at 30m 
-g.region rast=p034r032_7dt20010924_z13_10 -p
+g.region raster=p034r032_7dt20010924_z13_10 -p
 d.rgb b=p034r032_7dt20010924_z13_10 g=lp034r032_7dt20010924_z13_20 
     r=p034r032_7dt20010924_z13_30
 
@@ -94,7 +94,7 @@
     output=ihs321 method=ihs
 
 # display at 15m
-g.region rast=ihs321_blue -p
+g.region raster=ihs321_blue -p
 d.rgb b=ihs321_blue g=ihs321_green r=ihs321_red
 </pre></div>
 
@@ -144,7 +144,7 @@
 
 <div class="code"><pre>
 # original at 28m
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 
 d.mon wx0
 d.rgb b=lsat7_2002_10 g=lsat7_2002_20 r=lsat7_2002_30
@@ -156,7 +156,7 @@
   output=lsat7_2002_ihs
 
 # display at 14.25m
-g.region rast=lsat7_2002_ihs_red -p
+g.region raster=lsat7_2002_ihs_red -p
 d.erase
 d.rgb r=lsat7_2002_ihs_red g=lsat7_2002_ihs_green b=lsat7_2002_ihs_blue
 

Modified: grass/trunk/scripts/i.pansharpen/i.pansharpen.py
===================================================================
--- grass/trunk/scripts/i.pansharpen/i.pansharpen.py	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/i.pansharpen/i.pansharpen.py	2014-12-19 21:17:36 UTC (rev 63628)
@@ -335,7 +335,7 @@
     for ch in ['red', 'green', 'blue']:
         grass.verbose(_("%s_%s") % (out, ch))
 
-    grass.verbose(_("To visualize output, run: g.region -p rast=%s_red" % out))
+    grass.verbose(_("To visualize output, run: g.region -p raster=%s_red" % out))
     grass.verbose(_("d.rgb r=%s_red g=%s_green b=%s_blue" % (out, out, out)))
     grass.verbose(_("If desired, combine channels into a single RGB map with 'r.composite'."))
     grass.verbose(_("Channel colors can be rebalanced using i.colors.enhance."))

Modified: grass/trunk/scripts/i.spectral/i.spectral.html
===================================================================
--- grass/trunk/scripts/i.spectral/i.spectral.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/i.spectral/i.spectral.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -13,7 +13,7 @@
 Analysis of LANDSAT TM7 channels (North Carolina dataset):
 
 <div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 i.spectral -g input=lsat7_2002_10,lsat7_2002_20,lsat7_2002_30,lsat7_2002_40,lsat7_2002_50,lsat7_2002_70 \
            coordinates=636069,215440,637958,223393,633277,223605
 </pre></div>
@@ -28,7 +28,7 @@
 North Carolina sample dataset:
 
 <div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 LIST=`g.list type=rast pattern="lsat7_2002_[1-5,7]0" separator=","`
 i.spectral input=$LIST coordinates=637502.25,221744.25
 </pre></div>

Modified: grass/trunk/scripts/i.tasscap/i.tasscap.html
===================================================================
--- grass/trunk/scripts/i.tasscap/i.tasscap.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/i.tasscap/i.tasscap.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -27,7 +27,7 @@
 Calculation of TC maps from North Carolina Landsat 7 ETM scene:
 
 <div class="code"><pre>
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 i.tasscap sensor=landsat7_etm \
   input=lsat7_2002_10,lsat7_2002_20,lsat7_2002_30,lsat7_2002_40,lsat7_2002_50,lsat7_2002_70 \
   output=tasscap

Modified: grass/trunk/scripts/r.blend/r.blend.html
===================================================================
--- grass/trunk/scripts/r.blend/r.blend.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/r.blend/r.blend.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -10,7 +10,7 @@
 (North Carolina sample dataset):
 
 <div class="code"><pre>
-g.region rast=aspect -p
+g.region raster=aspect -p
 r.blend first=aspect second=elevation output=elev_shade_blend
 d.mon wx0
 d.rgb blue=elev_shade_blend.b green=elev_shade_blend.g red=elev_shade_blend.r

Modified: grass/trunk/scripts/r.colors.stddev/r.colors.stddev.html
===================================================================
--- grass/trunk/scripts/r.colors.stddev/r.colors.stddev.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/r.colors.stddev/r.colors.stddev.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -17,7 +17,7 @@
 North Carolina sample dataset location:
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.colors.stddev elevation
 </pre></div>
 

Modified: grass/trunk/scripts/r.fillnulls/r.fillnulls.html
===================================================================
--- grass/trunk/scripts/r.fillnulls/r.fillnulls.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/r.fillnulls/r.fillnulls.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -66,7 +66,7 @@
 a complete elevation map:
 
 <div class="code"><pre>
-g.region rast=elev_srtm_30m -p
+g.region raster=elev_srtm_30m -p
 d.mon wx0
 d.histogram elev_srtm_30m
 # remove too low elevations (esp. lakes)

Modified: grass/trunk/scripts/r.grow/r.grow.html
===================================================================
--- grass/trunk/scripts/r.grow/r.grow.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/r.grow/r.grow.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -54,7 +54,7 @@
 North Carolina sample dataset location is buffered:
 
 <div class="code"><pre>
-g.region rast=lakes -p
+g.region raster=lakes -p
 r.grow input=lakes output=lakes_grown_50m radius=10
 </pre></div>
 

Modified: grass/trunk/scripts/r.mask/r.mask.html
===================================================================
--- grass/trunk/scripts/r.mask/r.mask.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/r.mask/r.mask.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -62,7 +62,7 @@
 univariate statistics of the elevation values for "lakes":
 <div class="code"><pre>
 # set computation region to lakes raster map
-g.region rast=lakes -p
+g.region raster=lakes -p
 # use lakes as MASK
 r.mask raster=lakes
 # get statistics for elevation pixels of lakes:
@@ -77,7 +77,7 @@
 Creating a mask from selected categories in the North Carolina
 'geology_30m' raster map:
 <div class="code"><pre>
-g.region rast=geology_30m -p
+g.region raster=geology_30m -p
 r.category geology_30m
 d.mon wx0
 d.rast geology_30m

Modified: grass/trunk/scripts/r.out.xyz/r.out.xyz.html
===================================================================
--- grass/trunk/scripts/r.out.xyz/r.out.xyz.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/r.out.xyz/r.out.xyz.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -25,7 +25,7 @@
 North Carolina sample dataset location is exported to CSV format.
 
 <div class="code"><pre>
-g.region rast=elev_lid792_1m -p
+g.region raster=elev_lid792_1m -p
 r.out.xyz input=elev_lid792_1m output=elev_lid792_1m.csv separator=","
 </pre></div>
 
@@ -36,7 +36,7 @@
 <a href="http://grass.osgeo.org/sampledata/north_carolina/ortho2010_t792_subset_20cm.tif">color orthophoto</a>, here called "ortho2010_t792"):
 
 <div class="code"><pre>
-g.region rast=elev_lid792_1m res=1 -a -p
+g.region raster=elev_lid792_1m res=1 -a -p
 r.out.xyz input=elev_lid792_1m,ortho2010_t792.red,ortho2010_t792.green,ortho2010_t792.blue \
         separator=space output=pointcloud.asc
 

Modified: grass/trunk/scripts/r.reclass.area/r.reclass.area.html
===================================================================
--- grass/trunk/scripts/r.reclass.area/r.reclass.area.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/r.reclass.area/r.reclass.area.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -12,7 +12,7 @@
 is filtered for large areas (removing smaller areas from the map):
 
 <div class="code"><pre>
-g.region rast=zipcodes -p
+g.region raster=zipcodes -p
 r.report zipcodes unit=h
 # extract only areas > 2000 ha, NULL otherwise:
 r.reclass.area input=zipcodes output=zipcodes_larger2000ha greater=2000

Modified: grass/trunk/scripts/r.rgb/r.rgb.html
===================================================================
--- grass/trunk/scripts/r.rgb/r.rgb.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/r.rgb/r.rgb.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -6,7 +6,7 @@
 <h2>EXAMPLE</h2>
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 r.rgb input=elevation
 </pre></div>
 

Modified: grass/trunk/scripts/r.shade/r.shade.html
===================================================================
--- grass/trunk/scripts/r.shade/r.shade.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/r.shade/r.shade.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -45,7 +45,7 @@
 dataset location is used to hillshade the <tt>elevation</tt> map:
 
 <div class="code"><pre>
-g.region rast=aspect -p
+g.region raster=aspect -p
 r.shade reliefmap=aspect drapemap=elevation output=elevation_aspect_shaded
 
 d.mon wx0
@@ -57,7 +57,7 @@
 raster map for later use:
 
 <div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
 r.relief input=elevation output=elevation_shaded_relief
 
 r.shade reliefmap=elevation_shaded_relief drapemap=elevation \

Modified: grass/trunk/scripts/v.db.droprow/v.db.droprow.html
===================================================================
--- grass/trunk/scripts/v.db.droprow/v.db.droprow.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/v.db.droprow/v.db.droprow.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -16,7 +16,7 @@
 
 Dropping all vector points without elevation attribute (North Carolina data set):<br>
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 v.random output=rand5k_elev n=5000 
 
 v.db.addtable map=rand5k_elev column="elevation double precision"

Modified: grass/trunk/scripts/v.db.univar/v.db.univar.html
===================================================================
--- grass/trunk/scripts/v.db.univar/v.db.univar.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/v.db.univar/v.db.univar.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -15,7 +15,7 @@
 In this example, random points are sampled from the elevation map
 (North Carolina sample dataset) and univariate statistics performed:
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 v.random output=samples n=100
 v.db.addtable samples column="heights double precision"
 v.what.rast samples raster=elevation colum=heights

Modified: grass/trunk/scripts/v.db.update/v.db.update.html
===================================================================
--- grass/trunk/scripts/v.db.update/v.db.update.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/v.db.update/v.db.update.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -28,7 +28,7 @@
 v.db.select mylakes where="FTYPE IS NULL"
 
 # display the lakes, show undefined FTYPE lakes in red
-g.region vect=mylakes
+g.region vector=mylakes
 d.mon wx0
 d.vect mylakes where="FTYPE NOT NULL" type=area col=blue
 d.vect mylakes where="FTYPE IS NULL" type=area col=red

Modified: grass/trunk/scripts/v.krige/v.krige.html
===================================================================
--- grass/trunk/scripts/v.krige/v.krige.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/v.krige/v.krige.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -87,7 +87,7 @@
 
 <div class="code"><pre>
 # reduce resolution for this example
-g.region rast=elevation -p res=100
+g.region raster=elevation -p res=100
 v.random output=rand2k_elev n=2000
 v.db.addtable map=rand2k_elev column="elevation double precision"
 v.what.rast map=rand2k_elev rast=elevation column=elevation

Modified: grass/trunk/scripts/v.rast.stats/v.rast.stats.html
===================================================================
--- grass/trunk/scripts/v.rast.stats/v.rast.stats.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/scripts/v.rast.stats/v.rast.stats.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -40,7 +40,7 @@
 <div class="code"><pre>
 g.copy vect=zipcodes_wake,myzipcodes_wake
 # set computational region to DEM:
-g.region rast=elevation -p
+g.region raster=elevation -p
 # calculate DEM statistics, upload to vector map table:
 v.rast.stats myzipcodes_wake raster=elevation \
   column_prefix=elev method=minimum,maximum,average,stddev,percentile \

Modified: grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -73,7 +73,7 @@
       out=temperature_mean_1990_2000_daily_celsius extr=/tmp
 
 # We need to set the region correctly
-g.region -p rast=`t.rast.list input=temperature_mean_1990_2000_daily_celsius column=name | tail -1`
+g.region -p raster=`t.rast.list input=temperature_mean_1990_2000_daily_celsius column=name | tail -1`
 # We can zoom to the raster map
 g.region -p zoom=`t.rast.list input=temperature_mean_1990_2000_daily_celsius column=name | tail -1`
 

Modified: grass/trunk/vector/v.drape/spearfish.pov
===================================================================
--- grass/trunk/vector/v.drape/spearfish.pov	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.drape/spearfish.pov	2014-12-19 21:17:36 UTC (rev 63628)
@@ -5,7 +5,7 @@
 ####### GRASS procedure:
 
 #setup the region
-g.region vect=roads align=elevation.10m -p
+g.region vector=roads align=elevation.10m -p
 #export the vector data
 v.drape in=roads out=roads3d rast=elevation.10m
 v.out.pov roads3d out=roads3d.pov

Modified: grass/trunk/vector/v.label.sa/v.label.sa.html
===================================================================
--- grass/trunk/vector/v.label.sa/v.label.sa.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.label.sa/v.label.sa.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -17,7 +17,7 @@
            background=white size=250 font=Vera
 
 # set region:
-g.region rast=lsat7_2002_10 -p
+g.region raster=lsat7_2002_10 -p
 
 # display:
 d.rgb b=lsat7_2002_10 g=lsat7_2002_20 r=lsat7_2002_30

Modified: grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html
===================================================================
--- grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -48,7 +48,7 @@
 
 The result can be visualized:
 <div class="code"><pre>
-g.region vect=busroute n=n+100 s=s-100 w=w-100 e=e+100
+g.region vector=busroute n=n+100 s=s-100 w=w-100 e=e+100
 d.mon x0
 d.vect roads_net
 d.vect busroute col=red width=2

Modified: grass/trunk/vector/v.lrs/v.lrs.label/v.lrs.label.html
===================================================================
--- grass/trunk/vector/v.lrs/v.lrs.label/v.lrs.label.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.lrs/v.lrs.label/v.lrs.label.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -11,7 +11,7 @@
 v.lrs.label route_lrs rstable=route_lrs output=route_lrs_labels \
             labels=labels col=red size=50 xoffset=100
 
-g.region vect=route_lrs n=n+100 s=s-100 -p
+g.region vector=route_lrs n=n+100 s=s-100 -p
 d.erase
 d.vect route_lrs
 d.vect route_lrs_labels col=grey type=line

Modified: grass/trunk/vector/v.lrs/v.lrs.segment/v.lrs.segment.html
===================================================================
--- grass/trunk/vector/v.lrs/v.lrs.segment/v.lrs.segment.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.lrs/v.lrs.segment/v.lrs.segment.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -28,7 +28,7 @@
 # new point on LRS
 echo "P 7 22 4+180" | v.lrs.segment route_lrs out=route_lrs_new rstable=route_lrs
 
-g.region vect=route_lrs n=n+100 s=s-100 -p
+g.region vector=route_lrs n=n+100 s=s-100 -p
 d.erase
 # existing LRS
 d.vect route_lrs

Modified: grass/trunk/vector/v.lrs/v.lrs.where/v.lrs.where.html
===================================================================
--- grass/trunk/vector/v.lrs/v.lrs.where/v.lrs.where.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.lrs/v.lrs.where/v.lrs.where.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -23,7 +23,7 @@
 2|22|6.000000+188.112093
 
 # verification
-g.region vect=route_lrs n=n+100 s=s-100 -p
+g.region vector=route_lrs n=n+100 s=s-100 -p
 d.erase
 d.vect route_lrs
 d.vect busstops disp=attr attr=cat size=10 bg=white lcol=blue yref=bottom

Modified: grass/trunk/vector/v.mkgrid/v.mkgrid.html
===================================================================
--- grass/trunk/vector/v.mkgrid/v.mkgrid.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.mkgrid/v.mkgrid.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -80,7 +80,7 @@
 based on the current region extent defined by the "elevation" map:
 
 <div class="code"><pre>
-g.region rast=elevation res=1000 -pa
+g.region raster=elevation res=1000 -pa
 v.mkgrid type=point map=pointpattern
 </pre></div>
 <p>
@@ -93,7 +93,7 @@
 
 <div class="code"><pre>
 # create first set of points, covering extent of "elevation" raster map
-g.region rast=elevation res=1000 -pa
+g.region raster=elevation res=1000 -pa
 v.mkgrid type=point map=pointpattern1
 
 # shift grid by half point distance (map units)

Modified: grass/trunk/vector/v.neighbors/v.neighbors.html
===================================================================
--- grass/trunk/vector/v.neighbors/v.neighbors.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.neighbors/v.neighbors.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -10,7 +10,7 @@
 dataset):
 
 <div class="code"><pre>
-g.region vect=schools_wake res=100 -p -a
+g.region vector=schools_wake res=100 -p -a
 v.neighbors input=schools_wake output=schools_wake_3000m method=count size=3000
 
 d.mon wx0

Modified: grass/trunk/vector/v.net.alloc/v.net.alloc.html
===================================================================
--- grass/trunk/vector/v.net.alloc/v.net.alloc.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.net.alloc/v.net.alloc.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -73,7 +73,7 @@
 
 <div class="code"><pre>
 # show result
-g.region vect=myroads_net
+g.region vector=myroads_net
 d.mon x0
 d.vect myroads_net layer=1
 
@@ -138,7 +138,7 @@
 
 <div class="code"><pre>
 # show result
-g.region vect=myroads_net
+g.region vector=myroads_net
 d.mon x0
 d.vect myroads_net type=line layer=1
 

Modified: grass/trunk/vector/v.net.path/v.net.path.html
===================================================================
--- grass/trunk/vector/v.net.path/v.net.path.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.net.path/v.net.path.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -157,7 +157,7 @@
 To display the result, run for example:
 
 <div class="code"><pre>
-g.region vect=myroads_net
+g.region vector=myroads_net
 d.mon x0
 d.vect myroads_net
 # show shortest path

Modified: grass/trunk/vector/v.net.salesman/v.net.salesman.html
===================================================================
--- grass/trunk/vector/v.net.salesman/v.net.salesman.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.net.salesman/v.net.salesman.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -122,7 +122,7 @@
 
 <div class="code"><pre>
 # Display the results
-g.region vect=myroads_net
+g.region vector=myroads_net
 
 # shortest path
 d.mon x0

Modified: grass/trunk/vector/v.net.steiner/v.net.steiner.html
===================================================================
--- grass/trunk/vector/v.net.steiner/v.net.steiner.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.net.steiner/v.net.steiner.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -90,7 +90,7 @@
 
 <div class="code"><pre>
 # display the results
-g.region vect=myroads_net
+g.region vector=myroads_net
 
 # shortest path
 d.mon x0

Modified: grass/trunk/vector/v.net.visibility/v.net.visibility.html
===================================================================
--- grass/trunk/vector/v.net.visibility/v.net.visibility.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.net.visibility/v.net.visibility.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -62,7 +62,7 @@
 A simple example (North Carolina sample data) showing how to use the module:
 <div class="code"><pre>
 v.extract input=zipcodes_wake output=areas_7_11_25 cats=7,11,25
-g.region vect=zipcodes_wake
+g.region vector=zipcodes_wake
 d.mon wx0
 d.vect areas_7_11_25
 v.net.visibility input=areas_7_11_25 output=graph
@@ -98,7 +98,7 @@
 from it with the point 669547.97,208348.20 extra:
 <div class="code"><pre>
 v.extract input=zipcodes_wake output=areas_7_11_25 cats=7,11,25
-g.region vect=zipcodes_wake
+g.region vector=zipcodes_wake
 d.mon wx0
 d.vect areas_7_11_25
 v.net.visibility input=zipcodes_wake output=graph
@@ -116,7 +116,7 @@
 An example for connections of points (Spearfish):
 <div class="code"><pre>
 v.net.visibility input=archsites output=graph
-g.region vect=archsites
+g.region vector=archsites
 d.mon wx0
 d.vect graph
 d.vect archsites col=red

Modified: grass/trunk/vector/v.normal/v.normal.html
===================================================================
--- grass/trunk/vector/v.normal/v.normal.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.normal/v.normal.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -36,7 +36,7 @@
 <em>random</em> vector points:
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 v.random random n=200
 v.db.addtable random colum="elev double precision"
 v.what.rast random rast=elevation column=elev

Modified: grass/trunk/vector/v.overlay/v.overlay.html
===================================================================
--- grass/trunk/vector/v.overlay/v.overlay.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.overlay/v.overlay.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -168,7 +168,7 @@
 Using the North Carolina sample dataset, we clip the roads map to the area
 of city of Raleigh, preserving road attributes in layer 1:
 <div class="code"><pre>
-g.region vect=zipcodes_wake
+g.region vector=zipcodes_wake
 
 # extract Raleigh city:
 v.extract in=zipcodes_wake out=raleigh \

Modified: grass/trunk/vector/v.random/v.random.html
===================================================================
--- grass/trunk/vector/v.random/v.random.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.random/v.random.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -32,7 +32,7 @@
 <p>
 Generate 20 random points with binary attribute (only 0 or 1):
 <div class="code"><pre>
-v.random output=binary_random n=20 zmin=0 zmax=1 column='binary INTEGER'
+v.random output=binary_random npoints=20 zmin=0 zmax=1 column='binary INTEGER'
 </pre></div>
 
 Generate 20 random 3D points using a specific random seed:
@@ -47,7 +47,7 @@
 </center>
 
 <!--
-g.region rast=elev_lid792_1m
+g.region raster=elev_lid792_1m
 ...
 d.vect height_random color=60:60:60 icon=basic/point size=40 width=2 zcolor=gyr
 optipng -o5 map.png
@@ -56,32 +56,35 @@
 
 Get 20 random samples from raster map:
 <div class="code"><pre>
-g.region -p rast=elevation
-v.random output=random_samples n=20
+g.region -p raster=elevation
+v.random output=random_samples npoints=20
 v.db.addtable map=random_samples layer=1 columns='cat INTEGER, sample DOUBLE PRECISION'
 v.what.rast vector=random_samples raster=elevation at PERMANENT layer=1 column=sample 
 </pre></div>
 
 Generate 20 random points and sample attribute data from geology (vector) map:
 <div class="code"><pre>
-g.region -p vect=geology
-v.random output=random_samples n=20
+g.region -p vector=geology
+v.random output=random_samples npoints=20
 v.db.addtable map=random_samples layer=1 columns='cat integer, geology varchar(100)'
-v.what.vect vector=random_samples layer=1 column=geology qvector=geology at PERMANENT qlayer=1 qcolumn=label 
+v.what.vect vector=random_samples layer=1 column=geology \
+  qvector=geology at PERMANENT qlayer=1 qcolumn=label 
 </pre></div>
 
 Generate 20 random points in forested areas
 <div class="code"><pre>
-g.region -p rast=landclass96
+g.region -p raster=landclass96
 r.to.vect -v input=landclass96 output=landclass96 type=area
-v.random input=landclass96 output=random_samples n=20 where="label = 'forest'"
+v.random input=landclass96 output=random_samples npoints=20 \
+  where="label = 'forest'"
 </pre></div>
 
 Generate 20 random points in each forest patch
 <div class="code"><pre>
-g.region -p rast=landclass96
+g.region -p raster=landclass96
 r.to.vect -v input=landclass96 output=landclass96 type=area
-v.random input=landclass96 output=random_samples n=20 where="label = 'forest'" -a
+v.random input=landclass96 output=random_samples npoints=20 \
+  where="label = 'forest'" -a
 </pre></div>
 
 

Modified: grass/trunk/vector/v.sample/v.sample.html
===================================================================
--- grass/trunk/vector/v.sample/v.sample.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.sample/v.sample.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -34,7 +34,7 @@
 
 <div class="code"><pre>
 # set computational region:
- g.region rast=elev_srtm_30m -p
+ g.region raster=elev_srtm_30m -p
 # generate random points:
  v.random output=random n=100
 # add table with one column:

Modified: grass/trunk/vector/v.surf.rst/v.surf.rst.html
===================================================================
--- grass/trunk/vector/v.surf.rst/v.surf.rst.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.surf.rst/v.surf.rst.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -303,7 +303,7 @@
 measures):
 
 <div class="code"><pre>
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 # random elevation extraction
 r.random elevation.10m vector_output=elevrand n=200
 v.info -c elevrand

Modified: grass/trunk/vector/v.to.db/v.to.db.html
===================================================================
--- grass/trunk/vector/v.to.db/v.to.db.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.to.db/v.to.db.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -97,7 +97,7 @@
 v.db.addcolumn mysoils col="d double precision"
 v.to.db mysoils option=fd column="d"
 
-g.region vect=mysoils res=50
+g.region vector=mysoils res=50
 v.to.rast in=mysoils out=soils_fd type=area use=attr column=d
 r.colors map=soils_fd color=gyr
 

Modified: grass/trunk/vector/v.transform/v.transform.html
===================================================================
--- grass/trunk/vector/v.transform/v.transform.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.transform/v.transform.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -63,7 +63,7 @@
 v.db.addcolumn myarchsites col="zs double precision"
 
 # set region to elevation map and fetch individual heights:
-g.region rast=elevation.10m -p
+g.region raster=elevation.10m -p
 v.what.rast myarchsites rast=elevation.10m col=zs
 # verify:
 v.db.select myarchsites

Modified: grass/trunk/vector/v.univar/v.univar.html
===================================================================
--- grass/trunk/vector/v.univar/v.univar.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.univar/v.univar.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -26,7 +26,7 @@
 The example is based on the North Carolina sample dataset:
 
 <div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
 v.random output=samples npoints=100
 v.db.addtable map=samples columns="heights double precision"
 v.what.rast map=samples rast=elevation column=heights

Modified: grass/trunk/vector/v.voronoi/v.voronoi.html
===================================================================
--- grass/trunk/vector/v.voronoi/v.voronoi.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.voronoi/v.voronoi.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -35,7 +35,7 @@
 <h4>Voronoi diagram for points</h4>
 This example uses the hospitals in the North Carolina dataset.
 <div class="code"><pre>
-  g.region -p rast=elev_state_500m
+  g.region -p raster=elev_state_500m
   v.voronoi in=hospitals out=hospitals_voronoi
 </pre></div>
 

Modified: grass/trunk/vector/v.what.rast/v.what.rast.html
===================================================================
--- grass/trunk/vector/v.what.rast/v.what.rast.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.what.rast/v.what.rast.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -66,7 +66,7 @@
 v.db.addtable pnts column="heights double precision"
 
 # query raster map and upload values to vector table into specified column
-g.region rast=elevation -p
+g.region raster=elevation -p
 v.what.rast map=pnts raster=elevation column=heights
 
 # verify new attribute table:

Modified: grass/trunk/vector/v.what.rast3/v.what.rast3.html
===================================================================
--- grass/trunk/vector/v.what.rast3/v.what.rast3.html	2014-12-19 20:31:35 UTC (rev 63627)
+++ grass/trunk/vector/v.what.rast3/v.what.rast3.html	2014-12-19 21:17:36 UTC (rev 63628)
@@ -25,13 +25,13 @@
 <br>
 <div class="code"><pre>
 # create new random 3d vector points map
-v.random -z output=pnts n=100 zmin=0  zmax=50
+v.random -z output=pnts npoints=100 zmin=0  zmax=50
 
 # add new table, link to map
 v.db.addtable map=pnts column="concentration double precision"
 
 # query raster map and upload values to vector table into specified column
-g.region rast3d=plume -p
+g.region raster3d=plume -p
 v.what.rast3 map=pnts raster3d=plume column=concentration
 
 # verify new attribute table:

