This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass.
commit df0cf9ce96c5bbaa68c4235be1a7f0686e56da68 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Jan 24 02:56:37 2015 +0100 Add patches for various typos. --- debian/changelog | 1 + debian/patches/additionally-typo.patch | 25 ++++ debian/patches/available-typo.patch | 14 +++ debian/patches/default-typo.patch | 13 +++ debian/patches/extension-typo.patch | 47 ++++++++ debian/patches/information-typo.patch | 202 +++++++++++++++++++++++++++++++++ debian/patches/parameter-typo.patch | 69 +++++++++++ debian/patches/preferred-typo.patch | 14 +++ debian/patches/series | 9 ++ debian/patches/specifying-typo.patch | 34 ++++++ debian/patches/transferred-typo.patch | 105 +++++++++++++++++ 11 files changed, 533 insertions(+) diff --git a/debian/changelog b/debian/changelog index e915727..de84905 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ grass (7.0.0~rc1-1) UNRELEASED; urgency=medium - Update copyright years - Group files by license - Remove unused license sections + * Add patches for various typos. -- Bas Couwenberg <sebas...@xs4all.nl> Thu, 15 Jan 2015 01:15:41 +0100 diff --git a/debian/patches/additionally-typo.patch b/debian/patches/additionally-typo.patch new file mode 100644 index 0000000..50b693b --- /dev/null +++ b/debian/patches/additionally-typo.patch @@ -0,0 +1,25 @@ +Description: Fix 'Aditionally' typo, replace with 'Additionally'. +Author: Bas Couwenberg <sebas...@xs4all.nl> + +--- a/raster/r.solute.transport/r.solute.transport.html ++++ b/raster/r.solute.transport/r.solute.transport.html +@@ -77,7 +77,7 @@ module rapidely grow with the size of th + The resulting linear equation system <i>Ax = b</i> can be solved with several solvers. + Several iterative solvers with unsymmetric sparse and quadratic matrices support are implemented. + The jacobi method, the Gauss-Seidel method and the biconjugate gradients-stabilized (bicgstab) method. +-Aditionally a direct Gauss solver and LU solver are available. Those direct solvers ++Additionally a direct Gauss solver and LU solver are available. Those direct solvers + only work with quadratic matrices, so be careful using them with large maps + (maps of size 10.000 cells will need more than one gigabyte of ram). + Always prefer a sparse matrix solver. +--- a/raster3d/r3.gwflow/r3.gwflow.html ++++ b/raster3d/r3.gwflow/r3.gwflow.html +@@ -63,7 +63,7 @@ this module rapidely grow with the size + several solvers. An iterative solvers with sparse and quadratic matrices + support is implemented. + The conjugate gradients method with (pcg) and without (cg) precondition. +-Aditionally a direct Cholesky solver is available. This direct solver ++Additionally a direct Cholesky solver is available. This direct solver + only work with normal quadratic matrices, so be careful using them with + large maps (maps of size 10.000 cells will need more than one Gigabyte + of RAM). The user should always prefer to use a sparse matrix solver. diff --git a/debian/patches/available-typo.patch b/debian/patches/available-typo.patch new file mode 100644 index 0000000..96fd4f5 --- /dev/null +++ b/debian/patches/available-typo.patch @@ -0,0 +1,14 @@ +Description: Fix 'avaiable' typo, replace with 'available'. +Author: Bas Couwenberg <sebas...@xs4all.nl> + +--- a/scripts/r3.in.xyz/r3.in.xyz.html ++++ b/scripts/r3.in.xyz/r3.in.xyz.html +@@ -28,7 +28,7 @@ Unlike <em>r.in.xyz</em>, reading from s + possible. Filtering by z-range is accomplished by setting the 3D region. + <p> + To enable parallel processing support, set the <b>workers=</b> option +-to match the number of CPUs or CPU-cores avaiable on your system. ++to match the number of CPUs or CPU-cores available on your system. + Alternatively, the <tt>WORKERS</tt> environment variable can be set + to the number of concurrent processes desired. + <p> diff --git a/debian/patches/default-typo.patch b/debian/patches/default-typo.patch new file mode 100644 index 0000000..376b2fe --- /dev/null +++ b/debian/patches/default-typo.patch @@ -0,0 +1,13 @@ +Description: Fix 'deafult' typo, replace with 'default'. + +--- a/temporal/t.rast.list/t.rast.list.html ++++ b/temporal/t.rast.list/t.rast.list.html +@@ -9,7 +9,7 @@ dataset. Most of the raster map specifi + column selection, sorting and SQL where statements. + + Using the <b>method</b> option allows the specification of different +-methods to list map layers. Method <i>col</i> is the deafult option and ++methods to list map layers. Method <i>col</i> is the default option and + sensitive to the <b>column</b>,<b>order</b> and <b>where</b> options. + It will simply print user specified metadata columns of one map layer + per line. The <i>comma</i> method will list the map layer as comma diff --git a/debian/patches/extension-typo.patch b/debian/patches/extension-typo.patch new file mode 100644 index 0000000..b556bf3 --- /dev/null +++ b/debian/patches/extension-typo.patch @@ -0,0 +1,47 @@ +Description: Fix 'extention' typo, replace with 'extension'. +Author: Bas Couwenberg <sebas...@xs4all.nl> + +--- a/lib/python/docs/src/pygrass_raster.rst ++++ b/lib/python/docs/src/pygrass_raster.rst +@@ -226,7 +226,7 @@ array operations. :: + >>> raster = reload(raster) + >>> elev = raster.RasterNumpy('elevation', 'PERMANENT') + >>> elev.open('r') +- >>> # in this case RasterNumpy is an extention of the numpy class ++ >>> # in this case RasterNumpy is an extension of the numpy class + >>> # therefore you may use all the fancy things of numpy. + >>> elev[:5, :3] + RasterNumpy([[ 141.99613953, 141.27848816, 141.37904358], +--- a/lib/python/imaging/images2gif.py ++++ b/lib/python/imaging/images2gif.py +@@ -201,7 +201,7 @@ class GifWriter: + return bb + + def getAppExt(self, loops=float('inf')): +- """Application extention. This part specifies the amount of loops. ++ """Application extension. This part specifies the amount of loops. + If loops is 0 or inf, it goes on infinitely. + + :param float loops: +--- a/temporal/t.select/t.select.html ++++ b/temporal/t.select/t.select.html +@@ -270,7 +270,7 @@ compared by logical operators and evalua + the related maps. + For complex relations the comparison operator can be used to combine conditions: + <br> +-The structure is similar to the select operator with the extention of an aggregation operator: ++The structure is similar to the select operator with the extension of an aggregation operator: + {"comparison operator", "topological relations", aggregation operator, "temporal operator"} + <br> + This aggregation operator (| or &) define the behaviour if a map is related the more +--- a/temporal/t.vect.algebra/t.vect.algebra.html ++++ b/temporal/t.vect.algebra/t.vect.algebra.html +@@ -277,7 +277,7 @@ the related maps. + For complex relations the comparison operator can be used to combine conditions: + <br> + +-The structure is similar to the select operator with the extention of an aggregation operator: ++The structure is similar to the select operator with the extension of an aggregation operator: + + <div class="code"><pre> + {"comparison operator", "topological relations", aggregation operator, "temporal operator"} diff --git a/debian/patches/information-typo.patch b/debian/patches/information-typo.patch new file mode 100644 index 0000000..9b89ddd --- /dev/null +++ b/debian/patches/information-typo.patch @@ -0,0 +1,202 @@ +Description: Fix 'informations' typo, replace with 'information'. +Author: Bas Couwenberg <sebas...@xs4all.nl> + +--- a/lib/python/docs/src/temporal_framework.rst ++++ b/lib/python/docs/src/temporal_framework.rst +@@ -52,7 +52,7 @@ the SQL object serialization, all classe + :mod:`~temporal.base` + """"""""""""""""""""" + +- Implements of basic dataset informations and SQL conversion of such information: ++ Implements of basic dataset information and SQL conversion of such information: + + - Definition of the SQL serialize class :class:`~temporal.base.DictSQLSerializer` + that converts the content of temporal +@@ -60,7 +60,7 @@ the SQL object serialization, all classe + - Definition of :class:`~temporal.base.SQLDatabaseInterface` + that is the base class for all temporal datatype subclasses + - Contains classes for all datasets [#allds]_ that contain +- basic informations (id, name, mapset, creator, ...) ++ basic information (id, name, mapset, creator, ...) + + :mod:`~temporal.spatial_extent` + """"""""""""""""""""""""""""""" +@@ -101,7 +101,7 @@ the SQL object serialization, all classe + :mod:`~temporal.c_libraries_interface` + """""""""""""""""""""""""""""""""""""" + +- The RPC C-library interface for exit safe and fast access to raster, vector and 3D raster informations. ++ The RPC C-library interface for exit safe and fast access to raster, vector and 3D raster information. + + :mod:`~temporal.temporal_granularity` + """"""""""""""""""""""""""""""""""""" +@@ -133,14 +133,14 @@ temporal processing algorithms and tempo + + - Implements the base class for all datasets [#allds]_ :class:`~temporal.abstract_dataset.AbstractDataset`. + - Implements the the select, insert and update functionality as well as +- convenient functions to access the base, extent and metadata informations ++ convenient functions to access the base, extent and metadata information + + :mod:`~temporal.abstract_map_dataset` + """"""""""""""""""""""""""""""""""""" + + - Implements the base class :class:`~temporal.abstract_map_dataset.AbstractMapDataset` + for all map layer specific classes +- - Provides the interface to all map layer specific informations in the temporal database ++ - Provides the interface to all map layer specific information in the temporal database + + :mod:`~temporal.abstract_space_time_dataset` + """""""""""""""""""""""""""""""""""""""""""" +@@ -149,7 +149,7 @@ temporal processing algorithms and tempo + for all Space Time Datasets classes + - Contains the creation and deletion functionality, the map registration and un-registration, + access methods to map layer objects and so on +- - Provides the interface to all Space Time Dataset specific informations in the temporal database ++ - Provides the interface to all Space Time Dataset specific information in the temporal database + + :mod:`~temporal.space_time_datasets` + """""""""""""""""""""""""""""""""""" +@@ -295,11 +295,11 @@ to access its registered maps. + # Fill the object with the content from the temporal database + strds.select(dbif=dbif) + +- # Print informations about the space time raster dataset to stdout ++ # Print information about the space time raster dataset to stdout + strds.print_info() + + # Get all maps that are registered in the strds and print +- # informations about the maps to stdout ++ # information about the maps to stdout + maps = strds.get_registered_maps_as_objects(dbif=dbif) + + # We iterate over the temporal sorted map list +--- a/lib/python/temporal/abstract_space_time_dataset.py ++++ b/lib/python/temporal/abstract_space_time_dataset.py +@@ -1309,7 +1309,7 @@ class AbstractSpaceTimeDataset(AbstractD + order="start_time", + dbif=None): + """Return all or a subset of the registered maps as ordered object +- list with spatio-temporal topological relationship informations. ++ list with spatio-temporal topological relationship information. + + The objects are initialized with their id's' and the spatio-temporal + extent (temporal type, start time, end time, west, east, south, +--- a/lib/python/temporal/core.py ++++ b/lib/python/temporal/core.py +@@ -216,7 +216,7 @@ def get_enable_timestamp_write(): + + ..warning:: + +- Be aware that C-libraries can not access timestamp informations if ++ Be aware that C-libraries can not access timestamp information if + they are not written as spatial database metadata, hence modules + that make use of timestamps using the C-library interface will not + work with maps that were created without writing the timestamps. +--- a/lib/temporal/lib/map_list.c ++++ b/lib/temporal/lib/map_list.c +@@ -112,9 +112,9 @@ void tgis_map_list_add(tgisMapList *list + } + + /** +- * \brief Insert map informations into tgisMapList ++ * \brief Insert map information into tgisMapList + * +- * This function alocates a tgisMap, fills it with the provided informations ++ * This function alocates a tgisMap, fills it with the provided information + * and adds it to the list. + * In case allocation fails, G_fatal_error() will be invoked by the + * allocation function. +--- a/locale/grass_po_stats.py ++++ b/locale/grass_po_stats.py +@@ -1,11 +1,11 @@ + #!/usr/bin/env python + ############################################################################# + # +-# MODULE: Languages informations and statistics (Python) ++# MODULE: Languages information and statistics (Python) + # AUTHOR(S): Luca Delucchi <lucadel...@gmail.com> + # Pietro Zambelli <peter.z...@gmail.com> + # PURPOSE: Create a json file containing languages translations +-# informations and statistics. ++# information and statistics. + # COPYRIGHT: (C) 2012 by the GRASS Development Team + # + # This program is free software under the GNU General +@@ -88,7 +88,7 @@ def get_stats(languages, directory): + # TO DO TOTALS OF ENGLISH WORD FOR EACH FILE + # all the total string in english + output['totals'] = {} +- # all the informations about each lang ++ # all the information about each lang + output['langs'] = {} + # for each language + for lang, pofilelist in languages.iteritems(): +--- a/temporal/t.info/t.info.html ++++ b/temporal/t.info/t.info.html +@@ -1,18 +1,18 @@ + <h2>DESCRIPTION</h2> + +-<em>t.info</em> reports informations about any dataset that is ++<em>t.info</em> reports information about any dataset that is + registered in the temporal database in human readable or shell script + style. Datasets are raster, 3D raster and vector maps as well as their + corresponding space time datasets (STRDS, STR3DS and STVDS). This +-module reports the informations that are stored in the temporal +-database. These are basic informations (id, name, mapset, creator, ++module reports the information that are stored in the temporal ++database. These are basic information (id, name, mapset, creator, + creation time, temporal type), the temporal and spatial extent and + dataset type specific metadata. The user has to utilize <em>r.info</em>, +-<em>r3.info</em>, <em>v.info</em> to report detailed informations about ++<em>r3.info</em>, <em>v.info</em> to report detailed information about + raster, 3D raster and vector maps, since not all map specific +-informations and metadata are stored in the temporal database. ++information and metadata are stored in the temporal database. + <p> +-In addition, informations about the chosen temporal database backend ++In addition, information about the chosen temporal database backend + can be reported. + + <h2>EXAMPLES</h2> +--- a/temporal/t.rast.colors/t.rast.colors.html ++++ b/temporal/t.rast.colors/t.rast.colors.html +@@ -10,7 +10,7 @@ Internally a file with map names is crea + to the <em>file</em> option of <em>r.colors</em>. + <p> + Please have a look at the <a href="r.colors.html">r.colors</a> +-manual page for further informations. ++manual page for further information. + + <h2>EXAMPLE</h2> + +--- a/temporal/temporalintro.html ++++ b/temporal/temporalintro.html +@@ -30,7 +30,7 @@ New space time datasets are created in t + <a href="t.create.html">t.create</a>. The name of the new dataset, the + type (strds, str3ds, stvds), the title and the description must be + provided for creation. Optional the temporal type (absolute, relative) +-and semantic informations can be provided. ++and semantic information can be provided. + <p> + The module <a href="t.remove.html">t.remove</a> will remove the space time datasets + from the temporal database. Use <a href="t.support.html">t.support</a> +@@ -48,7 +48,7 @@ in an input file. The module supports th + With <a href="t.unregister.html">t.unregister</a> maps can be unregistered + from space time datasets and the temporal database. + <p> +-To print informations about space time datasets or registered maps, the ++To print information about space time datasets or registered maps, the + module <a href="t.info.html">t.info</a> can be used. + <a href="t.list.html">t.list</a> will list all space time datasets and + registered maps in the temporal database. +--- a/vector/v.lrs/MAIL ++++ b/vector/v.lrs/MAIL +@@ -74,7 +74,7 @@ is to change always all mileposts. + I don't have any documentation, as we use it only here. I have to write + something, but I don't have much time, let me know if you are interested. + For now briefly: +-All the LRS is stored in one table, each record stores informations ++All the LRS is stored in one table, each record stores information + about one segment between two mileposts: + rsid | integer | id of LRS segment (not so important) + lcat | integer | line id, unique id of the line diff --git a/debian/patches/parameter-typo.patch b/debian/patches/parameter-typo.patch new file mode 100644 index 0000000..4c61e0c --- /dev/null +++ b/debian/patches/parameter-typo.patch @@ -0,0 +1,69 @@ +Description: Fix 'paramter' typo, replace with 'parameter'. +Author: Bas Couwenberg <sebas...@xs4all.nl> + +--- a/imagery/i.eb.eta/i.eb.eta.html ++++ b/imagery/i.eb.eta/i.eb.eta.html +@@ -29,7 +29,7 @@ Full ETa processing will need those: + <h2>REFERENCES</h2> + + <p>[1] Bastiaanssen, W.G.M., 1995. +-Estimation of Land surface paramters by remote sensing under clear-sky ++Estimation of Land surface parameters by remote sensing under clear-sky + conditions. PhD thesis, Wageningen University, Wageningen, The Netherlands. + (<a href="http://edepot.wur.nl/206553">PDF</a>) + +--- a/imagery/i.eb.evapfr/i.eb.evapfr.html ++++ b/imagery/i.eb.evapfr/i.eb.evapfr.html +@@ -18,7 +18,7 @@ Makin, Molden and Bastiaanssen (2001). + <h2>REFERENCES</h2> + + <p>[1] Bastiaanssen, W.G.M., 1995. +-Estimation of Land surface paramters by remote sensing under clear-sky ++Estimation of Land surface parameters by remote sensing under clear-sky + conditions. PhD thesis, Wageningen University, Wageningen, The Netherlands. + (<a href="http://edepot.wur.nl/206553">PDF</a>) + +--- a/imagery/i.eb.hsebal01/i.eb.hsebal01.html ++++ b/imagery/i.eb.hsebal01/i.eb.hsebal01.html +@@ -43,7 +43,7 @@ in this code in [3]. + <h2>REFERENCES</h2> + + <p>[1] Bastiaanssen, W.G.M., 1995. +- Estimation of Land surface paramters by remote sensing under clear-sky ++ Estimation of Land surface parameters by remote sensing under clear-sky + conditions. PhD thesis, Wageningen University, Wageningen, The Netherlands. + (<a href="http://edepot.wur.nl/206553">PDF</a>) + +--- a/imagery/i.ortho.photo/README ++++ b/imagery/i.ortho.photo/README +@@ -75,7 +75,7 @@ The following GRASS 6 directories contai + parameters + + ./photo.2target: computes photo to target location +- transformation paramters ++ transformation parameters + + ./photo.rectify: does the actual image rectification + +--- a/lib/python/pygrass/modules/interface/module.py ++++ b/lib/python/pygrass/modules/interface/module.py +@@ -557,7 +557,7 @@ class Module(object): + self.__call__.__func__.__doc__ = self.__doc__ + + def __call__(self, *args, **kargs): +- """Set module paramters to the class and, if run_ is True execute the ++ """Set module parameters to the class and, if run_ is True execute the + module, therefore valid parameters are all the module parameters + plus some extra parameters that are: run_, stdin_, stdout_, stderr_, + env_ and finish_. +--- a/lib/python/temporal/temporal_operator.py ++++ b/lib/python/temporal/temporal_operator.py +@@ -253,7 +253,7 @@ class TemporalOperatorParser(object): + def parse(self, expression, optype = 'relation'): + self.optype = optype + self.parser.parse(expression) +- # The paramter optype can be of type: select {:, during, r}, boolean{&&, contains, |}, ++ # The parameter optype can be of type: select {:, during, r}, boolean{&&, contains, |}, + # raster{*, equal, |}, vector {|, starts, &}, + # hash{#, during, l} or relation {during}. + diff --git a/debian/patches/preferred-typo.patch b/debian/patches/preferred-typo.patch new file mode 100644 index 0000000..b72b856 --- /dev/null +++ b/debian/patches/preferred-typo.patch @@ -0,0 +1,14 @@ +Description: Fix 'prefered' typo, replace with 'preferred'. +Author: Bas Couwenberg <sebas...@xs4all.nl> + +--- a/vector/v.colors/v.colors.html ++++ b/vector/v.colors/v.colors.html +@@ -83,7 +83,7 @@ v.colors -c map=soils_general rgb_column + Note that in this case the vector map has a proper color table + assigned (check + by <em><a href="v.colors.out.html">v.colors.out</a></em>) together +-with GRASSRGB attribute column. Also note that color table is prefered ++with GRASSRGB attribute column. Also note that color table is preferred + over RGB values stored in attribute table. + + <h3>Remove existing color table</h3> diff --git a/debian/patches/series b/debian/patches/series index 39c39b8..18b2e49 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,12 @@ instdir #help_about_names wxpy3.0-compat.patch #animate-wish.patch +parameter-typo.patch +additionally-typo.patch +specifying-typo.patch +available-typo.patch +information-typo.patch +default-typo.patch +extension-typo.patch +preferred-typo.patch +transferred-typo.patch diff --git a/debian/patches/specifying-typo.patch b/debian/patches/specifying-typo.patch new file mode 100644 index 0000000..0d636b6 --- /dev/null +++ b/debian/patches/specifying-typo.patch @@ -0,0 +1,34 @@ +Description: Fix 'specifing' typo, replace with 'specifying'. +Author: Bas Couwenberg <sebas...@xs4all.nl> + +--- a/raster/r.what/r.what.html ++++ b/raster/r.what/r.what.html +@@ -43,7 +43,7 @@ r.what map=landuse96_28m,aspect coordina + <h3>Input coordinates given as a vector points map</h3> + + Coordinates can be read from exising vector points map by +-specifing <b>points</b> option. Other features than points or ++specifying <b>points</b> option. Other features than points or + centroids are ignored. Example: query North Carolina county number for + each community college: + +@@ -60,7 +60,7 @@ r.what map=boundary_county_500m points=c + <h3>Input coordinates given as a vector points map, output into CSV file</h3> + + Coordinates can be read from exising vector points map by +-specifing <b>points</b> option. Other features than points or ++specifying <b>points</b> option. Other features than points or + centroids are ignored. The output is stored in a CSV file including header + row. Example: query North Carolina county number for each community college: + +--- a/vector/v.out.postgis/v.out.postgis.html ++++ b/vector/v.out.postgis/v.out.postgis.html +@@ -219,7 +219,7 @@ by <em><a href="v.info.html">v.info</a>< + <h3>Export data without attributes</h3> + + <em>v.out.postgis</em> allows to ignore attributes when exporting +-vector features by specifing <b>-t</b> flag. ++vector features by specifying <b>-t</b> flag. + + Command bellow exports vector features without attributes. The feature + will contain only two columns, the fid and geometry column. diff --git a/debian/patches/transferred-typo.patch b/debian/patches/transferred-typo.patch new file mode 100644 index 0000000..4ccca29 --- /dev/null +++ b/debian/patches/transferred-typo.patch @@ -0,0 +1,105 @@ +Description: Fix 'transfered' typo, replace with 'transferred'. +Author: Bas Couwenberg <sebas...@xs4all.nl> + +--- a/lib/init/variables.html ++++ b/lib/init/variables.html +@@ -259,7 +259,7 @@ PERMANENT + non-native, vector features are written to output external + datasource immediately. By default, the vector library writes + output data to a temporary vector map in native format and when +- closing the map, the features are transfered to output external ++ closing the map, the features are transferred to output external + datasource. Note: if output vector format is topological PostGIS + format, then the vector library writes features immediately to output + database (in this case GRASS_VECTOR_EXTERNAL_IMMEDIATE is ignored).</dd> +--- a/lib/python/temporal/temporal_algebra.py ++++ b/lib/python/temporal/temporal_algebra.py +@@ -1798,7 +1798,7 @@ class TemporalAlgebraParser(object): + tfunc = gvar.tfunc.upper() + # Get value for function name from dictionary. + tfuncval = tfuncdict[tfunc] +- # Check if value has to be transfered to datetime object for comparison. ++ # Check if value has to be transferred to datetime object for comparison. + if tfunc in ["START_DATE", "END_DATE"]: + timeobj = datetime.strptime(value.replace("\"",""), '%Y-%m-%d') + value = timeobj.date() +--- a/lib/vector/Vlib/open.c ++++ b/lib/vector/Vlib/open.c +@@ -1304,7 +1304,7 @@ int map_format(struct Map_info *Map) + else { + /* vector features are written to the temporary vector map + * in the native format and when closing the map +- * transfered to output OGR layer */ ++ * transferred to output OGR layer */ + format = GV_FORMAT_NATIVE; + Map->temporary = TRUE; + } +@@ -1421,7 +1421,7 @@ int map_format(struct Map_info *Map) + else { + /* vector features are written to the temporary vector map + * in the native format and when closing the map +- * transfered to output PostGIS layer */ ++ * transferred to output PostGIS layer */ + format = GV_FORMAT_NATIVE; + Map->temporary = TRUE; + } +--- a/lib/vector/diglib/spindex_rw.c ++++ b/lib/vector/diglib/spindex_rw.c +@@ -659,8 +659,8 @@ int rtree_dump_node_file(FILE * fp, off_ + * all following methods to transfer spatial indices (rtrees) are based + * on the same idea + * do a postorder depth-first non-recursive traversal of the rtree +- * a leaf node is transfered first +- * the root node is transfered last ++ * a leaf node is transferred first ++ * the root node is transferred last + * + * this applies to all four scenarios + * - from intermediate file to sidx file +@@ -973,7 +973,7 @@ static void rtree_load_to_memory(struct + loadnode = 1; + /* this is an internal node in the RTree + * all its children are read first, +- * before it is transfered to the RTree in memory */ ++ * before it is transferred to the RTree in memory */ + if (s[top].sn.level > 0) { + for (i = s[top].branch_id; i < t->nodecard; i++) { + if (s[top].pos[i] > 0) { +@@ -991,7 +991,7 @@ static void rtree_load_to_memory(struct + /* leaf node + * vector object IDs are stored in file as + * off_t but always fit into an int, see dig_structs.h +- * vector object IDs are transfered to child.id */ ++ * vector object IDs are transferred to child.id */ + if (s[top].sn.level == 0) { + s[top].sn.branch[j].child.id = + (int)s[top].pos[j]; +@@ -1098,7 +1098,7 @@ static void rtree_load_to_file(struct gv + loadnode = 1; + /* this is an internal node in the RTree + * all its children are read first, +- * before it is transfered to the RTree in memory */ ++ * before it is transferred to the RTree in memory */ + if (s[top].sn.level > 0) { + for (i = s[top].branch_id; i < t->nodecard; i++) { + if (s[top].pos[i] > 0) { +@@ -1116,7 +1116,7 @@ static void rtree_load_to_file(struct gv + /* leaf node + * vector object IDs are stored in file as + * off_t but always fit into an int, see dig_structs.h +- * vector object IDs are transfered to child.id */ ++ * vector object IDs are transferred to child.id */ + if (s[top].sn.level == 0) { + s[top].sn.branch[j].child.id = + (int)s[top].pos[j]; +--- a/raster/r.watershed/shed/com_line.c ++++ b/raster/r.watershed/shed/com_line.c +@@ -4,7 +4,7 @@ + #include "watershed.h" + #include "string.h" + +-/* make sure any useful info is transfered to the man page before ripping out the interactive help messages */ ++/* make sure any useful info is transferred to the man page before ripping out the interactive help messages */ + /* in addition there seem to be some useful user options here which are not currently available from the main parser */ + int com_line_Gwater(INPUT * input, OUTPUT * output) + { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel