浏览代码

manual: some cleanup of HTML and examples (trunk, https://trac.osgeo.org/grass/changeset/63453)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63454 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 10 年之前
父节点
当前提交
942e6cdc57

+ 1 - 1
imagery/i.smap/i.smap.html

@@ -155,7 +155,7 @@ i.group group=my_lsat7_2002 subgroup=my_lsat7_2002 \
 
 
 # Now digitize training areas "training" with the digitizer
 # Now digitize training areas "training" with the digitizer
 # and convert to raster model with v.to.rast
 # and convert to raster model with v.to.rast
-v.to.rast training out=training use=cat labelcolumn=label
+v.to.rast input=training output=training use=cat label_column=label
 
 
 # calculate statistics
 # calculate statistics
 i.gensigset trainingmap=training group=my_lsat7_2002 subgroup=my_lsat7_2002 \
 i.gensigset trainingmap=training group=my_lsat7_2002 subgroup=my_lsat7_2002 \

+ 2 - 2
imagery/i.topo.corr/i.topo.corr.html

@@ -90,10 +90,10 @@ method:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
 # first pass: create illumination model
 # first pass: create illumination model
-i.topo.corr -i base=SRTM zenith=33.3631 azimuth=59.8897 out=SRTM.illumination
+i.topo.corr -i base=SRTM zenith=33.3631 azimuth=59.8897 output=SRTM.illumination
 
 
 # second pass: apply illumination model
 # second pass: apply illumination model
-i.topo.corr base=SRTM.illumination input=toar.5,toar.4,toar.3 out=tcor \ 
+i.topo.corr base=SRTM.illumination input=toar.5,toar.4,toar.3 output=tcor \ 
   zenith=33.3631 method=c-factor
   zenith=33.3631 method=c-factor
 </pre></div>
 </pre></div>
 
 

+ 5 - 5
misc/m.cogo/m.cogo.html

@@ -107,19 +107,19 @@ P016 S 88:44:56 W 18.7164
 <p>
 <p>
 Round trip:
 Round trip:
 <div class="code"><pre>
 <div class="code"><pre>
-   m.cogo -l in=cogo.dat | m.cogo -rl in="-"
+   m.cogo -l input=cogo.dat | m.cogo -rl in="-"
 </pre></div>
 </pre></div>
 
 
 <p>
 <p>
 Import as a vector points map:
 Import as a vector points map:
 <div class="code"><pre>
 <div class="code"><pre>
-   m.cogo -l in=cogo.dat | v.in.ascii out=cogo_points x=1 y=2 separator=space
+   m.cogo -l input=cogo.dat | v.in.ascii output=cogo_points x=1 y=2 separator=space
 </pre></div>
 </pre></div>
 
 
 <p>
 <p>
 Shell script to import as a vector line map:
 Shell script to import as a vector line map:
 <div class="code"><pre>
 <div class="code"><pre>
-   m.cogo -l in=cogo.dat | tac | awk '
+   m.cogo -l input=cogo.dat | tac | awk '
        BEGIN { FS=" " ; R=0 }
        BEGIN { FS=" " ; R=0 }
        $1~/\d*\.\d*/ { printf(" %.8f %.8f\n", $1, $2) ; ++R }
        $1~/\d*\.\d*/ { printf(" %.8f %.8f\n", $1, $2) ; ++R }
        END { printf("L %d\n", R) }' | tac | \
        END { printf("L %d\n", R) }' | tac | \
@@ -130,10 +130,10 @@ Shell script to import as a vector line map:
 Convert that lines map into an area:
 Convert that lines map into an area:
 <div class="code"><pre>
 <div class="code"><pre>
    # Add the -c flag to the above example to close the loop:
    # Add the -c flag to the above example to close the loop:
-   m.cogo -l -c in=cogo.dat | ...
+   m.cogo -l -c input=cogo.dat | ...
        ...
        ...
    v.type input=cogo_line output=cogo_boundary from_type=line to_type=boundary
    v.type input=cogo_line output=cogo_boundary from_type=line to_type=boundary
-   v.centroids in=cogo_boundary out=cogo_area
+   v.centroids input=cogo_boundary output=cogo_area
 </pre></div>
 </pre></div>
 
 
 If necessary, snap the boundary closed with the <em>v.clean</em> module.
 If necessary, snap the boundary closed with the <em>v.clean</em> module.

+ 2 - 1
raster/r.carve/main.c

@@ -209,7 +209,8 @@ static int init_projection(struct Cell_head *window, int *wrap_ncols)
 	*wrap_ncols =
 	*wrap_ncols =
 	    (360.0 - (window->east - window->west)) / window->ew_res + 1.1;
 	    (360.0 - (window->east - window->west)) / window->ew_res + 1.1;
 #else
 #else
-	G_fatal_error(_("lat/lon projection not supported at this time."));
+	G_fatal_error(_("Lat/Long location is not supported by %s. Please reproject map first."),
+		      G_program_name());
 #endif
 #endif
     }
     }
     else {
     else {

+ 13 - 8
raster/r.carve/r.carve.html

@@ -1,16 +1,16 @@
 <h2>DESCRIPTION</h2>
 <h2>DESCRIPTION</h2>
 
 
 <em>r.carve</em> accepts vector stream data as input, transforms them to
 <em>r.carve</em> accepts vector stream data as input, transforms them to
-raster, and subtracts a defaultdepth+additionaldepth from a DEM. If
+raster, and subtracts a default-depth + additional-depth from a DEM. If
 the given width is more than 1 cell, it will carve the stream with the
 the given width is more than 1 cell, it will carve the stream with the
-given width. With the -n flag it should eliminate all flat cells within
+given width. With the <b>-n</b> flag it should eliminate all flat cells within
 the stream, so when and if the water gets into the stream it will
 the stream, so when and if the water gets into the stream it will
 flow. The <em>points</em> option generates x,y,z for points which define the stream
 flow. The <em>points</em> option generates x,y,z for points which define the stream
 with the z-value of the bottom of the carved-in stream. These points
 with the z-value of the bottom of the carved-in stream. These points
 can then be combined with contours to interpolate a new DEM with
 can then be combined with contours to interpolate a new DEM with
 better representation of valleys.
 better representation of valleys.
 
 
-<h2>NOTE</h2>
+<h2>NOTES</h2>
 
 
 <em>r.carve</em> does not create a depressionless DEM because many
 <em>r.carve</em> does not create a depressionless DEM because many
 depressions are in flat areas and not in the streams.
 depressions are in flat areas and not in the streams.
@@ -18,9 +18,11 @@ depressions are in flat areas and not in the streams.
 
 
 <h2>EXAMPLE</h2>
 <h2>EXAMPLE</h2>
 
 
+North Carolina sample dataset:
+
 <div class="code"><pre>
 <div class="code"><pre>
-g.region rast=elevation.10m -p
-r.carve rast=elevation.10m vect=streams out=carve_dem width=20 depth=5
+g.region rast=elevation -p
+r.carve rast=elevation vect=streams out=carve_dem width=20 depth=5
 </pre></div>
 </pre></div>
 
 
 <h2>BUGS</h2>
 <h2>BUGS</h2>
@@ -37,9 +39,12 @@ areas</a>, by Helena Mitasova, Lubos Mitas, William M. Brown, Douglas
 M.  Johnston, GMSL (Report for CERL 1999)
 M.  Johnston, GMSL (Report for CERL 1999)
 
 
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>
-<em><a href="r.flow.html">r.flow</a></em>,
-<em><a href="r.fill.dir.html">r.fill.dir</a></em>,
-<em><a href="r.watershed.html">r.watershed</a></em> 
+
+<em>
+<a href="r.flow.html">r.flow</a>,
+<a href="r.fill.dir.html">r.fill.dir</a>,
+<a href="r.watershed.html">r.watershed</a>
+</em> 
 
 
 <h2>AUTHOR</h2>
 <h2>AUTHOR</h2>
 Bill Brown (GMSL)<br>
 Bill Brown (GMSL)<br>

+ 7 - 3
raster/r.colors.out/r3.colors.out.html

@@ -1,7 +1,7 @@
 <h2>DESCRIPTION</h2>
 <h2>DESCRIPTION</h2>
 
 
 <em>r3.colors.out</em> allows the user to export the color table for a
 <em>r3.colors.out</em> allows the user to export the color table for a
-raster3d map to a file which is suitable as input
+3D raste map to a file which is suitable as input
 to <em><a href="r3.colors.html">r3.colors</a></em>.
 to <em><a href="r3.colors.html">r3.colors</a></em>.
 
 
 <h2>EXAMPLES</h2>
 <h2>EXAMPLES</h2>
@@ -14,11 +14,15 @@ r3.colors map=volume_2 rules=rules.txt
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>
 
 
 <em>
 <em>
-  <a href="r3.colors.html">r3.colors</a>
-  <a href="r.colors.out.html">r.colors</a>
+<a href="r.colors.html">r.colors</a>,
+<a href="r.colors.out.html">r.colors.out</a>,
+<a href="r3.colors.html">r3.colors</a>
+<a href="v.colors.html">v.colors</a>,
+<a href="v.colors.out.html">v.colors.out</a>
 </em>
 </em>
 
 
 <h2>AUTHOR</h2>
 <h2>AUTHOR</h2>
+
 Glynn Clements
 Glynn Clements
 
 
 <p><i>Last changed: $Date$</i>
 <p><i>Last changed: $Date$</i>

+ 19 - 6
raster/r.colors/r3.colors.html

@@ -1,19 +1,32 @@
 <h2>DESCRIPTION</h2>
 <h2>DESCRIPTION</h2>
 
 
 <em>r3.colors</em> has exactly the same functionality
 <em>r3.colors</em> has exactly the same functionality
-as <em>r.colors</em> but for volume maps. Please refer
+as <em>r.colors</em> but for 3D raster maps. Please refer
 to <em><a href="r.colors.html">r.colors</a></em>.
 to <em><a href="r.colors.html">r.colors</a></em>.
 
 
+<h2>EXAMPLES</h2>
+
+<div class="code"><pre>
+r3.colors map=volume_1 color=gyr
+</pre></div>
+
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>
 
 
 <em>
 <em>
-  <a href="r.colors.html">r.colors</a>,
-  <a href="r.colors.out.html">r.colors.out</a>,
-  <a href="r3.colors.out.html">r3.colors.out</a>,
-  <a href="v.colors.html">v.colors</a>,
-  <a href="v.colors.out.html">v.colors.out</a>
+<a href="r.colors.html">r.colors</a>,
+<a href="r.colors.out.html">r.colors.out</a>,
+<a href="r3.colors.out.html">r3.colors.out</a>,
+<a href="v.colors.html">v.colors</a>,
+<a href="v.colors.out.html">v.colors.out</a>
 </em>
 </em>
 
 
+<p>See also wiki
+page <a href="http://grasswiki.osgeo.org/wiki/Color_tables">Color
+tables</a> (from GRASS User Wiki)
+
+<p><a href="http://colorbrewer.org">ColorBrewer</a> is an online tool designed to
+help people select good color schemes for maps and other graphics.
+
 <h2>AUTHORS</h2>
 <h2>AUTHORS</h2>
 
 
 Michael Shapiro and David Johnson
 Michael Shapiro and David Johnson

+ 12 - 10
raster/r.rescale.eq/r.rescale.eq.html

@@ -10,7 +10,7 @@ is useful for producing representations with a reduced
 number of categories from a raster map layer with a large
 number of categories from a raster map layer with a large
 range of category values (e.g., elevation).
 range of category values (e.g., elevation).
 <em>Rescaled</em> map layers are appropriate for use in
 <em>Rescaled</em> map layers are appropriate for use in
-such GRASS programs as
+such GRASS GIS commands as
 
 
 <em><a href="r.stats.html">r.stats</a></em>,
 <em><a href="r.stats.html">r.stats</a></em>,
 <em><a href="r.report.html">r.report</a></em>, and 
 <em><a href="r.report.html">r.report</a></em>, and 
@@ -46,15 +46,17 @@ selected as the input range.
 
 
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>
 
 
-<em><a href="r.coin.html">r.coin</a></em>,
-<em><a href="r.describe.html">r.describe</a></em>,
-<em><a href="r.info.html">r.info</a></em>,
-<em><a href="r.mapcalc.html">r.mapcalc</a></em>,
-<em><a href="r.reclass.html">r.reclass</a></em>,
-<em><a href="r.rescale.html">r.rescale</a></em>,
-<em><a href="r.report.html">r.report</a></em>,
-<em><a href="r.resample.html">r.resample</a></em>,
-<em><a href="r.stats.html">r.stats</a></em>
+<em>
+<a href="r.coin.html">r.coin</a>,
+<a href="r.describe.html">r.describe</a>,
+<a href="r.info.html">r.info</a>,
+<a href="r.mapcalc.html">r.mapcalc</a>,
+<a href="r.reclass.html">r.reclass</a>,
+<a href="r.rescale.html">r.rescale</a>,
+<a href="r.report.html">r.report</a>,
+<a href="r.resample.html">r.resample</a>,
+<a href="r.stats.html">r.stats</a>
+</em>
 
 
 <h2>AUTHOR</h2>
 <h2>AUTHOR</h2>
 Michael Shapiro,
 Michael Shapiro,

+ 14 - 12
raster/r.rescale/r.rescale.html

@@ -1,7 +1,7 @@
 <h2>DESCRIPTION</h2>
 <h2>DESCRIPTION</h2>
 
 
 The <em>r.rescale</em> program rescales the range of
 The <em>r.rescale</em> program rescales the range of
-category values appearing in a raster map layer.  A new
+category values appearing in a raster map layer. A new
 raster map layer, and an appropriate category file and
 raster map layer, and an appropriate category file and
 color table based upon the original raster map layer, are
 color table based upon the original raster map layer, are
 generated with category labels that reflect the original
 generated with category labels that reflect the original
@@ -10,7 +10,7 @@ is useful for producing representations with a reduced
 number of categories from a raster map layer with a large
 number of categories from a raster map layer with a large
 range of category values (e.g., elevation).
 range of category values (e.g., elevation).
 <em>Rescaled</em> map layers are appropriate for use in
 <em>Rescaled</em> map layers are appropriate for use in
-such GRASS programs as
+such GRASS GIS commands as
 
 
 <em><a href="r.stats.html">r.stats</a></em>,
 <em><a href="r.stats.html">r.stats</a></em>,
 <em><a href="r.report.html">r.report</a></em>, and 
 <em><a href="r.report.html">r.report</a></em>, and 
@@ -21,7 +21,7 @@ such GRASS programs as
 To rescale an elevation raster map layer with category
 To rescale an elevation raster map layer with category
 values ranging from 1090 meters to 1800 meters into the
 values ranging from 1090 meters to 1800 meters into the
 range 0-255, the following command line could be used
 range 0-255, the following command line could be used
-(without the <em>from</em> parameter, the full value range will 
+(without the <em>from</em> parameter, the full value range will
 be used):
 be used):
 
 
 <div class="code"><pre>
 <div class="code"><pre>
@@ -45,15 +45,17 @@ selected as the input range.
 
 
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>
 
 
-<em><a href="r.coin.html">r.coin</a></em>,
-<em><a href="r.describe.html">r.describe</a></em>,
-<em><a href="r.info.html">r.info</a></em>,
-<em><a href="r.mapcalc.html">r.mapcalc</a></em>,
-<em><a href="r.reclass.html">r.reclass</a></em>,
-<em><a href="r.rescale.eq.html">r.rescale.eq</a></em>,
-<em><a href="r.report.html">r.report</a></em>,
-<em><a href="r.resample.html">r.resample</a></em>,
-<em><a href="r.stats.html">r.stats</a></em>
+<em>
+<a href="r.coin.html">r.coin</a>,
+<a href="r.describe.html">r.describe</a>,
+<a href="r.info.html">r.info</a>,
+<a href="r.mapcalc.html">r.mapcalc</a>,
+<a href="r.reclass.html">r.reclass</a>,
+<a href="r.rescale.eq.html">r.rescale.eq</a>,
+<a href="r.report.html">r.report</a>,
+<a href="r.resample.html">r.resample</a>,
+<a href="r.stats.html">r.stats</a>
+</em>
 
 
 <h2>AUTHOR</h2>
 <h2>AUTHOR</h2>
 Michael Shapiro,
 Michael Shapiro,

+ 5 - 5
vector/v.colors.out/v.colors.out.html

@@ -14,11 +14,11 @@ v.colors map=soils_wake rules=rules.txt
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>
 
 
 <em>
 <em>
-  <a href="v.colors.html">v.colors</a>,
-  <a href="r.colors.html">r.colors</a>,
-  <a href="r3.colors.html">r3.colors</a>,
-  <a href="r.colors.out.html">r.colors.out</a>,
-  <a href="r3.colors.out.html">r3.colors.out</a>,
+<a href="v.colors.html">v.colors</a>,
+<a href="r.colors.html">r.colors</a>,
+<a href="r3.colors.html">r3.colors</a>,
+<a href="r.colors.out.html">r.colors.out</a>,
+<a href="r3.colors.out.html">r3.colors.out</a>
 </em>
 </em>
 
 
 <h2>AUTHOR</h2>
 <h2>AUTHOR</h2>

+ 6 - 6
vector/v.colors/v.colors.html

@@ -110,12 +110,12 @@ v.db.dropcolumn map=soils_general column=GRASSRGB
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>
 
 
 <em>
 <em>
-  <a href="d.vect.html">d.vect</a>,
-  <a href="v.colors.out.html">v.colors.out</a>,
-  <a href="r.colors.html">r.colors</a>,
-  <a href="r.colors.out.html">r.colors.out</a>,
-  <a href="r3.colors.html">r3.colors</a>,
-  <a href="r3.colors.out.html">r3.colors.out</a>,
+<a href="d.vect.html">d.vect</a>,
+<a href="r.colors.html">r.colors</a>,
+<a href="r.colors.out.html">r.colors.out</a>,
+<a href="r3.colors.html">r3.colors</a>,
+<a href="r3.colors.out.html">r3.colors.out</a>,
+<a href="v.colors.out.html">v.colors.out</a>
 </em>
 </em>
 
 
 <p>See also wiki
 <p>See also wiki

+ 13 - 13
vector/v.vect.stats/v.vect.stats.html

@@ -16,52 +16,40 @@ a new value is detmined with the selected method.
 <p><dl>
 <p><dl>
 
 
 <dt><b>sum</b> 
 <dt><b>sum</b> 
-
 <dd>The sum of values.
 <dd>The sum of values.
 
 
 <dt><b>average</b> 
 <dt><b>average</b> 
-
 <dd>The average value of all point attributes (sum / count).
 <dd>The average value of all point attributes (sum / count).
 
 
 <dt><b>median</b> 
 <dt><b>median</b> 
-
 <dd>The value found half-way through a list of the
 <dd>The value found half-way through a list of the
 attribute values, when these are ranged in numerical order.
 attribute values, when these are ranged in numerical order.
 
 
 <dt><b>mode</b> 
 <dt><b>mode</b> 
-
 <dd>The most frequently occurring value.
 <dd>The most frequently occurring value.
 
 
 <dt><b>minimum</b> 
 <dt><b>minimum</b> 
-
 <dd>The minimum observed value.
 <dd>The minimum observed value.
 
 
 <dt><b>min_cat</b> 
 <dt><b>min_cat</b> 
-
 <dd>The point category corresponding to the minimum observed value.
 <dd>The point category corresponding to the minimum observed value.
 
 
 <dt><b>maximum</b> 
 <dt><b>maximum</b> 
-
 <dd>The maximum observed value.
 <dd>The maximum observed value.
 
 
 <dt><b>max_cat</b> 
 <dt><b>max_cat</b> 
-
 <dd>The point category corresponding to the maximum observed value.
 <dd>The point category corresponding to the maximum observed value.
 
 
 <dt><b>range</b> 
 <dt><b>range</b> 
-
 <dd>The range of the observed values.
 <dd>The range of the observed values.
 
 
 <dt><b>stddev</b> 
 <dt><b>stddev</b> 
-
 <dd>The statistical standard deviation of the attribute values.
 <dd>The statistical standard deviation of the attribute values.
 
 
 <dt><b>variance</b> 
 <dt><b>variance</b> 
-
 <dd>The statistical variance of the attribute values.
 <dd>The statistical variance of the attribute values.
 
 
 <dt><b>diversity</b> 
 <dt><b>diversity</b> 
-
 <dd>The number of different attribute values.
 <dd>The number of different attribute values.
 
 
 </dl>
 </dl>
@@ -75,7 +63,19 @@ If no points are falling into a given area, the point count is set to 0
 (zero) and the statistics result to "null".
 (zero) and the statistics result to "null".
 <p>The columns <em>count_column</em> and <em>stats_column</em> are created if not
 <p>The columns <em>count_column</em> and <em>stats_column</em> are created if not
 existing. If they do already exist, the <em>count_column</em> must be of
 existing. If they do already exist, the <em>count_column</em> must be of
-type integer and the <em>stats_column</em> of type double.
+type integer and the <em>stats_column</em> of type double precision.
+
+<!-- TODO
+
+<h2>EXAMPLE</h2>
+
+...
+
+<div class="code"><pre>
+...
+</pre></div>
+
+-->
 
 
 <h2>SEE ALSO</h2>
 <h2>SEE ALSO</h2>