completion of https://trac.osgeo.org/grass/changeset/53139 (revert fs back to sep(arator))

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53144 15284696-431f-4ddb-bdfa-cd5b030d7da7

misc/m.cogo/m.cogo.html

@@ -100,7 +100,7 @@ Round trip:
 
 Import as a vector points map:
 <div class="code"><pre>
-   m.cogo -l in=cogo.dat | v.in.ascii out=cogo_points x=1 y=2 fs=space
+   m.cogo -l in=cogo.dat | v.in.ascii out=cogo_points x=1 y=2 separator=space
 </pre></div>
 
 

raster/r.category/r.category.html

@@ -17,7 +17,7 @@ specified, then the labels for those categories only are printed. The
 values. The user may also (optionally) specify that a field separator other
 than a space or tab be used to separate the category value from its
 corresponding category label in the output, by using the
-<b>fs=</b><em>character</em>|<em>space</em>|<em>tab</em> option (see example
+<b>separator=</b><em>character</em>|<em>space</em>|<em>tab</em> option (see example
 below). If no field separator is specified by the user, a tab is used to
 separate these fields in the output, by default.
 
@@ -120,7 +120,7 @@ prints only the category values and labels for <em>soils</em> map layer
 categories <tt>10, 12</tt>, and <tt>15</tt> through <tt>20</tt>; and
 
 <dt><span class="code"><tt>
-r.category map=soils cats=10,20 fs=':'
+r.category map=soils cats=10,20 separator=':'
 </tt></span>
 <dd>
 prints the values and labels for <em>soils</em> map layer categories
@@ -151,17 +151,19 @@ EOF
 
 <h2>TODO</h2>
 
-Respect the <b>fs=</b> field separator setting for input rules.
+Respect the <b>separator=</b> field separator setting for input rules.
 
 
 <h2>SEE ALSO</h2>
 
 UNIX Manual entries for <i>awk</i> and <i>sort</i>
 
-<p><em><a href="r.coin.html">r.coin</a></em>,
-<em><a href="r.describe.html">r.describe</a></em>,
-<em><a href="d.what.rast.html">d.what.rast</a></em>,
-<em><a href="r.support.html">r.support</a></em>
+<p>
+<em><a href="r.coin.html">r.coin</a>,
+<a href="r.describe.html">r.describe</a>,
+<a href="d.what.rast.html">d.what.rast</a>,
+<a href="r.support.html">r.support</a>
+</em>
 
 <h2>AUTHORS</h2>
 

raster/r.distance/r.distance.html

@@ -40,20 +40,27 @@ The output format lends itself to filtering.  For example, to "see" lines
 connecting each of the category pairs in two maps, filter the output using
 awk and then into <em>d.graph</em>:
 <p>
-<div class="code"><pre>r.distance maps=map1,map2 | \
-awk -F: '{print "move",$4,$5,"\ndraw",$6,$7}' | d.graph -m</pre></div>
+<div class="code"><pre>
+r.distance maps=map1,map2 | \
+  awk -F: '{print "move",$4,$5,"\ndraw",$6,$7}' | d.graph -m
+</pre></div>
 
 <p>To create a vector map of all the "map1" coordinates, filter the output into
 awk and then into <em>v.in.ascii</em>:
 <p>
-<div class="code"><pre>r.distance maps=map1,map2 | \
-<br>awk -F: '{print $4,$5}' | v.in.ascii format=point output=name fs=space</pre></div>
+<div class="code"><pre>
+r.distance maps=map1,map2 | \
+  awk -F: '{print $4,$5}' | v.in.ascii format=point output=name separator=space
+</pre></div>
 
 <h2>SEE ALSO</h2>
-<em><a href="r.buffer.html">r.buffer</a></em>,
-<em><a href="r.cost.html">r.cost</a></em>,
-<em><a href="r.drain.html">r.drain</a></em>,
-<em><a href="v.distance.html">v.distance</a></em>
+
+<em>
+<a href="r.buffer.html">r.buffer</a>,
+<a href="r.cost.html">r.cost</a>,
+<a href="r.drain.html">r.drain</a>,
+<a href="v.distance.html">v.distance</a>
+</em>
 
 <h2>AUTHOR</h2>
 Michael Shapiro, U.S. Army Construction Engineering Research Laboratory

raster/r.in.xyz/r.in.xyz.html

@@ -199,15 +199,15 @@ Ridge, NC, LIDAR dataset</a>, and process into a clean DEM:
 
 <div class="code"><pre>
     # scan and set region bounds
-  r.in.xyz -s fs=, in=lidaratm2.txt out=test
+  r.in.xyz -s separator="," in=lidaratm2.txt out=test
   g.region n=35.969493 s=35.949693 e=-75.620999 w=-75.639999
   g.region res=0:00:00.075 -a
     # create "n" map containing count of points per cell for checking density
-  r.in.xyz in=lidaratm2.txt out=lidar_n fs=, method=n zrange=-2,50
+  r.in.xyz in=lidaratm2.txt out=lidar_n separator="," method=n zrange=-2,50
     # check point density [rho = n_sum / (rows*cols)]
   r.univar lidar_n | grep sum
     # create "min" map (elevation filtered for premature hits)
-  r.in.xyz in=lidaratm2.txt out=lidar_min fs=, method=min zrange=-2,50
+  r.in.xyz in=lidaratm2.txt out=lidar_min separator="," method=min zrange=-2,50
     # zoom to area of interest
   g.region n=35:57:56.25N s=35:57:13.575N w=75:38:23.7W e=75:37:15.675W
     # check number of non-null cells (try and keep under a few million)

raster/r.profile/r.profile.html

@@ -32,7 +32,7 @@ is compatible with <em><a href="v.in.ascii.html">v.in.ascii</a></em> and can
 be piped direcly into this program.
 
 <div class="code"><pre>
-r.profile -ig input=elev.rast | v.in.ascii output=elev.profile fs=space
+r.profile -ig input=elev.rast | v.in.ascii output=elev.profile separator=space
 </pre></div>
 
 The 2 column output is compatible with most plotting programs.

raster/r.what/r.what.html

@@ -93,7 +93,7 @@ spaces for <em>r.what</em>.
 
 
 <div class="code"><pre>
-v.out.ascii bugsites fs=' ' | r.what map=soils,aspect
+v.out.ascii bugsites separator=' ' | r.what map=soils,aspect
 </pre></div>
 
 

scripts/i.spectral/i.spectral.html

@@ -29,7 +29,7 @@ North Carolina sample dataset:
 
 <div class="code"><pre>
 g.region rast=lsat7_2002_10 -p
-LIST=`g.mlist type=rast pat="lsat7_2002_[1-5,7]0" fs=","`
+LIST=`g.mlist type=rast pattern="lsat7_2002_[1-5,7]0" separator=","`
 i.spectral raster=$LIST coordinates=637502.25,221744.25
 </pre></div>
 

scripts/m.proj/m.proj.html

@@ -76,7 +76,7 @@ The same, but load points from a file named "<tt>waypoints.txt</tt>" and
 continue on to import the results into a GRASS vector points map in the
 current map projection:
 <div class="code"><pre>
-m.proj -i in=waypoints.txt | cut -f1 -d' ' | v.in.ascii out=test_pt fs=tab
+m.proj -i in=waypoints.txt | cut -f1 -d' ' | v.in.ascii out=test_pt separator=tab
 </pre></div>
 Here the standard UNIX <em>cut</em> tool is used to discard the <tt>z</tt>
 residual.

scripts/r.out.xyz/r.out.xyz.html

@@ -20,7 +20,7 @@ North Carolina sample dataset location is exported to CSV format.
 
 <div class="code"><pre>
 g.region rast=elev_lid792_1m -p
-r.out.xyz input=elev_lid792_1m output=elev_lid792_1m.csv fs=","
+r.out.xyz input=elev_lid792_1m output=elev_lid792_1m.csv separator=","
 </pre></div>
 
 <h2>TODO</h2>

scripts/r3.in.xyz/r3.in.xyz.html

@@ -48,25 +48,24 @@ Using the Serpent Mound dataset. (see the
 <div class="code"><pre>
   #scan dataset for extent:
   r3.in.xyz -s in=Serpent_Mound_Model_LAS_Data.txt out=dummy \
-     x=1 y=2 z=3 fs=space
+     x=1 y=2 z=3 separator=space
 
   # set the 2D and 3D regions:
   g.region n=4323641.57 s=4320942.61 w=289020.90 e=290106.02 res=1 -a
   g.region b=166 t=216 res3=1 tbres=5 -3 -p
 
   r3.in.xyz in=Serpent_Mound_Model_LAS_Data.txt out=serpent3D \
-     method=mean x=1 y=2 z=3 fs=space type=float
+     method=mean x=1 y=2 z=3 separator=space type=float
 </pre></div>
 
 The same, but aggregate and store backscatter strength from column 5
 into voxels in instead of the z-value:
 <div class="code"><pre>
   r3.in.xyz in=Serpent_Mound_Model_LAS_Data.txt out=serpent3D.bakscat \
-     method=mean x=1 y=2 z=3 val=5 fs=space type=float
+     method=mean x=1 y=2 z=3 val=5 separator=space type=float
 </pre></div>
 
 
-
 <h2>BUGS</h2>
 
 <em>r.to.rast3</em> always creates a <tt>double</tt> output map
@@ -76,9 +75,9 @@ regardless of input.
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="g.region.html">g.region</a><br>
-<a href="r.in.xyz.html">r.in.xyz</a><br>
-<a href="r.to.rast3.html">r.to.rast3</a><br>
+<a href="g.region.html">g.region</a>,
+<a href="r.in.xyz.html">r.in.xyz</a>,
+<a href="r.to.rast3.html">r.to.rast3</a>
 </em>
 
 

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

@@ -74,7 +74,7 @@
 #% answer: float
 #%End
 #%Option
-#% key: sep
+#% key: separator
 #% type: string
 #% required: no
 #% multiple: no

scripts/v.dissolve/v.dissolve.html

@@ -50,7 +50,7 @@ boundaries:
 
 <div class="code"><pre>
 # patch tiles after import:
-v.patch -e `g.mlist type=vect pat="clc2000_*" fs=","` out=clc2000_patched
+v.patch -e `g.mlist type=vect pat="clc2000_*" separator=","` out=clc2000_patched
 
 # remove duplicated tile boundaries:
 v.clean clc2000_patched out=clc2000_clean tool=snap,break,rmdupl thresh=.01

scripts/v.in.lines/v.in.lines.html

@@ -2,7 +2,6 @@
 
 Imports a stream of ASCII x,y[,z] coordinates as a line or series of lines.
 
-
 <h2>NOTES</h2>
 
 Input ASCII coordinates are simply a series of "x&nbsp;y" data points.
@@ -12,11 +11,10 @@ Lines are separated by a row containing "<tt>NaN&nbsp;NaN</tt>".
 stream and using the <b>-z</b> flag.
 <p>This script is a simple wrapper around the <em>v.in.mapgen</em> module.
 
-
 <h2>EXAMPLE</h2>
 
 <div class="code"><pre>
-v.in.lines in=- out=two_lines fs=, &lt;&lt;EOF
+v.in.lines in=- out=two_lines separator=, &lt;&lt;EOF
 167.846717,-46.516653
 167.846663,-46.516645
 167.846656,-46.516644

vector/v.in.ascii/v.in.ascii.html

@@ -62,7 +62,7 @@ default action if the <b>cat</b> parameter is not set.
 
 Data may be imported from many spreadsheet programs by saving the
 spreadsheet as a comma separated variable (.csv) text file, and then
-using the <b>fs=','</b> or <b>fs=comma</b> option
+using the <b>separator=','</b> or <b>separator=comma</b> option
 with <em>v.in.ascii</em> in <b>points</b> mode.  If the input file
 contains any header lines, such as column headings, the
 <b>skip</b> parameter should be used. These skipped header lines will
@@ -248,7 +248,7 @@ into <em>v.in.ascii</em>, only the vector map geometry will be generated.
 
 Convert ground control points into vector points:
 <div class="code"><pre>
-cat $MAPSET/group/$GROUP/POINTS | v.in.ascii out=$GROUP_gcp fs=space skip=3 \
+cat $MAPSET/group/$GROUP/POINTS | v.in.ascii out=$GROUP_gcp separator=space skip=3 \
     col='x double precision, y double precision, x_target double precision, \
     y_target double precision, ok int'
 </pre></div>