[GRASS-SVN] r66568 - in grass/branches/releasebranch_7_0: gui/wxpython/docs gui/wxpython/iscatt gui/wxpython/mapdisp lib/gis lib/init lib/vector lib/vector/Vlib mswindows mswindows/osgeo4w scripts/r.in.wms scripts/v.import temporal/t.rast.aggregate vector/v.in.ogr vector/v.out.postgis vector/v.select
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Oct 21 15:41:33 PDT 2015
Author: martinl
Date: 2015-10-21 15:41:33 -0700 (Wed, 21 Oct 2015)
New Revision: 66568
Modified:
grass/branches/releasebranch_7_0/gui/wxpython/docs/wxGUI.iscatt.html
grass/branches/releasebranch_7_0/gui/wxpython/iscatt/controllers.py
grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/main.py
grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
grass/branches/releasebranch_7_0/lib/init/grass7.html
grass/branches/releasebranch_7_0/lib/vector/Vlib/dgraph.h
grass/branches/releasebranch_7_0/lib/vector/Vlib/write_nat.c
grass/branches/releasebranch_7_0/lib/vector/vectorlib.dox
grass/branches/releasebranch_7_0/lib/vector/vectorlib_lists.dox
grass/branches/releasebranch_7_0/lib/vector/vectorlib_pg.dox
grass/branches/releasebranch_7_0/mswindows/env.bat
grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl
grass/branches/releasebranch_7_0/scripts/r.in.wms/srs.py
grass/branches/releasebranch_7_0/scripts/v.import/v.import.py
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.html
grass/branches/releasebranch_7_0/vector/v.in.ogr/v.in.ogr.html
grass/branches/releasebranch_7_0/vector/v.out.postgis/v.out.postgis.html
grass/branches/releasebranch_7_0/vector/v.select/v.select.html
Log:
Various typo fixes (#2776)
(merge r66567 from trunk)
Modified: grass/branches/releasebranch_7_0/gui/wxpython/docs/wxGUI.iscatt.html
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/docs/wxGUI.iscatt.html 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/gui/wxpython/docs/wxGUI.iscatt.html 2015-10-21 22:41:33 UTC (rev 66568)
@@ -5,7 +5,7 @@
<b>Interactive Scatter Plot Tool</b> allows analyzing group of raster
maps. The tool is integrated into <em><a href="wxGUI.iclass.html">
-Supervised Classification Tool</a></em> (see the screen shot bellow).
+Supervised Classification Tool</a></em> (see the screen shot below).
Also it is possible to launch it from Map Display Window (<tt>Analyze map
→ Interactive Scatter Plot Tool</tt>).
Modified: grass/branches/releasebranch_7_0/gui/wxpython/iscatt/controllers.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/iscatt/controllers.py 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/gui/wxpython/iscatt/controllers.py 2015-10-21 22:41:33 UTC (rev 66568)
@@ -228,7 +228,7 @@
message=_("Number of cells (rows*cols) <%d> in current region is "
"higher than recommended threshold <%d>.\n"
"It is strongly advised to reduce number of cells "
- "in current region bellow recommend threshold.\n "
+ "in current region below recommend threshold.\n "
"It can be done by <g.region> command.\n\n"
"Do you want to continue using "
"Interactive Scatter Plot Tool with this region?"
@@ -314,7 +314,7 @@
message=_("Multiple of bands ranges <%s:%d * %s:%d = %d> "
"is higher than recommended limit <%d>.\n"
"It is strongly advised to reduce range extend of bands"
- "(e. g. using r.rescale) bellow recommended threshold.\n\n"
+ "(e. g. using r.rescale) below recommended threshold.\n\n"
"Do you really want to add this scatter plot?"
% (b_1_name, b_1_i['range'], b_1_name, b_2_i['range'],
mrange, WARN_SCATT_SIZE)),
Modified: grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/main.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/main.py 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/main.py 2015-10-21 22:41:33 UTC (rev 66568)
@@ -397,7 +397,7 @@
cmdfile)
"""
try:
- # GISBASE and other sytem enviromental variables can not be used
+ # GISBASE and other system enviromental variables can not be used
# since the process inherited them from GRASS
# raises exception when vaiable does not exists
grass.gisenv()['GISDBASE']
Modified: grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c 2015-10-21 22:41:33 UTC (rev 66568)
@@ -25,7 +25,7 @@
parameter <i>opt</i>.
Valid parameters are defined by the STD_OPT enum in the file gis.h.
- A list of valid parameter values sorted to groups is bellow.
+ A list of valid parameter values sorted to groups is below.
This function allocates memory for the Option structure and returns a
pointer to this memory.
@@ -889,7 +889,7 @@
\brief Create standardised Flag structure.
This function will create a standardised Flag structure defined by
- parameter <i>flag</i>. A list of valid parameters bellow. It
+ parameter <i>flag</i>. A list of valid parameters below. It
allocates memory for the Flag structure and returns a pointer to
this memory.
Modified: grass/branches/releasebranch_7_0/lib/init/grass7.html
===================================================================
--- grass/branches/releasebranch_7_0/lib/init/grass7.html 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/lib/init/grass7.html 2015-10-21 22:41:33 UTC (rev 66568)
@@ -223,7 +223,7 @@
<dt><b>grass70 -text</b>
<dd> Start GRASS using the text-based user interface. Appropriate
location and mapset must be set by environmental variables (see
-examples bellow) otherwise taken from the last GRASS session.</dd>
+examples below) otherwise taken from the last GRASS session.</dd>
<dt><b>grass70 -gtext</b>
<dd> Start GRASS using the text-based user interface. The user will be
Modified: grass/branches/releasebranch_7_0/lib/vector/Vlib/dgraph.h
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/Vlib/dgraph.h 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/lib/vector/Vlib/dgraph.h 2015-10-21 22:41:33 UTC (rev 66568)
@@ -16,7 +16,7 @@
double x; /* coordinates */
double y;
int ecount; /* number of neighbours */
- int eallocated; /* size of the array bellow */
+ int eallocated; /* size of the array below */
struct pg_edge **edges; /* array of pointers */
double *angles; /* precalculated angles with Ox */
};
Modified: grass/branches/releasebranch_7_0/lib/vector/Vlib/write_nat.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/Vlib/write_nat.c 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/lib/vector/Vlib/write_nat.c 2015-10-21 22:41:33 UTC (rev 66568)
@@ -427,7 +427,7 @@
return V2__add_line_to_topo_nat(Map, offset, type, Points, Cats, line, NULL) > 0 ? 0 : -1;
}
-/*** static or internal subroutines bellow ****/
+/*** static or internal subroutines below ****/
/*!
\brief Writes feature at the given offset or at the end of the file
Modified: grass/branches/releasebranch_7_0/lib/vector/vectorlib.dox
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/vectorlib.dox 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/lib/vector/vectorlib.dox 2015-10-21 22:41:33 UTC (rev 66568)
@@ -322,7 +322,7 @@
\subsection vlibFeatureTypes Feature types
-Feature types are defined in include/vect_dig_defines.h, see the list bellow:
+Feature types are defined in include/vect_dig_defines.h, see the list below:
- GV_POINT
- GV_LINE
Modified: grass/branches/releasebranch_7_0/lib/vector/vectorlib_lists.dox
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/vectorlib_lists.dox 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/lib/vector/vectorlib_lists.dox 2015-10-21 22:41:33 UTC (rev 66568)
@@ -7,7 +7,7 @@
\section vlibStructures List of vector library data structures
All data structure used by the vector library are defined in
-include/vect/dig_structs.h. See the lists bellow.
+include/vect/dig_structs.h. See the lists below.
\subsection vlibStructuresMajor Major
Modified: grass/branches/releasebranch_7_0/lib/vector/vectorlib_pg.dox
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/vectorlib_pg.dox 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/lib/vector/vectorlib_pg.dox 2015-10-21 22:41:33 UTC (rev 66568)
@@ -22,7 +22,7 @@
\section vlibFn List of functions
-Note that the functions listed bellow are lower level subroutines, in
+Note that the functions listed below are lower level subroutines, in
other word these functions are not considered to be part of public
API. They are internally used by the vector library when accessing
PostGIS data. The programmer should use higher level functions
Modified: grass/branches/releasebranch_7_0/mswindows/env.bat
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/env.bat 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/mswindows/env.bat 2015-10-21 22:41:33 UTC (rev 66568)
@@ -3,7 +3,7 @@
REM
REM Default prompt: cmd.exe
-REM To enable bash prompt please uncomment the line bellow
+REM To enable bash prompt please uncomment the line below
REM set GRASS_SH=%GISBASE%\msys\bin\sh.exe
set GRASS_PYTHON=%GISBASE%\extrabin\python.exe
Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl 2015-10-21 22:41:33 UTC (rev 66568)
@@ -4,7 +4,7 @@
set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@
REM Default prompt: cmd.exe
-REM To enable bash prompt please uncomment the line bellow
+REM To enable bash prompt please uncomment the line below
REM set GRASS_SH=%OSGEO4W_ROOT%\apps\msys\bin\sh.exe
set GRASS_PYTHON=%OSGEO4W_ROOT%\bin\python.exe
Modified: grass/branches/releasebranch_7_0/scripts/r.in.wms/srs.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.in.wms/srs.py 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/scripts/r.in.wms/srs.py 2015-10-21 22:41:33 UTC (rev 66568)
@@ -9,7 +9,7 @@
This program is free software under the GNU General Public License
(>=v2). Read the file COPYING that comes with GRASS for details.
- at author Stepan Turek <stepan.turek seznam.cz> (Based on code from OWSLib - Copyright bellow)
+ at author Stepan Turek <stepan.turek seznam.cz> (Based on code from OWSLib - Copyright below)
"""
# -*- coding: ISO-8859-15 -*-
# =============================================================================
Modified: grass/branches/releasebranch_7_0/scripts/v.import/v.import.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.import/v.import.py 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/scripts/v.import/v.import.py 2015-10-21 22:41:33 UTC (rev 66568)
@@ -45,7 +45,7 @@
#% type: string
#% options: input,region
#% answer: input
-#% description: Ouput vector map extent
+#% description: Output vector map extent
#% descriptions: input;extent of input map;region;extent of current region
#% guisection: Output
#%end
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.html 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate/t.rast.aggregate.html 2015-10-21 22:41:33 UTC (rev 66568)
@@ -53,7 +53,7 @@
specified parallel processes (<em>nprocs</em>) and the number of
intervals to aggregate.
<p>
-The flag <b>-s</b> allows to store a date as map name suffix rather than
+The flag <b>-s</b> allows storing a date as map name suffix rather than
using consecutive numbering. See the examples below for details.
<h2>EXAMPLES</h2>
Modified: grass/branches/releasebranch_7_0/vector/v.in.ogr/v.in.ogr.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.in.ogr/v.in.ogr.html 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/vector/v.in.ogr/v.in.ogr.html 2015-10-21 22:41:33 UTC (rev 66568)
@@ -134,7 +134,7 @@
string fields to UTF-8. LDID "87 / 0x57" is treated as
ISO8859_1 which may not be appropriate for many
languages. Unfortunately it is not clear what other values may be
-appropriate (see example bellow). To change encoding the user can set
+appropriate (see example below). To change encoding the user can set
up <tt>SHAPE_ENCODING</tt> environmental variable or simply to define
encoding value using <b>encoding</b> parameter. Note that recoding
support is new for GDAL/OGR 1.9.0.
@@ -154,7 +154,7 @@
in OGR. By default <em>v.in.ogr</em> reads all geometry columns from
given layer. The user can choose desired geometry column
by <b>geometry</b> option,
-see <a href="#multiple-geometry-columns">example bellow</a>.
+see <a href="#multiple-geometry-columns">example below</a>.
<h2>EXAMPLES</h2>
@@ -297,7 +297,7 @@
"GeneralizovanaHranice". By default <em>v.in.ogr</em> reads data from
all three geometry columns. The user can specify desired geometry
column by <b>geometry</b> option, in this case the module will read
-geometry only from the specified geometry column. In the example bellow,
+geometry only from the specified geometry column. In the example below,
the output vector map will contain only geometry saved in
"OriginalniHranice" geometry column.
Modified: grass/branches/releasebranch_7_0/vector/v.out.postgis/v.out.postgis.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.out.postgis/v.out.postgis.html 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/vector/v.out.postgis/v.out.postgis.html 2015-10-21 22:41:33 UTC (rev 66568)
@@ -133,7 +133,7 @@
</pre></div>
GRASS areas are converted into polygons, isles into holes. We can
-check the number or created polygons by simple SQL query bellow.
+check the number or created polygons by simple SQL query below.
<div class="code"><pre>
db.select driver=pg database=grass \
@@ -175,7 +175,7 @@
<h3>Export data with creation options</h3>
-Example bellow demonstrates how to define name for geometry column and
+Example below demonstrates how to define name for geometry column and
disable building spatial index. Spatial reference system is defined
by <tt>srid</tt> identifier which corresponds in this case with EPSG
3358 (North Carolina dataset).
@@ -221,7 +221,7 @@
<em>v.out.postgis</em> allows ignoring attributes when exporting
vector features by specifying <b>-t</b> flag.
-Command bellow exports vector features without attributes. The feature
+Command below exports vector features without attributes. The feature
will contain only two columns, the fid and geometry column.
<div class="code"><pre>
Modified: grass/branches/releasebranch_7_0/vector/v.select/v.select.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.select/v.select.html 2015-10-21 22:30:01 UTC (rev 66567)
+++ grass/branches/releasebranch_7_0/vector/v.select/v.select.html 2015-10-21 22:41:33 UTC (rev 66568)
@@ -236,7 +236,7 @@
This operator additionally requires the <b>relate</b> parameter (in other
GIS called 'ST_Relate').
-This operator allows to calculate the
+This operator allows calculating the
<a href="https://en.wikipedia.org/wiki/DE-9IM">Dimensionally Extended nine-Intersection Model (DE-9IM)</a>.
In the following one example: Select polygon with 'TOUCHES' operator
More information about the grass-commit
mailing list