From 89e8c2c4defdebca6f0d968ac72d98d6238a73d6 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Fri, 29 Nov 2024 00:12:28 +0100 Subject: [PATCH] manual: fix more broken HTML tags (#4781) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * manual: fix more broken HTML tags In order to obtain a good result when converting the HTML manual pages files to markdown, ideally clean HTML code is used (continuation of #4765). This PR fixes numerous broken HTML tags identified during a test run of [adding HTML validation with super-linter](https://github.com/echoix/grass/pull/303). For reference, see logs showing the errors at https://github.com/echoix/grass/actions/runs/12067630007/job/33651008404?pr=303 Fixes include: - complete selected ncomplete tag pairs (esp. `
  • `) - tabs replaced with white space - `<`, `>`, `&` replaced with their HTML representations * Apply suggestions from code review --------- Co-authored-by: Edouard Choinière <27212526+echoix@users.noreply.github.com> --- db/db.execute/db.execute.html | 2 +- db/drivers/ogr/grass-ogr.html | 2 +- general/g.parser/g.parser.html | 2 +- general/g.proj/g.proj.html | 2 +- gui/wxpython/gmodeler/g.gui.gmodeler.html | 18 +-- imagery/i.evapo.pm/i.evapo.pm.html | 2 +- imagery/imageryintro.html | 8 +- mswindows/external/rbatch/README.html | 2 +- ps/ps.map/ps.map.html | 4 +- .../grass/docs/_templates/oholosidebar.html | 6 +- raster/r.fill.dir/r.fill.dir.html | 2 +- raster/r.geomorphon/r.geomorphon.html | 2 +- raster/r.gwflow/r.gwflow.html | 2 +- raster/r.in.gdal/r.in.gdal.html | 2 +- raster/r.in.lidar/r.in.lidar.html | 4 +- raster/r.in.xyz/r.in.xyz.html | 2 +- .../r.li.edgedensity/r.li.edgedensity.html | 12 +- raster/r.li/r.li.html | 64 +++++----- .../r.li.patchdensity/r.li.patchdensity.html | 2 +- raster/r.profile/r.profile.html | 2 +- .../r.solute.transport.html | 2 +- raster/r.texture/r.texture.html | 2 +- raster/r.thin/r.thin.html | 2 +- raster/r.timestamp/r.timestamp.html | 4 +- raster/r.viewshed/r.viewshed.html | 6 +- raster3d/r3.flow/r3.flow.html | 6 +- raster3d/r3.in.ascii/r3.in.ascii.html | 2 +- raster3d/r3.showdspf/r3.showdspf.html | 6 +- .../r.mapcalc.simple/r.mapcalc.simple.html | 4 +- .../t.rast.accumulate/t.rast.accumulate.html | 110 +++++++++--------- temporal/t.rast.algebra/t.rast.algebra.html | 4 +- temporal/t.vect.algebra/t.vect.algebra.html | 2 +- temporal/temporalintro.html | 16 +-- vector/v.clean/v.clean.html | 2 +- vector/v.label/v.label.html | 6 +- vector/v.normal/v.normal.html | 30 ++--- vector/v.overlay/v.overlay.html | 2 +- vector/v.select/v.select.html | 2 +- vector/v.vect.stats/v.vect.stats.html | 6 +- 39 files changed, 178 insertions(+), 178 deletions(-) diff --git a/db/db.execute/db.execute.html b/db/db.execute/db.execute.html index 8700258b404..b8fcce41d7b 100644 --- a/db/db.execute/db.execute.html +++ b/db/db.execute/db.execute.html @@ -104,7 +104,7 @@

    SEE ALSO

    GRASS SQL interface - +

    AUTHOR

    diff --git a/db/drivers/ogr/grass-ogr.html b/db/drivers/ogr/grass-ogr.html index dbeca085ecf..c573f882288 100644 --- a/db/drivers/ogr/grass-ogr.html +++ b/db/drivers/ogr/grass-ogr.html @@ -7,7 +7,7 @@

    SEE ALSO

    SQL support in GRASS GIS - +

    diff --git a/general/g.parser/g.parser.html b/general/g.parser/g.parser.html index aad91b22ec8..224049b46bb 100644 --- a/general/g.parser/g.parser.html +++ b/general/g.parser/g.parser.html @@ -523,7 +523,7 @@

    Example code for Perl

    if( $ARGV[0] ne '@ARGS_PARSED@' ){ my $arg = ""; - for (my $i=0; $i < @ARGV;$i++) { + for (my $i=0; $i < @ARGV;$i++) { $arg .= " $ARGV[$i] "; } system("$ENV{GISBASE}/bin/g.parser $0 $arg"); diff --git a/general/g.proj/g.proj.html b/general/g.proj/g.proj.html index 310ff2f1d10..b7f4f185af3 100644 --- a/general/g.proj/g.proj.html +++ b/general/g.proj/g.proj.html @@ -137,7 +137,7 @@

    Create projection (PRJ) file

    Create a '.prj' file in ESRI format corresponding to the current project:
    -g.proj -wef > irish_grid.prj
+g.proj -wef > irish_grid.prj

    Read CRS from file

    diff --git a/gui/wxpython/gmodeler/g.gui.gmodeler.html b/gui/wxpython/gmodeler/g.gui.gmodeler.html index 0bf5fa743b0..dae5aefea52 100644 --- a/gui/wxpython/gmodeler/g.gui.gmodeler.html +++ b/gui/wxpython/gmodeler/g.gui.gmodeler.html @@ -107,15 +107,15 @@

    Components of models

    Different model elements are shown in the figures below.
      -
    • (A) raster data: raster -
    • (B) relation: relation -
    • (C) GRASS module: module -
    • (D) loop: loop -
    • (E) database table: db -
    • (F) 3D raster data: raster3D -
    • (G) vector data: vector -
    • (H) disabled GRASS module: module -
    • (I) comment: comment +
    • (A) raster data: raster
      • +
    • (B) relation: relation
      • +
    • (C) GRASS module: module
      • +
    • (D) loop: loop
      • +
    • (E) database table: db
      • +
    • (F) 3D raster data: raster3D
      • +
    • (G) vector data: vector
      • +
    • (H) disabled GRASS module: module
      • +
    • (I) comment: comment
    diff --git a/imagery/i.evapo.pm/i.evapo.pm.html b/imagery/i.evapo.pm/i.evapo.pm.html index 542fe02263f..efa25bfed44 100644 --- a/imagery/i.evapo.pm/i.evapo.pm.html +++ b/imagery/i.evapo.pm/i.evapo.pm.html @@ -46,7 +46,7 @@

    NOTES

    REFERENCES

    [1] Cannata M., 2006. - GIS embedded approach for Free & Open Source Hydrological Modelling. PhD thesis, Department of Geodesy and Geomatics, Polytechnic of Milan, Italy. + GIS embedded approach for Free & Open Source Hydrological Modelling. PhD thesis, Department of Geodesy and Geomatics, Polytechnic of Milan, Italy.

    [2] Allen, R.G., L.S. Pereira, D. Raes, and M. Smith. 1998. Crop Evapotranspiration: Guidelines for computing crop water requirements. diff --git a/imagery/imageryintro.html b/imagery/imageryintro.html index bb5cf97ac0e..a2c11193033 100644 --- a/imagery/imageryintro.html +++ b/imagery/imageryintro.html @@ -76,10 +76,10 @@

    Image processing in general

    As a general rule in GRASS:
    1. Raster/imagery output maps have their bounds and resolution equal - to those of the current region. + to those of the current region.
    2. Raster/imagery input maps are automatically cropped/padded and rescaled (using nearest-neighbor resampling) to match the current - region. + region.
    @@ -207,12 +207,12 @@

    Image classification

  • Combined radiometric/geometric (segmentation based) classification:
  • Object-oriented classification: diff --git a/mswindows/external/rbatch/README.html b/mswindows/external/rbatch/README.html index 104405115b2..71335b5915a 100644 --- a/mswindows/external/rbatch/README.html +++ b/mswindows/external/rbatch/README.html @@ -2,7 +2,7 @@

    Batchfiles

    -Home Page: batchfiles home page. +Home Page: batchfiles home page.

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

    diff --git a/ps/ps.map/ps.map.html b/ps/ps.map/ps.map.html index 6b64fb2ca28..8245e909c21 100644 --- a/ps/ps.map/ps.map.html +++ b/ps/ps.map/ps.map.html @@ -48,7 +48,7 @@

    NOTES

    encoding, for example by using the iconv utility: 
    -iconv -f UTF-8 -t ISO_8859-1 utf_file > iso_file
+iconv -f UTF-8 -t ISO_8859-1 utf_file > iso_file
    @@ -1498,7 +1498,7 @@

    EXAMPLES

    - +

    Figure: Result of for the a simple Wake county terrain and roads example

    diff --git a/python/grass/docs/_templates/oholosidebar.html b/python/grass/docs/_templates/oholosidebar.html index 06dd9dc7540..bebce37732f 100644 --- a/python/grass/docs/_templates/oholosidebar.html +++ b/python/grass/docs/_templates/oholosidebar.html @@ -1,9 +1,9 @@

    - +

    - +

    - +

    diff --git a/raster/r.fill.dir/r.fill.dir.html b/raster/r.fill.dir/r.fill.dir.html index 4433a680187..dfa1bbb413b 100644 --- a/raster/r.fill.dir/r.fill.dir.html +++ b/raster/r.fill.dir/r.fill.dir.html @@ -133,7 +133,7 @@

    EXAMPLES

    r.univar -e elev_lid792_1m_diff # vectorize filled areas (here all fills are of positive value, see r.univar output) -r.mapcalc "elev_lid792_1m_fill_area = if(elev_lid792_1m_diff > 0.0, 1, null() )" +r.mapcalc "elev_lid792_1m_fill_area = if(elev_lid792_1m_diff > 0.0, 1, null() )" r.to.vect input=elev_lid792_1m_fill_area output=elev_lid792_1m_fill_area type=area # generate shaded terrain for better visibility of results diff --git a/raster/r.geomorphon/r.geomorphon.html b/raster/r.geomorphon/r.geomorphon.html index ac23aa85edc..57f744392bd 100644 --- a/raster/r.geomorphon/r.geomorphon.html +++ b/raster/r.geomorphon/r.geomorphon.html @@ -103,7 +103,7 @@

    Forms represented by geomorphons:

    profileformat
    Format of the profile data: "json", "yaml" or "xml".
    -

    NOTE: parameters below are experimental. The usefulness of these parameters are currently under investigation.

    +

    NOTE: parameters below are experimental. The usefulness of these parameters are currently under investigation.

    intensity
    returns average difference between central cell of geomorphon and eight cells in visibility neighbourhood. This parameter shows local (as is visible) exposition/abasement of the form in the terrain.
    diff --git a/raster/r.gwflow/r.gwflow.html b/raster/r.gwflow/r.gwflow.html index 2dbef39f74a..05dbe88d878 100644 --- a/raster/r.gwflow/r.gwflow.html +++ b/raster/r.gwflow/r.gwflow.html @@ -95,7 +95,7 @@

    EXAMPLE

    #now create the input raster maps for confined and unconfined aquifers r.mapcalc expression="phead = if(row() == 1 , 50, 40)" r.mapcalc expression="status = if(row() == 1 , 2, 1)" -r.mapcalc expression="well = if(row() == 20 && col() == 20 , -0.01, 0)" +r.mapcalc expression="well = if(row() == 20 && col() == 20 , -0.01, 0)" r.mapcalc expression="hydcond = 0.00025" r.mapcalc expression="recharge = 0" r.mapcalc expression="top_conf = 20.0" diff --git a/raster/r.in.gdal/r.in.gdal.html b/raster/r.in.gdal/r.in.gdal.html index 5af167a78e0..76de4e4eec5 100644 --- a/raster/r.in.gdal/r.in.gdal.html +++ b/raster/r.in.gdal/r.in.gdal.html @@ -162,7 +162,7 @@

    Support for Ground Control Points

    If the target project does not exist, a new project will be created matching the CRS definition of the GCPs. The target of the output group will be set to the new project, and -i.rectify can now be used without any further +i.rectify can now be used without any further preparation.

    Some satellite images (e.g. NOAA/AVHRR, ENVISAT) can contain hundreds diff --git a/raster/r.in.lidar/r.in.lidar.html b/raster/r.in.lidar/r.in.lidar.html index bc68bf10410..f92ad0485a8 100644 --- a/raster/r.in.lidar/r.in.lidar.html +++ b/raster/r.in.lidar/r.in.lidar.html @@ -554,11 +554,11 @@

    KNOWN ISSUES

  • The "nan" value (as defined in C language) can leak into coeff_var raster maps. Cause is unknown. Possible work-around is: r.null setnull=nan or - r.mapcalc 'no_nan = if(map == map, map, null())'. + r.mapcalc 'no_nan = if(map == map, map, null())'.
  • Only one method can be applied for a single run and multiple map output from a single run (e.g. method=string[,string,...] output=name[,name,...] - or n=string mean=string) is no supported. + or n=string mean=string) is no supported.
    • diff --git a/raster/r.in.xyz/r.in.xyz.html b/raster/r.in.xyz/r.in.xyz.html index bf20fffce88..70103d8e778 100644 --- a/raster/r.in.xyz/r.in.xyz.html +++ b/raster/r.in.xyz/r.in.xyz.html @@ -212,7 +212,7 @@

    Import of x,y,z ASCII into DEM

    diff --git a/raster/r.li/r.li.edgedensity/r.li.edgedensity.html b/raster/r.li/r.li.edgedensity/r.li.edgedensity.html
index 0bcdbd06ef8..a6d55592096 100644
--- a/raster/r.li/r.li.edgedensity/r.li.edgedensity.html
+++ b/raster/r.li/r.li.edgedensity/r.li.edgedensity.html
@@ -3,12 +3,12 @@ 
    DESCRIPTION
    
 r.li.edgedensity calculates:
    
 
    
 
      
-   
    •  the density of all edges of patch type k
-	r.li.edgedensity formula 1
-	, or
-   
    •  the density of all edges in the sampling area if k is
-        not specified,
-	r.li.edgedensity formula 2
+
    •  the density of all edges of patch type k
+r.li.edgedensity formula 1
+, or
      • 
+
    •  the density of all edges in the sampling area if k is
+not specified,
+r.li.edgedensity formula 2
      • 
 
    
 
    with:
 
      
diff --git a/raster/r.li/r.li.html b/raster/r.li/r.li.html
index 9786cba5bd1..a7685ca55ec 100644
--- a/raster/r.li/r.li.html
+++ b/raster/r.li/r.li.html
@@ -61,48 +61,50 @@ 
      EXAMPLES
      
 
 
        
 
      1.  CREATE A NEW CONFIGURATION FILE
-  
          
-  
        1.  run
+
            
+
          1.  run
 
            -  g.gui.rlisetup
-
            2. 
-  
          2.  The main g.gui.rlisetup window is displayed, click on "New"
            3. 
-  
          3.  The new configuration window is now displayed, enter the
            
-	configuration file name (e.g., "my_conf", do not use absolute paths)

            
-
-  Now the new configuration window is displayed.
            
-	Enter the configuration file name (e.g., "my_conf", do not use absolute paths)
            
-	and the name of raster map (e.g., "geology").
            
-	The other fields are not needed for this configuration.
            4. 
-  
          4.  Click on "Setup sampling frame", select "Whole map layer" and click "OK"
            5. 
-  
          5.  Click on "Setup sampling areas", select "Moving window" and click "OK"
            6. 
-  
          6.  Click on "Use keyboard to enter moving window dimension"
            7. 
-  
          7.  Select "Rectangle" and enter 5 in the "height" and "width" fields
            8. 
-  
          8.  Click on "Save settings"
            9. 
-  
          9.  Close the g.gui.rlisetup window
            10. 
-  
          
+g.gui.rlisetup
+
    +
    • +
  • The main g.gui.rlisetup window is displayed, click on "New"
    • +
  • The new configuration window is now displayed, enter the
    +configuration file name (e.g., "my_conf", do not use absolute paths) +

    +Now the new configuration window is displayed.
    +Enter the configuration file name (e.g., "my_conf", do not use absolute paths)
    +and the name of raster map (e.g., "geology").
    +The other fields are not needed for this configuration.
    • +
  • Click on "Setup sampling frame", select "Whole map layer" and click "OK"
    • +
  • Click on "Setup sampling areas", select "Moving window" and click "OK"
    • +
  • Click on "Use keyboard to enter moving window dimension"
    • +
  • Select "Rectangle" and enter 5 in the "height" and "width" fields
    • +
  • Click on "Save settings"
    • +
  • Close the g.gui.rlisetup window
    • +
  • CALCULATE PATCHDENSITY INDEX -
      -
    1. set the region settings to the "geology" raster map: +
        +
      1. set the region settings to the "geology" raster map: 
        -  g.region raster=geology -p
-
        2. - -
      2. run r.li.patchdensity: +g.region raster=geology -p + +
        3. +
      3. run r.li.patchdensity: 
        -  r.li.patchdensity input=geology conf=my_conf out=patchdens
-
        4. -
      +r.li.patchdensity input=geology conf=my_conf out=patchdens + +
      2. +
    • The resulting patch density is stored in "patchdens" raster map. You can verify the result for example with contour lines: 
    -  r.contour in=patchdens out=patchdens step=5
-  d.rast patchdens
-  d.vect -c patchdens
+r.contour in=patchdens out=patchdens step=5
+d.rast patchdens
+d.vect -c patchdens
    Note that if you want to run another index with the same area diff --git a/raster/r.li/r.li.patchdensity/r.li.patchdensity.html b/raster/r.li/r.li.patchdensity/r.li.patchdensity.html index 845617ee3e1..6b69f096131 100644 --- a/raster/r.li/r.li.patchdensity/r.li.patchdensity.html +++ b/raster/r.li/r.li.patchdensity/r.li.patchdensity.html @@ -44,7 +44,7 @@

    EXAMPLES

    g.region raster=landcover.30m -p # extract forested areas: r.category landcover.30m -r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43, 1, null())" +r.mapcalc "forests = if(landcover.30m >= 41 && landcover.30m <= 43, 1, null())" # patch density (7x7 moving window defined in g.gui.rlisetup): r.li.patchdensity forests conf=movwindow7 out=forests_p_dens7 diff --git a/raster/r.profile/r.profile.html b/raster/r.profile/r.profile.html index a0d747559d5..dd45802f783 100644 --- a/raster/r.profile/r.profile.html +++ b/raster/r.profile/r.profile.html @@ -86,7 +86,7 @@

    Extraction of values along profile defined by coordinates (variant 1)

    First create a points file with d.where 

    -d.where > saved.points
+d.where > saved.points
    Then pipe the points file into r.profile diff --git a/raster/r.solute.transport/r.solute.transport.html b/raster/r.solute.transport/r.solute.transport.html index 0046ac48f9f..ff77a35f419 100644 --- a/raster/r.solute.transport/r.solute.transport.html +++ b/raster/r.solute.transport/r.solute.transport.html @@ -108,7 +108,7 @@

    EXAMPLE

    gs.run_command("r.mapcalc", expression="phead = if(col() == 1 , 50, 40)") gs.run_command("r.mapcalc", expression="phead = if(col() ==200 , 45 + row()/40, phead)") gs.run_command("r.mapcalc", expression="status = if(col() == 1 || col() == 200 , 2, 1)") -gs.run_command("r.mapcalc", expression="well = if((row() == 50 && col() == 175) || (row() == 10 && col() == 135) , -0.001, 0)") +gs.run_command("r.mapcalc", expression="well = if((row() == 50 && col() == 175) || (row() == 10 && col() == 135) , -0.001, 0)") gs.run_command("r.mapcalc", expression="hydcond = 0.00005") gs.run_command("r.mapcalc", expression="recharge = 0") gs.run_command("r.mapcalc", expression="top_conf = 20") diff --git a/raster/r.texture/r.texture.html b/raster/r.texture/r.texture.html index e99914b5d23..7b87c2c716a 100644 --- a/raster/r.texture/r.texture.html +++ b/raster/r.texture/r.texture.html @@ -292,7 +292,7 @@

    REFERENCES

  • Haralick, R. (May 1979). Statistical and structural approaches to texture, Proceedings of the IEEE, vol. 67, No.5, pp. 786-804
  • Hall-Beyer, M. (2007). The GLCM Tutorial Home Page - (Grey-Level Co-occurrence Matrix texture measurements). University of Calgary, Canada + (Grey-Level Co-occurrence Matrix texture measurements). University of Calgary, Canada

    • SEE ALSO

    diff --git a/raster/r.thin/r.thin.html b/raster/r.thin/r.thin.html index b36ad3c5887..d62a5308a91 100644 --- a/raster/r.thin/r.thin.html +++ b/raster/r.thin/r.thin.html @@ -71,7 +71,7 @@

    EXAMPLE

    # create flow accumulation map r.watershed elevation=elevation accumulation=accum_50K thresh=50000 # extract streams from flow accumulation map -r.mapcalc "streams_from_flow = if(abs(accum_50K) >> 1000, 1, null())" +r.mapcalc "streams_from_flow = if(abs(accum_50K) > 1000, 1, null())" # skeletonize map r.thin streams_from_flow out=streams_thin diff --git a/raster/r.timestamp/r.timestamp.html b/raster/r.timestamp/r.timestamp.html index 59a73e3edb1..89ba6ea569a 100644 --- a/raster/r.timestamp/r.timestamp.html +++ b/raster/r.timestamp/r.timestamp.html @@ -21,8 +21,8 @@

    TIMESTAMP FORMAT

    There are two types of datetime values:

      -
    • absolute and -
    • relative. +
    • absolute and
      • +
    • relative.
    Absolute values specify exact dates and/or times. Relative values diff --git a/raster/r.viewshed/r.viewshed.html b/raster/r.viewshed/r.viewshed.html index ab8e782122b..cc371b781cf 100644 --- a/raster/r.viewshed/r.viewshed.html +++ b/raster/r.viewshed/r.viewshed.html @@ -161,10 +161,10 @@

    The algorithm

    - +
    - - + + diff --git a/raster3d/r3.flow/r3.flow.html b/raster3d/r3.flow/r3.flow.html index 7a7c60fd21d..5b1fcf26a3f 100644 --- a/raster3d/r3.flow/r3.flow.html +++ b/raster3d/r3.flow/r3.flow.html @@ -54,9 +54,9 @@

    EXAMPLES

    g.region res=25 res3=25 t=100 b=0 n=1000 s=0 w=0 e=1000 -p3 # now create the input raster maps for a confined aquifer -r3.mapcalc expression="phead = if(row() == 1 && depth() == 4, 50, 40)" -r3.mapcalc expression="status = if(row() == 1 && depth() == 4, 2, 1)" -r3.mapcalc expression="well = if(row() == 20 && col() == 20 && depth() == 2, -0.25, 0)" +r3.mapcalc expression="phead = if(row() == 1 && depth() == 4, 50, 40)" +r3.mapcalc expression="status = if(row() == 1 && depth() == 4, 2, 1)" +r3.mapcalc expression="well = if(row() == 20 && col() == 20 && depth() == 2, -0.25, 0)" r3.mapcalc expression="hydcond = 0.00025" r3.mapcalc expression="syield = 0.0001" r.mapcalc expression="recharge = 0.0" diff --git a/raster3d/r3.in.ascii/r3.in.ascii.html b/raster3d/r3.in.ascii/r3.in.ascii.html index 5154feb36d6..6d20844e70c 100644 --- a/raster3d/r3.in.ascii/r3.in.ascii.html +++ b/raster3d/r3.in.ascii/r3.in.ascii.html @@ -17,7 +17,7 @@

    NOTES

    ordering in the ASCII input file:

    -
    [SDF][SDF][SDF][SDF]
    The sweep-line.
    +
    diff --git a/raster3d/r3.showdspf/r3.showdspf.html b/raster3d/r3.showdspf/r3.showdspf.html index cd2b91ecf65..d42bd61494f 100644 --- a/raster3d/r3.showdspf/r3.showdspf.html +++ b/raster3d/r3.showdspf/r3.showdspf.html @@ -72,14 +72,14 @@

    Hints:

    the mouse pointer in the graphics window and drag with the left mouse to rotate the bounding box. To zoom in and out, drag right or left with the middle mouse. When satisfied with the new viewing -position, click with the right mouse. +position, click with the right mouse.
  • To quickly view a series of isosurfaces, enter a series of + or - -characters, i.e. +++++++ +characters, i.e. +++++++
  • Scripts using above commands on separate lines may be directed to r3.showdspf as standard input. -Use the # sign as the first character on a line to indicate a comment. +Use the # sign as the first character on a line to indicate a comment.

    • EXAMPLES

    diff --git a/scripts/r.mapcalc.simple/r.mapcalc.simple.html b/scripts/r.mapcalc.simple/r.mapcalc.simple.html index 81463659120..47481b58836 100644 --- a/scripts/r.mapcalc.simple/r.mapcalc.simple.html +++ b/scripts/r.mapcalc.simple/r.mapcalc.simple.html @@ -28,7 +28,7 @@

    NOTES

  • The input raster map names and the output map raster name are separate from the expression (formula) which uses generic variable names (A, B, C, ...).
    • -
  • The output raster name is not included in the expression. +
  • The output raster name is not included in the expression.
  • The expression is expected to be a single short one liner without the function eval().
    • @@ -47,7 +47,7 @@

    NOTES

  • Option names for each map are just one letter (not amap, etc.).
  • Output option name is output as for other modules (not outfile).
    • -
  • Raster map names can be optionally quoted (the -q flag). +
  • Raster map names can be optionally quoted (the -q flag).
  • There is no expert mode (which was just running r.mapcalc).
  • The expression option is first, so it is possible to diff --git a/temporal/t.rast.accumulate/t.rast.accumulate.html b/temporal/t.rast.accumulate/t.rast.accumulate.html index 09eef592a81..52c37b5e9f0 100644 --- a/temporal/t.rast.accumulate/t.rast.accumulate.html +++ b/temporal/t.rast.accumulate/t.rast.accumulate.html @@ -70,7 +70,7 @@

    EXAMPLE

    # Import the temperature data t.rast.import input=temperature_mean_1990_2000_daily_celsius.tar.gz \ - output=temperature_mean_1990_2000_daily_celsius directory=/tmp + output=temperature_mean_1990_2000_daily_celsius directory=/tmp # We need to set the region correctly g.region -p raster=`t.rast.list input=temperature_mean_1990_2000_daily_celsius column=name | tail -1` @@ -93,9 +93,9 @@

    EXAMPLE

    # a granularity of one day. Base temperature is 10°C, upper limit is 30°C. # Hence the accumulation starts at 10°C and does not accumulate values above 30°C. t.rast.accumulate input="temperature_mean_1990_2000_daily_celsius" \ - output="temperature_mean_1990_2000_daily_celsius_accumulated_10_30" \ - limits="10,30" start="1990-01-01" stop="2000-01-01" cycle="12 months" \ - basename="temp_acc_daily_10_30" method="bedd" + output="temperature_mean_1990_2000_daily_celsius_accumulated_10_30" \ + limits="10,30" start="1990-01-01" stop="2000-01-01" cycle="12 months" \ + basename="temp_acc_daily_10_30" method="bedd" ############################################################################# #### ACCUMULATION PATTERN DETECTION ######################################### @@ -104,18 +104,18 @@

    EXAMPLE

    # First cycle at 325°C - 427°C GDD t.rast.accdetect input=temperature_mean_1990_2000_daily_celsius_accumulated_10_30@PERMANENT \ - occ=leafhopper_occurrence_c1_1990_2000 start="1990-01-01" stop="2000-01-01" \ - cycle="12 months" range=325,427 basename=lh_c1 indicator=leafhopper_indicator_c1_1990_2000 + occ=leafhopper_occurrence_c1_1990_2000 start="1990-01-01" stop="2000-01-01" \ + cycle="12 months" range=325,427 basename=lh_c1 indicator=leafhopper_indicator_c1_1990_2000 # Second cycle at 685°C - 813°C GDD t.rast.accdetect input=temperature_mean_1990_2000_daily_celsius_accumulated_10_30@PERMANENT \ - occ=leafhopper_occurrence_c2_1990_2000 start="1990-01-01" stop="2000-01-01" \ - cycle="12 months" range=685,813 basename=lh_c2 indicator=leafhopper_indicator_c2_1990_2000 + occ=leafhopper_occurrence_c2_1990_2000 start="1990-01-01" stop="2000-01-01" \ + cycle="12 months" range=685,813 basename=lh_c2 indicator=leafhopper_indicator_c2_1990_2000 # Third cycle at 1047°C - 1179°C GDD t.rast.accdetect input=temperature_mean_1990_2000_daily_celsius_accumulated_10_30@PERMANENT \ - occ=leafhopper_occurrence_c3_1990_2000 start="1990-01-01" stop="2000-01-01" \ - cycle="12 months" range=1047,1179 basename=lh_c3 indicator=leafhopper_indicator_c3_1990_2000 + occ=leafhopper_occurrence_c3_1990_2000 start="1990-01-01" stop="2000-01-01" \ + cycle="12 months" range=1047,1179 basename=lh_c3 indicator=leafhopper_indicator_c3_1990_2000 ############################################################################# @@ -124,34 +124,34 @@

    EXAMPLE

    # Extract the areas that have full cycles t.rast.aggregate input=leafhopper_indicator_c1_1990_2000 gran="1 year" \ - output=leafhopper_cycle_1_1990_2000_yearly method=maximum basename=li_c1 + output=leafhopper_cycle_1_1990_2000_yearly method=maximum basename=li_c1 t.rast.mapcalc input=leafhopper_cycle_1_1990_2000_yearly basename=lh_clean_c1 \ - output=leafhopper_cycle_1_1990_2000_yearly_clean \ - expression="if(leafhopper_cycle_1_1990_2000_yearly == 3, 1, null())" + output=leafhopper_cycle_1_1990_2000_yearly_clean \ + expression="if(leafhopper_cycle_1_1990_2000_yearly == 3, 1, null())" t.rast.aggregate input=leafhopper_indicator_c2_1990_2000 gran="1 year" \ - output=leafhopper_cycle_2_1990_2000_yearly method=maximum basename=li_c2 + output=leafhopper_cycle_2_1990_2000_yearly method=maximum basename=li_c2 t.rast.mapcalc input=leafhopper_cycle_2_1990_2000_yearly basename=lh_clean_c2 \ - output=leafhopper_cycle_2_1990_2000_yearly_clean \ - expression="if(leafhopper_cycle_2_1990_2000_yearly == 3, 2, null())" + output=leafhopper_cycle_2_1990_2000_yearly_clean \ + expression="if(leafhopper_cycle_2_1990_2000_yearly == 3, 2, null())" t.rast.aggregate input=leafhopper_indicator_c3_1990_2000 gran="1 year" \ - output=leafhopper_cycle_3_1990_2000_yearly method=maximum basename=li_c3 + output=leafhopper_cycle_3_1990_2000_yearly method=maximum basename=li_c3 t.rast.mapcalc input=leafhopper_cycle_3_1990_2000_yearly basename=lh_clean_c3 \ - output=leafhopper_cycle_3_1990_2000_yearly_clean \ - expression="if(leafhopper_cycle_3_1990_2000_yearly == 3, 3, null())" + output=leafhopper_cycle_3_1990_2000_yearly_clean \ + expression="if(leafhopper_cycle_3_1990_2000_yearly == 3, 3, null())" t.rast.mapcalc input=leafhopper_cycle_1_1990_2000_yearly_clean,leafhopper_cycle_2_1990_2000_yearly_clean,leafhopper_cycle_3_1990_2000_yearly_clean \ - basename=lh_cleann_all_cycles \ - output=leafhopper_all_cycles_1990_2000_yearly_clean \ - expression="if(isnull(leafhopper_cycle_3_1990_2000_yearly_clean), \ - if(isnull(leafhopper_cycle_2_1990_2000_yearly_clean), \ - if(isnull(leafhopper_cycle_1_1990_2000_yearly_clean), \ - null() ,1),2),3)" + basename=lh_cleann_all_cycles \ + output=leafhopper_all_cycles_1990_2000_yearly_clean \ + expression="if(isnull(leafhopper_cycle_3_1990_2000_yearly_clean), \ + if(isnull(leafhopper_cycle_2_1990_2000_yearly_clean), \ + if(isnull(leafhopper_cycle_1_1990_2000_yearly_clean), \ + null() ,1),2),3)" cat > color.table << EOF 3 yellow @@ -170,35 +170,35 @@

    EXAMPLE

    # Extract the duration in days of the first cycle t.rast.aggregate input=leafhopper_occurrence_c1_1990_2000 gran="1 year" \ - output=leafhopper_min_day_c1_1990_2000 method=minimum basename=occ_min_day_c1 + output=leafhopper_min_day_c1_1990_2000 method=minimum basename=occ_min_day_c1 t.rast.aggregate input=leafhopper_occurrence_c1_1990_2000 gran="1 year" \ - output=leafhopper_max_day_c1_1990_2000 method=maximum basename=occ_max_day_c1 + output=leafhopper_max_day_c1_1990_2000 method=maximum basename=occ_max_day_c1 t.rast.mapcalc input=leafhopper_min_day_c1_1990_2000,leafhopper_max_day_c1_1990_2000 \ - basename=occ_duration_c1 \ - output=leafhopper_duration_c1_1990_2000 \ - expression="leafhopper_max_day_c1_1990_2000 - leafhopper_min_day_c1_1990_2000" + basename=occ_duration_c1 \ + output=leafhopper_duration_c1_1990_2000 \ + expression="leafhopper_max_day_c1_1990_2000 - leafhopper_min_day_c1_1990_2000" # Extract the duration in days of the second cycle t.rast.aggregate input=leafhopper_occurrence_c2_1990_2000 gran="1 year" \ - output=leafhopper_min_day_c2_1990_2000 method=minimum basename=occ_min_day_c2 + output=leafhopper_min_day_c2_1990_2000 method=minimum basename=occ_min_day_c2 t.rast.aggregate input=leafhopper_occurrence_c2_1990_2000 gran="1 year" \ - output=leafhopper_max_day_c2_1990_2000 method=maximum basename=occ_max_day_c2 + output=leafhopper_max_day_c2_1990_2000 method=maximum basename=occ_max_day_c2 t.rast.mapcalc input=leafhopper_min_day_c2_1990_2000,leafhopper_max_day_c2_1990_2000 \ - basename=occ_duration_c2 \ - output=leafhopper_duration_c2_1990_2000 \ - expression="leafhopper_max_day_c2_1990_2000 - leafhopper_min_day_c2_1990_2000" + basename=occ_duration_c2 \ + output=leafhopper_duration_c2_1990_2000 \ + expression="leafhopper_max_day_c2_1990_2000 - leafhopper_min_day_c2_1990_2000" # Extract the duration in days of the third cycle t.rast.aggregate input=leafhopper_occurrence_c3_1990_2000 gran="1 year" \ - output=leafhopper_min_day_c3_1990_2000 method=minimum basename=occ_min_day_c3 + output=leafhopper_min_day_c3_1990_2000 method=minimum basename=occ_min_day_c3 t.rast.aggregate input=leafhopper_occurrence_c3_1990_2000 gran="1 year" \ - output=leafhopper_max_day_c3_1990_2000 method=maximum basename=occ_max_day_c3 + output=leafhopper_max_day_c3_1990_2000 method=maximum basename=occ_max_day_c3 t.rast.mapcalc input=leafhopper_min_day_c3_1990_2000,leafhopper_max_day_c3_1990_2000 \ - basename=occ_duration_c3 \ - output=leafhopper_duration_c3_1990_2000 \ - expression="leafhopper_max_day_c3_1990_2000 - leafhopper_min_day_c3_1990_2000" + basename=occ_duration_c3 \ + output=leafhopper_duration_c3_1990_2000 \ + expression="leafhopper_max_day_c3_1990_2000 - leafhopper_min_day_c3_1990_2000" t.rast.colors input=leafhopper_duration_c1_1990_2000 color=rainbow t.rast.colors input=leafhopper_duration_c2_1990_2000 color=rainbow @@ -212,33 +212,33 @@

    EXAMPLE

    # First cycle t.rast.aggregate input=leafhopper_indicator_c1_1990_2000 gran="1 month" \ - output=leafhopper_indi_min_month_c1_1990_2000 method=minimum basename=occ_indi_min_month_c1 + output=leafhopper_indi_min_month_c1_1990_2000 method=minimum basename=occ_indi_min_month_c1 t.rast.aggregate input=leafhopper_indicator_c1_1990_2000 gran="1 month" \ - output=leafhopper_indi_max_month_c1_1990_2000 method=maximum basename=occ_indi_max_month_c1 + output=leafhopper_indi_max_month_c1_1990_2000 method=maximum basename=occ_indi_max_month_c1 t.rast.mapcalc input=leafhopper_indi_min_month_c1_1990_2000,leafhopper_indi_max_month_c1_1990_2000 \ - basename=indicator_monthly_c1 \ - output=leafhopper_monthly_indicator_c1_1990_2000 \ - expression="if(leafhopper_indi_min_month_c1_1990_2000 == 1, 1, if(leafhopper_indi_max_month_c1_1990_2000 == 3, 3, 2))" + basename=indicator_monthly_c1 \ + output=leafhopper_monthly_indicator_c1_1990_2000 \ + expression="if(leafhopper_indi_min_month_c1_1990_2000 == 1, 1, if(leafhopper_indi_max_month_c1_1990_2000 == 3, 3, 2))" # Second cycle t.rast.aggregate input=leafhopper_indicator_c2_1990_2000 gran="1 month" \ - output=leafhopper_indi_min_month_c2_1990_2000 method=minimum basename=occ_indi_min_month_c2 + output=leafhopper_indi_min_month_c2_1990_2000 method=minimum basename=occ_indi_min_month_c2 t.rast.aggregate input=leafhopper_indicator_c2_1990_2000 gran="1 month" \ - output=leafhopper_indi_max_month_c2_1990_2000 method=maximum basename=occ_indi_max_month_c2 + output=leafhopper_indi_max_month_c2_1990_2000 method=maximum basename=occ_indi_max_month_c2 t.rast.mapcalc input=leafhopper_indi_min_month_c2_1990_2000,leafhopper_indi_max_month_c2_1990_2000 \ - basename=indicator_monthly_c2 \ - output=leafhopper_monthly_indicator_c2_1990_2000 \ - expression="if(leafhopper_indi_min_month_c2_1990_2000 == 1, 1, if(leafhopper_indi_max_month_c2_1990_2000 == 3, 3, 2))" + basename=indicator_monthly_c2 \ + output=leafhopper_monthly_indicator_c2_1990_2000 \ + expression="if(leafhopper_indi_min_month_c2_1990_2000 == 1, 1, if(leafhopper_indi_max_month_c2_1990_2000 == 3, 3, 2))" # Third cycle t.rast.aggregate input=leafhopper_indicator_c3_1990_2000 gran="1 month" \ - output=leafhopper_indi_min_month_c3_1990_2000 method=minimum basename=occ_indi_min_month_c3 + output=leafhopper_indi_min_month_c3_1990_2000 method=minimum basename=occ_indi_min_month_c3 t.rast.aggregate input=leafhopper_indicator_c3_1990_2000 gran="1 month" \ - output=leafhopper_indi_max_month_c3_1990_2000 method=maximum basename=occ_indi_max_month_c3 + output=leafhopper_indi_max_month_c3_1990_2000 method=maximum basename=occ_indi_max_month_c3 t.rast.mapcalc input=leafhopper_indi_min_month_c3_1990_2000,leafhopper_indi_max_month_c3_1990_2000 \ - basename=indicator_monthly_c3 \ - output=leafhopper_monthly_indicator_c3_1990_2000 \ - expression="if(leafhopper_indi_min_month_c3_1990_2000 == 1, 1, if(leafhopper_indi_max_month_c3_1990_2000 == 3, 3, 2))" + basename=indicator_monthly_c3 \ + output=leafhopper_monthly_indicator_c3_1990_2000 \ + expression="if(leafhopper_indi_min_month_c3_1990_2000 == 1, 1, if(leafhopper_indi_max_month_c3_1990_2000 == 3, 3, 2))" cat > color.table << EOF 3 red diff --git a/temporal/t.rast.algebra/t.rast.algebra.html b/temporal/t.rast.algebra/t.rast.algebra.html index 27d9489b7dc..1944d63baa3 100644 --- a/temporal/t.rast.algebra/t.rast.algebra.html +++ b/temporal/t.rast.algebra/t.rast.algebra.html @@ -497,7 +497,7 @@

    Sum of space-time raster datasets

    Sum maps from STRDS A with maps from STRDS B which have equal time stamps and are temporally before Jan. 1. 2005 and store them in STRDS D: 
    -D = if(start_date(A) < "2005-01-01", A + B)
+D = if(start_date(A) < "2005-01-01", A + B)
    Create the sum of all maps from STRDS A and B that have equal time stamps @@ -528,7 +528,7 @@

    Selection of raster cells with temporal topology relation

    Same expression with explicit definition of the temporal topology relation and temporal operators: 
    -C = if({equal}, A > 100 && A < 1600 {&&,equal} td(A) > 30, B)
+C = if({equal}, A > 100 && A < 1600 {&&,equal} td(A) > 30, B)

    Conditional computation

    diff --git a/temporal/t.vect.algebra/t.vect.algebra.html b/temporal/t.vect.algebra/t.vect.algebra.html index 3e47fc043e4..89453068a61 100644 --- a/temporal/t.vect.algebra/t.vect.algebra.html +++ b/temporal/t.vect.algebra/t.vect.algebra.html @@ -420,7 +420,7 @@

    Examples:

    temporary before Jan. 1. 2005 and store them in space time dataset D. 
    -D = if(start_date(A) < "2005-01-01", A & B)
+D = if(start_date(A) < "2005-01-01", A & B)
    Buffer all vector points from space time vector dataset A and B with a diff --git a/temporal/temporalintro.html b/temporal/temporalintro.html index f19294b112a..c52b4e2057e 100644 --- a/temporal/temporalintro.html +++ b/temporal/temporalintro.html @@ -262,22 +262,22 @@

    See also

    diff --git a/vector/v.clean/v.clean.html b/vector/v.clean/v.clean.html index f004731bbc8..fcaa9d212c4 100644 --- a/vector/v.clean/v.clean.html +++ b/vector/v.clean/v.clean.html @@ -186,7 +186,7 @@

    Remove small angles between lines at nodes

    • The volume coordinate system and tile layout of the imported voxel map
    -
    +
    tool=rmsa
    diff --git a/vector/v.label/v.label.html b/vector/v.label/v.label.html index 3b42c98bd40..0331e6ff8a9 100644 --- a/vector/v.label/v.label.html +++ b/vector/v.label/v.label.html @@ -104,11 +104,9 @@

    Caution: The following information may be incomplete, out of date, and wrong text color can be specified in one of several ways:
      -
    1. By color name: - -
      +
    2. By color name:
      aqua black blue brown cyan gray green grey indigo -magenta orange purple red violet white yellow +magenta orange purple red violet white yellow
    3. As red, green, blue component values. (0-255)
      for example: 128:100:200
      4. diff --git a/vector/v.normal/v.normal.html b/vector/v.normal/v.normal.html index 327fcdcd5d1..2f40d6171e6 100644 --- a/vector/v.normal/v.normal.html +++ b/vector/v.normal/v.normal.html @@ -9,22 +9,22 @@

      NOTES

      giving an index, ranges of indices, or multiple thereof.
        -
      1. Sample skewness and kurtosis -
      2. Geary's a-statistic and an approximate normal transformation -
      3. Extreme normal deviates -
      4. D'Agostino's D-statistic -
      5. Modified Kuiper V-statistic -
      6. Modified Watson U^2-statistic -
      7. Durbin's Exact Test (modified Kolmogorov) -
      8. Modified Anderson-Darling statistic -
      9. Modified Cramer-Von Mises W^2-statistic -
      10. Kolmogorov-Smirnov D-statistic (modified for normality testing) +
      11. Sample skewness and kurtosis
        12. +
      12. Geary's a-statistic and an approximate normal transformation
        13. +
      13. Extreme normal deviates
        14. +
      14. D'Agostino's D-statistic
        15. +
      15. Modified Kuiper V-statistic
        16. +
      16. Modified Watson U^2-statistic
        17. +
      17. Durbin's Exact Test (modified Kolmogorov)
        18. +
      18. Modified Anderson-Darling statistic
        19. +
      19. Modified Cramer-Von Mises W^2-statistic
        20. +
      20. Kolmogorov-Smirnov D-statistic (modified for normality testing)
      21. Chi-Square test statistic (equal probability classes) and - the number of degrees of freedom -
      22. Shapiro-Wilk W Test -
      23. Weisberg-Binghams W'' (similar to Shapiro-Francia's W') -
      24. Royston's extension of W for large samples -
      25. Kotz Separate-Families Test for Lognormality vs. Normality + the number of degrees of freedom
        26. +
      26. Shapiro-Wilk W Test
        27. +
      27. Weisberg-Binghams W'' (similar to Shapiro-Francia's W')
        28. +
      28. Royston's extension of W for large samples
        29. +
      29. Kotz Separate-Families Test for Lognormality vs. Normality

      EXAMPLE

      diff --git a/vector/v.overlay/v.overlay.html b/vector/v.overlay/v.overlay.html index 1066e8a1145..7069ad58b23 100644 --- a/vector/v.overlay/v.overlay.html +++ b/vector/v.overlay/v.overlay.html @@ -247,7 +247,7 @@

      Lines overlaid with polygons

      GRASS v.overlay: Line to polygon clipping
      - +
      diff --git a/vector/v.select/v.select.html b/vector/v.select/v.select.html index 5d32e2fe2e4..cf799cfe21e 100644 --- a/vector/v.select/v.select.html +++ b/vector/v.select/v.select.html @@ -5,7 +5,7 @@

      DESCRIPTION

      Supported operators (without GEOS; using GRASS' own algorithm):

        -
      • overlap - features partially or completely overlap (GEOS equivalent: intersects) +
      • overlap - features partially or completely overlap (GEOS equivalent: intersects)
      Supported operators (internally using diff --git a/vector/v.vect.stats/v.vect.stats.html b/vector/v.vect.stats/v.vect.stats.html index adc8ee54f77..109519154c5 100644 --- a/vector/v.vect.stats/v.vect.stats.html +++ b/vector/v.vect.stats/v.vect.stats.html @@ -213,17 +213,17 @@

      Point statistics in a hexagonal grid

      d.frame frame=f2 at=50,100,50,100 -c v.colors map=hexagons use=attr column=count color=viridis -d.vect map=hexagons where="count > 0" +d.vect map=hexagons where="count > 0" d.text text="count" at=60,5 size=10 color=black d.frame frame=f3 at=0,50,0,50 -c v.colors map=hexagons use=attr column=average color=viridis -d.vect map=hexagons where="count > 0" +d.vect map=hexagons where="count > 0" d.text text="average" at=60,5 size=10 color=black d.frame frame=f4 at=0,50,50,100 -c v.colors map=hexagons use=attr column=stddev color=viridis -d.vect map=hexagons where="count > 0" +d.vect map=hexagons where="count > 0" d.text text="stddev" at=60,5 size=10 color=black d.mon stop=cairo
      Figure: v.overlay: Line to polygon clipping