merge

Author: baharmon

content/tutorials/earthworks/basics.qmd

@@ -66,7 +66,7 @@ This tutorial covers:
 This tutorial can be run as a 
 [computational notebook](https://grass-tutorials.osgeo.org/content/tutorials/earthworks/basics.ipynb).
 Learn how to work with notebooks with the tutorial
-[Get started with GRASS & Python in Jupyter Notebooks](./get_started/fast_track_grass_and_python.qmd).
+[Get started with GRASS & Python in Jupyter Notebooks](./../get_started/fast_track_grass_and_python.qmd).
 :::
 
 # Setup
@@ -401,4 +401,8 @@ m.show()
 
 :::
 
-![Contours](images/basics_06.webp)
+<<<<<<< HEAD
+![Contours](images/basics_06.webp)
+=======
+![Contours](images/basics_06.webp)
+>>>>>>> upstream/main

content/tutorials/earthworks/gullies.qmd

@@ -80,7 +80,7 @@ try the landscape evolution model
 This tutorial can be run as a 
 [computational notebook](https://grass-tutorials.osgeo.org/content/tutorials/earthworks/gullies.ipynb).
 Learn how to work with notebooks in the tutorial
-[Get started with GRASS & Python in Jupyter Notebooks](./get_started/fast_track_grass_and_python.qmd).
+[Get started with GRASS & Python in Jupyter Notebooks](./../get_started/fast_track_grass_and_python.qmd).
 :::
 
 # Setup
@@ -355,4 +355,8 @@ m.show()
 
 ![Gullies](images/gullies_03.webp)
 
-![Volumetric change](images/gullies_04.webp)
+<<<<<<< HEAD
+![Volumetric change](images/gullies_04.webp)
+=======
+![Volumetric change](images/gullies_04.webp)
+>>>>>>> upstream/main

content/tutorials/earthworks/levees.qmd

@@ -63,7 +63,7 @@ This tutorial covers:
 This tutorial can be run as a 
 [computational notebook](https://grass-tutorials.osgeo.org/content/tutorials/earthworks/levees.ipynb).
 Learn how to work with notebooks in the tutorial
-[Get started with GRASS & Python in Jupyter Notebooks](./get_started/fast_track_grass_and_python.qmd).
+[Get started with GRASS & Python in Jupyter Notebooks](./../get_started/fast_track_grass_and_python.qmd).
 :::
 
 # Setup
@@ -643,4 +643,8 @@ m.save("images/levees_09.webp")
 
 :::
 
-![Flood simulation](images/levees_09.webp)
+<<<<<<< HEAD
+![Flood simulation](images/levees_09.webp)
+=======
+![Flood simulation](images/levees_09.webp)
+>>>>>>> upstream/main

content/tutorials/earthworks/synthesis.qmd

@@ -72,7 +72,7 @@ Terrain Synthesis
 This tutorial can be run as a 
 [computational notebook](https://grass-tutorials.osgeo.org/content/tutorials/earthworks/synthesis.ipynb).
 Learn how to work with notebooks with the tutorial
-[Get started with GRASS & Python in Jupyter Notebooks](./get_started/fast_track_grass_and_python.qmd).
+[Get started with GRASS & Python in Jupyter Notebooks](./../get_started/fast_track_grass_and_python.qmd).
 :::
 
 # Setup
@@ -440,4 +440,8 @@ m.show()
 
 ![Terrain synthesis](images/synthesis_06.webp)
 
-![Volumetric change](images/synthesis_07.webp)
+<<<<<<< HEAD
+![Volumetric change](images/synthesis_07.webp)
+=======
+![Volumetric change](images/synthesis_07.webp)
+>>>>>>> upstream/main

content/tutorials/map_algebra/basic_map_algebra.qmd

@@ -8,8 +8,9 @@ description: >
   Learn the basics of map algebra in GRASS
   including arithmetic, functions, and logic. 
   Use map algebra to model a landscape.
-thumbnail: images/map_algebra_00.webp
+image: images/map_algebra_01.webp
 links:
+  g_region: "[g.region](https://grass.osgeo.org/grass-stable/manuals/g.region.html)"
   r_mapcalc: "[r.mapcalc](https://grass.osgeo.org/grass-stable/manuals/r.mapcalc.html)"
   r_mapcalc_simple: "[r.mapcalc.simple](https://grass.osgeo.org/grass-stable/manuals/r.mapcalc.simple.html)"
   r_series: "[r.series](https://grass.osgeo.org/grass-stable/manuals/r.series.html)"
@@ -150,7 +151,7 @@ Map algebra operators, functions, and variables in this tutorial
 
 # Setup
 Start a GRASS session in a new project with a Cartesian (XY) coordinate system.
-Use [g.region](https://grass.osgeo.org/grass-stable/manuals/g.region.html)
+Use {{< meta links.g_region >}}
 to set the extent and resolution of the computational region.
 Since we are working in a Cartesian coordinate system,
 we can simply create a region starting at the origin
@@ -285,7 +286,7 @@ Print the rescaled elevation range with
 ```{bash}
 r.mapcalc expression="elevation = fractal / 10"
 r.colors map=elevation color=elevation
-r.info -r map=elevation format=plain
+r.info -r map=elevation
 ```
 ## Python
 ```{python}