Fri Nov 28 08:25:40 PST 2014

Author: martinl
Date: 2014-11-28 08:25:40 -0800 (Fri, 28 Nov 2014)
New Revision: 63262

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/display/d.rhumbline/d.rhumbline.html
   grass/branches/releasebranch_7_0/display/d.vect.chart/d.vect.chart.html
   grass/branches/releasebranch_7_0/display/d.vect/d.vect.html
   grass/branches/releasebranch_7_0/imagery/i.fft/i.fft.html
   grass/branches/releasebranch_7_0/imagery/i.landsat.toar/i.landsat.toar.html
   grass/branches/releasebranch_7_0/raster/r.distance/r.distance.html
   grass/branches/releasebranch_7_0/raster/r.fill.dir/r.fill.dir.html
   grass/branches/releasebranch_7_0/raster/r.horizon/r.horizon.html
   grass/branches/releasebranch_7_0/raster/r.lake/r.lake.html
   grass/branches/releasebranch_7_0/raster/r.li/r.li.cwed/r.li.cwed.html
   grass/branches/releasebranch_7_0/raster/r.random/r.random.html
   grass/branches/releasebranch_7_0/raster/r.resamp.rst/r.resamp.rst.html
   grass/branches/releasebranch_7_0/raster/r.sun/r.sun.html
   grass/branches/releasebranch_7_0/raster/r.water.outlet/r.water.outlet.html
   grass/branches/releasebranch_7_0/raster3d/r3.gwflow/r3.gwflow.html
   grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.html
   grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.html
   grass/branches/releasebranch_7_0/scripts/i.spectral/i.spectral.html
   grass/branches/releasebranch_7_0/scripts/r.blend/r.blend.html
   grass/branches/releasebranch_7_0/scripts/v.db.join/v.db.join.html
   grass/branches/releasebranch_7_0/scripts/v.what.vect/v.what.vect.html
   grass/branches/releasebranch_7_0/vector/v.clean/v.clean.html
   grass/branches/releasebranch_7_0/vector/v.drape/v.drape.html
   grass/branches/releasebranch_7_0/vector/v.edit/v.edit.html
   grass/branches/releasebranch_7_0/vector/v.extrude/v.extrude.html
   grass/branches/releasebranch_7_0/vector/v.kcv/v.kcv.html
   grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.create/v.lrs.create.html
   grass/branches/releasebranch_7_0/vector/v.mkgrid/v.mkgrid.html
   grass/branches/releasebranch_7_0/vector/v.net/v.net.html
   grass/branches/releasebranch_7_0/vector/v.out.ogr/v.out.ogr.html
   grass/branches/releasebranch_7_0/vector/v.out.postgis/v.out.postgis.html
   grass/branches/releasebranch_7_0/vector/v.surf.rst/v.surf.rst.html
   grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html
Log:
update manuals (#2409)
       (merge r63261 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,
 63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259
   + /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,
 63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261

Modified: grass/branches/releasebranch_7_0/display/d.rhumbline/d.rhumbline.html
===================================================================

--- grass/branches/releasebranch_7_0/display/d.rhumbline/d.rhumbline.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/display/d.rhumbline/d.rhumbline.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -24,7 +24,7 @@
 g.region vect=world_political -p
 d.mon wx0
 d.vect world_political type=area
-d.rhumbline coor=55:58W,33:18S,26:43E,60:37N lcolor=yellow tcolor=red
+d.rhumbline coor=55:58W,33:18S,26:43E,60:37N line_color=yellow text_color=red
 </pre></div>
 
 <p><center>

Modified: grass/branches/releasebranch_7_0/display/d.vect/d.vect.html
===================================================================
--- grass/branches/releasebranch_7_0/display/d.vect/d.vect.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/display/d.vect/d.vect.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -17,7 +17,7 @@
 </pre></div>
 and areas can be made transparent with
 <div class="code"><pre>
-d.vect map=vector_map fcolor=none
+d.vect map=vector_map fill_color=none
 </pre></div>
 
 <p>In order to display attributes in the map, <b>attribute_column</b> must
@@ -72,7 +72,7 @@
 
 <div class="code"><pre>
 # display roads with category numbers:
-d.vect map=roads display=shape,cat lcolor=green
+d.vect map=roads display=shape,cat label_color=green
 
 # display randomly colorized soils map with attributes
 d.vect -c map=soils attribute_column=label

Modified: grass/branches/releasebranch_7_0/display/d.vect.chart/d.vect.chart.html
===================================================================
--- grass/branches/releasebranch_7_0/display/d.vect.chart/d.vect.chart.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/display/d.vect.chart/d.vect.chart.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -39,7 +39,7 @@
 r.to.vect -s -v input=erode.index output=erode_index type=area 
 v.extract input=erode_index output=erode_index_ctrds type=centroid 
 d.rast aspect
-d.vect.chart map=erode_index_ctrds ctype=bar columns=cat \
+d.vect.chart map=erode_index_ctrds chart_type=bar columns=cat \
              size=10 max_ref=12 scale=1.5 colors=yellow 
 d.vect erode_index_ctrds icon=basic/circle fcol=black col=black size=5
 </pre></div>

Modified: grass/branches/releasebranch_7_0/imagery/i.fft/i.fft.html
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.fft/i.fft.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/imagery/i.fft/i.fft.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -27,7 +27,7 @@
 
 <div class="code"><pre>
 g.region rast=lsat7_2002_70
-i.fft input_image=lsat7_2002_70 real=lsat7_2002_70.real imaginary=lsat7_2002_70.imag
+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

Modified: grass/branches/releasebranch_7_0/imagery/i.landsat.toar/i.landsat.toar.html
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.landsat.toar/i.landsat.toar.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/imagery/i.landsat.toar/i.landsat.toar.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -187,22 +187,22 @@
 files 293_39.61_toar and 293_39.62_toar:
 
 <div class="code"><pre>
-i.landsat.toar input_prefix=203_30. output_prefix=_toar \
+i.landsat.toar input=203_30. output=_toar \
   metfile=p203r030_7x20010620.met
 </pre></div>
 
 or
 
 <div class="code"><pre>
-i.landsat.toar input_prefix=L5121060_06020060714. \
-  output_prefix=L5121060_06020060714_toar \
+i.landsat.toar input=L5121060_06020060714. \
+  output=L5121060_06020060714_toar \
   metfile=L5121060_06020060714_MTL.txt
 </pre></div>
 
 or
 
 <div class="code"><pre>
-i.landsat.toar input_prefix=203_30. output_prefix=_toar \
+i.landsat.toar input=203_30. output=_toar \
   sensor=tm7 product_date=2004-06-07 date=2001-06-20 \
   sun_elevation=64.3242970 gain="HHHLHLHHL"
 </pre></div>
@@ -210,7 +210,7 @@
 or
 
 <div class="code"><pre>
-i.landsat.toar input_prefix=LC80160352013134LGN03_B output_prefix=toar \
+i.landsat.toar input=LC80160352013134LGN03_B output=toar \
   metfile=LC80160352013134LGN03_MTL.txt sensor=oli8 date=2013-05-14
 </pre></div>
 

Modified: grass/branches/releasebranch_7_0/raster/r.distance/r.distance.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.distance/r.distance.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/raster/r.distance/r.distance.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -42,7 +42,7 @@
 awk and then into <em>d.graph</em>:
 <p>
 <div class="code"><pre>
-r.distance maps=map1,map2 | \
+r.distance map=map1,map2 | \
   awk -F: '{print "move",$4,$5,"\ndraw",$6,$7}' | d.graph -m
 </pre></div>
 
@@ -51,7 +51,7 @@
 awk and then into <em>v.in.ascii</em>:
 <p>
 <div class="code"><pre>
-r.distance maps=map1,map2 | \
+r.distance map=map1,map2 | \
   awk -F: '{print $4,$5}' | v.in.ascii format=point output=name separator=space
 </pre></div>
 

Modified: grass/branches/releasebranch_7_0/raster/r.fill.dir/r.fill.dir.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.fill.dir/r.fill.dir.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/raster/r.fill.dir/r.fill.dir.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -65,7 +65,7 @@
 <h2>EXAMPLE</h2>
 
 <div class="code"><pre>
-r.fill.dir input=ansi.elev output=ansi.fill.elev outdir=ansi.asp
+r.fill.dir input=ansi.elev output=ansi.fill.elev direction=ansi.asp
 </pre></div>
 
 Will create a depressionless (sinkless) elevation

Modified: grass/branches/releasebranch_7_0/raster/r.horizon/r.horizon.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.horizon/r.horizon.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/raster/r.horizon/r.horizon.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -144,7 +144,7 @@
 <div class="code"><pre>
 g.region rast=elevation -p
 r.horizon elevation=elevation direction=215 step=0 bufferzone=200 \
-    coordinate=638871.6,223384.4 maxdistance=5000
+    coordinates=638871.6,223384.4 maxdistance=5000
 </pre></div>
 <p>
 <b>Example 2</b>: determine horizon values starting at 90 deg (North), 
@@ -152,7 +152,7 @@
 
 <div class="code"><pre>
 r.horizon elevation=elevation direction=90 step=5 bufferzone=200 \
-    coordinate=638871.6,223384.4 maxdistance=5000 output=horizon.csv
+    coordinates=638871.6,223384.4 maxdistance=5000 file=horizon.csv
 </pre></div>
 
 <p>
@@ -162,7 +162,7 @@
 <div class="code"><pre>
 g.region n=223540 s=220820 w=634650 e=638780 res=10 -p
 r.horizon elevation=elevation direction=0 step=5 bufferzone=200 \
-    coordinate=636483.54,222176.25 maxdistance=5000 -d output=horizon.csv
+    coordinates=636483.54,222176.25 maxdistance=5000 -d file=horizon.csv
 </pre></div>
 
 <center>
@@ -180,7 +180,7 @@
 # we put a bufferzone of 10% of maxdistance around the study area
 # compute only direction between 90 and 270 degrees
 r.horizon elevation=elevation step=30 start=90 end=300 \
-    bufferzone=200 basename=horangle maxdistance=5000
+    bufferzone=200 file=horangle maxdistance=5000
 </pre></div>
 
 

Modified: grass/branches/releasebranch_7_0/raster/r.lake/r.lake.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.lake/r.lake.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/raster/r.lake/r.lake.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -89,7 +89,7 @@
 g.region rast=elev_lid792_1m -p
 
 # water accumulation next to street dam
-r.lake elev_lid792_1m coordinates=638759.3,220264.1 wl=113.4 lake=flooding
+r.lake elev_lid792_1m coordinates=638759.3,220264.1 water_level=113.4 lake=flooding
 
 # draw resulting lake map over shaded terrain map
 r.shaded.relief elev_lid792_1m

Modified: grass/branches/releasebranch_7_0/raster/r.li/r.li.cwed/r.li.cwed.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.li/r.li.cwed/r.li.cwed.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/raster/r.li/r.li.cwed/r.li.cwed.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -45,7 +45,7 @@
 <em>my_conf</em> configuration file (previously defined with
 <em>g.gui.rlisetup</em>) and saving results in <em>my_out</em>, run:
 <div class="code"><pre>
-r.li.cwed map=my_map conf=my_conf output=my_out \
+r.li.cwed input=my_map conf=my_conf output=my_out \
           path=/path/to/weights.csv
 </pre></div>
 

Modified: grass/branches/releasebranch_7_0/raster/r.random/r.random.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.random/r.random.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/raster/r.random/r.random.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -72,7 +72,7 @@
 
 <div class="code"><pre>
 g.region rast=elevation.10m -p
-r.random elevation.10m vector_output=elevrand n=100
+r.random elevation.10m vector=elevrand n=100
 v.db.select elevrand
 v.univar elevrand col=value type=point
 </pre></div>
@@ -84,7 +84,7 @@
 
 <div class="code"><pre>
 g.region rast=elevation.10m -p
-r.random -d elevation.10m cover=landcover.30m vector_output=luserand3d n=100
+r.random -d elevation.10m cover=landcover.30m vector=luserand3d n=100
 
 # data output (value: elevation, covervalue: landuse class):
 v.db.select luserand3d

Modified: grass/branches/releasebranch_7_0/raster/r.resamp.rst/r.resamp.rst.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.resamp.rst/r.resamp.rst.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/raster/r.resamp.rst/r.resamp.rst.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -103,7 +103,7 @@
 g.region rast=elevation.dem -p
 
 # resample to 15m
-r.resamp.rst input=elevation.dem ew_res=15 ns_res=15 elev=elev15
+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

Modified: grass/branches/releasebranch_7_0/raster/r.sun/r.sun.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.sun/r.sun.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/raster/r.sun/r.sun.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -280,7 +280,7 @@
 g.region rast=elev_ned_30m -p
 
 # considering cast shadows
-r.sun elevation=elev_ned_30m lin=2.5 alb=0.2 day=172 \
+r.sun elevation=elev_ned_30m linke_value=2.5 albedo_value=0.2 day=172 \
       beam_rad=b172 diff_rad=d172 \
       refl_rad=r172 insol_time=it172
 

Modified: grass/branches/releasebranch_7_0/raster/r.water.outlet/r.water.outlet.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.water.outlet/r.water.outlet.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/raster/r.water.outlet/r.water.outlet.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -35,7 +35,7 @@
 g.region rast=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 basin=basin_5K
+r.watershed elev_lid792_1m thresh=5000 accum=accum_5K drain=draindir_5K output=basin_5K
 r.water.outlet input=draindir_5K output=basin_A30 coord=638740.423248,220271.519225
 
 d.mon wx0

Modified: grass/branches/releasebranch_7_0/raster3d/r3.gwflow/r3.gwflow.html
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.gwflow/r3.gwflow.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/raster3d/r3.gwflow/r3.gwflow.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -84,8 +84,8 @@
 r3.mapcalc expression="syield = 0.0001"
 r.mapcalc  expression="recharge = 0.0"
 
-r3.gwflow solver=cg phead=phead status=status hc_x=hydcond hc_y=hydcond  \
-   hc_z=hydcond q=well s=syield r=recharge output=gwresult dt=8640000 vx=vx vy=vy vz=vz budget=budget
+r3.gwflow solver=cg phead=phead statuyield=status hc_x=hydcond hc_y=hydcond  \
+   hc_z=hydcond sink=well yield=syield r=recharge output=gwresult dt=8640000 vx=vx vy=vy vz=vz budget=budget
 
 # The data can be visualized with ParaView when exported with r3.out.vtk
 r3.out.vtk -p in=gwresult,status,budget vector=vx,vy,vz out=/tmp/gwdata3d.vtk
@@ -113,8 +113,8 @@
 r3.mapcalc expression="hydcond = if(depth() < 10 && depth() >  7 && col() < 60, 0.000025, hydcond)"
 r3.mapcalc expression="syield = 0.0001"
 
-r3.gwflow solver=cg phead=phead status=status hc_x=hydcond hc_y=hydcond  \
-   hc_z=hydcond q=well s=syield output=gwresult dt=8640000 vx=vx vy=vy vz=vz budget=budget
+r3.gwflow solver=cg phead=phead statuyield=status hc_x=hydcond hc_y=hydcond  \
+   hc_z=hydcond sink=well yield=syield output=gwresult dt=8640000 vx=vx vy=vy vz=vz budget=budget
 
 # The data can be visualized with paraview when exported with r3.out.vtk
 r3.out.vtk -p in=gwresult,status,budget,hydcond,well vector=vx,vy,vz out=/tmp/gwdata3d.vtk

Modified: grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -28,7 +28,7 @@
 North Carolina sample dataset location is generated:
 
 <div class="code"><pre>
-g.region rast=landclass96 -p
+g.region raster=landclass96 -p
 d.rast.leg landclass96
 </pre></div>
 

Modified: grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -89,9 +89,9 @@
     r=p034r032_7dt20010924_z13_30
 
 # i.pansharpen with IHS algorithm
-i.pansharpen ms3=p034r032_7dt20010924_z13_30 ms2=p034r032_7dt20010924_z13_20 
-    ms1=p034r032_7dt20010924_z13_10 pan=p034r032_7dp20010924_z13_80 
-    output_prefix=ihs321 sharpen=ihs
+i.pansharpen red=p034r032_7dt20010924_z13_30 green=p034r032_7dt20010924_z13_20 
+    blue=p034r032_7dt20010924_z13_10 pan=p034r032_7dp20010924_z13_80 
+    output=ihs321 method=ihs
 
 # display at 15m
 g.region rast=ihs321_blue -p
@@ -150,10 +150,10 @@
 d.rgb b=lsat7_2002_10 g=lsat7_2002_20 r=lsat7_2002_30
 
 # i.pansharpen with IHS algorithm
-i.pansharpen ms3=lsat7_2002_30 at PERMANENT \
-  ms2=lsat7_2002_20 ms1=lsat7_2002_10 \
-  pan=lsat7_2002_80 sharpen=ihs \
-  output_prefix=lsat7_2002_ihs
+i.pansharpen red=lsat7_2002_30 at PERMANENT \
+  green=lsat7_2002_20 blue=lsat7_2002_10 \
+  pan=lsat7_2002_80 method=ihs \
+  output=lsat7_2002_ihs
 
 # display at 14.25m
 g.region rast=lsat7_2002_ihs_red -p

Modified: grass/branches/releasebranch_7_0/scripts/i.spectral/i.spectral.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/i.spectral/i.spectral.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/scripts/i.spectral/i.spectral.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -14,7 +14,7 @@
 
 <div class="code"><pre>
 g.region rast=lsat7_2002_10 -p
-i.spectral -g raster=lsat7_2002_10,lsat7_2002_20,lsat7_2002_30,lsat7_2002_40,lsat7_2002_50,lsat7_2002_70 \
+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>
 
@@ -30,7 +30,7 @@
 <div class="code"><pre>
 g.region rast=lsat7_2002_10 -p
 LIST=`g.list type=rast pattern="lsat7_2002_[1-5,7]0" separator=","`
-i.spectral raster=$LIST coordinates=637502.25,221744.25
+i.spectral input=$LIST coordinates=637502.25,221744.25
 </pre></div>
 
 This will search all LANDSAT map for 2002 but select only the B, G, R, 

Modified: grass/branches/releasebranch_7_0/scripts/r.blend/r.blend.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.blend/r.blend.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/scripts/r.blend/r.blend.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -11,7 +11,7 @@
 
 <div class="code"><pre>
 g.region rast=aspect -p
-r.blend first=aspect second=elevation output_prefix=elev_shade_blend
+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
 </pre></div>

Modified: grass/branches/releasebranch_7_0/scripts/v.db.join/v.db.join.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.db.join/v.db.join.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/scripts/v.db.join/v.db.join.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -50,7 +50,7 @@
 ...
 
 # join soils_legend into mysoils attribute table
-v.db.join mysoils col=label otable=soils_legend ocol=shortname
+v.db.join mysoils col=label other_table=soils_legend ocol=shortname
 
 # verification of join
 v.db.select mysoils

Modified: grass/branches/releasebranch_7_0/scripts/v.what.vect/v.what.vect.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.what.vect/v.what.vect.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/scripts/v.what.vect/v.what.vect.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -28,7 +28,7 @@
 <div class="code"><pre>
 g.copy vect=hospitals,myhospitals
 v.db.addcolumn myhospitals column="urb_name varchar(25)"
-v.what.vect myhospitals qmap=urbanarea column=urb_name qcolumn=NAME
+v.what.vect myhospitals query_map=urbanarea column=urb_name query_column=NAME
 # verification:
 v.db.select myhospitals
 </pre></div>
@@ -46,8 +46,8 @@
 # add new column 
 v.db.addcol corine_code111_112_cities column="gnameid double precision"
 # transfer geonameid (3000m maximal distance between points and centroids)
-v.what.vect corine_code111_112_cities qmap=geonames_IT_cities column=gnameid \
-            qcolumn=geonameid dmax=3000
+v.what.vect corine_code111_112_cities query_map=geonames_IT_cities column=gnameid \
+            query_column=geonameid dmax=3000
 # now gnameid can be used for v.db.join to join further
 # attributes in from geonames.org
 </pre></div>

Modified: grass/branches/releasebranch_7_0/vector/v.clean/v.clean.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.clean/v.clean.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.clean/v.clean.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -210,7 +210,7 @@
 
 <h3>Snap lines to vertex in threshold</h3>
 <div class="code"><pre>
-v.clean input=testmap output=cleanmap tool=snap thresh=1
+v.clean input=testmap output=cleanmap tool=snap threshold=1
 </pre></div>
 
 <h3>Cleaning OGR imported data (Simple Feature data) such as SHAPE file</h3>
@@ -277,7 +277,7 @@
 
 <div class="code"><pre>
 v.clean input=testmap output=cleanmap type=line \
-        tool=rmdangle,rmdangle,rmdangle,rmdangle thresh=5,10,20,50
+        tool=rmdangle,rmdangle,rmdangle,rmdangle threshold=5,10,20,50
 </pre></div>
 
 <h2>SEE ALSO</h2>

Modified: grass/branches/releasebranch_7_0/vector/v.drape/v.drape.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.drape/v.drape.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.drape/v.drape.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -29,7 +29,7 @@
 Spearfish example:
 
 <div class="code"><pre>
-v.drape in=roads rast=elevation.10m method=bilinear out=roads3d
+v.drape in=roads elevation=elevation.10m method=bilinear out=roads3d
 v.info roads3d
 </pre></div>
 
@@ -38,7 +38,7 @@
 road height to 1000 m for all parts without height information.
 
 <div class="code"><pre>
-v.drape input=roads type=line rast=elevation.dem output=roads_3d \
+v.drape input=roads type=line elevation=elevation.dem output=roads_3d \
         method=nearest scale=1.0 where='cat=5' layer=1 null_value=1000
 </pre></div>
 
@@ -46,7 +46,7 @@
 
 <div class="code"><pre>
 #export the vector data
-v.drape in=roads out=roads3d rast=elevation.10m
+v.drape in=roads out=roads3d elevation=elevation.10m
 v.out.pov roads3d out=roads3d.pov
 #export the raster data
 r.out.pov elevation.10m tga=elevation.tga

Modified: grass/branches/releasebranch_7_0/vector/v.edit/v.edit.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.edit/v.edit.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.edit/v.edit.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -21,7 +21,7 @@
 <div class="code"><pre>
 v.edit map=roads tool=select \
   coord=599505,4921010,603389.0625,4918292.1875 \
-  thresh=10000 where="label='interstate'"
+  threshold=10000 where="label='interstate'"
 </pre></div>
 
 selects all features (and prints their id's to standard output)
@@ -228,7 +228,7 @@
 <div class="code"><pre>
 v.edit map=roads tool=delete \
   coord=592542.892,4924766.996,603389.062,4918292.187 \
-  thresh=1000 cat=1,2
+  threshold=1000 cat=1,2
 </pre></div>
 
 <h3>Copy selected features from background map</h3>
@@ -253,7 +253,7 @@
 distance 10 map units:
 
 <div class="code"><pre>
-v.edit tool=move map=roads cat=1 move=1000,-1000 snap=node thresh=-1,10
+v.edit tool=move map=roads cat=1 move=1000,-1000 snap=node threshold=-1,10
 </pre></div>
 
 Move all features defined by bounding box
@@ -301,7 +301,7 @@
 Split line id 810 on coordinates 604268,4923570 in threshold 50 map units:
 
 <div class="code"><pre>
-v.edit map=roads tool=break coords=604268,4923570 id=810 thresh=50
+v.edit map=roads tool=break coords=604268,4923570 id=810 threshold=50
 </pre></div>
 
 <h3>Break selected lines at each intersection</h3>
@@ -317,7 +317,7 @@
 Snap all lines using threshold distance 20 map units:
 
 <div class="code"><pre>
-v.edit map=roads id=1-9999 tool=snap thresh=-1,20 type=line
+v.edit map=roads id=1-9999 tool=snap threshold=-1,20 type=line
 </pre></div>
 
 <h3>Connect lines</h3>
@@ -332,7 +332,7 @@
 50. Maximum threshold distance is 700 map units:
 
 <div class="code"><pre>
-v.edit map=roads tool=connect id=48,565,60,50 thresh=-1,700
+v.edit map=roads tool=connect id=48,565,60,50 threshold=-1,700
 </pre></div>
 
 <h3>Add vertex</h3>
@@ -341,7 +341,7 @@
 set to 1 map unit:
 
 <div class="code"><pre>
-v.edit tool=vertexadd map=roads coords=600952,4926107 thresh=1
+v.edit tool=vertexadd map=roads coords=600952,4926107 threshold=1
 </pre></div>
 
 <h3>Delete vertices</h3>
@@ -351,7 +351,7 @@
 
 <div class="code"><pre>
 v.edit tool=vertexdel map=roads coord=593191.608,4925684.849 \
-  thresh=1-e1 cats=1
+  threshold=1-e1 cats=1
 </pre></div>
 
 <h3>Move vertices</h3>
@@ -361,7 +361,7 @@
 
 <div class="code"><pre>
 v.edit tool=vertexmove map=roads cats=1-10 coord=604441,4921088 \
-  thresh=100 move=1000,1000
+  threshold=100 move=1000,1000
 </pre></div>
 
 <h3>Select features and print their id's</h3>
@@ -380,19 +380,19 @@
 d.vect roads;
 d.vect -i map=roads cats=`v.edit map=roads tool=select \
   coord=592542.89243878,4924766.99622811,603389.0625,4918292.1875 \
-  thresh=1000 --q` col=red
+  threshold=1000 --q` col=red
 </pre></div>
 
 Select all lines shorter (or equal) than 10 map units:
 
 <div class="code"><pre>
-v.edit map=roads tool=select query=length thresh=-1,0,-10
+v.edit map=roads tool=select query=length threshold=-1,0,-10
 </pre></div>
 
 Select from given bounding box all lines longer then 200 map units:
 
 <div class="code"><pre>
-v.edit map=roads tool=select bbox=598260,4919730,605100,4926240 query=length thresh=-1,0,200
+v.edit map=roads tool=select bbox=598260,4919730,605100,4926240 query=length threshold=-1,0,200
 </pre></div>
 
 <h3>Fix height of contours</h3>

Modified: grass/branches/releasebranch_7_0/vector/v.extrude/v.extrude.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.extrude/v.extrude.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.extrude/v.extrude.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -52,7 +52,7 @@
 <h3>3D houses with individual height</h3>
 
 <div class="code"><pre>
-v.extrude input=houses output=houses3D elevation=dem hcolumn=height type=area
+v.extrude input=houses output=houses3D elevation=dem height_column=height type=area
 </pre></div>
 
 <h3>Convert 2D points to 3D vertical lines with fixed height</h3>

Modified: grass/branches/releasebranch_7_0/vector/v.kcv/v.kcv.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.kcv/v.kcv.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.kcv/v.kcv.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -35,13 +35,13 @@
 
 <div class="code"><pre>
 g.copy vect=geonames_wake,my_geonames_wake
-v.kcv map=my_geonames_wake column=part k=10
+v.kcv map=my_geonames_wake column=part npartitions=10
 </pre></div>
 
 <p>
 <div class="code"><pre>
 g.copy vect=geodetic_pts,my_geodetic_pts
-v.kcv map=my_geodetic_pts column=part k=10
+v.kcv map=my_geodetic_pts column=part npartitions=10
 </pre></div>
 
 <h2>SEE ALSO</h2>

Modified: grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.create/v.lrs.create.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.create/v.lrs.create.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.create/v.lrs.create.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -38,7 +38,7 @@
 590346,4927246,590414,4927210,590438,4927096,590468,4926966,\
 590491,4926848,590566,4926798,590637,4926753,590701,4926698,\
 590830,4926726,590935,4926751,590993,4926830,590972,4926949,\
-590948,4927066,590922,4927182,590957,4927251 thresh=5
+590948,4927066,590922,4927182,590957,4927251 threshold=5
 
 # vector line needs to be polyline
 v.build.polylines busroute_tmp2 out=busroute_tmp3
@@ -124,7 +124,7 @@
 
 <div class="code"><pre>
 v.lrs.create busroute points=busstops out=route_lrs err=lrs_error \
-             lidcol=lid pidcol=lid rstable=route_lrs thresh=50
+             lidcol=lid pidcol=lid rstable=route_lrs threshold=50
 </pre></div>
 
 This creates the maps 'route_lrs' containing the LRS and 'lrs_error'

Modified: grass/branches/releasebranch_7_0/vector/v.mkgrid/v.mkgrid.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.mkgrid/v.mkgrid.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.mkgrid/v.mkgrid.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -59,7 +59,7 @@
 Creating a 4x3 grid, cells 20km a side, with lower left corner at 2716500,6447000:
 
 <div class="code"><pre>
-v.mkgrid map=coro_grid grid=4,3 position=coor coor=2716500,6447000 box=20000,20000
+v.mkgrid map=coro_grid grid=4,3 position=coor coordinates=2716500,6447000 box=20000,20000
 </pre></div>
 
 <h3>Creating a positioned grid in a latitude-longitude</h3>
@@ -71,7 +71,7 @@
 just use <em>d.grid -w</em> from the projected location for the same effect):
 
 <div class="code"><pre>
-v.mkgrid map=p2min_grid grid=10,12 position=coor coor=167:52E,47:06S box=0:02,0:02
+v.mkgrid map=p2min_grid grid=10,12 position=coor coordinates=167:52E,47:06S box=0:02,0:02
 </pre></div>
 
 <h3>Creating a simple point pattern</h3>

Modified: grass/branches/releasebranch_7_0/vector/v.net/v.net.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.net/v.net.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.net/v.net.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -134,7 +134,7 @@
 
 <div class="code"><pre>
 v.net input=streets_wake points=firestations out=streets_net \
-      operation=connect thresh=500
+      operation=connect threshold=500
 </pre></div>
 
 For generating network for given vector point map is required input 

Modified: grass/branches/releasebranch_7_0/vector/v.out.ogr/v.out.ogr.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.out.ogr/v.out.ogr.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.out.ogr/v.out.ogr.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -105,7 +105,7 @@
  (generates '/tmp/testogr.gml' file with layer 'testogr'):
 
 <div class="code"><pre>
-v.out.ogr input=multi type=line output=/tmp/testogr.gml olayer=testogr format=GML 
+v.out.ogr input=multi type=line output=/tmp/testogr.gml output_layer=testogr format=GML 
 </pre></div>
 
 <h3>Export to PostgreSQL/PostGIS</h3>
@@ -113,7 +113,7 @@
 Export areas from GRASS vector map to PostGIS database:
 
 <div class="code"><pre>
-v.out.ogr input=polygons type=area output="PG:host=localhost dbname=postgis user=postgres" olayer=polymap format=PostgreSQL
+v.out.ogr input=polygons type=area output="PG:host=localhost dbname=postgis user=postgres" output_layer=polymap format=PostgreSQL
 </pre></div>
 
 <i>Note:</i> For exporting GRASS vector data to PostGIS database can
@@ -127,7 +127,7 @@
 Export faces (3D vectors) from GRASS vector map to KML format for Google Earth:
 
 <div class="code"><pre>
-v.out.ogr input=buildings_3d output=buildings_3d.kml olayer=buildings_3d format=KML type=face
+v.out.ogr input=buildings_3d output=buildings_3d.kml output_layer=buildings_3d format=KML type=face
 </pre></div>
 
 <p>

Modified: grass/branches/releasebranch_7_0/vector/v.out.postgis/v.out.postgis.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.out.postgis/v.out.postgis.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.out.postgis/v.out.postgis.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -170,7 +170,7 @@
 schema "grassout".
 
 <div class="code"><pre>
-v.out.postgis input=bridges output="PG:dbname=grass" olayer=grassout.bridges
+v.out.postgis input=bridges output="PG:dbname=grass" output_layer=grassout.bridges
 </pre></div>
 
 <h3>Export data with creation options</h3>
@@ -194,7 +194,7 @@
 as a link to the PostGIS feature table.
 
 <div class="code"><pre>
-v.out.postgis input=busstopsall at PERMANENT output="PG:dbname=grass" olink=busstopsall_pg
+v.out.postgis input=busstopsall at PERMANENT output="PG:dbname=grass" output_link=busstopsall_pg
 </pre></div>
 
 Created link can be checked

Modified: grass/branches/releasebranch_7_0/vector/v.surf.rst/v.surf.rst.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.surf.rst/v.surf.rst.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.surf.rst/v.surf.rst.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -310,13 +310,13 @@
 v.db.select elevrand
 
 # interpolation based on all points
-v.surf.rst elevrand zcol=value elev=elev_full
+v.surf.rst elevrand zcol=value elevation=elev_full
 r.colors elev_full rast=elevation.10m
 d.rast elev_full
 d.vect elevrand
 
 # interpolation based on subset of points (only those over 1300m/asl)
-v.surf.rst elevrand zcol=value elev=elev_partial where="value > 1300"
+v.surf.rst elevrand zcol=value elevation=elev_partial where="value > 1300"
 r.colors elev_partial rast=elevation.10m
 d.rast elev_partial
 d.vect elevrand where="value > 1300"

Modified: grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html	2014-11-28 16:22:17 UTC (rev 63261)
+++ grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html	2014-11-28 16:25:40 UTC (rev 63262)
@@ -69,7 +69,7 @@
 
 <div class="code"><pre>
 # preparation as in above example
-v.vol.rst elevrand_3d wcol=soilrange elev=soilrange zmult=100 where="soilrange > 3"
+v.vol.rst elevrand_3d wcol=soilrange elevation=soilrange zmult=100 where="soilrange > 3"
 </pre></div>
 
 
@@ -209,7 +209,7 @@
 
 ### Second part: 3D interpolation from 3D point data
 # interpolate volume to "soilrange" voxel map
-v.vol.rst input=elevrand_3d wcol=soilrange elev=soilrange zmult=100
+v.vol.rst input=elevrand_3d wcol=soilrange elevation=soilrange zmult=100
 
 # visualize I: in GRASS GIS wxGUI
 g.gui

