浏览代码

manual: minor fixes

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63783 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 10 年之前
父节点
当前提交
7ff5d1af7c

+ 1 - 1
display/d.mon/d.mon.html

@@ -12,7 +12,7 @@ select whatever monitor is named by the user. The user can get a list
 of running monitors by setting the <b>-l</b> flag on the command
 line. Note that some monitor <a href="displaydrivers.html">drivers</a> use environment
 <em><a href="variables.html">variables</a></em> or the specific
-<em><a href="variables.html#rendering">driver documentation</a></em>.
+<em><a href="variables.html#list-of-selected-grass-environment-variables-for-rendering">driver documentation</a></em>.
 
 <p>When a monitor is <em>started</em>, it is therefore also
 (automatically) <em>selected</em> for output, unless the

+ 2 - 2
display/displaydrivers.html

@@ -18,6 +18,6 @@ running <em><a href="d.mon.html">d.mon</a></em> module.
 <h2>SEE ALSO</h2>
 
 <em>
-  <a href="d.mon.html">d.mon</a>,
-  <a href="variables.html#rendering">variables</a>
+<a href="d.mon.html">d.mon</a>,
+<a href="variables.html#list-of-selected-grass-environment-variables-for-rendering">variables</a>
 </em>

+ 1 - 1
gui/wxpython/docs/wxGUI.html

@@ -318,7 +318,7 @@ d.text text=Population\ density
     </dl>
 </dd>
 
-  <dt><img src="icons/calculator.png" alt="icon">&nbsp;
+  <dt><img src="icons/raster-calculator.png" alt="icon">&nbsp;
     <em>Raster Map Calculator</em></dt>
   <dd>Launches Raster Calculator GUI front-end
   for <em><a href="r.mapcalc.html">r.mapcalc</a></em>.</dd>

+ 5 - 7
imagery/i.evapo.time/i.evapo.time.html

@@ -29,7 +29,7 @@ DOYafterETa[i] = ( DOYofETa[i+1] - DOYofETa[i] ) / 2
 <h2>NOTES</h2>
 
 ETo images preparation:
-If you only have one meteorological station data, the easiest way is:
+If you only have one meteorological station data set, the easiest way is:
 
 <div class="code"><pre>
 n=0
@@ -42,10 +42,11 @@ done
 
 with Eto[1], Eto[2], etc being a simple copy and paste from your data file
 of all ETo values separated by an empty space from each other.
-
+<p>
 If you have several meteorological stations data, then you need to grid
-them, Thiessen polygons or interpolation for each day.
-
+them by generating Thiessen polygons or using different interpolation methods
+for each day.
+<p>
 For multi-year calculations, just continue incrementing DOY values above
 366, it will continue working, up to maximum input of 400 satellite images.
 
@@ -56,9 +57,6 @@ For multi-year calculations, just continue incrementing DOY values above
 <a href="i.evapo.mh.html">i.evapo.mh</a>,
 <a href="i.evapo.pt.html">i.evapo.pt</a>,
 <a href="i.evapo.pm.html">i.evapo.pm</a>,
-<a href="r.surf.idw.html">r.surf.idw</a>,
-<a href="r.surf.idw2.html">r.surf.idw2</a>,
-<a href="r.resamp.interp.html">r.resamp.interp</a>,
 <a href="r.sun.html">r.sun</a>
 </em>
 

+ 3 - 3
lib/init/grass7.html

@@ -342,9 +342,9 @@ List of <a href="variables.html">GRASS environment variables</a>
 
 <p>
 <a href="http://grass.osgeo.org">GRASS GIS Web site</a><br>
-<a href="http://grass.osgeo.org/wiki">GRASS GIS User Wiki</a><br>
-<a href="http://trac.osgeo.org/grass">GRASS GIS Bug Tracker</a><br>
-<a href="http://grass.osgeo.org/programming7">GRASS GIS 7 Programmer's
+<a href="http://grass.osgeo.org/wiki/">GRASS GIS User Wiki</a><br>
+<a href="http://trac.osgeo.org/grass/">GRASS GIS Bug Tracker</a><br>
+<a href="http://grass.osgeo.org/programming7/">GRASS GIS 7 Programmer's
   Manual</a>
 
 <h2>AUTHORS (of this page)</h2>

+ 1 - 1
lib/python/docs/src/gunittest_testing.rst

@@ -228,7 +228,7 @@ think using one or more assert methods.
 
 ::
 
-    from grass.guinttest import TestCase, test
+    from grass.gunittest import TestCase, test
 
 
     class TestPython(TestCase):

+ 8 - 9
raster/r.surf.area/r.surf.area.html

@@ -43,7 +43,7 @@ impact, but will cause longer processing times.
 <h2>EXAMPLES</h2>
 
 <div class="code"><pre>
-g.region raster=elevation
+g.region -p raster=elevation
 
 r.surf.area map=elevation units=hectares
 Null value area ignored in calculation: 0.000000
@@ -57,14 +57,13 @@ Estimated region Surface Area: 20336.234719
 <h2>SEE ALSO</h2>
 
 <em>
-  <a href="r.surf.idw.html">r.surf.idw</a>,
-  <a href="r.surf.idw2.html">r.surf.idw2</a>,
-  <a href="r.surf.fractal.html">r.surf.fractal</a>,
-  <a href="r.surf.gauss.html">r.surf.gauss</a>,
-  <a href="r.volume.html">r.volume</a>,
-  <a href="v.to.rast.html">v.to.rast</a>,
-  <a href="r.slope.aspect.html">r.slope.aspect</a>,
-  <a href="g.region.html">g.region</a>
+<a href="g.region.html">g.region</a>,
+<a href="r.surf.idw.html">r.surf.idw</a>,
+<a href="r.surf.fractal.html">r.surf.fractal</a>,
+<a href="r.surf.gauss.html">r.surf.gauss</a>,
+<a href="r.volume.html">r.volume</a>,
+<a href="r.slope.aspect.html">r.slope.aspect</a>,
+<a href="v.to.rast.html">v.to.rast</a>
 </em>
 
 <h2>AUTHOR</h2>

+ 7 - 8
raster/r.surf.contour/r.surf.contour.html

@@ -98,14 +98,13 @@ r.univar diff
 <h2>SEE ALSO</h2>
 
 <em>
-  <a href="r.mapcalc.html">r.mapcalc</a>,
-  <a href="r.slope.aspect.html">r.slope.aspect</a>,
-  <a href="r.surf.idw.html">r.surf.idw</a>,
-  <a href="r.surf.idw2.html">r.surf.idw2</a>,
-  <a href="wxGUI.vdigit.html">wxGUI vector digitizer</a>,
-  <a href="v.surf.idw.html">v.surf.idw</a>,
-  <a href="v.surf.rst.html">v.surf.rst</a>,
-  <a href="v.to.rast.html">v.to.rast</a>
+<a href="r.mapcalc.html">r.mapcalc</a>,
+<a href="r.slope.aspect.html">r.slope.aspect</a>,
+<a href="r.surf.idw.html">r.surf.idw</a>,
+<a href="wxGUI.vdigit.html">wxGUI vector digitizer</a>,
+<a href="v.surf.idw.html">v.surf.idw</a>,
+<a href="v.surf.rst.html">v.surf.rst</a>,
+<a href="v.to.rast.html">v.to.rast</a>
 </em>
 
 <h2>AUTHOR</h2>

+ 18 - 13
raster/r.surf.fractal/r.surf.fractal.html

@@ -6,10 +6,11 @@ intermediate layers showing the build up of different spectral coefficients
 (see Saupe, pp.106-107 for an example of this).
 
 <p>
-Use this module to generate naturally looking synthetical elevation models
+This module generates naturally looking synthetical elevation models
 (DEM).
 
 <h2>NOTE</h2>
+
 This module requires the <a href="http://www.fftw.org">FFTW library</a>
 for computing Discrete Fourier Transforms.
 
@@ -19,7 +20,7 @@ Generate surface using fractals in selected region, set color table and
 display with shade.
 
 <div class="code"><pre>
-g.region raster=elevation
+g.region -p raster=elevation
 
 r.surf.fractal output=fractals
 
@@ -59,9 +60,11 @@ r.info -r dem_d2_90
 r.mapcalc "dem_d2_90_final = 1.0 * dem_d2_90 + abs(min(dem_d2_90))"
 r.colors dem_d2_90_final color=terrain
 r.slope.aspect dem_d2_90_final aspect=dem_d2_90_final_as
+</pre></div>
 
-d.mon x0
-d.erase -f
+<!--
+d.mon wx0
+d.erase
 d.split.frame
 d.frame -s uno
 d.rast dem_d2_0005_final
@@ -71,7 +74,7 @@ d.frame -s tres
 d.rast dem_d2_90_final
 d.frame -s cuatro
 d.rast dem_d2_90_final_as
-</pre></div>
+-->
 
 <center>
 <img src="r_surf_fractal.jpg" alt="Artificial DEMs created with fractals"><br>
@@ -82,20 +85,22 @@ top: fractal dimension d=2.90 (left: elevation map, right: aspect map)
 
 
 <h2>REFERENCE</h2>
- Saupe, D. (1988) Algorithms for random fractals, in Barnsley M., 
+
+Saupe, D. (1988) Algorithms for random fractals, in Barnsley M., 
  Devaney R., Mandelbrot B., Peitgen, H-O., Saupe D., and Voss R.
  (1988) The Science of Fractal Images, Ch. 2, pp.71-136. London:
  Springer-Verlag.
 
 <h2>SEE ALSO</h2>
 
-<em><a href="r.surf.contour.html">r.surf.contour</a></em>,
-<em><a href="r.surf.idw.html">r.surf.idw</a></em>,
-<em><a href="r.surf.gauss.html">r.surf.gauss</a></em>,
-<em><a href="r.surf.random.html">r.surf.random</a></em>,
-<em><a href="r.surf.idw2.html">r.surf.idw2</a></em>,
-<em><a href="v.surf.idw.html">v.surf.idw</a></em>,
-<em><a href="v.surf.rst.html">v.surf.rst</a></em>
+<em>
+<a href="r.surf.contour.html">r.surf.contour</a>,
+<a href="r.surf.idw.html">r.surf.idw</a>,
+<a href="r.surf.gauss.html">r.surf.gauss</a>,
+<a href="r.surf.random.html">r.surf.random</a>,
+<a href="v.surf.idw.html">v.surf.idw</a>,
+<a href="v.surf.rst.html">v.surf.rst</a>
+</em>
 
 <h2>AUTHOR</h2>
 

+ 4 - 1
raster/r.surf.gauss/r.surf.gauss.html

@@ -14,7 +14,11 @@ Gaussian random number generator instead.
 <h2>EXAMPLE</h2>
 
 <div class="code"><pre>
+g.region -p n=228500 s=215000 w=630000 e=645000 res=10
 r.surf.gauss out=gauss mean=0 sigma=10
+
+# check result
+r.univar gauss
 </pre></div>
 
 <h2>SEE ALSO</h2>
@@ -23,7 +27,6 @@ r.surf.gauss out=gauss mean=0 sigma=10
 <a href="r.surf.contour.html">r.surf.contour</a>,
 <a href="r.surf.fractal.html">r.surf.fractal</a>,
 <a href="r.surf.idw.html">r.surf.idw</a>,
-<a href="r.surf.idw2.html">r.surf.idw2</a>,
 <a href="r.surf.random.html">r.surf.random</a>,
 <a href="v.surf.rst.html">v.surf.rst</a>
 </em>

+ 8 - 8
raster/r.surf.idw/r.surf.idw.html

@@ -35,8 +35,8 @@ distances are calculated from point to point along a
 geodesic.
 
 <p>
-Unlike <em><a href="http://grass.osgeo.org/grass70/manuals/addons/r.surf.idw2.html">r.surf.idw2</a></em> (addons), which processes
-all input data points in each interpolation cycle, <em>r.surf.idw</em>
+Unlike <em><a href="http://grass.osgeo.org/grass70/manuals/addons/r.surf.idw2.html">r.surf.idw2</a></em> (addon),
+which processes all input data points in each interpolation cycle, <em>r.surf.idw</em>
 attempts to minimize the number of input data for which distances must be
 calculated. Execution speed is therefore a function of the search effort,
 and does not increase appreciably with the number of input data points.
@@ -82,12 +82,12 @@ considered for surface generation.
 <h2>SEE ALSO</h2>
 
 <em>
-  <a href="r.surf.contour.html">r.surf.contour</a>,
-  <a href="r.surf.gauss.html">r.surf.gauss</a>,
-  <a href="r.surf.fractal.html">r.surf.fractal</a>,
-  <a href="r.surf.random.html">r.surf.random</a>,
-  <a href="v.surf.idw.html">v.surf.idw</a>,
-  <a href="v.surf.rst.html">v.surf.rst</a>
+<a href="r.surf.contour.html">r.surf.contour</a>,
+<a href="r.surf.gauss.html">r.surf.gauss</a>,
+<a href="r.surf.fractal.html">r.surf.fractal</a>,
+<a href="r.surf.random.html">r.surf.random</a>,
+<a href="v.surf.idw.html">v.surf.idw</a>,
+<a href="v.surf.rst.html">v.surf.rst</a>
 </em>
 
 <h2>AUTHOR</h2>

+ 10 - 1
raster/r.surf.random/r.surf.random.html

@@ -11,6 +11,16 @@ depending on the user's platform.
 <i>Histogram of map generated with r.surf.random</i>
 </center>
 
+<h2>EXAMPLE</h2>
+
+<div class="code"><pre>
+g.region -p n=228500 s=215000 w=630000 e=645000 res=10
+r.surf.random out=random min=0 max=100
+
+# check result
+r.univar random
+</pre></div>
+
 <h2>SEE ALSO</h2>
 
 <em>
@@ -18,7 +28,6 @@ depending on the user's platform.
 <a href="r.surf.fractal.html">r.surf.fractal</a>,
 <a href="r.surf.gauss.html">r.surf.gauss</a>,
 <a href="r.surf.idw.html">r.surf.idw</a>,
-<a href="r.surf.idw2.html">r.surf.idw2</a>,
 <a href="v.surf.rst.html">v.surf.rst</a>
 </em>
 

+ 2 - 1
raster/rasterintro.html

@@ -156,8 +156,9 @@ Furthermore, there are modules available for reinterpolation of "sparse"
 
 <ul>
 <li> Inverse distance weighted average (IDW) interpolation
- (<a href="r.surf.idw.html">r.surf.idw</a> and <a href="r.surf.idw2.html">r.surf.idw2</a>)</li>
+ (<a href="r.surf.idw.html">r.surf.idw</a>)</li>
 <li> Interpolating from contour lines (<a href="r.contour.html">r.contour</a>)</li>
+<li> Various vector modules for interpolation</li>
 </ul>
 
 For Lidar and similar data, <a href="r.in.lidar.html">r.in.lidar</a> and <a href="r.in.xyz.html">r.in.xyz</a>

+ 7 - 4
temporal/t.rast.gapfill/test.t.rast.gapfill.sh

@@ -3,11 +3,14 @@
 # We need to set a specific region in the
 # @preprocess step of this test. 
 # The region setting should work for UTM and LL test locations
+
+export GRASS_OVERWRITE=1
+
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
-r.mapcalc --o expr="prec_1 = 100"
-r.mapcalc --o expr="prec_2 = 300"
-r.mapcalc --o expr="prec_3 = 500"
+r.mapcalc  expr="prec_1 = 100"
+r.mapcalc  expr="prec_2 = 300"
+r.mapcalc  expr="prec_3 = 500"
 
 n1=`g.tempfile pid=1 -d` 
 
@@ -17,7 +20,7 @@ prec_2|2001-03-01|2001-04-01
 prec_3|2001-05-01|2001-06-01
 EOF
 
-t.create --v --o type=strds temporaltype=absolute output=precip_abs title="A test" descr="A test"
+t.create --v  type=strds temporaltype=absolute output=precip_abs title="A test" descr="A test"
 t.register --v type=raster input=precip_abs file="${n1}"
 
 # @test

+ 2 - 1
temporal/temporalintro.html

@@ -189,7 +189,8 @@ pendants but with 3D raster map layers:
     (<a href="http://dx.doi.org/10.1016/j.envsoft.2013.11.001">DOI</a>)</li>
 <li>Vaclav Petras, Anna Petrasova, Helena Mitasova, Markus Neteler, <b>FOSS4G 2014 workshop</b>: <br>
     <a href="http://fatra.cnr.ncsu.edu/temporal-grass-workshop/">Spatio-temporal data handling and visualization in GRASS GIS</a></li>
-<li><a href="http://www.geostat-course.org/Topic_Gebbert">GeoStat TGRASS Course</a></li>
+<li><a href="http://grasswiki.osgeo.org/wiki/Temporal_data_processing">Temporal data processing</a> (Wiki)</li>
+<li><a href="http://www.geostat-course.org/Topic_Gebbert">GEOSTAT TGRASS Course</a></li>
 </ul>
 
 

+ 0 - 1
vector/v.surf.idw/v.surf.idw.html

@@ -60,7 +60,6 @@ raster Voronoi diagrams (Thiessen polygons).
 <a href="g.region.html">g.region</a>,
 <a href="r.surf.contour.html">r.surf.contour</a>,
 <a href="r.surf.idw.html">r.surf.idw</a>,
-<a href="r.surf.idw2.html">r.surf.idw2</a>,
 <a href="r.surf.gauss.html">r.surf.gauss</a>,
 <a href="r.surf.fractal.html">r.surf.fractal</a>,
 <a href="r.surf.random.html">r.surf.random</a>,