[GRASS-SVN] r48109 - in grass/branches/develbranch_6/scripts: d.polar d.rast.leg d.redraw d.shadedmap d.vect.thematic db.droptable db.out.ogr db.test i.image.mosaic i.in.spotvgt i.oif r.blend r.colors.stddev r.fillnulls r.in.aster r.in.wms r.mapcalculator r.mask r.out.xyz r.plane r.reclass.area r.shaded.relief r.tileset r3.mapcalculator v.build.all v.centroids v.convert.all v.db.addtable v.db.droptable v.db.join v.db.reconnect.all v.db.univar v.db.update v.dissolve v.in.e00 v.in.garmin v.in.geonames v.in.gns v.in.gpsbabel v.in.lines v.in.mapgen v.in.sites.all v.krige v.rast.stats v.report v.what.vect

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Sep 4 09:23:02 EDT 2011


Author: neteler
Date: 2011-09-04 06:23:01 -0700 (Sun, 04 Sep 2011)
New Revision: 48109

Modified:
   grass/branches/develbranch_6/scripts/d.polar/description.html
   grass/branches/develbranch_6/scripts/d.rast.leg/description.html
   grass/branches/develbranch_6/scripts/d.redraw/description.html
   grass/branches/develbranch_6/scripts/d.shadedmap/description.html
   grass/branches/develbranch_6/scripts/d.vect.thematic/description.html
   grass/branches/develbranch_6/scripts/db.droptable/description.html
   grass/branches/develbranch_6/scripts/db.out.ogr/description.html
   grass/branches/develbranch_6/scripts/db.test/description.html
   grass/branches/develbranch_6/scripts/i.image.mosaic/description.html
   grass/branches/develbranch_6/scripts/i.in.spotvgt/description.html
   grass/branches/develbranch_6/scripts/i.oif/description.html
   grass/branches/develbranch_6/scripts/r.blend/description.html
   grass/branches/develbranch_6/scripts/r.colors.stddev/description.html
   grass/branches/develbranch_6/scripts/r.fillnulls/description.html
   grass/branches/develbranch_6/scripts/r.in.aster/description.html
   grass/branches/develbranch_6/scripts/r.in.wms/description.html
   grass/branches/develbranch_6/scripts/r.mapcalculator/description.html
   grass/branches/develbranch_6/scripts/r.mask/description.html
   grass/branches/develbranch_6/scripts/r.out.xyz/description.html
   grass/branches/develbranch_6/scripts/r.plane/description.html
   grass/branches/develbranch_6/scripts/r.reclass.area/description.html
   grass/branches/develbranch_6/scripts/r.shaded.relief/description.html
   grass/branches/develbranch_6/scripts/r.tileset/description.html
   grass/branches/develbranch_6/scripts/r3.mapcalculator/description.html
   grass/branches/develbranch_6/scripts/v.build.all/description.html
   grass/branches/develbranch_6/scripts/v.centroids/description.html
   grass/branches/develbranch_6/scripts/v.convert.all/description.html
   grass/branches/develbranch_6/scripts/v.db.addtable/description.html
   grass/branches/develbranch_6/scripts/v.db.droptable/description.html
   grass/branches/develbranch_6/scripts/v.db.join/description.html
   grass/branches/develbranch_6/scripts/v.db.reconnect.all/description.html
   grass/branches/develbranch_6/scripts/v.db.univar/description.html
   grass/branches/develbranch_6/scripts/v.db.update/description.html
   grass/branches/develbranch_6/scripts/v.dissolve/description.html
   grass/branches/develbranch_6/scripts/v.in.e00/description.html
   grass/branches/develbranch_6/scripts/v.in.garmin/description.html
   grass/branches/develbranch_6/scripts/v.in.geonames/description.html
   grass/branches/develbranch_6/scripts/v.in.gns/description.html
   grass/branches/develbranch_6/scripts/v.in.gpsbabel/description.html
   grass/branches/develbranch_6/scripts/v.in.lines/description.html
   grass/branches/develbranch_6/scripts/v.in.mapgen/description.html
   grass/branches/develbranch_6/scripts/v.in.sites.all/description.html
   grass/branches/develbranch_6/scripts/v.krige/description.html
   grass/branches/develbranch_6/scripts/v.rast.stats/description.html
   grass/branches/develbranch_6/scripts/v.report/description.html
   grass/branches/develbranch_6/scripts/v.what.vect/description.html
Log:
NC examples added; HTML cleaned up (backport from trunk)

Modified: grass/branches/develbranch_6/scripts/d.polar/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/d.polar/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/d.polar/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,6 +1,6 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>d.polar</EM> calculates and displays a polar diagram of an
+<em>d.polar</em> calculates and displays a polar diagram of an
 angle raster map such as aspect, wind direction, or flow.
 The input angle map orientation must be counter-clockwise (CCW)
 from east, and the angle map units must be degrees. This refers
@@ -20,51 +20,59 @@
 the related angle(s) which happens in particular if integer maps
 are used.
 
-<H2>NOTES</H2>
+<h2>NOTES</h2>
 
 If the <b>eps</b> parameter is used, the diagram is generated
-as EPS file. If the <b>-x</b> flag is used <EM>xgraph</EM> is lauched.
+as EPS file. If the <b>-x</b> flag is used <em>xgraph</em> is lauched.
 Otherwise <em>d.polar</em> will use <em>d.graph</em> to draw the plot
 in the current display frame.
 <P>
-If <EM>d.polar</EM> is used on an aspect map generated by
-<EM>r.slope.aspect</EM>, the <b>undef</b> parameter should be
+If <em>d.polar</em> is used on an aspect map generated by
+<em>r.slope.aspect</em>, the <b>undef</b> parameter should be
 set to 0 to distinguish NO DATA (NULL) areas from areas where
 aspect is undefined (i.e. flat areas).
-<P>
+<p>
 
 <center>
 <img src="d_polar_aspect.png" alt="Polar diagram of aspect map">
-<BR>
+<br>
 <i>Polar diagram of aspect map</i>
 </center>
 
 <h2>EXAMPLE</h2>
 
 In this example, the polar diagram of the 'aspect' angle map in the
-Spearfish location is generated:
+North Carolina sample dataset location is generated:
 
 <div class="code"><pre>
+g.region rast=aspect -p
 d.polar aspect
 </pre></div>
 
+<h2>SEE ALSO</h2>
 
-<H2>SEE ALSO</H2>
+<em>
+<a href="d.graph.html">d.graph</a>,
+<a href="d.histogram.html">d.histogram</a>,
+<a href="d.rast.arrow.html">d.rast.arrow</a>,
+<a href="r.slope.aspect.html">r.slope.aspect</a>
+</em>
 
-<EM><A HREF="d.graph.html">d.graph</A></EM>,
-<EM><A HREF="d.histogram.html">d.histogram</A></EM>,
-<EM><A HREF="d.rast.arrow.html">d.rast.arrow</A></EM>,
-<EM><A HREF="r.slope.aspect.html">r.slope.aspect</A></EM>
 
+<h2>XGRAPH REQUIREMENT</h2>
 
-<H2>XGRAPH REQUIREMENT</H2>
-
-<A HREF="http://www.xgraph.org">Xgraph</a> must be installed for the
+<a href="http://www.xgraph.org">Xgraph</a> must be installed for the
 <b>-x</b> flag to function.
 
+<h2>REFERENCE</h2>
 
-<H2>AUTHORS</H2>
+J. Hofierka, H. Mitasova, and M. Neteler (2009): Terrain parameterization in GRASS.
+In T. Hengl and H.I. Reuter, editors, Geomorphometry: concepts, software, applications. Elsevier
+(<a href="http://dx.doi.org/10.1016/S0166-2481(08)00017-2">DOI</a>)
 
+
+<h2>AUTHORS</h2>
+
 Markus Neteler, ITC-irst, Italy<BR>
 Bruno Caprile, ITC-irst, Italy<BR>
 Hamish Bowman, Otago University, New Zealand<BR>

Modified: grass/branches/develbranch_6/scripts/d.rast.leg/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/d.rast.leg/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/d.rast.leg/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,41 +1,52 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>d.rast.leg</EM>
-is a GRASS script which clears the entire screen, divides it 
-into a main (left) and a minor (right) frames, and then displays a raster 
+<em>d.rast.leg</em> shows a raster map along with its legend.
+It first clears the entire screen, then divides it 
+into a main (left) and a minor (right) frames, and displays a raster 
 map in the main frame and the map legend in the minor frame. The main
-frame remains active when the program finishs.
+frame remains active when the program finishes.
 
+<h2>NOTES</h2>
 
-<H2>NOTES</H2>
-
-The legend may be flipped with the <B>-f</B> flag.
-<P>
-If the <B>num_of_lines</B> parameter is not given then the legend frame will 
+The legend may be flipped with the <b>-f</b> flag.
+<p>
+If the <b>num_of_lines</b> parameter is not given then the legend frame will 
 display as many lines as number of categories in the map, otherwise, it 
-will display the first <B>num_of_lines</B> minus 1 categories with the
+will display the first <b>num_of_lines</b> minus 1 categories with the
 rest being truncated.
-<P>
-The user may adjust the <B>num_of_lines</B> parameter or
+<p>
+The user may adjust the <b>num_of_lines</b> parameter or
 the size of graphics window to get an appropriate result.
 
-<P>
+<p>
 The user may specify a second raster map with the <b>rast</b> parameter from
 which the legend is generated. This is useful to visualize (time) series of
 raster maps with a common static legend instead of the default dynamic legend.
-<P>
+<p>
 To remove all frames when clearing the display, use
 "<em><tt>d.erase -f</tt></em>".
 
-<H2>SEE ALSO</H2>
+<h2>EXAMPLE</h2>
 
-<EM><A HREF="d.legend.html">d.legend</A></EM><BR>
-<EM><A HREF="d.erase.html">d.erase</A></EM><BR>
-<EM><A HREF="d.rast.html">d.rast</A></EM>
+In this example, the polar diagram of the 'aspect' angle map in the
+North Carolina sample dataset location is generated:
 
-<H2>AUTHORS</H2>
+<div class="code"><pre>
+g.region rast=landclass96 -p
+d.rast.leg landclass96
+</pre></div>
 
-Jianping Xu, Scott Madry, Rutgers University<BR>
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="d.legend.html">d.legend</a>,
+<a href="d.erase.html">d.erase</a>,
+<a href="d.rast.html">d.rast</a>
+</em>
+
+<h2>AUTHORS</h2>
+
+Jianping Xu, Scott Madry, Rutgers University<br>
 Markus Neteler
 
 <p><i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/d.redraw/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/d.redraw/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/d.redraw/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,14 +1,17 @@
 <h2>DESCRIPTION</h2>
 
-<em>d.redraw</em> redraws current displayed maps without saving d.save
-info before d.erase.
+<em>d.redraw</em> redraws the content of the currently selected
+monitor. The active monitor can be selected
+with <em>d.mon</em>.
 
-<H2>SEE ALSO</H2>
+<h2>SEE ALSO</h2>
  
-<EM><a href="d.erase.html">d.erase</a></EM>,
-<EM><a href="d.rast.html">d.rast</a></EM>,
-<EM><a href="d.vect.html">d.vect</a></EM>,
-<EM><a href="d.mvmon.html">d.mvmon</a></EM>
+<em>
+  <a href="d.erase.html">d.erase</a>,
+  <a href="d.rast.html">d.rast</a>,
+  <a href="d.vect.html">d.vect</a>,
+  <a href="d.mon.html">d.mon</a>
+</em>
 
 <h2>AUTHOR</h2>
 

Modified: grass/branches/develbranch_6/scripts/d.shadedmap/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/d.shadedmap/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/d.shadedmap/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,29 +1,35 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>d.shadedmap</EM> will drape a color raster map over a shaded relief map.
+<em>d.shadedmap</em> will drape a color raster map over a shaded relief map.
 
+<h2>NOTES</h2>
 
-<H2>NOTES</H2>
-
-Refer to the <em>d.his</em> help page for more details; <EM>d.shadedmap</EM>
+refer to the <em>d.his</em> help page for more details; <em>d.shadedmap</em>
 is simply a frontend to that module.
-<P>
-<EM>(GRASS Shell Script)</EM>
 
+<h2>EXAMPLE</h2>
 
-<H2>SEE ALSO</H2>
+In this example, the aspect map in the North Carolina sample
+dataset location is used to hillshade the elevation map:
 
+<div class="code"><pre>
+g.region rast=aspect -p
+d.shadedmap reliefmap=aspect drapemap=elevation
+</pre></div>
+
+<h2>SEE ALSO</h2>
+
 <em>
-<A HREF="d.his.html">d.his</A>,
-<A HREF="g.pnmcomp.html">g.pnmcomp</A>,
-<A HREF="nviz.html">NVIZ</A>,
-<A HREF="r.slope.aspect.html">r.slope.aspect</A>,
-<A HREF="r.shaded.relief.html">r.shaded.relief</A>
+<a href="d.his.html">d.his</a>,
+<a href="g.pnmcomp.html">g.pnmcomp</a>,
+<a href="nviz.html">NVIZ</a>,
+<a href="r.slope.aspect.html">r.slope.aspect</a>,
+<a href="r.shaded.relief.html">r.shaded.relief</a>
 </em>
 
-<H2>AUTHORS</H2>
+<h2>AUTHORS</h2>
 
 Unknown; updated to GRASS 5.7 by Michael Barton
 
-<P>
+<p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/d.vect.thematic/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/d.vect.thematic/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/d.vect.thematic/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,40 +1,42 @@
 <h2>DESCRIPTION</h2>
 
-<p><em><b>d.vect.thematic</b></em>  - Creates thematic  maps from vectors of
-  all types and numeric attributes (stored in the data table connected to a vector
-  map). Thematic maps can be displayed by either a graduated color scheme (for
-  all vector types), as graduated icon sizes (for point and centroid types), or
-graduated line widths (for lines and boundaries with associated
-attributes).
-  The user selects the vector map to be mapped and attribute column from which
-  to derive mapping intervals, and (optionally) the layer for attribute data. </p>
+<em>d.vect.thematic</em>  creates thematic maps from vectors of
+all types and numeric attributes (stored in the data table connected to a vector
+map). Thematic maps can be displayed by either a graduated color scheme (for
+all vector types), as graduated icon sizes (for point and centroid types), or
+graduated line widths (for lines and boundaries with associated attributes).
+The user selects the vector map to be mapped and attribute column from which
+to derive mapping intervals, and (optionally) the layer for attribute data.
 
 <p>In thematic maps, the color or point size changes for each range of attribute
-  values. Value ranges for thematic mapping can be
-  set at regular intervals, standard deviation units on either
-  side of the mean, quartiles, or delimited by user-defined breakpoints. User-defined
-  breakpoints also can  be entered, or piped into d.vect.thematic from standard input or
-  other external source. </p>
+values. Value ranges for thematic mapping can be
+set at regular intervals, standard deviation units on either
+side of the mean, quartiles, or delimited by user-defined breakpoints.
+User-defined breakpoints also can  be entered, or piped into d.vect.thematic
+from standard input or other external source.
 
 <p>There are options to define the color scheme (graduated
-    colors) and range of point sizes (graduated points) for thematic maps. A
-  simple text legend is printed. Optionally, a graphic legend can be drawn in
-  the selected display monitor. Thematic colors can be uploaded to a GRASSRGB
-  column for later display,  and thematic map display commands can
-  be saved to a group file (*.dm) that can be opened, edited, and displayed in
-the GIS Manager.</p>
+colors) and range of point sizes (graduated points) for thematic maps. A
+simple text legend is printed. Optionally, a graphic legend can be drawn in
+the selected display monitor. Thematic colors can be uploaded to a GRASSRGB
+column for later display,  and thematic map display commands can be saved to a
+group file (*.dm) that can be opened, edited, and displayed in
+the GIS Manager.
 
-<p>When the psmap option is set to 'name', two psmap instruction files are created (in the current directory if no path is given), one for the map ('name.psmap') and one for the legend ('name_legend.psmap'). The map file also contains 'label' commands which allow to create a legend directly in the map by adding a 'vlegend' command. See the <em><a href="ps.map">ps.map</a></em> man page for more details.</p>
+<p>When the psmap option is set to 'name', two psmap instruction files are
+created (in the current directory if no path is given), one for the map
+('name.psmap') and one for the legend ('name_legend.psmap'). The map file also
+contains 'label' commands which allow to create a legend directly in the map by
+adding a 'vlegend' command. See the <em><a href="ps.map">ps.map</a></em> man
+page for more details.
 
-<p><em>(GRASS Shell Script)</em></p>
 
-<h2>ATTENTION</h2>
+<h2>NOTES</h2>
 
+The algorithm currently uses the <em>v.univar.sh</em> to calculate basic
+descriptive statistics needed for thematic mapping (minimum, maximum, mean,
+standard deviation, and quartiles).
 
-The algorithm currently uses the script <em><a href="v.univar.sh.html">v.univar.sh</a></em>
-to calculate basic descriptive statistics needed for thematic mapping (minimum,
-maximum, mean, standard deviation, and quartiles).
-
 <h2>EXAMPLES</h2>
 
 Earthquake points with color gradient:
@@ -72,17 +74,24 @@
 d.vect.thematic -l elev_sample column=diff type=point
 </pre></div>
 
+<p>
+North Carolina data set example:
+<div class="code"><pre>
+g.region vect=nc_state
+d.vect.thematic -l precip_30ynormals column=annual type=point
+</pre></div>
 
 <h2>SEE ALSO</h2>
 
 <em>
 <a href="d.vect.html">d.vect</a>, 
 <a href="d.vect.chart.html">d.vect.chart</a>,
-<a href="v.univar.sh.html">v.univar.sh</a></em>
+<a href="v.univar.sh.html">v.univar.sh</a>
+</em>
 
 <h2>AUTHORS</h2>
 
- Michael Barton, Arizona State University, Daniel Cavelo Aros,
- Martin Landa, and Jachym Cepicky.
+Michael Barton, Arizona State University, Daniel Cavelo Aros,
+Martin Landa, and Jachym Cepicky.
 
-<p><i>Last changed: $Date$</i></p>
+<p><i>Last changed: $Date: 2008-08-15 08:16:42 +0200 (Fri, 15 Aug 2008)$</i>

Modified: grass/branches/develbranch_6/scripts/db.droptable/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/db.droptable/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/db.droptable/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -7,29 +7,35 @@
 <h2>NOTES</h2>
 
 <em>db.droptable</em> is a front-end to <em>db.execute</em> to allow easier
-usage. To some extent it is verified if the table is connected to a vector map.
+usage. To some extent it is verified if the table is connected to a vector map
+to avoid accidential table removal.
 
-<h2>EXAMPLES</h2>
+<h2>EXAMPLE</h2>
 
-Dropping a table (Spearfish):
+Removing an attribute table:
 <p>
 <div class="code"><pre>
-# work on own copy
-g.copy vect=roads,myroads
+# show available tables
+db.tables -p
 
-# only shows what would happen
-db.droptable myroads
+# this will show what would happen
+db.droptable table=sometable
 
 # actually drop the table
-db.droptable -f myroads
-
-db.tables -p
+db.droptable -f sometable
 </pre></div>
 
 <h2>SEE ALSO</h2>
 
-<em><a HREF="db.execute.html">db.execute</a></em>,
-<em><a HREF="v.db.droptable.html">v.db.droptable</a></em>
+<em>
+<a HREF="db.describe.html">db.describe</a>,
+<a HREF="db.droptable.html">db.droptable</a>,
+<a HREF="db.execute.html">db.execute</a>,
+<a HREF="db.login.html">db.login</a>,
+<a HREF="db.tables.html">db.tables</a>,
+<a HREF="v.db.droptable.html">v.db.droptable</a>,
+<a HREF="sql.html">GRASS SQL interface</a>
+</em>
 
 <h2>AUTHOR</h2>
 

Modified: grass/branches/develbranch_6/scripts/db.out.ogr/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/db.out.ogr/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/db.out.ogr/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -9,22 +9,23 @@
 Export of GRASS table to a DBF table (default format):
 <p>
 <div class="code"><pre>
-db.out.ogr points_tab dsn=/tmp/points_tab.dbf
+db.out.ogr precip_30ynormals dsn=/tmp/precip_30ynormals.dbf
 </pre></div>
 
 <p>
 Export of GRASS table to a CSV table file:<br>
 <p>
 <div class="code"><pre>
-db.out.ogr points_tab dsn=points.csv format=CSV
+db.out.ogr precip_30ynormals dsn=precip_30ynormals.csv format=CSV
 </pre></div>
 
 <p>
 Export of GRASS table into a PostgreSQL table:
 <p>
 <div class="code"><pre>
-db.out.ogr points_tab dsn="PG:host=localhost dbname=postgres user=neteler" format=PostgreSQL
-echo "SELECT * FROM points_tab" | psql postgres
+db.out.ogr precip_30ynormals dsn="PG:host=localhost dbname=meteo user=neteler" \
+           format=PostgreSQL
+echo "SELECT * FROM precip_30ynormals" | psql meteo
 </pre></div>
 
 

Modified: grass/branches/develbranch_6/scripts/db.test/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/db.test/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/db.test/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -4,9 +4,19 @@
 set of SQL queries. Database must exist and connection must be set
 by db.connect.
 
+<h2>EXAMPLE</h2>
+
+Test current SQL backend driver:
+<p>
+<div class="code"><pre>
+db.connect -p
+db.test test=test1
+</pre></div>
+
 <h2>SEE ALSO</h2>
 
-<em><a HREF="sql.html">GRASS SQL interface</a>,
+<em>
+<a HREF="sql.html">GRASS SQL interface</a>,
 <a HREF="db.connect.html">db.connect</a>,
 <a HREF="db.describe.html">db.describe</a>,
 <a HREF="db.drivers.html">db.drivers</a>

Modified: grass/branches/develbranch_6/scripts/i.image.mosaic/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/i.image.mosaic/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/i.image.mosaic/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,18 +1,18 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
+<em>i.image.mosaic</em> mosaics several images or raster maps using the
+GRASS GIS map calculator, and extends the colormap to the range of all images.
 
-<EM>i.image.mosaic</EM> Mosaics up to 4 images or raster maps using map calculator, and extends colormap to range of all images.
-<br>
-
-
 <H2>SEE ALSO</H2>
 
-<EM><A HREF="r.patch.html">r.patch</A></EM>,
-<EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM>,
+<em>
+<a href="r.patch.html">r.patch</a>,
+<a href="r.mapcalc.html">r.mapcalc</a>
+</em>
 
+<h2>AUTHOR</h2>
 
-<H2>AUTHOR</H2>
-
 Markus Neteler, ITC-Irst, Trento, Italy
 Updated to GRASS 5.7 by Michael Barton, Arizona State University
+
 <p><i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/i.in.spotvgt/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/i.in.spotvgt/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/i.in.spotvgt/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -29,23 +29,24 @@
 
 # export:
 g.region w=180W e=180E n=75:00:16.071429N s=56:00:16.069919S res=0:00:32.142857 -p
-r.out.tiff -t 0001_NDV out=spotndvi
+r.out.gdal 0001_NDV format=GTiff out=spotndvi.tif
 </pre></div>
 
 <h2>SEE ALSO</h2>
 
 <em>
-<a HREF="r.in.gdal.html">r.in.gdal</a>
+<a HREF="r.in.gdal.html">r.in.gdal</a>,
+<a HREF="r.out.gdal.html">r.out.gdal</a>
 </em>
 
 <H2>REFERENCES</H2>
 
 <a href="http://free.vgt.vito.be/">SPOT Vegetation (1km, global) NDVI data set server</a><br>
-<a href="http://www.vgt.vito.be/faq/faq.html">SPOT Vegetation FAQ</a><br>
+<a href="http://www.vgt.vito.be/faqnew/index.html">SPOT Vegetation FAQ</a><br>
 <a href="http://nieuw.vgt.vito.be/faq/FAQS/faq22.html">SPOT Vegetation Status Map (SM)</a> - Quality map
 
 <h2>AUTHOR</h2>
 
-Markus Neteler</a>
+Markus Neteler
 
 <p><i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/i.oif/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/i.oif/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/i.oif/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,50 +1,69 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>i.oif</EM> calculates the Optimum Index Factor for LANDSAT TM bands 1,2,3,4,5 and 7.
-<P>
+<em>i.oif</em> calculates the Optimum Index Factor for LANDSAT TM bands 1,2,3,4,5 and 7.
+<p>
 The Optimum Index Factor is calculated to determine the band combination which
 shows the maximum information when combined into a composite image. The bands
-comprising the highest scoring combination from <EM>i.oif</EM> are used as the 
-three color channels required for <EM><A HREF="d.rgb.html">d.rgb</A></EM> or
-<EM><A HREF="r.composite.html">r.composite</A></EM>.
-<P>
+comprising the highest scoring combination from <em>i.oif</em> are used as the 
+three color channels required for <em>d.rgb</em> or <em>r.composite</em>.
+<p>
 The analysis is saved to a file in the current directory called "i.oif.result".
 
-<H2>NOTES</H2>
+<h2>NOTES</h2>
 
 Colour Composites in BGR order: important band combinations (example: 
 234 in BGR order means: B=2, G=3, R=4):
 
 <ul>
-<li> 123: near natural ("true") colour; however, because of correlation of the 3 bands in visible 
-      spectrum, this combination contains not much more info than is contained in single band.
-<li> 234: sensitive to green vegetation (portrayed as red), coniferous as distinctly darker
-      red than deciduous forests. Roads and water bodies are clear.
-<li> 243: green vegetation is green but coniferous forests aren't as clear as in the 234 combination
-<li> 247: one of the best for info pertaining to forestry. Good for operation scale mapping of
-      recent harvest areas and road construction.
-<li> 345: contains one band from each of the main reflective units (vis, nir, shortwave infra).
-      Green vegetation is green and the shortwave band shows vegetational stress and mortality.
-      Roads are less evident as band 3 is blue.
+<li> 123: near natural ("true") colour; however, because of correlation of
+the 3 bands in visible spectrum, this combination contains not much more
+info than is contained in single band.
+
+<li> 234: sensitive to green vegetation (portrayed as red), coniferous as
+distinctly darker red than deciduous forests. Roads and water bodies are clear.
+
+<li> 243: green vegetation is green but coniferous forests aren't as clear as
+the 234 combination.
+
+<li> 247: one of the best for info pertaining to forestry. Good for operation
+scale mapping of recent harvest areas and road construction.
+
+<li> 345: contains one band from each of the main reflective units (vis, nir,
+shortwave infra). Green vegetation is green and the shortwave band shows
+vegetational stress and mortality. Roads are less evident as band 3 is blue.
+
 <li> 347: similar to 345 but depicts burned areas better.
 <li> 354: appears more like a colour infrared photo.
 <li> 374: similar to 354.
 <li> 457: shows soil texture classes (clay, loam, sandy).
 </ul>
 
+<h2>EXAMPLE</h2>
 
-<H2>REFERENCES</H2>
+North Carolina sample dataset:
+<div class="code"><pre>
+g.region rast=lsat7_2002_10 -p
+i.oif image1=lsat7_2002_10 image2=lsat7_2002_20 image3=lsat7_2002_30 \
+      image4=lsat7_2002_40 image5=lsat7_2002_50 image7=lsat7_2002_70
+</pre></div>
 
-Jensen, 1996. Introductory digital image processing, p.98. ISBN 0-13-205840-5
 
-<H2>SEE ALSO</H2>
-<EM><A HREF="d.rgb.html">d.rgb</A></EM><BR>
-<EM><A HREF="r.composite.html">r.composite</A></EM><BR>
-<EM><A HREF="r.covar.html">r.covar</A></EM><BR>
-<EM><A HREF="r.univar.html">r.univar</A></EM><BR>
-<BR>
-<H2>AUTHOR</H2>
+<h2>REFERENCE</h2>
 
+Jensen, 1996. Introductory digital image processing. Prentice Hall, p.98. ISBN 0-13-205840-5
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="d.rgb.html">d.rgb</a>,
+<a href="r.composite.html">r.composite</a>,
+<a href="r.covar.html">r.covar</a>,
+<a href="r.univar.html">r.univar</a>
+</em>
+
+<h2>AUTHOR</h2>
+
 Markus Neteler, ITC-Irst, Trento, Italy<br>
 Updated to GRASS 5.7 by Michael Barton, Arizona State University
+
 <p><i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/r.blend/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.blend/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.blend/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,19 +1,31 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>r.blend</EM> blends color components of 2 raster maps by a
+<em>r.blend</em> blends color components of 2 raster maps by a
 specificed percentage of the first map.
 
-<H2>SEE ALSO</H2>
+<h2>EXAMPLE</h2>
 
-<EM>
-<A HREF="g.region.html">g.region</A>,
-<A HREF="r.mapcalc.html">r.mapcalc</A>,
-<A HREF="r.colors.html">r.colors</A>,
-<A HREF="r.support.html">r.support</A>,
-</EM>
+Blending the aspect map with the elevation map for a shaded map
+(North Carolina sample dataset):
+<p>
+<div class="code"><pre>
+g.region rast=aspect -p
+r.blend first=aspect second=elevation output_prefix=elev_shade_blend
+d.mon x0
+d.rgb blue=elev_shade_blend.b green=elev_shade_blend.g red=elev_shade_blend.r
 
-<H2>AUTHOR</H2>
+<h2>SEE ALSO</h2>
 
+<em>
+<a href="d.shadedmap.html">d.shadedmap</a>,
+<a href="g.region.html">g.region</a>,
+<a href="r.mapcalc.html">r.mapcalc</a>,
+<a href="r.colors.html">r.colors</a>,
+<a href="r.support.html">r.support</a>
+</em>
+
+<h2>AUTHOR</h2>
+
 Unknown: probably CERL<br>
 Updated to GRASS 5.7 by Michael Barton, Arizona State University
 

Modified: grass/branches/develbranch_6/scripts/r.colors.stddev/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.colors.stddev/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.colors.stddev/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,8 +1,8 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>r.colors.stddev</EM> set raster map color rules based on standard
+<em>r.colors.stddev</em> set raster map color rules based on standard
 deviations from a map's mean value, either as a continuous color gradient
-or in color bands per standard deviation from the mean.
+or in color bands per standard deviation (S.D.) from the mean.
 
 <p>
 With the color band option values less that 1 S.D. from the mean are
@@ -14,25 +14,28 @@
 values below the mean but less than 2 S.D. away will transition to white,
 and above the mean the colors will simularly transition to full red at +2 S.D.
 
+<h2>EXAMPLE</h2>
 
-<!--
-<h2>EXAMPLES</h2>
--->
+North Carolina sample dataset location:
 
+<div class="code"><pre>
+g.region rast=elevation -p
+r.colors.stddev elevation
+</pre></div>
 
-<H2>SEE ALSO</H2>
 
-<EM>
-<A HREF="r.colors.html">r.colors</A><BR>
-<A HREF="r.univar.html">r.univar</A><BR>
-<A HREF="v.colors.html">v.colors</A><BR>
-</EM>
+<h2>SEE ALSO</h2>
 
+<em>
+<a href="r.colors.html">r.colors</a>,
+<a href="r.univar.html">r.univar</a>,
+<a href="v.colors.html">v.colors</a>
+</em>
 
-<H2>AUTHOR</H2>
 
-Hamish Bowman<BR>
-<i>Dunedin, New Zealand</i>
+<h2>AUTHOR</h2>
 
+Hamish Bowman, <i>Dunedin, New Zealand</i>
+
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/r.fillnulls/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.fillnulls/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.fillnulls/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,20 +1,17 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-
-<EM><b>r.fillnulls</b></EM>  - Fills NULL (no data areas) in input map and
+<em>r.fillnulls</em> fills NULL pixels (no data areas) in input map and
 stores filled map to a new output map. The fill data are interpolated 
-from the no data area boundaries buffer using <EM>v.surf.rst</EM>
-spline interpolation.<br>
+from the no data area boundaries buffer using <em>v.surf.rst</em>
+spline interpolation.
 
-<EM>(GRASS Shell Script)</EM>
+<h2>NOTES</h2>
 
-<H2>NOTES</H2>
-
 Each area boundary buffer is set to three times the map resolution to get nominally
 three points around the edge. This way the algorithm interpolates into the hole with
 a trained slope and curvature at the edges, in order to avoid that such a flat plane
 is generated in a hole.
-<P>
+<p>
 During the interpolation following warning may occur:<p>
 
 <tt>
@@ -28,30 +25,54 @@
 ignore the warning. The interpolation will be continued. However, the user
 may pay attention to below notes.
 
-<H2>ATTENTION</H2>
+<h2>NOTES</h2>
 
-The algorithm is based on <EM><A HREF="v.surf.rst.html">v.surf.rst</A></EM>
+The algorithm is based on <em>v.surf.rst</em>
 regularized splines with tension interpolation module which interpolates the
 raster cell values for NULL data areas from the boundary values of the NULL
 data area. An eventual raster MASK is respected during the NULL data area(s)
 filling. The interpolated values are patched into the NULL data area(s) of
 the input map and saved into a new raster map.
 
-<H2>WARNING</H2>
+<h2>WARNING</h2>
 
 Depending on the shape of the NULL data area(s) problems may occur due to an
 insufficient number of input cell values for the interpolation process. Most
 problems will occur if a NULL data area reaches a large amount of the map
 boundary. The user will have to carefully check the result using
-<EM><a href="r.mapcalc.html">r.mapcalc</A></EM> (generating a difference map to the
-input map) and/or <EM><A HREF="d.what.rast.html">d.what.rast</A></EM> to
-query individual cell values.<p>
+<em>r.mapcalc</em> (generating a difference map to the
+input map) and/or <em>d.what.rast</em> to query individual cell values.
 
-<H2>SEE ALSO</H2>
+<h2>EXAMPLE</h2>
 
-<EM><A HREF="r.fill.dir.html">r.fill.dir</A>, 
-<A HREF="v.surf.rst.html">v.surf.rst</A></EM>
+In this example, the SRTM elevation map in the
+North Carolina sample dataset location is filtered for outlier
+elevation values; missing pixels are then re-interpolated to obtain
+a complete elevation map:
 
+<div class="code"><pre>
+g.region rast=elev_srtm_30m -p
+d.mon x0
+d.histogram elev_srtm_30m
+# remove too low elevations (esp. lakes)
+r.mapcalc "elev_srtm_30m_filt = if(elev_srtm_30m &lt; 50.0, null(), elev_srtm_30m)"
+d.histogram elev_srtm_30m_filt
+d.rast elev_srtm_30m_filt
+r.fillnulls input=elev_srtm_30m_filt output=elev_srtm_30m_complete tension=20
+d.histogram elev_srtm_30m_complete
+d.rast elev_srtm_30m_complete
+</pre></div>
+
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="r.fill.dir.html">r.fill.dir</a>, 
+<a href="r.mapcalc.html">r.mapcalc</a>, 
+<a href="v.surf.rst.html">v.surf.rst</a>
+</em>
+
+<h2>REFERENCES</h2>
 <P> Mitas, L., Mitasova, H., 1999, Spatial Interpolation. In: P.Longley,
 M.F. Goodchild, D.J. Maguire, D.W.Rhind (Eds.), Geographical Information
 Systems: Principles, Techniques, Management and Applications, Wiley,

Modified: grass/branches/develbranch_6/scripts/r.in.aster/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.in.aster/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.in.aster/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,4 +1,4 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
 <em>r.in.aster</em> rectifies, georeferences, and imports Terra-ASTER imagery 
 to current location using gdalwarp, hdf 4, and r.in.gdal, using projection parameters 
@@ -13,10 +13,12 @@
 
 <h2>NOTES</h2>
 
-<em>r.in.aster</em> requires gdal to be in the user's path and the hdf 4 to be installed. Gdal must be compiled with hdf support.
+<em>r.in.aster</em> requires GDAL library to be in the user's path and the hdf 4 driver
+to be installed. The GDAL library must be compiled with hdf support.
 
 <h2>AUTHORS</h2>
 
 Michael Barton, Arizona State University and Paul Kelly 
-<p><i>Last changed: $Date: 2004/12/20</i>
 
+<p><i>Last changed: $Date$</i>
+

Modified: grass/branches/develbranch_6/scripts/r.in.wms/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.in.wms/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.in.wms/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,33 +1,37 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>r.in.wms</EM>  handles all of downloading and importing raster data from
-an <a href="http://www.opengeospatial.org/specs/?page=specs">OpenGIS</a>
-"WMS" web mapping server. It need only be told the desired data to collect
-(bounds and resolution) via a region, the server to get the data from, and
-the layer or layers to get. It downloads the data in tiles, reprojects it,
-imports it, and patches it back together.
+<em>r.in.wms</em> handles all of downloading and importing raster data
+from an <a href="http://www.opengeospatial.org/standards/wms">OGC
+WMS</a> web mapping server. It need only be told the desired data to
+collect (bounds and resolution) via a region, the server to get the
+data from, and the layer or layers to get. It downloads the data in
+tiles, reprojects it, imports it, and patches it back together.
 
-<H2>NOTES</H2>
+<h2>NOTES</h2>
 
-By default data is downloaded to $GISDBASE/wms_download. This can be changed
-by setting the <EM>folder=</EM> option when using <EM>r.in.wms</EM>.
-<P>
+By default data is downloaded to <tt>$GISDBASE/wms_download</tt>. This can be changed
+by setting the <b>folder</b> option when using <em>r.in.wms</em>.
+
+<p>
 To understand the data you are getting it is necessary to look at the
 capabilities of the WMS server. This should be available via a capabilities
 request. This is an
 <a href="http://wms.jpl.nasa.gov/wms.cgi?request=GetCapabilities">example
 capabilities request to NASA's OnEarth server</a>.
-<P>
+
+<p>
+<!--
 Some brain-dead servers will only talk to certain web browsers. You can
-fool these by adding "<tt>--user-agent=MSIE5.5</tt>" to <b>wgetoptions</b>
-or for curl adding "<tt>-A "MSIE5.5</tt>" to <b>curloptions</b>.
+fool these by adding <tt>- -user-agent=MSIE5.5</tt> to <b>wgetoptions</b>
+or for curl adding <tt>-A "MSIE5.5"</tt> to <b>curloptions</b>.
+-->
 Other brain-dead servers will not accept queries in the form of POST data.
 If you get an error try using the <b>-g</b> flag to force <em>r.in.wms</em>
 to send an atomic GET request instead.
 
-<H2>EXAMPLES</H2>
+<h2>EXAMPLES</h2>
 
-<H3>General Get Capabilities Request</H3>
+<h3>General Get Capabilities Request</h3>
 
 A capabilities request like
 <a href="http://wms.jpl.nasa.gov/wms.cgi?request=GetCapabilities">http://wms.jpl.nasa.gov/wms.cgi?request=GetCapabilities</a>
@@ -35,29 +39,25 @@
 it is in,  where to find meta data, resolutions, scales, and bounds for
 data, etc.
 
-<H3>NASA OnEarth server: Get Capabilities Request</H3>
+E.g. lists the layers available from the NASA OnEarth server.
 
 <div class="code"><pre>
 r.in.wms mapserver=http://wms.jpl.nasa.gov/wms.cgi -l
 </pre></div>
 
-Lists the layers available from the NASA OnEarth server. The output is
-more reliable if <a href="http://ofb.net/~egnor/xml2/">xml2</a> is installed.
+<h3>US NED Elevation from OnEarth server download (metric units)</h3>
 
-
-<H3>US NED Elevation from OnEarth server download (metric units)</H3>
-
 Set the resolution to 30 (assuming you're in metric units):
 <div class="code"><pre>
 g.region res=30 -ap
-r.in.wms output=elevation_meters mapserver=http://wms.jpl.nasa.gov/wms.cgi \
-         layers=us_ned styles=real -o
+r.in.wms -o output=elevation_meters mapserver=http://wms.jpl.nasa.gov/wms.cgi \
+         layers=us_ned styles=real
 </pre></div>
 
 Downloads real number meter elevation from OnEarth to cover the current
-region. Uses -o for opaque to get smaller download.
+region. Uses <b>-o</b> for opaque to get smaller download.
 
-<H3>US NED Elevation from OnEarth server download (feet units)</H3>
+<h3>US NED Elevation from OnEarth server download (feet units)</h3>
 
 Set the resolution to 90 (assuming you're in feet units) a save this
 region with a name; this makes resuming downloads possible or rather
@@ -67,8 +67,8 @@
 g.region res=90 -ap
 g.region save=panhandle-90ft
 
-r.in.wms output=elevation_feet mapserver=http://wms.jpl.nasa.gov/wms.cgi \
-         layers=us_ned styles=feet_real -o region=panhandle-90ft
+r.in.wms -o output=elevation_feet mapserver=http://wms.jpl.nasa.gov/wms.cgi \
+         layers=us_ned styles=feet_real region=panhandle-90ft
 </pre></div>
 
 Downloads real number feet elevation from OnEarth to cover the current
@@ -76,18 +76,17 @@
 region lets us resume later easily.
 
 <div class="code"><pre>
-r.in.wms output=elevation_feet mapserver=http://wms.jpl.nasa.gov/wms.cgi \
-         layers=us_ned styles=feet_real -o region=panhandle-90ft -d method=cubic
+r.in.wms -d output=elevation_feet mapserver=http://wms.jpl.nasa.gov/wms.cgi \
+         layers=us_ned styles=feet_real -o region=panhandle-90ft method=cubic
 </pre></div>
 
-<dd><b>-d</b> skips ahead to downloading. This could be used to try
+Use flag <b>-d</b> to skip ahead to downloading. This could be used to try
 downloading again (if some files failed last time) or to import the data
 differently. Since downloaded files are remembered those already received
 successfully are not re-requested. In this case we are reimporting the
 data using the cubic interpolation method instead of nearest neighbor.
-</dd>
 
-<H3>LANDSAT from OnEarth server download</H3>
+<h3>LANDSAT from OnEarth server download</h3>
 
 Set the resolution to 30 meters for LANDSAT:
 <div class="code"><pre>
@@ -133,11 +132,15 @@
 
 
 <H2>SEE ALSO</H2>
+<em>
 <a href="r.tileset.html">r.tileset</a>,
 <a href="r.in.gdal.html">r.in.gdal</a>,
-<a href="r.patch.html">r.patch</a>
+<a href="r.patch.html">r.patch</a>,
+<a href="r.colors.html">r.colors</a>,
+<a href="r.composite.html">r.composite</a><br><br>
+<a href="v.in.wfs.html">v.in.wfs</a>
+</em>
 
-
 <H2>AUTHORS</H2>
 
 Soeren Gebbert, Jachym Cepicky, and Cedric Shock

Modified: grass/branches/develbranch_6/scripts/r.mapcalculator/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.mapcalculator/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.mapcalculator/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,16 +1,25 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
+<em>r.mapcalculator</em> provides a GUI frontend to <em>r.mapcalc</em>.
+Up to 5 maps can be combined using simple expressions.
+In the expert mode, it runs <em>r.mapcalc</em> for more complex expressions.
 
-<EM>r.mapcalculator</EM> Provides a GUI frontend to r.mapcalc. Up to 5 maps can be combined using simple expressions. Expert mode runs r.mapcalc for more complex expressions.
-<br>
+Enter an <em>r.mapcalc</em> expression in the formula field using the
+format: A+C or exp(A+C)+(B-2)*7 where A, B, C are raster maps entered
+in the A field, B field, and C field. 
+<p>
+Do not enter output file in the formula field: correct: A+B; incorrect: newfile = A+B. Use no spaces or blanks. 
+<p>
+Expert mode runs <em>r.mapcalc</em> for more complex expressions.
 
-<H2>SEE ALSO</H2>
+<h2>SEE ALSO</h2>
 
-<EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM>,
+<em><A HREF="r.mapcalc.html">r.mapcalc</A></em>
 
 
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
 
-R. Brunzema (r.brunzema at web.de)<BR>
+R. Brunzema (r.brunzema at web.de)<br>
 Updated to GRASS 5.7 by Michael Barton, Arizona State University
+
 <p><i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/r.mask/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.mask/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.mask/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -7,16 +7,16 @@
 The MASK is only applied when <em>reading</em> an existing GRASS raster map,
 for example when used in a module as an input map.
 
-The MASK will block out certain areas of a raster map from analysis and/or display, by
-"hiding" them from sight of other GRASS modules. Data falling within the bounaries of the MASK 
-can be modified and operated upon by other GRASS raster modules; data
-falling outside the MASK is treated as if it were NULL.
+The MASK will block out certain areas of a raster map from analysis and/or
+display, by "hiding" them from sight of other GRASS modules. Data falling
+within the bounaries of the MASK can be modified and operated upon by other
+GRASS raster modules; data falling outside the MASK is treated as if it were NULL.
 <p>
 Because the MASK is actually only a reclass map named "MASK", it can be
 copied, renamed, removed, and used in analyses, just like other GRASS
 raster map layers.  The user should be aware that a MASK remains in
 place until a user renames it to something other than "MASK", or removes
-it using "<tt>r.mask -r</tt>" or <em><a HREF="g.remove.html">g.remove</a></em>.
+it using "<tt>r.mask -r</tt>" or <em>g.remove</em>.
 
 <p>
 Grid cells in the MASK map containing <tt>0</tt> or <tt>NULL</tt>
@@ -27,8 +27,8 @@
 To restore raster operations to normal (i.e., all cells of the current region),
 remove the MASK file by setting the <b>-r</b> remove MASK flag. In this case, a
 dummy value must also be given for the input parameter.
-A MASK also can&nbsp;be removed by using <em><a href="g.remove.html">g.remove</a></em>
-or by renaming it to any other name with <em><a href="g.rename.html">g.rename</a></em>.
+A MASK also can be removed by using <em>g.remove</em>
+or by renaming it to any other name with <em>g.rename</em>.
 
 
 <h2>NOTES</h2>
@@ -47,55 +47,49 @@
 
 <em>r.mask</em> uses <em>r.reclass</em> to create a reclassification of an
 existing raster map and name it MASK. A reclass map takes up less space, but
-is affected by any changes to the underlying map from which it was created. The user 
-can select category values from the input raster to use in the MASK with the <em>maskcats</em> parameter; 
-if <em>r.mask</em> is run from the command line, the category values listed in <em>maskcats</em> 
-must be quoted (see example below).
+is affected by any changes to the underlying map from which it was created.
+The user can select category values from the input raster to use in the MASK
+with the <em>maskcats</em> parameter; if <em>r.mask</em> is run from the
+command line, the category values listed in <em>maskcats</em> must be quoted
+(see example below).
 <p>
 
 Somewhat similar program functions to those performed by
-<em>r.mask</em> can be done using
-<em><a HREF="r.mapcalc.html">r.mapcalc</a></em>, 
-<em><a HREF="g.region.html">g.region</a></em>,
-and other programs.
+<em>r.mask</em> can be done using <em>r.mapcalc</em>, 
+<em>g.region</em>, and other commands.
 
-<p>
-<em>(GRASS Shell Script)</em>
-
 <h2>EXAMPLES</h2>
-Creating a raster mask:
+
+Creating a raster mask, for showing only elevations of lakes:
 <div class="code"><pre>
-<b>r.mask input=</b>geology
-MASK created. All subsequent raster operations
-will be limited to MASK area
-Removing or renaming raster file named MASK will
-restore raster operations to normal
-[Raster MASK present]
+r.mask input=lakes
+# statistics only for elevation pixels in the lakes:
+r.univar elevation
 </pre></div>
 
 Removing a raster mask with the -r flag:
 <div class="code"><pre>
-<b>r.mask -r input=</b>anything_you_wish
-Removing raster <MASK>
-Raster MASK removed
+r.mask -r
 </pre></div>
 
-Creating a mask from categories 3 through 6 in the spearfish 'geology' raster map:
+Creating a mask from categories 3 through 6 in the North Carolina
+'geology_30m' raster map:
 <div class="code"><pre>
-<b>r.mask input=</b>geology <b>maskcats=</b>"3 thru 6"
-MASK created. All subsequent raster operations
-will be limited to MASK area
-Removing or renaming raster file named MASK will
-restore raster operations to normal
-[Raster MASK present]
+g.region rast=geology_30m -p
+r.category geology_30m
+d.mon x0
+d.rast geology_30m
+r.mask input=geology_30m maskcats="217 thru 720"
+d.erase
+d.rast geology_30m
 </pre></div>
 
 <h2>SEE ALSO</h2>
 <em>
 <a HREF="g.region.html">g.region</a>,
 <a HREF="r.mapcalc.html">r.mapcalc</a>,
-<a href="r.reclass.html">r.reclass</a>
-<a href="g.remove.html">g.remove</a>
+<a href="r.reclass.html">r.reclass</a>,
+<a href="g.remove.html">g.remove</a>,
 <a href="g.rename.html">g.rename</a>
 </em>
 

Modified: grass/branches/develbranch_6/scripts/r.out.xyz/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.out.xyz/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.out.xyz/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,42 +1,51 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-The <EM>r.out.xyz</EM> module will export a raster map as a list of x,y,z
+The <em>r.out.xyz</em> module exports a raster map as a list of x,y,z
 values into an ASCII text file.
-<P>
-<EM>(GRASS Shell Script)</EM>
+<p>
 
-<H2>NOTES</H2>
+<h2>NOTES</h2>
 
 This module will not export x,y coordinates for raster cells containing
 a NULL value. This includes cells masked by a raster MASK.
-<P>
+<p>
 This module, as all GRASS raster modules, will export cells based on the
-current region settings. See the <EM>g.region</EM> module for details.
-<P>
-The <EM>r.out.ascii</EM> module should be used to export an array (of
+current region settings. See the <em>g.region</em> module for details.
+<p>
+The <em>r.out.ascii</em> module should be used to export an array (of
 size row x column) containing z values.
-<P>
-<EM>r.out.xyz</EM> is simply a front-end to "<tt>r.stats -1gn</tt>".
+<p>
+<em>r.out.xyz</em> is simply a front-end to "<tt>r.stats -1gn</tt>".
 
-<H2>TODO</H2>
+<h2>EXAMPLE</h2>
 
+In this example, a LiDAR elevation map in the
+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=","
+</pre></div>
+
+<h2>TODO</h2>
+
 Implement this script as a <EM>r.out.ascii</EM> option?
 
 
-<H2>SEE ALSO</H2>
+<h2>SEE ALSO</h2>
 
-<EM>
-<A HREF="g.region.html">g.region</A>,
-<A HREF="r.mask.html">r.mask</A>
-<A HREF="r.out.ascii.html">r.out.ascii</A>,
-<A HREF="r.stats.html">r.stats</A>
-</EM>
+<em>
+<a href="g.region.html">g.region</a>,
+<a href="r.mask.html">r.mask</a>
+<a href="r.out.ascii.html">r.out.ascii</a>,
+<a href="r.stats.html">r.stats</a>
+</em>
 
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
 
-M. Hamish Bowman<BR>
-<i>Dept. Marine Science<BR>
+M. Hamish Bowman<br>
+<i>Dept. Marine Science<br>
 Otago University, New Zealand</i>
 
-<P>
+<p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/r.plane/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.plane/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.plane/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,37 +1,38 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-
-<EM>r.plane</EM> creates a tilted plane raster map given user-specified
+<em>r.plane</em> creates a tilted plane raster map given user-specified
 parameters for inclination, azimuth, and the geographic location of a
-point on the plane.<BR>
+point on the plane.<br>
 The angle orientations of the <em>azimuth</em> parameter increase counter-clockwise,
 i.e., 0 degree = N, 45 degree = NW, 90 degree = W etc.
-<P>
+<p>
 Increasing values of the <em>dip</em> parameter progressively lower (or dip) the northern
 half of the plane, and incline the southern half, assuming the <em>azimuth</em> parameter 
 is held constant at 0 degrees.
 
 
-<H2>NOTES</H2>
+<h2>NOTES</h2>
 <tt>g.region -c</tt> provides the easting and northing coordinates for
 the center of the current region.
-<P>
+<p>
 <em>int</em> maps take less disk space than <em>float</em>s, which in turn
 take up less space than <em>double</em>s (but can be less exact).
 
 
-<H2>EXAMPLE</H2>
+<h2>EXAMPLE</h2>
 
-A tilted plane in the Spearfish region:
+A tilted plane in the North Carolina sample dataset region:
 
 <div class="code"><pre>
-r.plane myplane45 dip=45 az=90 east=599490 north=4920855 \
+g.region -d
+g.region -c
+r.plane myplane45 dip=45 az=90 east=527500.0 north=165000.0 \
         elev=1000 type=float
 </pre></div>
 
+<h2>AUTHOR</h2>
 
-<H2>AUTHOR</H2>
-
 Unknown<br>
 Updated to GRASS 5.7 by Michael Barton, Arizona State University
-<p><i>Last changed: $Date$</i></p>
+
+<p><i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/r.reclass.area/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.reclass.area/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.reclass.area/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -3,6 +3,18 @@
 <em>r.reclass.area</em> reclasses a raster map greater or
 less than a user specified area size (in hectares).
 
+<h2>EXAMPLE</h2>
+
+In this example, the ZIP code map in the
+North Carolina sample dataset location is filtered for large areas:
+
+<div class="code"><pre>
+g.region rast=zipcodes -p
+r.report zipcodes unit=h
+# extract only areas &gt; 2000 ha:
+r.reclass.area input=zipcodes output=zipcodes_larger2000ha greater=2000
+</pre></div>
+
 <h2>SEE ALSO</h2>
 
 <em><a HREF="r.reclass.html">r.reclass</a></em><br>

Modified: grass/branches/develbranch_6/scripts/r.shaded.relief/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.shaded.relief/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.shaded.relief/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,41 +1,30 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-
-<EM>r.shaded.relief</EM> is a Bourne shell script that
-creates a raster shaded relief map based on current
+<em>r.shaded.relief</em> creates a raster shaded relief map based on current
 resolution settings and on sun altitude, azimuth, and z-exaggeration values
 entered by the user. If no output shademap name is given, the new shaded
-relief map is named <EM>&lt;input_map&gt;.shade</EM>.
+relief map is named <em>&lt;input_map&gt;.shade</em>.
 The map is assigned a grey-scale color table.
 
-
-<P>
-If no parameters are provided on startup, this program is interactive;
-thus if the user enters the command:
-
-<DL>
-<DD>
-<B>r.shaded.relief</B>
-</DL>
-
-The program then prompts the user to enter values for:
-<OL>
-<LI>The <B>altitude</B> of the sun in degrees above the horizon
+<p>
+The module then prompts the user to enter values for:
+<ol>
+<li>The <b>altitude</b> of the sun in degrees above the horizon
 (a value between 0 and 90 degrees), and
 
-<LI>The <B>azimuth</B> of the sun in degrees to the east of north
+<li>The <b>azimuth</b> of the sun in degrees to the east of north
 (a value between 0 and 360 degrees).
 
-<LI>The name of a raster map layer to provide elevation values for the 
+<li>The name of a raster map layer to provide elevation values for the 
 shaded relief map.  Typically, this would be a map layer of elevation;
 however, any raster map layer can be named.
 
-<LI>The scaling parameter, which compensates for a different horizontal
-<B>scale</B> than vertical scale. If 'scale' is a number then the ewres 
+<li>The scaling parameter, which compensates for a different horizontal
+<b>scale</b> than vertical scale. If 'scale' is a number then the ewres 
 and nsres are multiplied by that scale to calculate the shading. (Default=1.0 
 for equivalent horizontal and vertical scales.)
 
-<LI>For the special case when a latitude-longitude projection is used with an
+<li>For the special case when a latitude-longitude projection is used with an
 elevation map measured in meters (e.g., SRTM, ETOPO2 etc.) or feet, the 
 <b>units</b> can be set to automatically set the horizontal scale to the the number of 
 meters (scale=111120) or feet (scale=370400) in a degree of latitude. The script scales
@@ -43,38 +32,48 @@
 it's close enough. It makes the difference between a usable and unusable shade.
 The <b>units</b> parameter overrides the <b>scale</b> parameter.
 
-<LI>The <b>zmult</b> exaggeration factor that changes the apparent relief
+<li>The <b>zmult</b> exaggeration factor that changes the apparent relief
 for the shaded relief map.  This can be any positive (or negative) floating
 point value. (Default=1.0)
+</ol>
 
-</OL>
-
-Specifically, <EM>r.shaded.relief</EM> executes a  
-<EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM>
-statement. Refer to the manual entry for 
-<EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM> for an explanation
+Specifically, <em>r.shaded.relief</em> executes a <em>r.mapcalc</em>
+statement. Refer to the manual entry for <em>r.mapcalc</em> for an explanation
 of the filtering syntax shown in the above expression.
 See, for example, the section on "The Neighborhood Modifier".
 
-<P>
-<EM>r.shaded.relief</EM> then runs <EM><a href="r.colors.html">r.colors</A></EM>
+<p>
+<em>r.shaded.relief</em> then runs <em>r.colors</em>
 to assign a grey-scale color table to the new shaded relief map.
 
-<H2>NOTES</H2>
+<h2>NOTES</h2>
 
 To visually improve the result of shade maps from low resolution elevation
 models, use <em>r.resamp.interp</em> with bilinear or bicubic method to
-resample the DEM at higher resolution. <EM>r.shaded.relief</EM> is then
+resample the DEM at higher resolution. <em>r.shaded.relief</em> is then
 run on the resampled DEM.
 
-<H2>FILES</H2>
+<h2>EXAMPLES</h2>
 
-This program is simply a shell script.  Users are encouraged to make their
-own shell scripts using similar techniques.
-See <KBD>$GISBASE/scripts/r.shaded.relief</KBD>.
+In this example, the aspect map in the North Carolina sample
+dataset location is used to hillshade the elevation map:
 
-<H2>SEE ALSO</H2>
+<div class="code"><pre>
+g.region rast=elevation -p
+r.shaded.relief map=elevation shadedmap=elevation.shaded
+</pre></div>
 
+<p>
+In Latitude-Longitude locations (or other non-metric locations), the
+<em>scale</em> factor has to be used:
+
+<div class="code"><pre>
+# Latitude-Longitude example
+r.shaded.relief map=srtm shadedmap=srtm.shaded scale=111120
+</pre></div>
+
+<h2>SEE ALSO</h2>
+
 "<i>r.mapcalc: An Algebra for GIS and Image Processing</i>", by Michael Shapiro
 and Jim Westervelt, U.S. Army Construction Engineering Research Laboratory
 (March/1991) (available from the GRASS web site).
@@ -83,16 +82,16 @@
 <!-- RGB version not ported to GRASS 6:
   <EM><A HREF="shade.clr.sh.html">shade.clr.sh</A></EM><BR>
  -->
-<EM>
-<A HREF="d.his.html">d.his</A>,<br>
-<A HREF="g.region.html">g.region</A>,<br>
-<A HREF="r.blend.html">r.blend</A>,<br>
-<A HREF="r.colors.html">r.colors</A>,<br>
-<A HREF="r.mapcalc.html">r.mapcalc</A>,<br>
-<A HREF="r.resamp.interp.html">r.resamp.interp</A>
-</EM>
+<em>
+<a href="d.his.html">d.his</a>,
+<a href="g.region.html">g.region</a>,
+<a href="r.blend.html">r.blend</a>,
+<a href="r.colors.html">r.colors</a>,
+<a href="r.mapcalc.html">r.mapcalc</a>,
+<a href="r.resamp.interp.html">r.resamp.interp</a>
+</em>
 
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
 
 Jim Westervelt, U.S. Army Construction Engineering 
 Research Laboratory

Modified: grass/branches/develbranch_6/scripts/r.tileset/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r.tileset/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r.tileset/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,133 +1,103 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>r.tileset</EM> generates sets of tiles in another projection that cover
-a region in this projection with adequate resolution. By default the current
-region and its resolution are used, the bounds and resolution of another
-region can be used via the region option.
+<em>r.tileset</em> generates sets of tiles in another projection that
+cover a region in this projection with adequate resolution. By default
+the current region and its resolution are used, the bounds and
+resolution of another region can be used via the region option.
 
-<H2>NOTES</H2>
 
-<EM>r.tileset</EM> does not make "optimal" tilings (as few tiles of the
-largest size less than the maximums). This means that from latitude
-longitude projection to an appropriate projection for a region, in the
-degenerate case, it may create tiles demanding up to twice the necessary
-information. Furthermore, generating a tiling near a divergant point of
-a source projection, such as the poles of a cylindrical source projections,
-results in divergence of the tile set.
+<h2>NOTES</h2>
 
-<p>Not generating "optimal" tilings may have another consequence; the
+<em>r.tileset</em> does not make "optimal" tilings (as few tiles of
+the largest size less than the maximums). This means that from
+latitude longitude projection to an appropriate projection for a
+region, in the degenerate case, it may create tiles demanding up to
+twice the necessary information. Furthermore, generating a tiling near
+a divergant point of a source projection, such as the poles of a
+cylindrical source projections, results in divergence of the tile set.
+<p>
+Not generating "optimal" tilings may have another consequence; the
 aspect ratio of cells in the destination region will not necessarily
 carry over to the source region and generated tiles may have cells of
 strange aspect ratios. This might be a problem for some map request
 services presenting data in an inappropriate projection or with strict
 constraints on cell aspect ratio.
 
-<H2>OUTPUT FORMAT</H2>
 
+<h2>OUTPUT FORMAT</h2>
+
 Each tile is listed on a separate line in the output. The lines are
 formatted as follows:
 
 <dl>
 <dt>
-<div class="code"><pre>
+<span class="code"><tt>
 5|125|45|175|80|100
-</pre></div>
+</tt></span>
 
-<dd>
-This is the default output format. It is the tile's minimum x coordinate,
-minimum y coordinate, maximum x coordinate, maximum y coordinate, width
-in cells, and height in cells separated by the "|" character. The fields
-can be separated by a different character by changing the fs option.
+<dd>This is the default output format. It is the tile's minimum x
+coordinate, minimum y coordinate, maximum x coordinate, maximum y
+coordinate, width in cells, and height in cells separated by the "|"
+character. The fields can be separated by a different character by
+changing the fs option.
 
-<p>
-
 <dt>
-<div class="code"><pre>
+<span class="code"><tt>
 w=5;s=125;e=45;n=175;cols=80;rows=100;
-</pre></div>
+</tt></span>
 
-<dd>
-This is output in a format convinent for setting variables in a shell script.
-
-<p>
-
+<dd>This is output in a format convinent for setting variables in a shell
+script.
 <dt>
-<div class="code"><pre>
+<span class="code"><tt>
 bbox=5,125,45,175&amp;width=80&amp;height=100
-</pre></div>
+</tt></span>
 
-<dd>
-This is output in a format convinent for requesting data from some http
-services.
-
-<p>
+<dd>This is output in a format convinent for requesting data from some
+http services.
 </dl>
 
 
-<H2>EXAMPLES</H2>
+<h2>EXAMPLES</h2>
 
-<dl>
-<dt>
+Generates tiles in latitude longitude that cover the current
+region, each tile will be less than 1024 cells high and 2048 cells
+across. The bounds and sizes of tiles in the output are separated by | (pipe):
+<p></p>
 <div class="code"><pre>
 r.tileset sourceproj=+init=epsg:4326 maxrows=1024 maxcols=2048
 </pre></div>
-<dd> Generates tiles in latitude longitude that cover the current region,
-each tile will be less than 1024 cells high and 2048 cells across.
-The bounds and sizes of tiles in the output are separated by "|"
 
+Generates tiles in latitude longitude projection that cover the
+named region "ne-rio". The tiles will have 2 cells of overlap. The
+output format will be strings like the bbox requests for WMS servers:
 <p>
-
-<dt>
 <div class="code"><pre>
 r.tileset sourceproj=+init=epsg:4326 overlap=2 -w region=ne-rio
 </pre></div>
-<dd>Generates tiles in latitude longitude projection that cover the
-named region "ne-rio". The tiles will have 2 cells of overlap. The output
-format will be strings like the bbox requests for WMS servers.
 
+Generates tiles in the projection of the location
+"IrishGrid". Each tile will be less than 300x400 cells in size, with 3
+cells of overlap in the top and right sides of each tile. The output
+is in a format where each line is in shell script style. The
+substitution <code>`g.proj -j location=IrishGrid`</code> will only
+work in a unix style shell:
 <p>
-
-<dt>
 <div class="code"><pre>
 r.tileset sourceproj=`g.proj -j location=IrishGrid` maxrows=400 maxcols=300 overlap=3 -g
 </pre></div>
-<dd>Generates tiles in the projection of the location "IrishGrid".
-Each tile will be less than 300x400 cells in size, with 3 cells of
-overlap in the top and right sides of each tile. The output is in a
-format where each line is in shell script style. The substitution
-<code>`g.proj -j location=IrishGrid`</code> will only work in a unix
-style shell.
 
-</dl>
+<h2>BUGS</h2>
 
-<H2>REQUIRED PROGRAMS</H2>
-
-<EM>r.tileset</EM> requires the following programs to work:
-
-<dl>
-<dt>cs2cs
-<dd>The coordinate system transformation program from Proj4.
-
-<dt>bc
-<dd>A calculator program
-
-<dt>sed, grep
-<dd>Unix string processing and search programs
-
-</dl>
-
-
-<H2>BUGS</H2>
-
 <ul>
-<li><EM>r.tileset</EM> does not know about meridians that "wrap-around"
-in projections.
-</ul>
+<li><em>r.tileset</em> does not know about meridians that
+"wrap-around" in projections.  </ul>
 
 
-<H2>AUTHORS</H2>
+<h2>AUTHORS</h2>
 
-Cedric Shock
+Cedric Shock<br>
+Updated for GRASS 7 by Martin Landa, CTU in Prague, Czech Republic
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/r3.mapcalculator/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/r3.mapcalculator/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/r3.mapcalculator/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,21 +1,24 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
+<em>r3.mapcalculator</em> provides a GUI frontend to <em>r3.mapcalc</em>.
+Up to 5 maps can be combined using simple expressions.
+In the expert mode, it runs <em>r3.mapcalc</em> for more complex expressions.
 
-<EM>r3.mapcalculator</EM> Provides a GUI frontend to r3.mapcalc. Up to 5 maps can be combined using simple expressions. 
-
-Enter an r3.mapcalc expression in the formula field using the format: A+C or exp(A+C)+(B-2)*7 where A, B, C are grid3D volumes entered in the A field, B field, and C field. 
-
+Enter an <em>r3.mapcalc</em> expression in the formula field using the
+format: A+C or exp(A+C)+(B-2)*7 where A, B, C are 3D raster volumes entered
+in the A field, B field, and C field. 
+<p>
 Do not enter output file in the formula field: correct: A+B; incorrect: newfile = A+B. Use no spaces or blanks. 
+<p>
+Expert mode runs <em>r3.mapcalc</em> for more complex expressions.
 
-Expert mode runs r.mapcalc for more complex expressions.
-<br>
+<h2>SEE ALSO</h2>
 
-<H2>SEE ALSO</H2>
+<em><A HREF="r3.mapcalc.html">r3.mapcalc</A></em>
 
-<EM><A HREF="r3.mapcalc.html">r.mapcalc</A></EM>,
 
+<h2>AUTHOR</h2>
 
-<H2>AUTHOR</H2>
+Michael Barton, Arizona State University. Based on r.mapcalculator by R. Brunzema (r.brunzema at web.de)
 
-Michael Barton, Arizona State University. Based on r.mapcalculator by R. Brunzema (r.brunzema at web.de)
 <p><i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.build.all/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.build.all/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.build.all/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,9 +1,10 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>v.build.all</EM> will run <em><a href="v.build.html">v.build</a></em>
+<em>v.build.all</em> runs <em><a href="v.build.html">v.build</a></em>
 for all vectors in the current mapset.
 
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
 Radim Blazek
+
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.centroids/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.centroids/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.centroids/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,37 +1,34 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
 GRASS defines vector areas as composite entities consisting of a set of
 closed boundaries and a centroid. The attribute information associated
-with that area is linked to the centroid. The <EM>v.centroids</EM> module
+with that area is linked to the centroid. The <em>v.centroids</em> module
 adds centroids to closed boundaries in the <b>input</b> file and assigns a
 category number to them. The starting value as well as the increment size
 may be set using optional parameters. 
-<P>
+<p>
 Multiple attributes may be linked to a single vector entity through
 numbered fields referred to as layers. Refer to <em>v.category</em>
-for more details, as <EM>v.centroids</EM> is simply a frontend to that
+for more details, as <em>v.centroids</em> is simply a frontend to that
 module.
-<P>
+<p>
 The boundary itself is often stored without any category reference as it
 can mark the border between two adjacent areas. Thus it would be ambiguous
 as to which feature the attribute would belong. In some cases it may, for
 example, represent a road between two parcels of land. In this case it
 is entirely appropriate for the boundary to contain category information.
-<p>
 
-<EM>(GRASS Shell Script)</EM>
-
 <H2>SEE ALSO</H2>
 
 <em>
-<A HREF="v.category.html">v.category</A>
+<a href="v.category.html">v.category</a>
 </em>
 
-<H2>AUTHORS</H2>
+<h2>AUTHORS</h2>
 
 module: M. Hamish Bowman, Dept. Marine Science, Otago University, New Zealand
-<BR>
+<br>
 help page: Trevor Wiens
 
-<P>
+<p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.convert.all/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.convert.all/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.convert.all/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -9,12 +9,12 @@
 directories, so you can use the same names. Old vector maps can be listed with
 <em>g.list oldvect</em>.
 
-<P>
+<p>
 If you need to convert back from 6.0 into the 5.0/5.3/5.4 vector format,
 use <em>v.out.ogr</em> (to SHAPE format) and then <em>v.in.shape</em>
 in the old GRASS program.
 Alternatively use "<em>v.out.ascii -o</em>" and <em>v.in.ascii</em>.
-<P>
+<p>
 As this GRASS version uses SQL for attribute management, there are
 some <a href=sql.html>SQL restrictings concerning the file names</a>.
 This script changes dots (e.g. "foo.bar") in old vector map names into
@@ -24,16 +24,18 @@
 
 To convert all old vector maps in the current mapset to the new vector format:
 <br>
-<tt>
+<div class="code"><pre>
 v.convert.all -r
-</tt>
+</pre></div>
 
 <h2>SEE ALSO</h2>
 
-<em><A HREF="g.list.html">g.list</A>,
-<A HREF="v.convert.html">v.convert</A>,
-<A HREF="v.out.ascii.html">v.out.ascii</A>,
-<A HREF="v.out.ogr.html">v.out.ogr</A></em>
+<em>
+<a href="g.list.html">g.list</a>,
+<a href="v.convert.html">v.convert</a>,
+<a href="v.out.ascii.html">v.out.ascii</a>,
+<a href="v.out.ogr.html">v.out.ogr</a>
+</em>
 
 
 <h2>AUTHOR</h2>

Modified: grass/branches/develbranch_6/scripts/v.db.addtable/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.db.addtable/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.db.addtable/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -13,48 +13,52 @@
 v.db.addtable will only insert category values into the table for those features 
 which actually have a category value in the relevant layer. The use can add 
 category values automatically by using <em>v.category</em> or manually with 
-<em>v.digit</em> before running v.db.addtable. Or one can run v.db.addtable first
+<em><a href="wxGUI.Vector_Digitizing_Tool.html">wxGUI vector digitizer</a></em>
+before running v.db.addtable. Or one can run v.db.addtable first
 and then use either a combinatino of <em>v.category</em> + <em>v.to.db</em> or 
-<em>v.digit</em> to add the relevant lines to the table.
+<em><a href="wxGUI.Vector_Digitizing_Tool.html">wxGUI vector digitizer</a></em>
+to add the relevant lines to the table.
 
 The supported types of columns depend on the database backend. However, all
-backends should support VARCHAR, INT, DOUBLE PRECISION and DATE. The default
-dbf backend supports only these types.
-
+backends should support VARCHAR, INT, DOUBLE PRECISION and DATE.
+<p>
 The existing database connection(s) can be verified with <em>v.db.connect</em>.
 
 <h2>EXAMPLE</h2>
 
 Adding a new attribute table with a single column to default layer 1:<br>
 <div class="code"><pre>
-v.db.addtable sentiero_brenta_points columns="slope double precision"
-v.db.connect -p sentiero_brenta_points
-v.info -c sentiero_brenta_points
+g.copy vect=roadsmajor,myroads
+v.db.addtable myroads columns="slope double precision"
+v.db.connect -p myroads
+v.info -c myroads
 </pre></div>
 
 <p>
 Adding a new attribute table with two columns to layer 2:<br>
 <div class="code"><pre>
-v.db.addtable sentiero_brenta_points columns="slope double precision,myname varchar(15)" layer=2
-v.db.connect -p sentiero_brenta_points
-v.info -c sentiero_brenta_points
+g.copy vect=roadsmajor,myroads
+v.db.addtable myroads columns="slope double precision, roadname varchar(15)" layer=2
+v.db.connect -p myroads
+v.info -c myroads
+v.info -c myroads layer=2
 </pre></div>
 
 <h2>SEE ALSO</h2>
 
-<em><a HREF="db.connect.html">db.connect</a></em>,
-<em><a HREF="db.droptable.html">db.droptable</a></em>,
-<em><a HREF="db.execute.html">db.execute</a></em>,
-<em><a HREF="v.category.html">v.category</a></em>,
-<em><a HREF="v.db.addcol.html">v.db.addcol</a></em>,
-<em><a HREF="v.db.connect.html">v.db.connect</a></em>,
-<em><a HREF="v.db.dropcol.html">v.db.dropcol</a></em>,
-<em><a HREF="v.db.droptable.html">v.db.droptable</a></em>,
-<em><a HREF="v.db.select.html">v.db.select</a></em>,
-<em><a HREF="v.db.update.html">v.db.update</a></em><br>
-<em><a href="sql.html">GRASS SQL interface</a></em>
+<em>
+<a href="db.connect.html">db.connect</a>,
+<a href="db.droptable.html">db.droptable</a>,
+<a href="db.execute.html">db.execute</a>,
+<a href="v.db.addtable.html">v.db.addtable</a>,
+<a href="v.db.connect.html">v.db.connect</a>,
+<a href="v.db.dropcolumn.html">v.db.dropcolumn</a>,
+<a href="v.db.droptable.html">v.db.droptable</a>,
+<a href="v.db.select.html">v.db.select</a>,
+<a href="v.db.update.html">v.db.update</a><br>
+<a href="sql.html">GRASS SQL interface</a>
+</em>
 
-
 <h2>AUTHOR</h2>
 
 Markus Neteler

Modified: grass/branches/develbranch_6/scripts/v.db.droptable/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.db.droptable/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.db.droptable/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -7,28 +7,32 @@
 <h2>NOTES</h2>
 
 <em>v.db.droptable</em> is a front-end to <em>db.execute</em> to allow easier usage.
-
+<p>
 The existing database connection(s) can be verified with <em>v.db.connect</em>.
 
 <h2>EXAMPLE</h2>
 
-Removing attribute table connected to layer 2:<br>
+Removing attribute table connected to layer 1:<br>
 <div class="code"><pre>
-v.db.droptable sentiero_brenta_points layer=2
-v.db.connect -p sentiero_brenta_points
+g.copy vect=roadsmajor,myroads
+v.db.droptable myroads
+v.db.droptable myroads -f
+v.db.connect -p myroads
 </pre></div>
 
 <h2>SEE ALSO</h2>
 
-<em><a HREF="db.droptable.html">db.droptable</a></em>,
-<em><a HREF="db.execute.html">db.execute</a></em>,
-<em><a HREF="v.db.addcol.html">v.db.addcol</a></em>,
-<em><a HREF="v.db.addtable.html">v.db.addtable</a></em>,
-<em><a HREF="v.db.connect.html">v.db.connect</a></em>,
-<em><a HREF="v.db.dropcol.html">v.db.dropcol</a></em>,
-<em><a HREF="v.db.droprow.html">v.db.droprow</a></em>,
-<em><a HREF="v.db.select.html">v.db.select</a></em>,
-<em><a HREF="v.db.update.html">v.db.update</a></em>
+<em>
+<a href="db.addtable.html">db.addtable</a>,
+<a href="db.connect.html">db.connect</a>,
+<a href="db.execute.html">db.execute</a>,
+<a href="v.db.addtable.html">v.db.addtable</a>,
+<a href="v.db.connect.html">v.db.connect</a>,
+<a href="v.db.dropcolumn.html">v.db.dropcolumn</a>,
+<a href="v.db.select.html">v.db.select</a>,
+<a href="v.db.update.html">v.db.update</a><br>
+<a href="sql.html">GRASS SQL interface</a>
+</em>
 
 
 <h2>AUTHOR</h2>

Modified: grass/branches/develbranch_6/scripts/v.db.join/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.db.join/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.db.join/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -66,10 +66,12 @@
 
 <h2>SEE ALSO</h2>
 
-<em><a HREF="db.execute.html">db.execute</a></em>,
-<em><a HREF="db.in.ogr.html">db.in.ogr</a></em>,
-<em><a HREF="v.db.update.html">v.db.update</a></em><br>
-<em><a href="sql.html">GRASS SQL interface</a></em>
+<em>
+<a HREF="db.execute.html">db.execute</a>,
+<a HREF="db.in.ogr.html">db.in.ogr</a>,
+<a HREF="v.db.update.html">v.db.update</a><br>
+<a href="sql.html">GRASS SQL interface</a>
+</em>
 
 <h2>AUTHOR</h2>
 

Modified: grass/branches/develbranch_6/scripts/v.db.reconnect.all/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.db.reconnect.all/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.db.reconnect.all/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,18 +1,17 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>v.db.reconnect.all</EM> changes database connection of all layers of
+<em>v.db.reconnect.all</em> changes database connection of all layers of
 all vectors in the current mapset from old_database to database. If a link
 does not match the old_database it is left untouched.
 
+<h2>NOTES</h2>
 
-<H2>NOTES</H2>
-
 The value of the <em>old_database</em> option needs to be the exact
 string which appears as the fourth field printed by
-<code>'v.db.connect -g'</code>, i.e. with substituted variables.
+<tt>v.db.connect -g</tt>, i.e. with substituted variables.
 
 
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
 Radim Blazek
 
 <p>

Modified: grass/branches/develbranch_6/scripts/v.db.univar/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.db.univar/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.db.univar/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,42 +1,43 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-
-<EM><b>v.db.univar</b></EM>  - Calculates basic univariate statistics for numeric
+<em>v.db.univar</em> calculates basic univariate statistics for numeric
 attributes in a data table. It will calculate minimum, maximum, range, mean,
 standard deviation, variance, coefficient of variation, quartiles, median, and
 90th percentile.
 It uses <em>db.select</em> to create list values for statistical calculations.
 
-<EM>(GRASS Shell Script)</EM>
+<em>NOTES</em>
 
-<H2>NOTES</H2>
-
 If the database and driver are not specified, the default values set in
 <em>db.connect</em> will be used.
 
-<H2>EXAMPLE</H2>
+<h2>EXAMPLE</h2>
 
+In this example, random points are sampled from the elevation map
+(North Carolina sample dataset) and univariate statistics performed:
 <div class="code"><pre>
-g.region rast=elevation.10m -p
-v.random out=samples n=100
-v.db.addtable samples col="heights double precision"
-v.what.rast samples rast=elevation.10m col=heights
+g.region rast=elevation -p
+v.random output=samples n=100
+v.db.addtable samples column="heights double precision"
+v.what.rast samples raster=elevation colum=heights
 v.db.select samples
 
-v.db.univar samples col=heights
+v.db.univar samples colum=heights
 </pre></div>
 
-<H2>SEE ALSO</H2>
+<h2>SEE ALSO</h2>
 
-<EM>
-<A HREF="r.univar.html">r.univar</A>,
-<A HREF="v.univar.html">v.univar,</A>,
-<A HREF="db.select.html">db.select</A>,
-<A HREF="d.vect.thematic.html">d.vect.thematic</A></EM>
+<em>
+<a href="r.univar.html">r.univar</a>,
+<a href="v.univar.html">v.univar,</a>,
+<a href="db.select.html">db.select</a>,
+<a href="d.vect.thematic.html">d.vect.thematic</a>
+</em>
 
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
  Michael Barton, Arizona State University
 <p>
 and authors of <em>r.univar.sh</em>
+
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.db.update/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.db.update/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.db.update/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -7,20 +7,33 @@
 <h2>NOTES</h2>
 
 <em>v.db.update</em> is just a front-end to <em>db.execute</em> to allow easier usage.
+<p>
 For complex SQL UPDATE statements, <em>db.execute</em> should be used.
 
 <h2>EXAMPLES</h2>
 
-Spearfish: adding new column, inserting selectively a specified value:
+In this example, selectively display lakes without (blue) and with NULL (red)
+are shown to find out which type is undefined. In the original map there are
+lakes missing FTYPE attribute which are wetlands along streams. These NULL
+attributes are replaced with the landuse type WETLAND:
+
 <div class="code"><pre>
-g.copy vect=fields,myfields
-v.db.addcol myfields col="polynum integer"
-v.db.update myfields col=polynum val=42 where="label='V. White#1'"
-v.db.select myfields
-</pre></div>
+g.copy vect=lakes,mylakes
+v.db.select mylakes
+v.db.select mylakes where="FTYPE IS NULL"
 
+# display the lakes, show undefined FTYPE lakes in red
+g.region vect=mylakes
+d.mon x0
+d.vect mylakes where="FTYPE NOT NULL" type=area col=blue
+d.vect mylakes where="FTYPE IS NULL" type=area col=red
+
+# replace NULL with FTYPE WETLAND
+v.db.update mylakes col=FTYPE value=WETLAND \
+            where="FTYPE IS NULL"
+v.db.select mylakes
 <p>
-Spearfish: adding new column, copying values from other table column with
+Spearfish example: adding new column, copying values from other table column with
 on the fly calculation:
 <div class="code"><pre>
 g.copy vect=fields,myfields
@@ -32,20 +45,23 @@
 <p>
 Type cast (type conversion) of strings to double precision (unsupported by DBF driver):
 <div class="code"><pre>
+g.copy vect=geodetic_pts,mygeodetic_pts
 v.db.update mygeodetic_pts col=zval qcol="CAST(z_value AS double precision)" \
-            where="z_value <> 'N/A'"
+            where="z_value &lt;&gt; 'N/A'"
 </pre></div>
 
 <h2>SEE ALSO</h2>
 
-<em><a HREF="db.execute.html">db.execute</a></em>,
-<em><a HREF="v.db.addcol.html">v.db.addcol</a></em>,
-<em><a HREF="v.db.addtable.html">v.db.addtable</a></em>,
-<em><a HREF="v.db.connect.html">v.db.connect</a></em>,
-<em><a HREF="v.db.droptable.html">v.db.droptable</a></em>,
-<em><a HREF="v.db.join.html">v.db.join</a></em>,
-<em><a HREF="v.db.select.html">v.db.select</a></em><br>
-<em><a href="sql.html">GRASS SQL interface</a></em>
+<em>
+<a HREF="db.execute.html">db.execute</a>,
+<a HREF="v.db.addcolumn.html">v.db.addcolumn</a>,
+<a HREF="v.db.addtable.html">v.db.addtable</a>,
+<a HREF="v.db.connect.html">v.db.connect</a>,
+<a HREF="v.db.droptable.html">v.db.droptable</a>,
+<a HREF="v.db.join.html">v.db.join</a>,
+<a HREF="v.db.select.html">v.db.select</a><br>
+<a href="sql.html">GRASS SQL interface</a>
+</em>
 
 
 <h2>AUTHOR</h2>

Modified: grass/branches/develbranch_6/scripts/v.dissolve/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.dissolve/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.dissolve/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,6 +1,6 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-The <EM>v.dissolve</EM> module is used to merge adjacent areas in a vector
+The <em>v.dissolve</em> module is used to merge adjacent areas in a vector
 map which share the same category value. The resulting merged area(s) retains
 this category value. Alternatively an integer or string column can be defined
 which is used to find adjacent polygons with identical attribute for common
@@ -13,19 +13,19 @@
 GRASS defines a vector area as composite entity consisting of a set of
 closed boundaries and a centroid. The centroids must contain a
 category number
-(see <em><a href="v.centroids.html">v.centroids</a></em>), this number
-is linked to area attributes and database links.
-<P>
+(see <em>v.centroids</em>), this number is linked to area attributes and
+database links.
+<p>
 Multiple attributes may be linked to a single vector entity through
-numbered fields referred to as layers. Refer
-to <em><a href="v.category.html">v.category</a></em> for more details.
+numbered fields referred to as layers. Refer to <em>v.category</em> for
+more details.
 
-<P>
+<p>
 Merging of areas can also be accomplished using
-"<em>v.extract <b>-d</b></em>" which provides some additional options.
-In fact, <a href="v.dissolve.html">v.dissolve</a> is simply a
-front-end to that module. The use of the <EM>column</EM> parameter
-adds a call to <em><a href="v.reclass.html">v.reclass</a></em> before.
+<tt>v.extract -d</tt> which provides some additional options.
+In fact, <em>v.dissolve</em> is simply a
+front-end to that module. The use of the <em>column</em> parameter
+adds a call to <em>v.reclass</em> before.
 
 
 <h2>EXAMPLES</h2>
@@ -36,12 +36,12 @@
 </pre></div>
 
 <h3>Dissolving based on column attributes</h3>
+
+North Carolina data set:
+
 <div class="code"><pre>
-# check column names:
-v.info -c polbnda_italy
-
-# dissolve based on column attributes:
-v.dissolve input=polbnda_italy output=pol_italy_regions col=vmap_nam
+g.copy vect=soils_general,mysoils_general
+v.dissolve mysoils_general output=mysoils_general_families column=GSL_NAME
 </pre></div>
 
 <h3>Dissolving adjacent SHAPE files to remove tile boundaries</h3>
@@ -52,7 +52,7 @@
 
 <div class="code"><pre>
 # patch tiles after import:
-v.patch -e `g.mlist type=vect pat="clc2000_*" sep=,` out=clc2000_patched
+v.patch -e `g.mlist type=vect pat="clc2000_*" sep=","` out=clc2000_patched
 
 # remove duplicated tile boundaries:
 v.clean clc2000_patched out=clc2000_clean tool=snap,break,rmdupl thresh=.01
@@ -62,21 +62,21 @@
 </pre></div>
 
 
-<H2>SEE ALSO</H2>
+<h2>SEE ALSO</h2>
 
-<EM>
-<A HREF="v.category.html">v.category</A>,
-<A HREF="v.centroids.html">v.centroids</A>,
-<A HREF="v.extract.html">v.extract</A>,
-<A HREF="v.reclass.html">v.reclass</A>
-</EM>
+<em>
+<a href="v.category.html">v.category</a>,
+<a href="v.centroids.html">v.centroids</a>,
+<a href="v.extract.html">v.extract</a>,
+<a href="v.reclass.html">v.reclass</a>
+</em>
 
 
-<H2>AUTHORS</H2>
+<h2>AUTHORS</h2>
 
 module: M. Hamish Bowman, Dept. Marine Science, Otago University, New Zealand<br>
-Markus Neteler for column support<BR>
+Markus Neteler for column support<br>
 help page: Trevor Wiens
 
-<P>
+<p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.in.e00/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.in.e00/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.in.e00/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -12,14 +12,14 @@
 <H2>REFERENCES</H2>
 
 <a href="http://avce00.maptools.org">AVCE00 library</a> (providing 'avcimport' and 'e00conv')<br>
-<a href="http://www.remotesensing.org/gdal/ogr/">OGR vector library</a>
+<a href="http://www.gdal.org/ogr/">OGR vector library</a>
 
 <h2>SEE ALSO</h2>
 
 <em><a HREF="v.in.ogr.html">v.in.ogr</a></em>
 
-<h2>AUTHOR</h2>
+<h2>AUTHORS</h2>
 
-Markus Neteler, Otto Dassau, <a href=http://www.gdf-hannover.de>GDF Hannover bR</a>, Germany
+Markus Neteler, Otto Dassau, <a href="http://www.gdf-hannover.de/">GDF Hannover bR</a>, Germany
 
 <p><i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.in.garmin/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.in.garmin/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.in.garmin/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,17 +1,13 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>v.in.garmin</EM> allows the user to import waypoint, route, and track
+<em>v.in.garmin</em> allows the user to import waypoint, route, and track
  data from a locally connected Garmin GPS receiver via the 
-<EM><A HREF="http://gpstrans.sourceforge.net">gpstrans</a></EM>
+<em><a href="http://gpstrans.sourceforge.net">gpstrans</a></em>
  program by Carsten Tschach or the
-<EM><A HREF="http://www.snafu.org">gardump</a></EM>
+<em><a href="http://www.snafu.org">gardump</a></em>
  program by Marc Hyman. 
 
-<P>
-Use at your own risk. This software comes with absolutely no warranty.
-
-<P>
-<H2>NOTES</H2>
+<h2>NOTES</h2>
 If the GPS is set up to output WGS84 Lat/Lon, <em>v.in.garmin</em> will
 attempt to automatically transform the coordinates to the current projection.
 In all other cases, no checks are performed for datum, projection and format of data.
@@ -19,13 +15,13 @@
 use the same map datum and projection.
 The automatic transform may be skipped by using the <b>-k</b> flag.
 
-<P>
-Route and Track data may be uploaded as points by using the <B>-p</B> flag, 
-otherwise they will be imported as a line. You can run <EM>v.in.garmin</EM>
-multiple times and merge the line and point vectors with the <EM>v.patch</EM>
+<p>
+Route and Track data may be uploaded as points by using the <em>-p</em> flag, 
+otherwise they will be imported as a line. You can run <em>v.in.garmin</em>
+multiple times and merge the line and point vectors with the <em>v.patch</em>
 command if you want, but take care when merging dissimilar attribute tables.
 
-<P>
+<p>
 Future versions of GRASS will use <em>gardump</em> as the default download
 program. It can talk to newer Garmin GPSs, while <em>gpstrans</em> seems to
 be mostly abandoned these days and only works with older GPSs. The current
@@ -34,43 +30,41 @@
 code has been tested with an older Garmin GPS 45 and a newer GPS V and is
 expected to work with everything in between.
 
-<P>
-Before running <EM>v.in.garmin</EM>, <em>gpstrans</em> should be set up 
-to output WGS84 latitude-longitude, as follows: <BR>
+<p>
+Before running <em>v.in.garmin</em>, <em>gpstrans</em> should be set up 
+to output WGS84 latitude-longitude, as follows: <br>
 <tt>
-$ <B>gpstrans -s</B><BR>
-datum:  100 (WGS84)<BR>
-format: 2 - lat/lon  ddd.ddddd<BR>
+$ <b>gpstrans -s</b><br>
+datum:  100 (WGS84)<br>
+format: 2 - lat/lon  ddd.ddddd<br>
 </tt>
 
-<P>
-<H2>SEE ALSO</H2>
-<EM>
-<A HREF="db.execute.html">db.execute</A><BR>
-<A HREF="v.in.ascii.html">v.in.ascii</A><BR>
-<A HREF="v.in.gpsbabel.html">v.in.gpsbabel</A><BR>
-<A HREF="v.db.connect.html">v.db.connect</A><BR>
-<A HREF="v.patch.html">v.patch</A>
-</EM>
-<BR>
-<BR>
+<h2>SEE ALSO</h2>
 
-<A HREF="http://gpstrans.sourceforge.net">gpstrans</a> manual<BR>
-<A HREF="http://www.snafu.org">gardump</a> from the "garmin-utils" package<BR>
-cs2cs from <A HREF="http://proj.maptools.org">PROJ.4</a><BR>
+<em>
+<a href="db.execute.html">db.execute</a>,
+<a href="v.in.ascii.html">v.in.ascii</a>,
+<a href="v.in.gpsbabel.html">v.in.gpsbabel</a>,
+<a href="v.db.connect.html">v.db.connect</a>,
+<a href="v.patch.html">v.patch</A>
+</em>
+
+<p>
+<a href="http://gpstrans.sourceforge.net">gpstrans</a> manual<br>
+<a href="http://www.snafu.org">gardump</a> from the "garmin-utils" package<br>
+cs2cs from <a href="http://trac.osgeo.org/proj/">PROJ.4</a><br>
 The <tt>awk</tt> user manual
 
-<P>
-<H2>AUTHORS</H2>
+<p>
+<h2>AUTHORS</h2>
 Based on <em>v.in.garmin.sh</em> for GRASS 5.0 by Andreas Lange
-<BR>&nbsp;&nbsp;&nbsp;&nbsp;
+<br>&nbsp;&nbsp;&nbsp;&nbsp;
 with bug fixes by Glynn Clements and Markus Neteler
-<BR>Rewritten for GRASS 5.3 and 5.7 by Hamish Bowman
-<BR><tt>gardump</tt> and 3D track support by Hamish Bowman
-<P>
-gpstrans was written by Carsten Tschach<BR>
-gardump was written by Marc Hyman<BR>
-<BR>
+<br>Rewritten for GRASS 5.3 and 5.7 by Hamish Bowman
+<br><tt>gardump</tt> and 3D track support by Hamish Bowman
+<p>
+gpstrans was written by Carsten Tschach<br>
+gardump was written by Marc Hyman<br>
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.in.geonames/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.in.geonames/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.in.geonames/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -11,7 +11,7 @@
 <h2>NOTES</h2>
 
 The current DB connection is used to write the database table.
-<P>
+<p>
 If importing into a DBF database, the original column names longer that 10 characters
 are shortened to 10 characters to meet the DBF column name restrictions. If this is a
 problem consider choosing another database driver with <em>db.connect</em>.
@@ -48,7 +48,7 @@
 <a HREF="v.select.html">v.select</a>
 </em>
 
-<H2>REFERENCES</H2>
+<h2>REFERENCES</h2>
 
 <a href="http://www.geonames.org">GeoNames Web site</a><br>
 <a href="http://download.geonames.org/export/dump/">GeoNames Data Dump Server</a>

Modified: grass/branches/develbranch_6/scripts/v.in.gns/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.in.gns/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.in.gns/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -10,11 +10,11 @@
 <h2>NOTES</h2>
 
 The current DB connection is used to write the database table.
-<P>
+<p>
 Generally, column names longer that 10 characters are shortened to
 10 characters to meet the DBF column name restrictions. If this is a
 problem consider choosing another database driver with <em>db.connect</em>.
-<P>
+<p>
 To filter outliers (points outside of a country), the <em>v.select</em>
 module can be used to perform point-in-polygon tests. <em>v.select</em>
 saves only the GNS points falling into a country polygon into the new
@@ -27,14 +27,14 @@
 <a HREF="v.select.html">v.select</a>
 </em>
 
-<H2>REFERENCES</H2>
+<h2>REFERENCES</h2>
 
 <a href="http://earth-info.nga.mil/gns/html/">GEOnet Names Server files for countries and territories</a><br>
 <a href="http://earth-info.nga.mil/gns/html/help.htm">Column names explanations</a>
 
 <h2>AUTHOR</h2>
 
-Markus Neteler, <a href=http://mpa.itc.it>MPBA Group, ITC-irst</a>
+Markus Neteler, MPBA Group, ITC-irst, Trento, Italy
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.in.gpsbabel/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.in.gpsbabel/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.in.gpsbabel/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,21 +1,21 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>v.in.gpsbabel</EM> allows the user to import waypoint, route, and track
+<em>v.in.gpsbabel</em> allows the user to import waypoint, route, and track
 data from a locally connected GPS receiver or a text file containing 
 GPS data of many common formats. Translation is done via the 
-<EM><A HREF="http://www.gpsbabel.org">gpsbabel</a></EM> program. 
+<em><a href="http://www.gpsbabel.org">GPSBabel</a></em> program. 
 
-<P>
+<p>
 This software is not intended as a primary means of navigation.
 
-<H2>NOTES</H2>
+<h2>NOTES</h2>
 
 <em>v.in.gpsbabel</em> automatically reprojects data using the 
 projection settings of the current location.
 
 The default input data projection is lat/lon WGS84. If your GPS outputs data
 using another projection or map datum, you may include the 
-<EM><A HREF="http://proj.maptools.org">PROJ.4</a></EM>
+<em><a href="http://trac.osgeo.org/proj/">PROJ.4</a></em>
 parameters defining your projection in the <b>proj</b> option and 
 <em>v.in.gpsbabel</em> will reproject your data accordingly.
 Great care must be taken to get these parameters correct!
@@ -23,13 +23,13 @@
 The automatic transform may be skipped by using the <b>-k</b> flag in which 
 case the data will be imported unprojected, as it appears in the <b>input</b>.
 
-<P>
-Route and Track data may be uploaded as a series of points by using the <B>-p</B> 
-flag, otherwise they will be imported as lines. You can run <EM>v.in.gpsbabel</EM>
-multiple times and merge the line and point vectors with the <EM>v.patch</EM>
+<p>
+Route and Track data may be uploaded as a series of points by using the <b>-p</b> 
+flag, otherwise they will be imported as lines. You can run <em>v.in.gpsbabel</em>
+multiple times and merge the line and point vectors with the <em>v.patch</em>
 command if you want, but take care when merging dissimilar attribute tables.
 
-<H2>EXAMPLES</H2>
+<h2>EXAMPLES</h2>
 
 <h3>GPS device connected via USB adapter</h3>
 
@@ -69,25 +69,25 @@
 </pre></div>
 
 
-<H2>SEE ALSO</H2>
-<EM><A HREF="db.execute.html">db.execute</A></EM><BR>
-<EM><A HREF="v.in.ascii.html">v.in.ascii</A></EM><BR>
-<EM><A HREF="v.in.garmin.html">v.in.garmin</A></EM><BR>
-<EM><A HREF="v.db.connect.html">v.db.connect</A></EM><BR>
-<EM><A HREF="v.patch.html">v.patch</A></EM><BR>
-<BR>
+<h2>SEE ALSO</h2>
+<em>
+<a href="db.execute.html">db.execute</a>,
+<a href="v.in.ascii.html">v.in.ascii</a>,
+<a href="v.in.garmin.html">v.in.garmin</a>,
+<a href="v.db.connect.html">v.db.connect</a>,
+<a href="v.patch.html">v.patch</a>
+</em>
 
-<A HREF="http://www.gpsbabel.org">gpsbabel</a> from gpsbabel.org<BR>
-cs2cs from <A HREF="http://proj.maptools.org">PROJ.4</a><BR>
+<a href="http://www.gpsbabel.org">gpsbabel</a> from gpsbabel.org<br>
+cs2cs from <A HREF="http://trac.osgeo.org/proj/">PROJ.4</a>
 
-<P>
-<H2>AUTHORS</H2>
+<h2>AUTHORS</h2>
 Claudio Porta and Lucio Davide Spano, students of Computer Science at
 University of Pisa (Italy).<br>
 Commission from Faunalia Pontedera (PI)<br><br>
 Based on <em>v.in.garmin</em> for GRASS 6.0 by Hamish Bowman<br>
 and <em>v.in.garmin.sh</em> for GRASS 5 by Andreas Lange
-<BR>
+<br>
 
 <!--
 When we tested the script with a Garmin GPS we noticed that importing waypoints 
@@ -97,4 +97,5 @@
 from <i>garmin</i> to <i>xcsv</i> ... 
 -->
 
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.in.lines/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.in.lines/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.in.lines/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,21 +1,21 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
 Imports a stream of ASCII x,y[,z] coordinates as a line or series of lines.
 
 
-<H2>NOTES</H2>
+<h2>NOTES</h2>
 
 Input ASCII coordinates are simply a series of "x&nbsp;y" data points.
 Lines are separated by a row containing "<tt>NaN&nbsp;NaN</tt>".
 <!-- TODO:? Line categories start at 1 and increase sequentially. -->
-<P>
-You can import 3D lines by providing 3 columns of data in the input
-stream and using the <B>-z</B> flag.
-<P>
+<p>
+The user can import 3D lines by providing 3 columns of data in the input
+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>
+<h2>EXAMPLE</h2>
 
 <div class="code"><pre>
 v.in.lines in=- out=two_lines fs=, &lt;&lt;EOF
@@ -37,19 +37,20 @@
 </pre></div>
 
 
-<H2>SEE ALSO</H2>
+<h2>SEE ALSO</h2>
+
 <em>
-<A HREF="v.in.ascii.html">v.in.ascii</A><br>
-<A HREF="v.in.mapgen.html">v.in.mapgen</A><br>
-<A HREF="v.out.ascii.html">v.out.ascii</A><br>
-<A HREF="d.graph.html">d.graph</a><br>
-<A HREF="r.in.poly.html">r.in.poly</A>
+<a href="v.in.ascii.html">v.in.ascii</a>,
+<a href="v.in.mapgen.html">v.in.mapgen</a>,
+<a href="v.out.ascii.html">v.out.ascii</a>,
+<a href="d.graph.html">d.graph</a>,
+<a href="r.in.poly.html">r.in.poly</a>
 </em>
 
 
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
 
-Hamish Bowman<BR>
+Hamish Bowman<br>
 Dunedin, New Zealand
 
 <p>

Modified: grass/branches/develbranch_6/scripts/v.in.mapgen/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.in.mapgen/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.in.mapgen/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,37 +1,34 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM>v.in.mapgen</EM> allows the user to import Mapgen or Matlab vector maps 
+<em>v.in.mapgen</em> allows the user to import Mapgen or Matlab vector maps 
 into GRASS.
 
-<H2>NOTES</H2>
+<h2>NOTES</h2>
 
 This module only imports data into vector lines.
-<P>
-You can get coastline data in Mapgen or Matlab format from NOAA's Coastline 
+<p>
+The user can get coastline data in Mapgen or Matlab format from NOAA's Coastline 
 Extractor at <a href="http://www.ngdc.noaa.gov/mgg/shorelines/shorelines.html">http://www.ngdc.noaa.gov/mgg/shorelines/shorelines.html</a>.
-<P>
+<p>
 Matlab vector line maps are simply a series of "x y" data points. Lines
 are separated by a row containing <tt>NaN NaN</tt>.
 
 Output from Matlab with this command:
-<BR>
+<br>
 <div class="code"><pre>
     save filename.txt arrayname -ASCII
 </pre></div>
-<P>
-You can import 3D lines from Matlab by exporting a 3 column array and
+<p>
+The user can import 3D lines from Matlab by exporting a 3 column array and
 using the <B>-z</B> flag.
 
 
-<H2>SEE ALSO</H2>
-<EM><A HREF="v.in.ascii.html">v.in.ascii</A></EM><BR>
-<BR>
+<h2>SEE ALSO</h2>
+<em><a href="v.in.ascii.html">v.in.ascii</a></em>
 
-<P>
-<H2>AUTHORS</H2>
+<h2>AUTHORS</h2>
 Based on <em>v.in.mapgen.sh</em> for GRASS 5.0 by Andreas Lange
-<BR>Rewritten for GRASS 6 by Hamish Bowman
-<BR>
+<br>Rewritten for GRASS 6 by Hamish Bowman
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.in.sites.all/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.in.sites.all/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.in.sites.all/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -19,15 +19,15 @@
 
 To convert all old vector maps in the current mapset to the new vector format:
 <br>
-<tt>
+<div class="code"><pre>
 v.in.sites.all -r
-</tt>
+</pre></div>
 
 <h2>SEE ALSO</h2>
 
 <em>
-<A HREF="g.list.html">g.list</A>,
-<A HREF="v.in.sites.html">v.in.sites</A>
+<a href="g.list.html">g.list</a>,
+<a href="v.in.sites.html">v.in.sites</a>
 </em>
 
 

Modified: grass/branches/develbranch_6/scripts/v.krige/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.krige/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.krige/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -28,10 +28,17 @@
 <dt><b>rpy2</b></dt>
 <dd>Python binding to R. Note! <tt>rpy</tt> version 1 is not supported.</dd>
 
-<dt><b>R packages automap and gstat. </b></dt>
+<dt><b>R packages automap, gstat, spgrass6 and rgeos. </b></dt>
 <dd>automap is optional (provides automatic variogram fit).</dd>
 </dl>
 
+Install the packages via R command line (or your preferred GUI):
+<div class="code"><pre>
+  install.packages("rgeos", dep=T)
+  install.packages("gstat", dep=T)
+  install.packages("spgrass6", dep=T)
+  install.packages("automap", dep=T)
+</pre></div>
 
 <h4>Notes for Debian GNU/Linux</h4>
 
@@ -42,14 +49,8 @@
   aptitude install R python-rpy2
 </pre></div>
 
-To install R packages, use either R's function (as root):
-
-<div class="code"><pre>
-  install.packages("gstat", dep=T)
-  install.packages("spgrass6", dep=T)
-</pre></div>
-
-either the brand new Debian packages [5], add to repositories' list
+To install R packages, use either R's functions listed above (as root or as user),
+either the Debian packages [5], add to repositories' list
 for 32bit or 64bit (pick up the suitable line):
 
 <div class="code"><pre>

Modified: grass/branches/develbranch_6/scripts/v.rast.stats/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.rast.stats/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.rast.stats/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,6 +1,6 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
 
-<EM><b>v.rast.stats</b></EM> - Calculates basic univariate statistics from
+<em>v.rast.stats</em> calculates basic univariate statistics from
 a raster map only for the parts covered by the specified vector map.
 The vector map will be rasterized according to the raster map resolution.
 Then univariate statistics are calculated per vector category (cat) from
@@ -9,14 +9,14 @@
 <p>
 Nine columns are generated (n, min, max, range, mean, stddev, variance, 
 coeff_var, sum) according to the output of <em>r.univar</em>.
-If the <B>-e</B> extended statistics flag is given the 1st quartile,
+If the <b>-e</b> extended statistics flag is given the 1st quartile,
 median, 3rd quartile, and given percentile are also calculated.
 
 
-<H2>NOTES</H2>
+<h2>NOTES</h2>
 
 The module may take a long time to run if the raster region contains a large
-number of cells. In this case the <B>--verbose</B> flag may be used to track
+number of cells. In this case the <b>--verbose</b> flag may be used to track
 progress.
 <p>
 The script stops if a (prefixed) upload column is already present in the
@@ -24,7 +24,7 @@
 continue flag. The column prefix will be separated from the statistic name
 with an underscore. For example with a prefix of "<tt>elev</tt>" the sum
 column will be named <tt>elev_sum</tt>.
-<P>
+<p>
 If a DBF database is being used, note that column names are restricted by the
 DBF specification to 10 characters. Therefore it is advised to be economical
 in the use of the column prefix when using DBF as any additional characters
@@ -32,7 +32,7 @@
 <p>
 If a MASK is present, it will be restored after the script finished.
 The script changes temporarily to the resolution of the given raster map.
-<P>
+<p>
 <!-- r.univar limitation -->
 Large amounts of system memory can be used when the <B>-e</B> extended
 statistics flag is used with a very large region setting. If the region
@@ -40,36 +40,36 @@
 Basic statistics can be calculated using any size input region.
 
 
-<H2>EXAMPLES</H2>
+<h2>EXAMPLES</h2>
 
-Example to upload DEM statistics to vector field patches:
+Example to upload DEM statistics to ZIP codes vector map
+(North Carolina sample dataset):
 
 <div class="code"><pre>
-# work on copy of original map:
-g.copy vect=fields,myfields
-# if needed, zoom to raster map:
-g.region rast=elevation.dem -p
+g.copy vect=zipcodes_wake,myzipcodes_wake
+# set computational region to DEM:
+g.region rast=elevation -p
 # calculate DEM statistics, upload to vector map table:
-v.rast.stats myfields raster=elevation.dem colprefix=dem
+v.rast.stats myzipcodes_wake raster=elevation colprefix=elev
 # verify results:
-v.info -c myfields
-v.db.select myfields
-v.univar myfields column=dem_range type=centroid
+v.info -c myzipcodes_wake
+v.db.select myzipcodes_wake
+v.univar myzipcodes_wake column=elev_range type=centroid
 </pre></div>
 
 
-<H2>SEE ALSO</H2>
+<h2>SEE ALSO</h2>
 
-<EM>
-<A HREF="r.univar.html">r.univar</A>, 
-<A HREF="v.univar.html">v.univar</A>,
-<a HREF="v.what.rast.html">v.what.rast</a>,
+<em>
+<a href="r.univar.html">r.univar</a>, 
+<a href="v.univar.html">v.univar</a>,
+<a href="v.what.rast.html">v.what.rast</a>,
 <a href="v.what.vect.html">v.what.vect</a>
-</EM>
+</em>
 
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
 
-Markus Neteler, CEA (<a href="http://www.eden-fp6project.net/">EDEN Project</a>)
+Markus Neteler, CEA (for the <a href="http://www.eden-fp6project.net/">EDEN EU/FP6 Project</a>)
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.report/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.report/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.report/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -1,29 +1,30 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</H2>
 
 <em>v.report</em> generates a table showing the area present in 
 each of the categories of a user-selected data layer.
-<P>
+<p>
 Area is given in hectares, square meters, and square kilometers.
 If the units option is used, area is given in acres, square feet,
 and square miles.
-<P>
+<p>
 Feet and acre units are always reported in their common versions
 (i.e. the International Foot, exactly 5280 feet in a mile), even
 when the location's standard map unit is the US Survey foot.
-<P>
-<EM>v.report</EM> works on the full map data; therefore, the current
+<p>
+<em>v.report</em> works on the full map data; therefore, the current
 region is ignored. If you wish to spatially limit the statistics,
-a map subset must be created with <EM>v.in.region</EM> and 
-<EM>v.overlay</EM>, and then run <EM>v.report</EM> on the new map.
+a map subset must be created with <em>v.in.region</em> and 
+<em>v.overlay</em>, and then run <em>v.report</em> on the new map.
 
 
 <h2>EXAMPLE</h2>
 
-Spearfish example:
+North Carolina sample dataset:
 <div class="code"><pre>
-v.report fields option=area units=hectares
+v.report zipcodes_wake option=area units=hectares
 </pre></div>
 
+In the output, there is an extra column added containing the results.
 
 <h2>SEE ALSO</h2>
 
@@ -34,7 +35,7 @@
 </em>
 
 
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
 
 Markus Neteler, GDF Hannover
 

Modified: grass/branches/develbranch_6/scripts/v.what.vect/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.what.vect/description.html	2011-09-04 13:16:47 UTC (rev 48108)
+++ grass/branches/develbranch_6/scripts/v.what.vect/description.html	2011-09-04 13:23:01 UTC (rev 48109)
@@ -7,7 +7,7 @@
 <h2>NOTES</h2>
 
 The upload <b>column</b>, into which the query results are stored, must be
-present in the <b>vector</b> map. Use <em>v.db.addcol</em> to add one if needed.
+present in the <b>vector</b> map. Use <em>v.db.addcolumn</em> to add one if needed.
 <p>
 Use dmax parameter to control query distance tolerance (how far points/centroids
 can be from <b>qvector</b> features). For more options, use
@@ -29,11 +29,11 @@
 map at points' locations:
 
 <div class="code"><pre>
-g.copy vect=archsites,myarchsites
-v.db.addcol myarchsites col="owner varchar(25)"
-v.what.vect myarchsites qvect=fields column=owner qcolumn=label
+g.copy vect=hospitals,myhospitals
+v.db.addcol myhospitals column="urb_name varchar(25)"
+v.what.vect myhospitals qvect=urbanarea column=urb_name qcolumn=NAME
 # verification:
-v.db.select myarchsites
+v.db.select myhospitals
 </pre></div>
 <P>
 
@@ -46,20 +46,20 @@
 
 <div class="code"><pre>
 # extract populated places from geonames
-v.extract geonames_IT where="featurecla='P'" out=geonames_IT_cities
+v.extract geonames_IT where="featurecla='P'" output=geonames_IT_cities
 # add new column 
-v.db.addcol corine_code111_112_cities col="gnameid double precision"
+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 qvect=geonames_IT_cities col=gnameid \
-            qcol=geonameid dmax=3000
+v.what.vect corine_code111_112_cities qvect=geonames_IT_cities column=gnameid \
+            qcolumn=geonameid dmax=3000
 # now gnameid can be used for v.db.join to join further
-# attributes in from Geonames.org
+# attributes in from geonames.org
 </pre></div>
 
 <h2>SEE ALSO</h2>
 
 <em>
-<a HREF="v.db.addcol.html">v.db.addcol</a>,
+<a HREF="v.db.addcolumn.html">v.db.addcolumn</a>,
 <a HREF="v.db.select.html">v.db.select</a>,
 <a HREF="v.distance.html">v.distance</a>,
 <a HREF="v.rast.stats.html">v.rast.stats</a>,



More information about the grass-commit mailing list