diff --git a/doc/development/style_guide.md b/doc/development/style_guide.md index c00fd1c8410..a94c872c42d 100644 --- a/doc/development/style_guide.md +++ b/doc/development/style_guide.md @@ -276,7 +276,7 @@ The structure consists of several required and optional sections: ``` Sections _Notes_, _Examples_, _References_, and _Authors_ can be also in -singular form (e.g, _Note_). +singular form (e.g., _Note_). Note that Markdown is converted to html using [MkDocs](https://www.mkdocs.org/). See also [supported Markdown elements by MkDocs](https://www.markdownguide.org/tools/mkdocs/) @@ -337,7 +337,7 @@ Examples: - `v_clean_rmsa.png` **Image size:** ideally **600 pixel width** (height depends on that), use e.g. -ImageMagic: +ImageMagick: ```bash mogrify -resize 600x file.png @@ -759,7 +759,7 @@ gs.fatal(_("No map found, exiting.")) # debug output (users can use g.gisenv to enable/disable) # debug level is 1 to 5 (5 is most detailed) # debug message should not be translated -gs.debug(f"Our calculated value is: {value}."), 3) +gs.debug(f"Our calculated value is: {value}.", 3) ``` Do not use the `print` function for informational output. This is reserved for @@ -926,7 +926,7 @@ d. - display tools db. - database tools g. - general GIS management tools i. - imagery tools -m. - miscellaneous tool tools +m. - miscellaneous tools ps. - postscript tools r. - raster tools r3. - raster3D tools diff --git a/gui/wxpython/gmodeler/panels.py b/gui/wxpython/gmodeler/panels.py index 23415c882da..1df05cb312c 100644 --- a/gui/wxpython/gmodeler/panels.py +++ b/gui/wxpython/gmodeler/panels.py @@ -163,7 +163,7 @@ def __init__( lambda message: self.SetStatusText(message) ) - # here events are binded twice + # here events are bound twice self._gconsole.Bind( EVT_CMD_RUN, lambda event: self._switchPageHandler( diff --git a/lib/raster/put_row.c b/lib/raster/put_row.c index 578b4a275e3..8a7bb4307c5 100644 --- a/lib/raster/put_row.c +++ b/lib/raster/put_row.c @@ -50,7 +50,7 @@ static void put_raster_row(int, const void *, RASTER_MAP_TYPE, int); updating the range file upon close of the cell file. HOWEVER when nulls are not embedded, the cells are considered 0's as far as updating range is concerned, even if the corresponding cell is null - in the resulting null file, so programmer should be carefult to set + in the resulting null file, so programmer should be careful to set all the null values using Rast_set_null_value() or G_insert_d_null_values() or G_insert_f_null_values(). diff --git a/python/grass/pygrass/vector/table.py b/python/grass/pygrass/vector/table.py index 1dae4ffcab5..ea54af90841 100644 --- a/python/grass/pygrass/vector/table.py +++ b/python/grass/pygrass/vector/table.py @@ -399,7 +399,7 @@ def add(self, col_name, col_type): :param col_name: the name of column to add :type col_name: str - :param col_type: the tipe of column to add + :param col_type: the type of column to add :type col_type: str >>> import sqlite3 diff --git a/python/grass/temporal/gui_support.py b/python/grass/temporal/gui_support.py index 709ec7fe77d..13906882223 100644 --- a/python/grass/temporal/gui_support.py +++ b/python/grass/temporal/gui_support.py @@ -34,7 +34,9 @@ def tlist_grouped(type, group_type: bool = False, dbif=None): ['precipitation', 'temperature'] :param type: element type (strds, str3ds, stvds) - :param group_type: TBD + :param group_type: If True, group results by dataset type within each + mapset (dict of dicts); otherwise return a flat list of dataset names + per mapset (dict of lists). :return: directory of mapsets/elements """ diff --git a/python/grass/temporal/stds_import.py b/python/grass/temporal/stds_import.py index dbc918e44bd..1bcb830b1a7 100644 --- a/python/grass/temporal/stds_import.py +++ b/python/grass/temporal/stds_import.py @@ -10,7 +10,7 @@ output = "temp_1950_2012" directory = "/tmp" title = "My new dataset" - descr = "May new shiny dataset" + descr = "My new shiny dataset" location = None link = True exp = True diff --git a/raster/r.param.scale/close_down.c b/raster/r.param.scale/close_down.c index 4f3a44e105e..e020bca38cc 100644 --- a/raster/r.param.scale/close_down.c +++ b/raster/r.param.scale/close_down.c @@ -76,7 +76,7 @@ void close_down(void) strcpy(map_type, "Longitudinal curvature"); Rast_append_history(&history, "Longitudinal curvature is the profile " "curvature intersecting with the"); - Rast_append_history(&history, "plane defined by the surfacenormal and " + Rast_append_history(&history, "plane defined by the surface normal and " "maximum gradient direction."); break; diff --git a/raster/r.param.scale/interface.c b/raster/r.param.scale/interface.c index 1867cbcc245..52076a97194 100644 --- a/raster/r.param.scale/interface.c +++ b/raster/r.param.scale/interface.c @@ -138,7 +138,7 @@ void interface(int argc, char **argv) nprocs = G_set_omp_num_threads(nprocs_opt); nprocs = Rast_disable_omp_on_mask(nprocs); if (nprocs < 1) - G_fatal_error(_("<%d> is not valid number of nprocs."), nprocs); + G_fatal_error(_("<%d> is not a valid number of nprocs."), nprocs); memory = atoi(mem_opt->answer); constrained = constr->answer; sscanf(expon->answer, "%lf", &exponent); diff --git a/raster/r.sunmask/solpos00.c b/raster/r.sunmask/solpos00.c index 588a967e19b..ccdaa5e87c4 100644 --- a/raster/r.sunmask/solpos00.c +++ b/raster/r.sunmask/solpos00.c @@ -432,7 +432,7 @@ static void geometry(struct posdata *pdat) { float bottom; /* denominator (bottom) of the fraction */ float c2; /* cosine of d2 */ - float cd; /* cosine of the day angle or delination */ + float cd; /* cosine of the day angle or declination */ float d2; /* pdat->dayang times two */ float delta; /* difference between current year and 1949 */ float s2; /* sine of d2 */ diff --git a/raster/r.viewshed/grass.cpp b/raster/r.viewshed/grass.cpp index 5aa0d005fea..34aeb361b61 100644 --- a/raster/r.viewshed/grass.cpp +++ b/raster/r.viewshed/grass.cpp @@ -92,7 +92,7 @@ GridHeader *read_header(char *rastName, Cell_head *region) nrows = Rast_window_rows(); ncols = Rast_window_cols(); - /*check for loss of prescion */ + /*check for loss of precision */ if (nrows <= maxDimension && ncols <= maxDimension) { hd->nrows = (dimensionType)nrows; hd->ncols = (dimensionType)ncols; @@ -866,7 +866,7 @@ void save_io_visibilitygrid_to_GRASS(IOVisibilityGrid *visgrid, char *fname, for (j = 0; j < (dimensionType)ncols; j++) { if (curResult->row == i && curResult->col == j) { - /*cell is recodred in the visibility stream: it must be + /*cell is recorded in the visibility stream: it must be either visible, or NODATA */ if (is_visible(curResult->angle)) writeValue(visrast, j, fun(curResult->angle), type); @@ -991,7 +991,7 @@ void save_io_vis_and_elev_to_GRASS(IOVisibilityGrid *visgrid, char *elevfname, } if (curResult->row == i && curResult->col == j) { - /*cell is recodred in the visibility stream: it must be + /*cell is recorded in the visibility stream: it must be either visible, or NODATA */ if (is_visible(curResult->angle)) writeValue(visrast, j, elev - vp_elev, elev_data_type); diff --git a/scripts/g.extension/g.extension.py b/scripts/g.extension/g.extension.py index 5ab2232adb9..8d644151255 100755 --- a/scripts/g.extension/g.extension.py +++ b/scripts/g.extension/g.extension.py @@ -289,13 +289,13 @@ def _is_git_installed(self): try: gs.call([self._git], stdout=PIPE) except OSError: - gs.fatal(_("Could not found Git. Please install it.")) + gs.fatal(_("Could not find Git. Please install it.")) def __check_permissions(self): """""" # Create working directory if it does not exist self.working_directory.mkdir(parents=True, exist_ok=True) - # Check pemissions in case he workdir existed + # Check permissions in case the workdir exists if not os.access(self.working_directory, os.W_OK): gs.fatal( _("Cannot write to working directory {}.").format( diff --git a/scripts/r.reclass.area/r.reclass.area.html b/scripts/r.reclass.area/r.reclass.area.html index 213b9d523b8..3ba3857d2a1 100644 --- a/scripts/r.reclass.area/r.reclass.area.html +++ b/scripts/r.reclass.area/r.reclass.area.html @@ -77,9 +77,9 @@

SEE ALSO

r.clump, r.reclass, r.stats, -r.stats, -r.stats, -r.stats +v.to.rast, +v.clean, +v.edit

AUTHORS

diff --git a/scripts/r.reclass.area/r.reclass.area.md b/scripts/r.reclass.area/r.reclass.area.md index 612f5af0ec0..202f238aa37 100644 --- a/scripts/r.reclass.area/r.reclass.area.md +++ b/scripts/r.reclass.area/r.reclass.area.md @@ -41,7 +41,7 @@ r.report zipcodes unit=h Extract only areas greater than 2000 ha, NULL otherwise: ```sh -r.reclass.area input=zipcodes output=zipcodes_larger2000ha greater=2000 +r.reclass.area input=zipcodes output=zipcodes_larger2000ha lower=2000 r.report zipcodes_larger2000ha unit=h ``` diff --git a/scripts/r.reclass.area/testsuite/test_r_reclass_area.py b/scripts/r.reclass.area/testsuite/test_r_reclass_area.py index c3a13c34d6c..1ab6485b7a4 100644 --- a/scripts/r.reclass.area/testsuite/test_r_reclass_area.py +++ b/scripts/r.reclass.area/testsuite/test_r_reclass_area.py @@ -221,7 +221,7 @@ def test_rmarea_lower_upper_vector_basins(self) -> None: self.assertVectorFitsTopoInfo( vector=output_map, reference={"areas": 14, "primitives": 82}, - msg=f"Toplogy of output map {output_map} does not match reference.", + msg=f"Topology of output map {output_map} does not match reference.", )