diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6ef1ae4a16a..b7463f0e2d1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -128,7 +128,5 @@ repos: - c - c++ - csv - - html - - markdown - python - tex diff --git a/doc/development/style_guide.md b/doc/development/style_guide.md index 524decabbcb..1c8b109f827 100644 --- a/doc/development/style_guide.md +++ b/doc/development/style_guide.md @@ -414,7 +414,7 @@ See [Changing computational region](#changing-computational-region) for more det #### Mapsets **Output data should be always written to the current mapset**. This is ensured -by build-in GRASS mechanisms, so there is nothing which needs to be done in the +by built-in GRASS mechanisms, so there is nothing which needs to be done in the tool. If a tool modifies inputs, the input must be in the current mapset. The tool should accept inputs from any mapset in the current project. The diff --git a/doc/interfaces_overview.md b/doc/interfaces_overview.md index cc6c2c173b5..a932fe5edd1 100644 --- a/doc/interfaces_overview.md +++ b/doc/interfaces_overview.md @@ -114,7 +114,7 @@ m.d_vect(map="streets", color="black") m.show() ``` -![Elevation map overlayed with streets with gj.Map](jupyter_map.png) +![Elevation map overlaid with streets with gj.Map](jupyter_map.png) [Learn more :material-arrow-right-bold:](jupyter_intro.md){ .md-button } diff --git a/doc/jupyter_intro.md b/doc/jupyter_intro.md index 4db8a8f3440..d1839ab372f 100644 --- a/doc/jupyter_intro.md +++ b/doc/jupyter_intro.md @@ -58,7 +58,7 @@ The following examples will use the [North Carolina dataset](https://grass.osgeo ## Map The `gj.Map` class in `grass.jupyter` provides a way to create static maps in Jupyter. -Here we create a map of elevation overlayed with streets: +Here we create a map of elevation overlaid with streets: ```python # Create a new map @@ -74,7 +74,7 @@ m.d_vect(map="streets", color="black") m.show() ``` -![Elevation map overlayed with streets with gj.Map](jupyter_map.png) +![Elevation map overlaid with streets with gj.Map](jupyter_map.png) !!! grass-tip "Order Matters" diff --git a/doc/python_intro.md b/doc/python_intro.md index cf0ee6c277a..5ae951a05a4 100644 --- a/doc/python_intro.md +++ b/doc/python_intro.md @@ -839,7 +839,7 @@ slope_aspect_tool.inputs ``` The [grass.pygrass.modules](https://grass.osgeo.org/grass-stable/manuals/libpython/pygrass_modules.html) -module provides an alterative approach to running GRASS tools. +module provides an alternative approach to running GRASS tools. To learn more about the `Module` class, see the Full Documentation: diff --git a/general/g.proj/g.proj.html b/general/g.proj/g.proj.html index 7591d9fa50e..30dfb764e78 100644 --- a/general/g.proj/g.proj.html +++ b/general/g.proj/g.proj.html @@ -47,18 +47,18 @@

DESCRIPTION

epsg=number
number should correspond to the index number of a valid -co-ordinate system in the EPSG +coordinate system in the EPSG database. EPSG code support is based upon a local copy of the GDAL CSV -co-ordinate system and datum information files, stored in the directory +coordinate system and datum information files, stored in the directory $GISBASE/etc/proj/ogr_csv. These can be updated if necessary to support future revisions of the EPSG database.

If datum information is incorrect or missing in the input -co-ordinate system definition (e.g. PROJ descriptions have very limited +coordinate system definition (e.g. PROJ descriptions have very limited support for specifying datum names), a GRASS datum abbreviation can instead be supplied using the datum parameter. This will override any -datum contained in the input co-ordinate system, and discard +datum contained in the input coordinate system, and discard any datum transformation parameters. Enter datum=list to return a list of all the datums supported by GRASS. Since any existing datum transformation parameters will have been discarded, the @@ -80,12 +80,12 @@

DESCRIPTION

The final mode of operation of g.proj is to report on the datum information and datum transformation parameters associated with the -co-ordinate system. The -d flag will report a human-readable summary of +coordinate system. The -d flag will report a human-readable summary of this.

NOTES

-

If the input co-ordinate system contains a datum name but no +

If the input coordinate system contains a datum name but no transformation parameters, and there is more than one suitable parameter set available (according to the files datum.table and datumtransform.table in $GISBASE/etc/proj), g.proj will check the value of @@ -99,17 +99,17 @@

NOTES

(likely non-optimum) parameters for this datum if necessary in the future.
  • Any other number less than or equal to the number of parameter sets available for this datum: Choose this parameter set and add it to the -co-ordinate system description.
  • +coordinate system description. If the -t flag is specified, the module will attempt to change the datum transformation parameters using one of the above two methods even if a valid parameter set is already specified in the -input co-ordinate system. This can be useful to change the datum information +input coordinate system. This can be useful to change the datum information for an existing project.

    Output is simply based on the input CRS information. g.proj does -not attempt to verify that the co-ordinate system thus +not attempt to verify that the coordinate system thus described matches a pre-defined existing system in use in the world. In particular, this means there may be no authority names and codes in the WKT output. diff --git a/general/g.proj/g.proj.md b/general/g.proj/g.proj.md index 65fdef6f115..20793dfc789 100644 --- a/general/g.proj/g.proj.md +++ b/general/g.proj/g.proj.md @@ -41,18 +41,18 @@ given for *description*, the PROJ description will be read from stdin rather than as a directly-supplied command-line parameter. epsg=*number* -*number* should correspond to the index number of a valid co-ordinate +*number* should correspond to the index number of a valid coordinate system in the [EPSG database](https://epsg.org/search/by-name). EPSG -code support is based upon a local copy of the GDAL CSV co-ordinate +code support is based upon a local copy of the GDAL CSV coordinate system and datum information files, stored in the directory `$GISBASE/etc/proj/ogr_csv`. These can be updated if necessary to support future revisions of the EPSG database. -If datum information is incorrect or missing in the input co-ordinate +If datum information is incorrect or missing in the input coordinate system definition (e.g. PROJ descriptions have very limited support for specifying datum names), a GRASS datum abbreviation can instead be supplied using the *datum* parameter. This will override any datum -contained in the input co-ordinate system, and discard any datum +contained in the input coordinate system, and discard any datum transformation parameters. Enter datum=*list* to return a list of all the datums supported by GRASS. Since any existing datum transformation parameters will have been discarded, the *datumtrans* parameter should @@ -72,12 +72,12 @@ be overwritten. The program will **not** warn before doing this. The final mode of operation of *g.proj* is to report on the datum information and datum transformation parameters associated with the -co-ordinate system. The **-d** flag will report a human-readable summary +coordinate system. The **-d** flag will report a human-readable summary of this. ## NOTES -If the input co-ordinate system contains a datum name but no +If the input coordinate system contains a datum name but no transformation parameters, and there is more than one suitable parameter set available (according to the files datum.table and datumtransform.table in `$GISBASE/etc/proj`), *g.proj* will check the @@ -90,16 +90,16 @@ value of the *datumtrans* option and act according to the following: non-optimum) parameters for this datum if necessary in the future. - **Any other number less than or equal to the number of parameter sets available for this datum:** Choose this parameter set and add it to - the co-ordinate system description. + the coordinate system description. If the **-t** flag is specified, the module will attempt to change the datum transformation parameters using one of the above two methods **even if** a valid parameter set is already specified in the input -co-ordinate system. This can be useful to change the datum information +coordinate system. This can be useful to change the datum information for an existing project. Output is simply based on the input CRS information. g.proj does **not** -attempt to verify that the co-ordinate system thus described matches a +attempt to verify that the coordinate system thus described matches a pre-defined existing system in use in the world. In particular, this means there may be no authority names and codes in the WKT output. diff --git a/general/g.setproj/g.setproj.html b/general/g.setproj/g.setproj.html index 8db06bc6880..0b11611b62e 100644 --- a/general/g.setproj/g.setproj.html +++ b/general/g.setproj/g.setproj.html @@ -16,7 +16,7 @@

    NOTES

    Most projections are supported. The PROJ abbreviations for the names are used with two exceptions, viz. 'll', for latitude / longitude geographic -co-ordinates, and 'stp', for the State Plane Co-ordinate system (used in the +coordinates, and 'stp', for the State Plane Coordinate system (used in the USA).

    After the projection name, the user will be asked for a geodetic datum. If diff --git a/general/g.setproj/g.setproj.md b/general/g.setproj/g.setproj.md index ed0d826c784..6d54da5ef59 100644 --- a/general/g.setproj/g.setproj.md +++ b/general/g.setproj/g.setproj.md @@ -14,7 +14,7 @@ can be run. The user will be prompted for the projection name. Most projections are supported. The [PROJ](https://proj.org/) abbreviations for the names are used with two exceptions, viz. 'll', for latitude / longitude geographic -co-ordinates, and 'stp', for the State Plane Co-ordinate system (used in +coordinates, and 'stp', for the State Plane Coordinate system (used in the USA). After the projection name, the user will be asked for a geodetic datum. diff --git a/gui/xml/grass-interface.dtd b/gui/xml/grass-interface.dtd index 006bb70edb1..e1f81795cbe 100644 --- a/gui/xml/grass-interface.dtd +++ b/gui/xml/grass-interface.dtd @@ -71,7 +71,7 @@ integer : a numeric integer parameter. float : a numeric float parameter. If multiple is "yes", then many values for the - parameter may be given in a comma-seperated list + parameter may be given in a comma-separated list --> EXAMPLE

    The signature file obtained in the example above will allow to classify the current imagery group only (lsat7_2002). -If the user would like to re-use the signature file for the +If the user would like to reuse the signature file for the classification of different imagery group(s), they can set semantic labels for each group member beforehand, i.e., before generating the signature files. diff --git a/imagery/i.cluster/i.cluster.md b/imagery/i.cluster/i.cluster.md index fb673d7ecad..d6e4536cfc3 100644 --- a/imagery/i.cluster/i.cluster.md +++ b/imagery/i.cluster/i.cluster.md @@ -205,7 +205,7 @@ used. See example in its manual page. The signature file obtained in the example above will allow to classify the current imagery group only (lsat7_2002). If the user would like to -re-use the signature file for the classification of different imagery +reuse the signature file for the classification of different imagery group(s), they can set semantic labels for each group member beforehand, i.e., before generating the signature files. Semantic labels are set by means of *r.support* as shown below: diff --git a/imagery/i.smap/i.smap.html b/imagery/i.smap/i.smap.html index fedf0bb3560..b805bf9e7d2 100644 --- a/imagery/i.smap/i.smap.html +++ b/imagery/i.smap/i.smap.html @@ -181,7 +181,7 @@

    EXAMPLE

    The signature file obtained in the example above will allow to classify the current imagery group only (lsat7_2002). -If the user would like to re-use the signature file for the +If the user would like to reuse the signature file for the classification of different imagery group(s), they can set semantic labels for each group member beforehand, i.e., before generating the signature files. diff --git a/imagery/i.smap/i.smap.md b/imagery/i.smap/i.smap.md index 7cbfd6d44af..2a709ee1883 100644 --- a/imagery/i.smap/i.smap.md +++ b/imagery/i.smap/i.smap.md @@ -149,7 +149,7 @@ r.kappa -w classification=lsat7_2002_smap_classes reference=training The signature file obtained in the example above will allow to classify the current imagery group only (lsat7_2002). If the user would like to -re-use the signature file for the classification of different imagery +reuse the signature file for the classification of different imagery group(s), they can set semantic labels for each group member beforehand, i.e., before generating the signature files. Semantic labels are set by means of *r.support* as shown below: diff --git a/include/grass/iostream/pqheap.h b/include/grass/iostream/pqheap.h index 7aa0b6b2b88..dd5120da712 100644 --- a/include/grass/iostream/pqheap.h +++ b/include/grass/iostream/pqheap.h @@ -163,7 +163,7 @@ class pqheap_t1 { inline void delete_min_and_insert(const T &x); // this function is a dirty way to allow building faster the heap - // in case we build it from a sorted array; in that case we dont need + // in case we build it from a sorted array; in that case we don't need // to 'insert' and then 'heapify', but it is enough to 'set' void set(long i, T &elt); @@ -342,7 +342,7 @@ T pqheap_t1::min() //************************************************************/ // this function is a dirty hack to allow building faster the heap -// in case we build it from a sorted array; in thiat case we dont need +// in case we build it from a sorted array; in that case we don't need // to 'insert' and then 'heapify', but it is enough to 'set' template inline void pqheap_t1::set(long i, T &elt) @@ -472,7 +472,7 @@ inline void pqheap_t1::heapify(unsigned int root) unsigned int rc = heap_rchild(root); #ifdef HEAPSTATUS - // already did the root, so dont do it again + // already did the root, so don't do it again if (lc < cur_elts) { heaptouch(lc); } diff --git a/lib/cdhc/doc/goodness.tex b/lib/cdhc/doc/goodness.tex index 843c223e2ce..671ff7b54f6 100644 --- a/lib/cdhc/doc/goodness.tex +++ b/lib/cdhc/doc/goodness.tex @@ -1674,7 +1674,7 @@ \section{Utility Functions} \clearpage \begin{table} -\caption{Signficant Values of D'Agostino's D Test (\(y\) statistic +\caption{Significant Values of D'Agostino's D Test (\(y\) statistic of eqn.~\protect\ref{eqn:xform-d}).} \centerline{Reproduced from D'Agostino~\protect\cite{dagostino86}.} \label{tbl:d-test} diff --git a/misc/m.cogo/m.cogo.html b/misc/m.cogo/m.cogo.html index 4135ed91ecc..f2623f6e59e 100644 --- a/misc/m.cogo/m.cogo.html +++ b/misc/m.cogo/m.cogo.html @@ -47,7 +47,7 @@

    DESCRIPTION

    NOTES

    For those unfamiliar with the notation for bearings: Picture yourself in the -center of a circle. The first hemispere notation tell you whether you should +center of a circle. The first hemisphere notation tell you whether you should face north or south. Then you read the angle and either turn that many degrees to the east or west, depending on the second hemisphere notation. Finally, you move <distance> units in that direction to get to the diff --git a/misc/m.cogo/m.cogo.md b/misc/m.cogo/m.cogo.md index 9f8dc253302..ae771e7c0a2 100644 --- a/misc/m.cogo/m.cogo.md +++ b/misc/m.cogo/m.cogo.md @@ -43,7 +43,7 @@ Unless specified with the **coord** option, calculations begin from ## NOTES For those unfamiliar with the notation for bearings: Picture yourself in -the center of a circle. The first hemispere notation tell you whether +the center of a circle. The first hemisphere notation tell you whether you should face north or south. Then you read the angle and either turn that many degrees to the east or west, depending on the second hemisphere notation. Finally, you move \ units in that diff --git a/mswindows/external/rbatch/README.html b/mswindows/external/rbatch/README.html index 71335b5915a..bcddc2fadaf 100644 --- a/mswindows/external/rbatch/README.html +++ b/mswindows/external/rbatch/README.html @@ -4,6 +4,6 @@

    Batchfiles

    Home Page: batchfiles home page.

    -Discuss: sqldf dicussion group is being used for discussion of this software too. +Discuss: sqldf discussion group is being used for discussion of this software too.

    SVN: source diff --git a/mswindows/external/rbatch/README.md b/mswindows/external/rbatch/README.md index ed4d130d82d..7e3af643d2a 100644 --- a/mswindows/external/rbatch/README.md +++ b/mswindows/external/rbatch/README.md @@ -2,7 +2,7 @@ Home Page: [batchfiles home page](http://batchfiles.googlecode.com). -Discuss: [sqldf dicussion group](http://groups.google.com/group/sqldf) +Discuss: [sqldf discussion group](http://groups.google.com/group/sqldf) is being used for discussion of this software too. SVN: [source](https://code.google.com/p/batchfiles/source/checkout) diff --git a/mswindows/external/rbatch/batchfiles.md b/mswindows/external/rbatch/batchfiles.md index a41f810fc5a..ef6d5df19ef 100644 --- a/mswindows/external/rbatch/batchfiles.md +++ b/mswindows/external/rbatch/batchfiles.md @@ -226,7 +226,7 @@ and then enter the same set command into the new window. Now any use of R in the original window will use the default version whereas in the new `cmd` line window it will use the specified version. -One can change the registry entry permanently to refer to a particlar version +One can change the registry entry permanently to refer to a particular version like this: ```bash diff --git a/ps/ps.map/README b/ps/ps.map/README index 4082a4fab34..bdd03f32f03 100644 --- a/ps/ps.map/README +++ b/ps/ps.map/README @@ -23,7 +23,7 @@ The manual for ps.map says that fields width and hwidth specify the width of the line in pixels, which is not true: they were actually interpreted as width in user space PostScript coordinates: 1/72 of inch. I made the width double, added width options -for outline and grid, and also now the width ni is isnterpreted as n inches. +for outline and grid, and also now the width ni is interpreted as n inches. STATUS: FIXED and coming out with the next update diff --git a/pyproject.toml b/pyproject.toml index 1d275ba8afe..c9b8a7bb24a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,6 +42,18 @@ ignore-words-list = [ "parms", "siz", "vizual", + "ETo", # Evapotranspiration technical term + "Eto", # Evapotranspiration technical term + "eto", # Evapotranspiration technical term + "ist", # Part of acronyms (IST-SUPSI, etc.) + "IHS", # Color model: Intensity-Hue-Saturation + "ihs", # Color model: Intensity-Hue-Saturation + "ALOG", # Function name + "Redner", # Person's name in citation + "NED", # Acronym/proper name + "linke", # Linke turbidity factor parameter + "infex", # Infiltration excess parameter + "alle", # Italian word in references ] quiet-level = 3 skip = [ diff --git a/python/grass/docs/README.md b/python/grass/docs/README.md index 9ce87c5656b..a9995587a6e 100644 --- a/python/grass/docs/README.md +++ b/python/grass/docs/README.md @@ -10,7 +10,7 @@ Install the following dependencies from the `requirements.txt` file: in * [sphinx (v8.1.3)](https://www.sphinx-doc.org/en/master/changes/8.1.html) * [sphinx-material (v0.0.36)](https://bashtage.github.io/sphinx-material/) * [sphinx-sitemap (v2.6.0)](https://sphinx-sitemap.readthedocs.io/en/latest/) -* [sphinx-last-updated-by-git](hhttps://github.com/mgeier/sphinx-last-updated-by-git/) +* [sphinx-last-updated-by-git](https://github.com/mgeier/sphinx-last-updated-by-git/) ```bash pip install -r python/grass/docs/requirements.txt diff --git a/python/grass/docs/_templates/header.html b/python/grass/docs/_templates/header.html index 88f309fc56c..bef2ce6f2d8 100644 --- a/python/grass/docs/_templates/header.html +++ b/python/grass/docs/_templates/header.html @@ -1,5 +1,5 @@ - +