浏览代码

manual: some cleanup of HTML and examples

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

+ 22 - 9
display/d.vect.chart/d.vect.chart.html

@@ -7,9 +7,9 @@ frame on the graphics monitor.
 
 The charts are positioned as follows:
 <ul>
-<li> vector points: on point position
-<li> vector lines: on line centers
-<li> vector areas: on area centroids
+<li> vector points: on point position,
+<li> vector lines: on line centers,
+<li> vector areas: on area centroids.
 </ul>
 
 Bar charts are placed with their lower edge starting from the y-coordinate
@@ -27,25 +27,38 @@ plot if <b>chart_type</b> is <em>bar</em> (See Example 2).
 <h2>EXAMPLES</h2>
 
 <h3>Example 1</h3>
+
+Pie-chart of winter precipitation (North Carolina sample dataset):
+
 <div class="code"><pre>
-d.vect.chart map=vectmap columns=cens51,cens61,cens71,cens81
+d.vect.chart precip_30ynormals columns=nov,dec,jan,feb -l
 </pre></div>
 
 <h3>Example 2</h3>
 
-Create framed bar graphs of an erodibiliy index from the SPEARFISH dataset.
+Bar-chart of different census map values:
+
+<div class="code"><pre>
+d.vect.chart map=vectmap columns=cens51,cens61,cens71,cens81 chart_type=bar
+</pre></div>
+
+<h3>Example 3</h3>
+
+Creation of framed bar charts of an erodibiliy index from the Spearfish
+sample dataset:
+
 <div class="code"><pre>
 g.region rast=erode.index -p
-r.to.vect -s -v input=erode.index output=erode_index type=area 
+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
 d.vect.chart map=erode_index_ctrds chart_type=bar columns=cat \
-             size=10 max_ref=12 scale=1.5 colors=yellow 
+             size=10 max_ref=12 scale=0.05 colors=yellow 
 d.vect erode_index_ctrds icon=basic/circle fcol=black col=black size=5
 </pre></div>
 
-Example screenshot (zoomed):<br>
-<img src="d.vect.chart_example.jpg" alt="d.vect.chart example">
+<img src="d.vect.chart_example.jpg" alt="d.vect.chart example"><br>
+Bar charts of an erodibiliy index (spatial subset)
 
 <h2>SEE ALSO</h2>
 

+ 6 - 2
general/g.copy/g.copy.html

@@ -16,7 +16,11 @@ to copy an existing vector map <em>roads</em> to a file
 called <em>rds.old</em>, the user could type:
 
 <div class="code"><pre>
-g.copy rast=soils,soils.ph vect=roads,rds.old
+g.copy raster=soils,soils.ph
+g.copy vector=roads,rds.old
+
+# or even combined:
+g.copy raster=soils,soils.ph vector=roads,rds.old
 </pre></div>
 
 <p>
@@ -27,7 +31,7 @@ file called <em>soils</em> to be placed under the user's
 current mapset:
 
 <div class="code"><pre>
-g.copy rast=soils@wilson,soils
+g.copy raster=soils@wilson,soils
 </pre></div>
 
 If no mapset name is specified, <em>g.copy</em> searches for the

+ 4 - 4
general/g.filename/g.filename.html

@@ -5,8 +5,8 @@ the full file name, including it's path, for mapset elements, like raster,
 vector and site maps, region definitions and imagery groups.
 <p>The list of element names to search for is not fixed; any subdirectory of the
 mapset directory is a valid element name.
-<p>However, the user can find the list of standard GRASS element names in
-the file $GISBASE/etc/element_list. This is the file which
+<p>However, the user can find the list of standard GRASS GIS element names in
+the file <tt>$GISBASE/etc/element_list</tt>. This is the file which
 g.remove/g.rename/g.copy use to determine which files need to be
 deleted/renamed/copied for a given entity type.
 
@@ -50,14 +50,14 @@ be set in the <em>/bin/sh</em> as follows:
 <dl>
 <dd>
 <div class="code"><pre>
-eval `g.filename element=<em>name</em> mapset=<em>name</em> file=<em>name</em>`
+eval `g.filename element=name mapset=name file=name`
 </pre></div>
 </dl>
 
 
 <h2>NOTES</h2>
 
-This routine generates the filename, but does not care if the file (or mapset
+This module generates the filename, but does not care if the file (or mapset
 or element) exists or not. This feature allows shell scripts to create new data
 base files as well as use existing ones.
 

+ 15 - 10
general/g.findfile/g.findfile.html

@@ -33,7 +33,9 @@ as follows:
 <div class="code"><pre>
 eval `g.findfile element=name mapset=name file=name`
 </pre></div>
-<p>For example (raster map):
+
+<p>
+For example (raster map):
 <div class="code"><pre>
 eval `g.findfile element=cell file=elevation`
 </pre></div>
@@ -52,28 +54,31 @@ The following is a way to test for this case:
 <div class="code"><pre>
 if [ ! "$file" ]
 then
-	exit
+	exit 1
 fi
 </pre></div>
 
 <h2>PYTHON</h2>
 
-See <em><a href="http://grass.osgeo.org/programming7/pythonlib.html">Python
+See <em><a href="http://grass.osgeo.org/grass71/manuals/libpython/">Python
 Scripting Library</a></em> for more info.
-
+<p>
+Note: The Python shell in the <em>wxGUI</em> can be used for entering the
+following code:
+<p>
 <div class="code"><pre>
-import grass.script as grass
+import grass.script as gcore
     
-grass.find_file('elevation', element = 'cell')
+gcore.find_file('elevation', element = 'cell')
 </pre></div>
 
 <h2>SEE ALSO</h2>
 
 <em>
-  <a href="g.filename.html">g.filename</a>,
-  <a href="g.gisenv.html">g.gisenv</a>,
-  <a href="g.mapsets.html">g.mapsets</a>,
-  <a href="g.parser.html">g.parser</a>
+<a href="g.filename.html">g.filename</a>,
+<a href="g.gisenv.html">g.gisenv</a>,
+<a href="g.mapsets.html">g.mapsets</a>,
+<a href="g.parser.html">g.parser</a>
 </em>
 
 <h2>AUTHOR</h2>

+ 25 - 7
general/g.list/g.list.html

@@ -11,16 +11,32 @@ when used with <em>separator=comma</em>.
 
 <h2>EXAMPLES</h2>
 
-List all available GRASS data base files:
+List all raster maps as continuous, sorted list:
 <div class="code"><pre>
-g.list type=all
+g.list type=rast
+</pre></div>
+
+List all vector maps as continuous, sorted list with MAPSET info (i.e.
+fully-qualified map names):
+<div class="code"><pre>
+g.list type=vect -m
+</pre></div>
+
+List all raster and vector maps ordered by mapset:
+<div class="code"><pre>
+g.list type=rast -p
 </pre></div>
 
-List all raster and vector maps:
+List all raster and vector maps as continuous, sorted list:
 <div class="code"><pre>
 g.list type=rast,vect
 </pre></div>
 
+List all available GRASS data base files:
+<div class="code"><pre>
+g.list type=all
+</pre></div>
+
 <h3>Mapset search path</h3>
 
 If <b>mapset</b> is not specified than <em>g.list</em> searches for
@@ -29,7 +45,7 @@ data files in the mapsets which are included in the search path
 see <tt>g.mapsets -p</tt>.
 
 <div class="code"><pre>
-g.list rast
+g.list rast -p
 
 raster map(s) available in mapset &lt;user1&gt;:
 dmt
@@ -44,16 +60,16 @@ the current mapset:
 
 <div class="code"><pre>
 g.list rast mapset=.
-raster map(s) available in mapset &lt;user1&gt;:
-dmt
+...
 </pre></div>
 
+<!-- better quote * as "*"? -->
 Similarly <b>mapset</b>=* (one asterisk) prints data files from all
 available mapsets also including those which are not listed in the
 current search path (see <tt>g.mapsets -l</tt>).
 
 <div class="code"><pre>
-g.list rast mapset=*
+g.list rast mapset=* -p
 
 raster map(s) available in mapset &lt;landsat&gt;:
 lsat5_1987_10
@@ -181,6 +197,8 @@ regardless of their region.
 
 Huidae Cho<br>
 grass4u@gmail.com
+<br>
+based on general/manage/cmd/list.c by Michael Shapiro
 
 <p>
 <i>Last changed: $Date$</i>

+ 8 - 4
general/g.message/g.message.html

@@ -47,7 +47,7 @@ you are enouraged to single-quote messages that do not require
 
 <h3>Usage in Python scripts</h3>
 
-<a href="http://grass.osgeo.org/programming7/pythonlib.html">GRASS
+<a href="http://grass.osgeo.org/grass71/manuals/libpython/">GRASS
 Python Scripting Library</a> defines special wrappers
 for <em>g.message</em>.
 
@@ -61,11 +61,15 @@ for <em>g.message</em>.
   <li><tt>warning()</tt> for <tt>g.message -w</tt>
 </ul>
 
-Eg.
+<p>
+Note: The Python shell in the <em>wxGUI</em> can be used for entering the
+following sample code:
+<p>
 
 <div class="code"><pre>
-import grass.script as grass
-grass.warning("This is a warning")
+import grass.script as gcore
+
+gcore.warning("This is a warning")
 </pre></div>
 
 is identical with

+ 1 - 1
general/g.proj/g.proj.html

@@ -148,7 +148,7 @@ g.proj -c epsg=4326 location=latlong
 900913 (<a href="http://spatialreference.org/ref/user/6/">Google Mercator Projection</a>)<br>
 
 <div class="code"><pre>
-g.proj -c epsg=900913 loc=google
+g.proj -c epsg=900913 location=google
 </pre></div>
 
 <p>Create a new location with the co-ordinate system referred to by EPSG code

+ 20 - 20
general/g.rename/g.rename.html

@@ -13,24 +13,21 @@ new name to be assigned to this file element (<em>new</em>)
 in the current mapset.  The file element <em>old</em> is
 then renamed to <em>new</em>.
 
-
 <p>
-Users can also simply type <em>g.rename -help</em> without
+Users can also simply type <em>g.rename --help</em> without
 arguments on the command line, to receive a menu of
 existing data base element types and files from which to
 choose for possible renaming:
 
-<div class="code">
-<pre>
-     rast   rast file(s) to be renamed
-  oldvect   oldvect file(s) to be renamed (GRASS 5.0)
-     vect   vect file(s) to be renamed	  (GRASS >5.1)
-     icon   icon file(s) to be renamed
-   labels   labels file(s) to be renamed
-    sites   sites file(s) to be renamed
-   region   region file(s) to be renamed
-    group   group file(s) to be renamed
-   3dview   3dview file(s) to be renamed
+<div class="code"><pre>
+       raster   raster map(s) to be renamed
+     3draster   3D raster map(s) to be renamed
+       vector   vector map(s) to be renamed
+    oldvector   old  (GRASS 5.0) vector map(s) to be renamed
+  asciivector   ASCII vector map(s) to be renamed
+       labels   paint label file(s) to be renamed
+       region   region definition(s) to be renamed
+        group   imagery group(s) to be renamed
 </pre></div>
 
 
@@ -43,7 +40,7 @@ also are renamed.
 <p>
 If the user attempts to rename a file to itself by setting
 the <em>new</em> file name equal to the <em>old</em> file
-name (e.g., <b>g.rename rast=soils,soils</b>),
+name (e.g., <b>g.rename raster=soils,soils</b>),
 <em>g.rename</em> will not execute the rename, but instead
 state that no rename is needed.  However, <em>g.rename</em>
 
@@ -59,19 +56,22 @@ the intended name.
 
 <div class="code"><pre>
 # rename raster map
-g.rename rast=oldrast,newrast
+g.rename raster=oldrast,newrast
 
 # rename vector map
-g.rename vect=oldvect,newvect
+g.rename vector=oldvect,newvect
 
 # combined renaming
-g.rename rast=oldrast,newrast vect=oldvect,newvect
+g.rename raster=oldrast,newrast vector=oldvect,newvect
 </pre></div>
+
 <h2>SEE ALSO</h2>
 
-<em><a href="g.copy.html">g.copy</a></em><br>
-<em><a href="g.list.html">g.list</a></em><br>
-<em><a href="g.remove.html">g.remove</a></em>
+<em>
+<a href="g.copy.html">g.copy</a>,
+<a href="g.list.html">g.list</a>,
+<a href="g.remove.html">g.remove</a>
+</em>
 
 <h2>AUTHOR</h2>
 

+ 19 - 17
general/g.version/g.version.html

@@ -1,17 +1,17 @@
 <h2>DESCRIPTION</h2>
 
 <em>g.version</em> prints to standard output the GRASS version number,
-date, the GRASS copyright (<b>-c</b> flag), and GRASS build information
+date, the GRASS GIS copyright (<b>-c</b> flag), and GRASS build information
 (<b>-b</b> flag).
 
 <h2>NOTES</h2>
 
 This program requires no command line arguments; the user simply types
 <em>g.version</em> on the command line to see the version number and
-date of the GRASS software currently being run by the user.
+date of the GRASS GIS software currently being run by the user.
 
 <p>
-Information about GRASS
+Information about GRASS GIS
 core <a href="http://grass.osgeo.org/programming7/gislib.html">GIS
 Library</a> can be printed by <b>-r</b> flag.
 
@@ -27,9 +27,9 @@ from <a href="http://grasswiki.osgeo.org/wiki/GRASS_Python_Scripting_Library">Py
 Scripting Library</a>.
 
 <div class="code"><pre>
-import grass.script as grass
+import grass.script as gcore
 
-print grass.version()
+print gcore.version()
 </pre></div>
 
 <h2>EXAMPLES</h2>
@@ -38,7 +38,7 @@ print grass.version()
 <div class="code"><pre>
 g.version 
 
-GRASS 7.0.svn (2012)
+GRASS 7.0.0svn (2014)
 </pre></div>
 
 <h3>GIS Library info</h3>
@@ -46,24 +46,26 @@ GRASS 7.0.svn (2012)
 <div class="code"><pre>
 g.version -r
 
-GRASS 7.0.svn (2012)
-libgis Revision: 52468 
-libgis Date: 2012-07-27 22:53:30 +0200 (Fri, 27 Jul 2012) 
+GRASS 7.0.0svn (2014)
+libgis Revision: 63222 
+libgis Date: 2014-11-28 10:04:17 +0100 (Fri, 28 Nov 2014) 
 </pre></div>
 
 <h3>Full info in shell script style</h3>
 <div class="code"><pre>
 g.version -rge
 
-version=7.0.svn
-revision=53670
-date=2012
-libgis_revision=52468 
-libgis_date="2012-07-27 22:53:30 +0200 (Fri, 27 Jul 2012) "
+version=7.0.0svn
+date=2014
+revision=63285M
+build_date=2014-12-03
+build_platform=x86_64-unknown-linux-gnu
+libgis_revision=63222 
+libgis_date="2014-11-28 10:04:17 +0100 (Fri, 28 Nov 2014) "
 proj4=4.8.0
-gdal=1.9.2
-geos=3.3.5
-sqlite=3.7.14.1
+gdal=1.10.1
+geos=3.4.2
+sqlite=3.8.7
 </pre></div>
 
 <h2>AUTHORS</h2>

+ 14 - 12
imagery/i.albedo/i.albedo.html

@@ -1,28 +1,30 @@
 <h2>DESCRIPTION</h2>
 
-<em>i.albedo</em> calculates the Albedo, that is the Shortwave surface
-reflectance in the range of 0.3-3 micro-meters.  It takes input of
-individual bands of surface reflectance from Modis, AVHRR, Landsat or
-Aster and calculates the Albedo for those.  This is an precursor to
-r.sun and any Energy-Balance processing.
-
-Landsat 8 weighted average reflectance (temporary until algorithm is found)
+<em>i.albedo</em> calculates the albedo, that is the Shortwave surface
+reflectance in the range of 0.3-3 micro-meters.  It takes as input
+individual bands of surface reflectance originating from MODIS, AVHRR, Landsat
+or Aster satellite sensors and calculates the albedo for those.  This is
+a precursor to <em>r.sun</em> and any energy-balance processing.
 
 <h2>NOTES</h2>
-It assumes MODIS product surface reflectance in [0;10000]
+
+It uses for Landsat 8 the weighted average reflectance (temporary until algorithm is found).
+<p>
+It assumes MODIS product surface reflectance in [0;10000].
 
 <h2>TODO</h2>
+
 Maybe change input requirement of MODIS to [0.0-1.0]?
 
 <h2>SEE ALSO</h2>
 
 <em>
-  <a href="r.sun.html">r.sun</a>,
-  <a href="i.vi.html">i.vi</a>
+<a href="r.sun.html">r.sun</a>,
+<a href="i.vi.html">i.vi</a>
 </em>
 
-<h2>AUTHORS</h2>
+<h2>AUTHOR</h2>
 
-GRASS Development Team
+Yann Chemin
 
 <p><i>Last changed: $Date$</i>

+ 2 - 2
imagery/i.albedo/main.c

@@ -6,7 +6,7 @@
  * PURPOSE:      Calculate Broadband Albedo (0.3-3 Micrometers)
  *               from Surface Reflectance (Modis, AVHRR, Landsat, Aster).
  *
- * COPYRIGHT:    (C) 2004-2008 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2004-2014 by the GRASS Development Team
  *
  *               This program is free software under the GNU Lesser General Public
  *                License. Read the file COPYING that comes with GRASS for details.
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
 
     flag3 = G_define_flag();
     flag3->key = 'l';
-    flag3->description = _("Landsat (6 input bands:1,2,3,4,5,7)");
+    flag3->description = _("Landsat 5+7 (6 input bands:1,2,3,4,5,7)");
 
     flag4 = G_define_flag();
     flag4->key = '8';

+ 2 - 0
imagery/i.aster.toar/i.aster.toar.html

@@ -5,6 +5,8 @@ for Terra-Aster L1B in the visible, NIR and SWIR bands (9+1 bands) and
 brigthness temperature for the TIR bands (5 bands), all from L1B DN values. 
 It is useful after importing your Aster imagery from storage format that
 is generally in standard DN values range.
+
+<p>
 The order of input bands is
 <ul>
 <li> VNIR: 1,2,3N,3B

+ 6 - 5
imagery/i.biomass/i.biomass.html

@@ -1,15 +1,15 @@
 <h2>DESCRIPTION</h2>
 
-<em>i.biomass</em> Calculates the biomass growth for a day after [1][2]. 
+<em>i.biomass</em> calculates the biomass growth for a day after [1][2]. 
 
 Input:
 <ul>
  <li>fPAR, the modified Photosynthetic Active Radiation for crops.
  <li>Light Use Efficiency [0.0-1.0], in Uzbekistan cotton is at 1.9 most of the time.
- <li>Latitude [0.0-90.0], from r.latlong.
+ <li>Latitude [0.0-90.0], from <em>r.latlong</em>.
  <li>DOY [1-366].
  <li>Transmissivity of the Atmosphere single-way [0.0-1.0], mostly around 0.7+ in clear sky.
- <li>Water availability [0.0-1.0], possibly using direct output from i.eb.evapfr.
+ <li>Water availability [0.0-1.0], possibly using direct output from <em>i.eb.evapfr</em>.
 </ul>
 
 <h2>NOTES</h2>
@@ -17,12 +17,13 @@ It can use the output of i.eb.evapfr directly as water availability input.
 
 <h2>TODO</h2>
 Remove Latitude, DOY and Tsw from input and replace with a raster 
-input compatible with r.sun output.
+input compatible with <em>r.sun</em> output.
 
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="i.eb.evapfr">i.eb.evapfr</a><br>
+<a href="i.eb.evapfr.html">i.eb.evapfr</a>,
+<a href="r.latlong.html">r.latlong</a>
 </em>
 
 <h2>REFERENCES</h2>

+ 10 - 11
imagery/i.eb.eta/i.eb.eta.html

@@ -2,28 +2,28 @@
 
 <em>i.eb.eta</em> calculates the actual evapotranspiration (ETa ; mm/d) for
 diurnal period after [1], implemented in [3].
-It takes input of Diurnal Net Radiation (see <i>r.sun</i>), evaporative fraction (see
-<i>i.eb.evapfr</i>) and surface skin temperature. 
+It takes input of Diurnal Net Radiation (see <em>r.sun</em>), evaporative fraction (see
+<em>i.eb.evapfr</em>) and surface skin temperature. 
 
 <h2>NOTES</h2>
 Full ETa processing will need those:
 <ul>
-  <li>i.vi, i.albedo, r.latlong, i.emissivity
-  <li>i.evapo.potrad (Addon)
-  <li>i.eb.netrad, i.eb.soilheatflux, i.eb.hsebal01
-  <li>i.eb.evapfr, i.eb.eta
+  <li><em>i.vi</em>, <em>i.albedo</em>, <em>r.latlong</em>, <em>i.emissivity</em>
+  <li><em>i.evapo.potrad</em> (GRASS Addon)
+  <li><em>i.eb.netrad</em>, <em>i.eb.soilheatflux</em>, <em>i.eb.hsebal01</em>
+  <li><em>i.eb.evapfr</em>, <em>i.eb.eta</em>
 </ul>
 
-(for time integration: i.evapo.time_integration)
+(for time integration: <em>i.evapo.time_integration</em>) <!-- TODO unknown module -->
 
 <p>For more details on the algorithms see [1][2][3][4].
 
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="r.sun.html">r.sun</a><br>
-<a href="i.eb.evapfr.html">i.eb.evapfr</a><br>
-<a href="i.eb.netrad.html">i.eb.netrad</a><br>
+<a href="r.sun.html">r.sun</a>,
+<a href="i.eb.evapfr.html">i.eb.evapfr</a>,
+<a href="i.eb.netrad.html">i.eb.netrad</a>
 </em>
 
 <h2>REFERENCES</h2>
@@ -47,7 +47,6 @@ A Distributed Benchmarking Framework for Actual ET Models,
 in: Irmak, A. (Ed.), Evapotranspiration - Remote Sensing and Modeling. InTech.
 (<a href="http://www.intechopen.com/books/evapotranspiration-remote-sensing-and-modeling/a-distributed-benchmarking-framework-for-actual-et-models">PDF</a>)
 
-
 <h2>AUTHORS</h2>
 
 Yann Chemin, Asian Institute of Technology, Thailand

+ 11 - 11
imagery/i.eb.hsebal01/i.eb.hsebal01.html

@@ -8,13 +8,13 @@ pressure (ea[KPa]) and the (x,y) pairs for wet and dry pixels.
 
 Full process will need those:
 <ul>
-  <li>i.vi, i.albedo, r.latlong, i.emissivity
-  <li>i.evapo.potrad (Addon)
-  <li>i.eb.netrad, i.eb.soilheatflux, i.eb.hsebal01
-  <li>i.eb.evapfr, i.eb.eta
+  <li><em>i.vi</em>, <em>i.albedo</em>, <em>r.latlong</em>, <em>i.emissivity</em>
+  <li><em>i.evapo.potrad</em> (GRASS Addon)
+  <li><em>i.eb.netrad</em>, <em>i.eb.soilheatflux</em>, <em>i.eb.hsebal01</em>
+  <li><em>i.eb.evapfr</em>, <em>i.eb.eta</em>
 </ul>
 
-(for time integration: i.evapo.time_integration)
+(for time integration: <em>i.evapo.time_integration</em>) <!-- TODO unknown module -->
 
 <p>
 <em>i.eb.hsebal01</em> performs the computation of <i>sensible heat flux</i>
@@ -23,7 +23,7 @@ in this code in [3].
 
 <h2>NOTES</h2>
 <ul>
-<li> z0m can be alculated by i.eb.z0m or i.eb.z0m0 (grass-addons).
+<li> z0m can be alculated by <em>i.eb.z0m</em> or <em>i.eb.z0m0</em> (GRASS Addons).
 <li> ea can be calculated with standard meteorological data.<br>
 	eoTmin=0.6108*EXP(17.27*Tmin/(Tmin+237.3))<br>
 	eoTmax=0.6108*EXP(17.27*Tmax/(Tmax+237.3))<br>
@@ -33,13 +33,13 @@ in this code in [3].
 
 
 <h2>SEE ALSO</h2>
+
 <em>
-<a href=i.eb.soilheatflux.html>i.eb.soilheatflux</a>,
-<a href=i.eb.hsebal01.html>i.eb.hsebal01</a>,
-<a href=i.eb.evapfr.html>i.eb.evapfr</a>
+<a href="i.eb.soilheatflux.html">i.eb.soilheatflux</a>,
+<a href="i.eb.hsebal01.html">i.eb.hsebal01</a>,
+<a href="i.eb.evapfr.html">i.eb.evapfr</a>
 </em>
 
-
 <h2>REFERENCES</h2>
 
 <p>[1] Bastiaanssen, W.G.M., 1995.
@@ -48,7 +48,7 @@ conditions. PhD thesis, Wageningen University, Wageningen, The Netherlands.
 (<a href="http://edepot.wur.nl/206553">PDF</a>)
 
 <p>[2] Chemin Y., Alexandridis T.A., 2001. Improving spatial resolution of ET
-seasonal for irrigated rice in Zhanghe, China}''. Asian Journal of
+seasonal for irrigated rice in Zhanghe, China. Asian Journal of
 Geoinformatics. 5(1):3-11,2004. 
 
 <p>[3] Alexandridis T.K., Cherif I., Chemin Y., Silleos N.G., Stavrinos E.,

+ 3 - 1
imagery/i.eb.netrad/i.eb.netrad.html

@@ -9,10 +9,12 @@ about 2 m height (dT), instantaneous satellite overpass single-way atmospheric
 transmissivity (tsw), Day of Year (DOY), and sun zenith angle.
 
 <h2>NOTES</h2>
+
+<!-- rewrite too sloppy notes or move to addons -->
 In the old methods, dT was taken as flat images (dT=5.0), if you don't have a dT
 map from ground data, you would want to try something in this line, this is to
 calculate atmospherical energy balance. In the same way, a standard tsw is used
-in those equations. Refer to r_net.c for that and for other non-used equations,
+in those equations. Refer to <tt>r_net.c</tt> for that and for other non-used equations,
 but stored in there for further research convenience.
 
 <h2>TODO</h2>

+ 1 - 1
imagery/i.eb.soilheatflux/i.eb.soilheatflux.html

@@ -1,7 +1,7 @@
 <h2>DESCRIPTION</h2>
 
 <em>i.eb.soilheatflux</em> calculates the soil heat flux approximation (g0)
-after Bastiaanssen (1995). The main reference for implementation is Alexandridis, submitted.
+after Bastiaanssen (1995). The main reference for implementation is Alexandridis, 2009.
 It takes input of Albedo, NDVI, Surface Skin temperature, Net Radiation (see 
 <em>r.sun</em>), time of satellite overpass, and a flag for the Roerink empirical
 modification from the HAPEX-Sahel experiment.

+ 3 - 2
imagery/i.emissivity/i.emissivity.html

@@ -3,8 +3,9 @@
 <em>i.emissivity</em> calculates the emissivity in the longwave radiation
 spectrum, according to the semi-empirical equation related to NDVI by
 Caselles and Colles (1997), valid in the NDVI range of 0.16 to 0.74.
-<p>Estimation in the 8-14 micrometers range for sparse canopy...
-
+<p>
+Estimation in the 8-14 micrometers range for sparse canopy...
+<!-- TODO: incomplete phrase! -->
 
 <h2>SEE ALSO</h2>
 

+ 3 - 1
imagery/i.evapo.mh/i.evapo.mh.html

@@ -3,6 +3,8 @@
 <em>i.evapo.MH</em> Calculates the reference ET after Hargreaves (1985)
 and Modified Hargreaves (2001). 
 
+<!-- TODO Hargreaves (2001) citation missing! -->
+
 <h2>SEE ALSO</h2>
 
 <em>
@@ -20,7 +22,7 @@ ASCE, 111(2):113-124.
 evapotranspiration equation. Irrigation Science.
 <p>Droogers, P., and R.G. Allen. 2002. Estimating reference evapotranspiration
 under inaccurate data conditions. Irrigation and Drainage Systems 16: 33-45.
-<p>Hargreaves and Samani, 1985.
+<p>Hargreaves and Samani, 1985. <!-- incomplete -->
 
 <h2>AUTHORS</h2>
 

+ 6 - 3
imagery/i.evapo.pm/i.evapo.pm.html

@@ -12,7 +12,9 @@ vapour content, are sometime undesired because they can produce  computational
 problems. The usage of the flag -n detect that the module is run in night hours 
 and the appropriate soil heat flux is calculated.
 
-<p>The algorithm implements well known approaches: the hourly Penman-Monteith method as presented in Allen et al. (1998) for land surfaces and the Penman method (Penman, 1948) for water surfaces.<br>
+<p>The algorithm implements well known approaches: the hourly 
+Penman-Monteith method as presented in Allen et al. (1998) for land 
+surfaces and the Penman method (Penman, 1948) for water surfaces.
 
 <p>Land and water surfaces are idenfyied by Vh:
 <ul>
@@ -52,8 +54,8 @@ applied science for the Southern Switzerland)
 <a href="i.evapo.mh.html">i.evapo.mh</a>,
 <a href="i.evapo.pm.html">i.evapo.pm</a>,
 <a href="i.evapo.time.html">i.evapo.time</a>,
-<a href=r.sun.html>r.sun</a>,
-<a href=r.mapcalc.html>r.mapcalc</a>
+<a href="r.sun.html">r.sun</a>,
+<a href="r.mapcalc.html">r.mapcalc</a>
 </em>
 
 <h2>AUTHORS</h2>
@@ -76,6 +78,7 @@ applied science for the Southern Switzerland)
   Crop Evapotranspiration: Guidelines for computing crop water requirements. 
   Irrigation and Drainage Paper 56, Food and Agriculture Organization of the 
   United Nations, Rome, pp. 300
+
   <p>[3] Penman, H. L. 1948. Natural evaporation from open water, 
   bare soil and grass. Proc. Roy. Soc. London, A193, pp. 120-146. 
 

+ 3 - 2
imagery/i.evapo.pt/i.evapo.pt.html

@@ -16,11 +16,12 @@ surface roughness (Morton, 1983; Brutsaert and Stricker, 1979)
 Stewart and Rouse, 1976; Shuttleworth and Calder, 1979), and temperate
 hardwood swamps (Munro, 1979)
 <li> 1.74 has been recommended for estimating potential evapotranspiration
-in more arid regions (ASCE, 1990). This Worked well in Greece with University of Thessaloniki.
+in more arid regions (ASCE, 1990). This worked well in Greece with University
+of Thessaloniki.
 </ul>
 
 Alpha values extracted from:
-http://www.civil.uwaterloo.ca/Watflood/Manual/02_03_1.htm
+<a href="http://www.civil.uwaterloo.ca/Watflood/Manual/02_03_1.htm">Watflood manual</a>.
 
 <h2>SEE ALSO</h2>
 

+ 2 - 2
imagery/i.evapo.time/i.evapo.time.html

@@ -36,7 +36,7 @@ n=0
 for ETo_val in Eto[1] Eto[2] ...
 do
 	r.mapcalc "eto$n = $ETo_val" 
-	`expr n = n + 1'
+	`expr n = n + 1`
 done
 </pre></div>
 
@@ -63,7 +63,7 @@ For multi-year calculations, just continue incrementing DOY values above
 </em>
 
 
-<h2>AUTHORS</h2>
+<h2>AUTHOR</h2>
 Yann Chemin, International Rice Research Institute, The Philippines
 
 <p><i>Last changed: $Date$</i>

+ 5 - 4
imagery/i.his.rgb/i.his.rgb.html

@@ -14,9 +14,7 @@ geographic region and mask settings are respected.
 
 It is not possible to process three bands with
 <em>i.his.rgb</em> and then exactly recover the original
-bands with
-
-<em><a href="i.rgb.his.html">i.rgb.his</a></em>.  
+bands with <em>i.rgb.his</em>.  
 
 This is due to loss of precision because of integer
 computations and rounding.  Tests have shown that more than
@@ -27,7 +25,10 @@ significantly from their original values.
 
 <h2>SEE ALSO</h2>
 
-<em><a href="r.colors.html">r.colors</a></em>
+<em>
+<a href="i.rgb.his.html">i.rgb.his</a>,
+<a href="r.colors.html">r.colors</a>
+</em>
 
 <h2>AUTHOR</h2>
 

+ 5 - 3
imagery/i.landsat.acca/i.landsat.acca.html

@@ -27,8 +27,10 @@ thermal band <tt>226_62.toar.61</tt>, outputing to a new raster map
 named <tt>226_62.acca</tt>:
 
 <div class="code"><pre>
-    i.landsat.toar sensor=7 gain=HHHLHLHHL date=2003-04-07 product_date=2008-11-27 band_prefix=226_62 solar_elevation=49.51654
-    i.landsat.acca -f band_prefix=226_62.toar output=226_62.acca
+i.landsat.toar sensor=7 gain=HHHLHLHHL date=2003-04-07 \
+  product_date=2008-11-27 band_prefix=226_62 solar_elevation=49.51654
+
+i.landsat.acca -f band_prefix=226_62.toar output=226_62.acca
 </pre></div>
 
 
@@ -49,7 +51,7 @@ named <tt>226_62.acca</tt>:
 <h2>SEE ALSO</h2>
 
 <em>
-  <a href="i.landsat.toar.html">i.landsat.toar</a>
+<a href="i.landsat.toar.html">i.landsat.toar</a>
 </em>
 
 <h2>AUTHOR</h2>

+ 2 - 1
imagery/i.modis.qc/i.modis.qc.html

@@ -412,7 +412,8 @@ Add more daily products.
 <ul>
 <li> <a href="https://lpdaac.usgs.gov/products/modis_products_table">MODIS Products</a>
 <li> Vermote E.F., Kotchenova S.Y., Ray J.P. MODIS Surface Reflectance User's Guide. 
- Version 1.2. June 2008. MODIS Land Surface Reflectance Science Computing Facility. <a href="http://modis-sr.ltdri.org">Homepage</a>
+ Version 1.2. June 2008. MODIS Land Surface Reflectance Science Computing Facility.
+ <a href="http://modis-sr.ltdri.org">Homepage</a>
 </ul>
 
 <h2>AUTHOR</h2>

+ 5 - 4
lib/htmldriver/htmldriver.html

@@ -133,7 +133,8 @@ d.vect map=roswell fillcolor=yellow linecolor=blue
 d.vect map=states  color=green
 d.vect map=roads   color=black
 d.mon stop=png
-<!-- ????  FIXME -->
+
+<!-- ????  FIXME and the ppm stuff looks overly complicated -->
 # make the region the same as the newly created cell for ppm export
 g.region save=saved.reg
 g.region raster=D_cell
@@ -172,9 +173,9 @@ will need to edit the map names. The HTML driver creates its map
 with the name
 <tt>map</tt>. A small sed script can easily change the map name:
 
-<pre>
-  sed -e 's/NAME="map"/NAME="foomap"/' &lt; htmlmap &gt; foomap.html
-</pre>
+<div class="code"><pre>
+sed -e 's/NAME="map"/NAME="foomap"/' &lt; htmlmap &gt; foomap.html
+</pre></div>
 
 <h2>SEE ALSO</h2>
 

+ 5 - 5
lib/init/grass7.html

@@ -129,13 +129,13 @@ from highest precedence to lowest.
 interface, then the GRASS_PYTHON environment variable can be used to
 override your system default <tt>python</tt> command.
 
-<p>Suppose for example your system has Python 2.4 installed and you
-install a personal version of the Python 2.5 binaries
+<p>Suppose for example your system has Python 2.5 installed and you
+install a personal version of the Python 2.6 binaries
 under <tt>$HOME/bin</tt>. You can use the above variables to have
-GRASS use the Python 2.5 binaries instead.
+GRASS use the Python 2.6 binaries instead.
 
 <div class="code"><pre>
-   GRASS_PYTHON=python2.5
+   GRASS_PYTHON=python2.6
 </pre></div>
 
 <h3>Addon Path to Extra User Scripts</h3>
@@ -327,7 +327,7 @@ the environment variables LOCATION_NAME and MAPSET.
 If you start GRASS using the <em><a href="wxGUI.html">wxGUI</a></em>
 interface you must have a <tt>python</tt> command in your $PATH
 variable. That is, the command must be named
-<tt>python</tt> and not something like <tt>python2.5</tt>. Rarely some
+<tt>python</tt> and not something like <tt>python2.6</tt>. Rarely some
 Python installations do not create a <tt>python</tt> command. In these
 cases you can override <tt>python</tt> by GRASS_PYTHON environmental
 variable.

+ 9 - 7
scripts/d.vect.thematic/d.vect.thematic.html

@@ -67,25 +67,27 @@ Example for earthquake map rendering
 <div class="code"><pre>
 # random sampling of elevation points:
 g.region rast=elevation -p
-v.random random n=200
-v.db.addtable random col="el10 double precision"
+v.random random npoints=200
+v.db.addtable random column="el10 double precision"
 # transfer elevations to attribute table of random points map:
-v.what.rast random rast=elevation col=el10
+v.what.rast random rast=elevation column=el10
 v.db.select random
 
 # comparative sampling of second map, incl. differences:
-v.sample in=random col=el10 rast=elev_state_500m out=elev_sample
+v.sample input=random column=el10 raster=elev_state_500m output=elev_sample
 v.db.select elev_sample
 
 # univariate statistics:
-v.univar -e elev_sample col=diff type=point
+v.univar -e elev_sample column=diff type=point
 
 # thematic map:
 d.mon wx0
 d.vect.thematic -l elev_sample column=diff type=point
 </pre></div>
 
-<p>North Carolina data set example:
+<p>
+North Carolina sample dataset example:
+
 <div class="code"><pre>
 g.region vect=nc_state
 d.vect.thematic -l precip_30ynormals column=annual type=point
@@ -94,7 +96,7 @@ d.vect.thematic -l precip_30ynormals column=annual type=point
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="d.vect.html">d.vect</a>, 
+<a href="d.vect.html">d.vect</a>,
 <a href="d.vect.chart.html">d.vect.chart</a>,
 <a href="v.univar.html">v.univar</a>
 </em>

+ 3 - 3
scripts/i.tasscap/i.tasscap.html

@@ -18,13 +18,13 @@ The following TC components are generated:
 <li> tasscap.1: corresponds to brightness,
 <li> tasscap.2: corresponds to greenness,
 <li> tasscap.3: corresponds to wetness,
-<li> tasscap.4: corresponds to atmospheric haze (only selected sensors).
+<li> tasscap.4: corresponds to atmospheric haze (only selected sensors: Landsat 5,7,8).
 </ul>
 
 
 <h2>EXAMPLE</h2>
 
-Calculation of TC maps from North Carolina Landsat scene:
+Calculation of TC maps from North Carolina Landsat 7 ETM scene:
 
 <div class="code"><pre>
 g.region rast=lsat7_2002_10 -p
@@ -106,5 +106,5 @@ Results:
 
 <h2>AUTHOR</h2>
 
-Markus Neteler, ITC-irst
+Markus Neteler, ITC-irst, based on a script by Agustin Lobo
 <p><i>Last changed: $Date$</i>

+ 14 - 10
vector/v.info/v.info.html

@@ -9,7 +9,7 @@ on the fly which may take some time.
 
 <h2>EXAMPLE</h2>
 
-<h3>Basic info</h3>
+<h3>Basic metadata information</h3>
 
 <div class="code"><pre>
 v.info map=geology
@@ -46,7 +46,7 @@ v.info map=geology
  +----------------------------------------------------------------------------+
 </pre></div>
 
-<h3>History</h3>
+<h3>Map history</h3>
 
 <div class="code"><pre>
 v.info -h map=geology
@@ -78,7 +78,7 @@ DOUBLE PRECISION|SHAPE_area
 DOUBLE PRECISION|SHAPE_len
 </pre></div>
 
-<h3>Basic info in shell script style</h3>
+<h3>Basic metadata information in shell script style</h3>
 
 <div class="code"><pre>
 v.info -get map=geology 
@@ -128,21 +128,25 @@ bottom=0.000000
 
 <h2>PYTHON</h2>
 
-See <em><a href="http://grass.osgeo.org/programming7/pythonlib.html">Python
+See <em><a href="http://grass.osgeo.org/grass71/manuals/libpython/">Python
 Scripting Library</a></em> for more info.
-
+<p>
+Note: The Python shell in the <em>wxGUI</em> can be used for entering the
+following code:
+<p>
 <div class="code"><pre>
-import grass.script as grass
+import grass.script as gcore
     
-grass.vector_columns('geology')   # for `v.info -c`
-grass.vector_info_topo('geology') # for `v.info shell=topo`
+gcore.vector_columns('geology')   # for `v.info -c`
+gcore.vector_info_topo('geology') # for `v.info shell=topo`
 </pre></div>
 
 <h2>SEE ALSO</h2>
 
 <em>
-  <a href="r.info.html">r.info</a>,
-  <a href="r3.info.html">r3.info</a>
+<a href="r.info.html">r.info</a>,
+<a href="r3.info.html">r3.info</a>,
+<a href="t.info.html">t.info</a>
 </em>
 
 <h2>AUTHOR</h2>