[GRASS-SVN] r55863 - in grass/branches/develbranch_6: display/d.where general/g.mapset imagery/i.topo.corr lib/init raster/r.in.gdal raster/r.region scripts/v.db.join scripts/v.db.update vector vector/v.what

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Apr 17 22:50:21 PDT 2013


Author: hamish
Date: 2013-04-17 22:50:21 -0700 (Wed, 17 Apr 2013)
New Revision: 55863

Modified:
   grass/branches/develbranch_6/display/d.where/description.html
   grass/branches/develbranch_6/general/g.mapset/description.html
   grass/branches/develbranch_6/imagery/i.topo.corr/description.html
   grass/branches/develbranch_6/lib/init/variables.html
   grass/branches/develbranch_6/raster/r.in.gdal/description.html
   grass/branches/develbranch_6/raster/r.region/description.html
   grass/branches/develbranch_6/scripts/v.db.join/v.db.join
   grass/branches/develbranch_6/scripts/v.db.update/description.html
   grass/branches/develbranch_6/scripts/v.db.update/v.db.update
   grass/branches/develbranch_6/vector/v.what/description.html
   grass/branches/develbranch_6/vector/vectorintro.html
Log:
clean up language (#1591, partial merge of r55862 from trunk)

Modified: grass/branches/develbranch_6/display/d.where/description.html
===================================================================
--- grass/branches/develbranch_6/display/d.where/description.html	2013-04-18 05:38:39 UTC (rev 55862)
+++ grass/branches/develbranch_6/display/d.where/description.html	2013-04-18 05:50:21 UTC (rev 55863)
@@ -25,8 +25,8 @@
 </pre>
 
 The left mouse button prints the coordinates at the selected point,
-the middle mouse button allows to query two points (they are connected by a
-line for convenience). By using the right mouse button the module is left.
+the middle mouse button allows you to query two points (they are connected
+by a line for convenience). Use the right mouse button to exit the module.
 
 
 <h2>NOTES</h2>

Modified: grass/branches/develbranch_6/general/g.mapset/description.html
===================================================================
--- grass/branches/develbranch_6/general/g.mapset/description.html	2013-04-18 05:38:39 UTC (rev 55862)
+++ grass/branches/develbranch_6/general/g.mapset/description.html	2013-04-18 05:50:21 UTC (rev 55863)
@@ -1,7 +1,10 @@
 <h2>DESCRIPTION</h2>
 
-<em>g.mapset</em> allows to change the current mapset 
+<em>g.mapset</em> allows to change the current MAPSET, LOCATION, or GISDBASE.
+This is a fairly radical maneuver to run mid-session, take care when running
+the GUI at the same time.
 
+
 <h2>NOTES</h2>
 
 The shell continues to use the history for the old mapset. To change this 
@@ -9,17 +12,23 @@
 <br>
 <div class="code"><pre>
    history -w
-   history -r /$GISDBASE/$LOCATION/$MAPSET/.bash_history
-   HISTFILE=/$GISDBASE/$LOCATION/$MAPSET/.bash_history
+   history -r /"$GISDBASE/$LOCATION/$MAPSET"/.bash_history
+   HISTFILE=/"$GISDBASE/$LOCATION/$MAPSET"/.bash_history
 </pre></div><br>
 
+
 <h2>SEE ALSO</h2>
 
-<em><a href="g.gisenv.html">g.gisenv</a></em><br>
-<em><a href="g.mapsets.html">g.mapsets</a></em><br>
+<em>
+<a href="g.gisenv.html">g.gisenv</a><br>
+<a href="g.mapsets.html">g.mapsets</a>
+</em>
+<br>
 
+
 <h2>AUTHOR</h2>
 
 Radim Blazek
 
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/imagery/i.topo.corr/description.html
===================================================================
--- grass/branches/develbranch_6/imagery/i.topo.corr/description.html	2013-04-18 05:38:39 UTC (rev 55862)
+++ grass/branches/develbranch_6/imagery/i.topo.corr/description.html	2013-04-18 05:50:21 UTC (rev 55863)
@@ -8,10 +8,10 @@
 (parameter incidout), and then calculating its cosine with float precision.
 
 <p>
-Using flag -i and given an elevation map as basemap (metric),
-<em>i.topo.corr</em> permits to obtain a simple illumination model from the formula:
+Using the <b>-i</b> flag and given an elevation basemap (metric),
+<em>i.topo.corr</em> creates a simple illumination model using the formula:
 </ul>
-	<li> cos_i = cos(s) * cos(z) + sin(s) * sin(z) * cos(a - o) </li>
+  <li> cos_i = cos(s) * cos(z) + sin(s) * sin(z) * cos(a - o) </li>
 </ul>
 where,
 <em>s</em> is the terrain slope angle, <em>z</em> is the solar zenith angle,
@@ -26,13 +26,13 @@
 <h3>Method: cosine</h3>
 
 <ul>
-<li> ref_c = ref_o * cos_z / cos_i </li>
+  <li> ref_c = ref_o * cos_z / cos_i </li>
 </ul>
 
 <h3>Method: minnaert</h3>
 
 <ul>
-<li>ref_c = ref_o * (cos_z / cos_i) ^k</li>
+  <li>ref_c = ref_o * (cos_z / cos_i) ^k</li>
 </ul>
 where,
 <em>k</em> is obtained by linear regression of<br>
@@ -41,7 +41,7 @@
 <h3>Method: c-factor</h3>
 
 <ul>
-<li>ref_c = ref_o * (cos_z + c)/ (cos_i + c)</li>
+  <li>ref_c = ref_o * (cos_z + c)/ (cos_i + c)</li>
 </ul>
 where,
 <em>c</em> is a/m from ref_o = a + m * cos_i
@@ -54,9 +54,10 @@
 (direct exhibition to the sun: no correction) and the corrected reflectance can
 be calculated as
 <ul>
-<li>ref_c = ref_o * 2 / (cos_i + 1)</li>
+  <li>ref_c = ref_o * 2 / (cos_i + 1)</li>
 </ul>
 
+
 <h2>NOTES</h2>
 
 <ol>
@@ -67,6 +68,7 @@
 <li>The elevation map to calculate the illumination model should be metric.</li>
 </ol>
 
+
 <h2>EXAMPLES</h2>
 
 First, make a illumination model from the elevation map (here, SRTM). Then
@@ -81,6 +83,7 @@
   zenith=33.3631 method=c-factor
 </pre></div>
 
+
 <h2>REFERENCES</h2>
 
 <ul>
@@ -109,6 +112,7 @@
 <a href="r.sun.html">r.sun</a>
 </em>
 
+
 <h2>AUTHOR</h2>
 
 E. Jorge Tizado  (ej.tizado unileon es)<br>

Modified: grass/branches/develbranch_6/lib/init/variables.html
===================================================================
--- grass/branches/develbranch_6/lib/init/variables.html	2013-04-18 05:38:39 UTC (rev 55862)
+++ grass/branches/develbranch_6/lib/init/variables.html	2013-04-18 05:50:21 UTC (rev 55863)
@@ -110,9 +110,9 @@
     while in a GRASS session.</dd>
   
   <dt>GRASS_ADDON_PATH</dt>
-  <dd>[grass startup script]<br>
-    allows to specify additional paths to local GRASS modules extra
-    to standard distribution.</dd>
+  <dd>[grass startup script, g.extension]<br>
+    specifies additional path(s) containing local and/or custom GRASS
+    modules extra to the standard distribution.</dd>
   
   <dt>GRASS_ADDON_ETC</dt>
   <dd>[libgis, g.findetc]<br>

Modified: grass/branches/develbranch_6/raster/r.in.gdal/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.in.gdal/description.html	2013-04-18 05:38:39 UTC (rev 55862)
+++ grass/branches/develbranch_6/raster/r.in.gdal/description.html	2013-04-18 05:50:21 UTC (rev 55863)
@@ -23,7 +23,7 @@
 
 <a href="http://www.gdal.org/formats_list.html">http://www.gdal.org/formats_list.html</a><p>
 
-Selected formats of more than 80 supported formats:
+Selected formats of the more than 80 supported formats:
 <div class="code"><pre>
 
 Long Format Name                                        Code                    Creation        Georeferencing          Maximum File Size
@@ -106,7 +106,7 @@
 <p>
 Support for GCPs: In case the image contains GCPs they are written to a
 POINTS file within an imagery group. They can directly be used for 
-<a href=i.rectify.html>i.rectify</a>. The <b>target</b> option allows to
+<a href=i.rectify.html>i.rectify</a>. The <b>target</b> option allows you to
 automatically re-project the GCPs from their own projection into another
 projection read from the PROJ_INFO file of the location name
 <b>target</b>.

Modified: grass/branches/develbranch_6/raster/r.region/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.region/description.html	2013-04-18 05:38:39 UTC (rev 55862)
+++ grass/branches/develbranch_6/raster/r.region/description.html	2013-04-18 05:50:21 UTC (rev 55863)
@@ -7,7 +7,7 @@
 or vector map, or a 3dview file.
 <p>
 
-The <b>align</b> parameter allows to set the current resolution equal to
+The <b>align</b> parameter sets the current resolution equal to
 that of the named raster map, and align the boundaries to a row and column
 edge in the named map.  Alignment only moves the existing boundaries outward
 to the edges of the next nearest cell in the named raster map -- not to the

Modified: grass/branches/develbranch_6/scripts/v.db.join/v.db.join
===================================================================
--- grass/branches/develbranch_6/scripts/v.db.join/v.db.join	2013-04-18 05:38:39 UTC (rev 55862)
+++ grass/branches/develbranch_6/scripts/v.db.join/v.db.join	2013-04-18 05:50:21 UTC (rev 55863)
@@ -14,7 +14,7 @@
 #############################################################################
 
 #%Module
-#% description: Allows to join a table to a vector map table.
+#% description: Joins a database table to a vector map table.
 #% keywords: vector, database, attribute table
 #%End
 

Modified: grass/branches/develbranch_6/scripts/v.db.update/description.html
===================================================================
--- grass/branches/develbranch_6/scripts/v.db.update/description.html	2013-04-18 05:38:39 UTC (rev 55862)
+++ grass/branches/develbranch_6/scripts/v.db.update/description.html	2013-04-18 05:50:21 UTC (rev 55863)
@@ -1,15 +1,17 @@
 <h2>DESCRIPTION</h2>
 
-<em>v.db.update</em> allows to assign a new value to a column in the
+<em>v.db.update</em> assigns a new value to a column in the
 attribute table connected to a given map. Alternatively, values can
 be copied from another column in the table.
 
+
 <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>
 
 In this example, selectively display lakes without (blue) and with NULL (red)
@@ -51,6 +53,7 @@
             where="z_value <> 'N/A'"
 </pre></div>
 
+
 <h2>SEE ALSO</h2>
 
 <em>
@@ -69,4 +72,5 @@
 
 Moritz Lennert (mlennert at club.worldonline.be)
 
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>

Modified: grass/branches/develbranch_6/scripts/v.db.update/v.db.update
===================================================================
--- grass/branches/develbranch_6/scripts/v.db.update/v.db.update	2013-04-18 05:38:39 UTC (rev 55862)
+++ grass/branches/develbranch_6/scripts/v.db.update/v.db.update	2013-04-18 05:50:21 UTC (rev 55863)
@@ -15,7 +15,7 @@
 #############################################################################
 
 #%Module
-#%  description: Allows to update a column in the attribute table connected to a vector map.
+#%  description: Updates a column in the attribute table connected to a vector map.
 #%  keywords: vector, database, attribute table
 #%End
 #%option

Modified: grass/branches/develbranch_6/vector/v.what/description.html
===================================================================
--- grass/branches/develbranch_6/vector/v.what/description.html	2013-04-18 05:38:39 UTC (rev 55862)
+++ grass/branches/develbranch_6/vector/v.what/description.html	2013-04-18 05:50:21 UTC (rev 55863)
@@ -4,8 +4,8 @@
 Outputs the category number value(s) associated with user-specified location(s) 
 in user-specified vector map layer(s).  This module was derived from the
 <em>d.what.vect</em> module by removing all interactive code and
-modification of the output for easy parsing. Using the <em>-g</em> flag permits to
-generate script style output which is easily parsable.
+modification of the output for easy parsing. Using the <em>-g</em> flag
+generates script-style output which is easily parsable.
 <p>
 This module always reports standard acres, even when the location uses
 US Survey feet as the map unit.

Modified: grass/branches/develbranch_6/vector/vectorintro.html
===================================================================
--- grass/branches/develbranch_6/vector/vectorintro.html	2013-04-18 05:38:39 UTC (rev 55862)
+++ grass/branches/develbranch_6/vector/vectorintro.html	2013-04-18 05:50:21 UTC (rev 55863)
@@ -110,8 +110,8 @@
 <p>
 The <a href="v.type.html">v.type</a> module can be used to convert
 between vector types if possible. The <a href="v.build.html">v.build</a>
-module is used to generate topology. It optionally allows to extract
-the erroneous vector objects into a separate map. Topological errors
+module is used to generate topology. It optionally allows the user to extract
+erroneous vector objects into a separate map. Topological errors
 can be corrected either manually within <a href="v.digit.html">v.digit</a>
 or, to some extent, automatically in <a href="v.clean.html">v.clean</a>.
 A dedicated vector editing module is <a href="v.edit.html">v.edit</a>



More information about the grass-commit mailing list