diff --git a/imagery/i.gensigset/i.gensigset.html b/imagery/i.gensigset/i.gensigset.html
index 5db3efa5802..68017ceb2c0 100644
--- a/imagery/i.gensigset/i.gensigset.html
+++ b/imagery/i.gensigset/i.gensigset.html
@@ -61,7 +61,7 @@ <h3>Parameters</h3>
 and
 <em><a href="v.to.rast.html">v.to.rast</a></em>,
 or some other import/development process (e.g.,
-<em><a href="v.transects.html">v.transects</a>)</em>
+<em><a href="https://grass.osgeo.org/grass-stable/manuals/addons/v.transects.html">v.transects</a>)</em>
 to define the areas representative of the classes in the image.
 
 <p>
diff --git a/imagery/i.landsat.toar/i.landsat.toar.html b/imagery/i.landsat.toar/i.landsat.toar.html
index 3305c80b7de..7aa3f58346c 100644
--- a/imagery/i.landsat.toar/i.landsat.toar.html
+++ b/imagery/i.landsat.toar/i.landsat.toar.html
@@ -29,7 +29,7 @@ <h2>DESCRIPTION</h2>
 region settings, in order to have the largest possible sample of pixels
 from where to get the darkest one of the scene and perform the DOS
 correction. To limit the results to a custom region, the user is
-advised to clip the results (with <a href="r.clip.html">r.clip</a>, for
+advised to clip the results (with <a href="https://grass.osgeo.org/grass-stable/manuals/addons/r.clip.html">r.clip</a>, for
 instance) or to define the region first, import the images with region
 cropping, and then running the module.
 
diff --git a/imagery/i.ortho.photo/i.ortho.init/i.ortho.init.html b/imagery/i.ortho.photo/i.ortho.init/i.ortho.init.html
index a9e86ab2a0b..f3436ee53d5 100644
--- a/imagery/i.ortho.photo/i.ortho.init/i.ortho.init.html
+++ b/imagery/i.ortho.photo/i.ortho.init/i.ortho.init.html
@@ -16,7 +16,7 @@ <h2>DESCRIPTION</h2>
 include: the (XC,YC,ZC) standard (e.g. UTM) approximate coordinates of the camera exposure
 station; initial roll, pitch, and yaw angles (in degrees) of the cameras
 attitude; and the <em>a priori</em> standard deviations for these
-parameters. During the imagery program, <em>i.photo.rectify</em>, the initial camera
+parameters. During the imagery program, <em>i.ortho.rectify</em>, the initial camera
 exposure station file is used for computation of the ortho-rectification
 parameters.  If no initial camera exposure station file exist, the default
 values are computed from the control points file created in
@@ -107,7 +107,7 @@ <h2>SEE ALSO</h2>
 <a href="i.ortho.elev.html">i.ortho.elev</a>,
 <a href="i.ortho.camera.html">i.ortho.camera</a>,
 <a href="i.ortho.transform.html">i.ortho.transform</a>,
-<a href="i.photo.rectify.html">i.photo.rectify</a>
+<a href="i.ortho.rectify.html">i.ortho.rectify</a>
 </em>
 
 <h2>AUTHOR</h2>
diff --git a/imagery/i.ortho.photo/i.ortho.rectify/i.ortho.rectify.html b/imagery/i.ortho.photo/i.ortho.rectify/i.ortho.rectify.html
index 607e53f70bc..b3ab58925e2 100644
--- a/imagery/i.ortho.photo/i.ortho.rectify/i.ortho.rectify.html
+++ b/imagery/i.ortho.photo/i.ortho.rectify/i.ortho.rectify.html
@@ -1,11 +1,11 @@
 <h2>DESCRIPTION</h2>
 
-<em>i.photo.rectify</em> rectifies an image by using the image to photo
+<em>i.ortho.rectify</em> rectifies an image by using the image to photo
 coordinate transformation matrix created by <a href="g.gui.photo2image.html">g.gui.photo2image</a>
 and the rectification parameters created by <a href="g.gui.image2target.html">g.gui.image2target</a>.
 Rectification is the process by which the geometry of an image is made
 planimetric.  This is accomplished by mapping an image from one coordinate
-system to another. In <em>i.photo.rectify</em> the parameters computed by
+system to another. In <em>i.ortho.rectify</em> the parameters computed by
 <a href="g.gui.photo2image.html">g.gui.photo2image</a> and
 <a href="g.gui.image2target.html">g.gui.image2target</a> are used in equations to
 convert x,y image coordinates to standard map coordinates for each pixel in
@@ -38,7 +38,7 @@ <h2>DESCRIPTION</h2>
 areas with high camera angles may also appear blurred if they are located
 (viewed from the camera position) behind mountain ridges or peaks.
 <p>
-<em>i.photo.rectify</em> can be run directly, specifying options in the
+<em>i.ortho.rectify</em> can be run directly, specifying options in the
 command line or the GUI, or it can be invoked as OPTION 8 through
 <a href="i.ortho.photo.html">i.ortho.photo</a>. If invoked though
 <a href="i.ortho.photo.html">i.ortho.photo</a>, an interactive terminal
@@ -70,7 +70,7 @@ <h4>Interactive mode</h4>
 <p>
 If you choose option 2, you can also specify a desired target resolution.
 <p>
-<em>i.photo.rectify</em> will only rectify that portion of the
+<em>i.ortho.rectify</em> will only rectify that portion of the
 image that occurs within the chosen window.  Only that portion will be
 relocated in the target database. It is therefore important to check the
 current window in the target project if choice number one is selected.
@@ -87,7 +87,7 @@ <h4>Interactive mode</h4>
 </pre>
 <p>
 The last prompt will ask you about the amount of memory to be used by
-<em>i.photo.rectify</em>.
+<em>i.ortho.rectify</em>.
 
 <h2>SEE ALSO</h2>
 
diff --git a/imagery/i.pca/i.pca.html b/imagery/i.pca/i.pca.html
index 6fee184c618..28a4e075298 100644
--- a/imagery/i.pca/i.pca.html
+++ b/imagery/i.pca/i.pca.html
@@ -96,7 +96,7 @@ <h2>SEE ALSO</h2>
 <a href="g.gui.iclass.html">g.gui.iclass</a>,
 <a href="i.fft.html">i.fft</a>,
 <a href="i.ifft.html">i.ifft</a>,
-<a href="m.eigensystem.html">m.eigensystem</a>,
+<a href="https://grass.osgeo.org/grass-stable/manuals/addons/m.eigensystem.html">m.eigensystem</a>,
 <a href="r.covar.html">r.covar</a>,
 <a href="r.mapcalc.html">r.mapcalc</a>
 <p>
diff --git a/raster/r.clump/r.clump.html b/raster/r.clump/r.clump.html
index acf2a88d5f2..b01dc4229b2 100644
--- a/raster/r.clump/r.clump.html
+++ b/raster/r.clump/r.clump.html
@@ -131,7 +131,6 @@ <h3>Fuzzy clumping on Landsat bands</h3>
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="r.average.html">r.average</a>,
 <a href="r.buffer.html">r.buffer</a>,
 <a href="r.distance.html">r.distance</a>,
 <a href="r.grow.html">r.grow</a>,
diff --git a/raster/r.covar/r.covar.html b/raster/r.covar/r.covar.html
index a510bb39c7a..c51087a8ebb 100644
--- a/raster/r.covar/r.covar.html
+++ b/raster/r.covar/r.covar.html
@@ -88,7 +88,7 @@ <h2>SEE ALSO</h2>
 
 <em>
 <a href="i.pca.html">i.pca</a>,
-<a href="m.eigensystem.html">m.eigensystem</a> (Addon),
+<a href="https://grass.osgeo.org/grass-stable/manuals/addons/m.eigensystem.html">m.eigensystem</a> (Addon),
 <a href="r.mapcalc.html">r.mapcalc</a>,
 <a href="r.rescale.html">r.rescale</a>
 </em>
diff --git a/raster/r.fill.stats/r.fill.stats.html b/raster/r.fill.stats/r.fill.stats.html
index c8414796e73..87fb0c045df 100644
--- a/raster/r.fill.stats/r.fill.stats.html
+++ b/raster/r.fill.stats/r.fill.stats.html
@@ -395,10 +395,10 @@ <h3>Lidar point cloud example</h3>
 -->
 
 Inspect the point density and determine the extent of the point cloud
-using the <em><a href="r.in.lidar.html">r.in.lidar</a></em> module:
+using the <em><a href="r.in.pdal.html">r.in.pdal</a></em> module:
 
 <div class="code"><pre>
-r.in.lidar -e input=points.las output=density method=n resolution=5 class_filter=2
+r.in.pdal -e input=points.las output=density method=n resolution=5 class_filter=2
 </pre></div>
 
 Based on the result, set computational region extent and desired
@@ -411,7 +411,7 @@ <h3>Lidar point cloud example</h3>
 Import the point cloud as raster using binning:
 
 <div class="code"><pre>
-r.in.lidar input=points.las output=ground_raw method=mean class_filter=2
+r.in.pdal input=points.las output=ground_raw method=mean class_filter=2
 </pre></div>
 
 Check that there are more non-NULL cells than NULL ("no data") cells:
diff --git a/raster/r.in.xyz/r.in.xyz.html b/raster/r.in.xyz/r.in.xyz.html
index 55c04e74a2d..92591a8c258 100644
--- a/raster/r.in.xyz/r.in.xyz.html
+++ b/raster/r.in.xyz/r.in.xyz.html
@@ -310,7 +310,7 @@ <h2>SEE ALSO</h2>
 <a href="m.proj.html">m.proj</a>,
 <a href="r.fillnulls.html">r.fillnulls</a>,
 <a href="r.in.ascii.html">r.in.ascii</a>,
-<a href="r.in.lidar.html">r.in.lidar</a>,
+<a href="r.in.pdal.html">r.in.pdal</a>,
 <a href="r3.in.xyz.html">r3.in.xyz</a>,
 <a href="r.mapcalc.html">r.mapcalc</a>,
 <a href="r.neighbors.html">r.neighbors</a>,
diff --git a/raster/r.mapcalc/r.mapcalc.html b/raster/r.mapcalc/r.mapcalc.html
index 0f41f42b5db..360c68d05b3 100644
--- a/raster/r.mapcalc/r.mapcalc.html
+++ b/raster/r.mapcalc/r.mapcalc.html
@@ -842,7 +842,7 @@ <h2>SEE ALSO</h2>
 
 <em>
 <a href="g.region.html">g.region</a>,
-<a href="r.bitpattern.html">r.bitpattern</a>,
+<a href="https://grass.osgeo.org/grass-stable/manuals/addons/r.bitpattern.html">r.bitpattern</a>,
 <a href="r.blend.html">r.blend</a>,
 <a href="r.colors.html">r.colors</a>,
 <a href="r.fillnulls.html">r.fillnulls</a>,
diff --git a/scripts/g.download.project/g.download.project.html b/scripts/g.download.project/g.download.project.html
index 7fc469fb0a6..01f354050c5 100644
--- a/scripts/g.download.project/g.download.project.html
+++ b/scripts/g.download.project/g.download.project.html
@@ -38,7 +38,7 @@ <h2>SEE ALSO</h2>
   <a href="g.mapsets.html">g.mapsets</a>,
   <a href="r.proj.html">r.proj</a>,
   <a href="v.proj.html">v.proj</a>,
-  <a href="g.proj.all.html">g.proj.all</a>
+  <a href="https://grass.osgeo.org/grass-stable/manuals/addons/g.proj.all.html">g.proj.all</a>
 </em>
 
 <h2>AUTHOR</h2>
diff --git a/vector/v.decimate/v.decimate.html b/vector/v.decimate/v.decimate.html
index 9f7b0001307..979371f5cc6 100644
--- a/vector/v.decimate/v.decimate.html
+++ b/vector/v.decimate/v.decimate.html
@@ -132,7 +132,7 @@ <h2>SEE ALSO</h2>
 <a href="v.select.html">v.select</a>,
 <a href="v.category.html">v.category</a>,
 <a href="v.build.html">v.build</a>,
-<a href="v.in.lidar.html">v.in.lidar</a>,
+<a href="v.in.pdal.html">v.in.pdal</a>,
 <a href="g.region.html">g.region</a>
 </em>
 
diff --git a/vector/v.lidar.correction/v.lidar.correction.html b/vector/v.lidar.correction/v.lidar.correction.html
index 29d1bab645d..997aa5a2ac0 100644
--- a/vector/v.lidar.correction/v.lidar.correction.html
+++ b/vector/v.lidar.correction/v.lidar.correction.html
@@ -100,7 +100,7 @@ <h2>SEE ALSO</h2>
 <a href="v.lidar.growing.html">v.lidar.growing</a>,
 <a href="v.surf.bspline.html">v.surf.bspline</a>,
 <a href="v.surf.rst.html">v.surf.rst</a>,
-<a href="v.in.lidar.html">v.in.lidar</a>,
+<a href="v.in.pdal.html">v.in.pdal</a>,
 <a href="v.in.ascii.html">v.in.ascii</a>
 </em>
 
diff --git a/vector/v.lidar.edgedetection/v.lidar.edgedetection.html b/vector/v.lidar.edgedetection/v.lidar.edgedetection.html
index 77f0efe6e0b..a8c2a835460 100644
--- a/vector/v.lidar.edgedetection/v.lidar.edgedetection.html
+++ b/vector/v.lidar.edgedetection/v.lidar.edgedetection.html
@@ -79,8 +79,8 @@ <h3>Complete workflow</h3>
 g.region raster=elev_lid792_1m
 
 # import
-v.in.lidar -tr input=points.las output=points
-v.in.lidar -tr input=points.las output=points_first return_filter=first
+v.in.pdal -r input=points.las output=points
+v.in.pdal -r input=points.las output=points_first return_filter=first
 
 # detection
 v.lidar.edgedetection input=points output=edge ew_step=8 ns_step=8 lambda_g=0.5
@@ -153,7 +153,7 @@ <h2>SEE ALSO</h2>
 <a href="v.lidar.correction.html">v.lidar.correction</a>,
 <a href="v.surf.bspline.html">v.surf.bspline</a>,
 <a href="v.surf.rst.html">v.surf.rst</a>,
-<a href="v.in.lidar.html">v.in.lidar</a>,
+<a href="v.in.pdal.html">v.in.pdal</a>,
 <a href="v.in.ascii.html">v.in.ascii</a>
 </em>
 
diff --git a/vector/v.lidar.growing/v.lidar.growing.html b/vector/v.lidar.growing/v.lidar.growing.html
index 58c76c59fb2..ca2c44d28d3 100644
--- a/vector/v.lidar.growing/v.lidar.growing.html
+++ b/vector/v.lidar.growing/v.lidar.growing.html
@@ -78,7 +78,7 @@ <h2>SEE ALSO</h2>
 <a href="v.lidar.correction.html">v.lidar.correction</a>,
 <a href="v.surf.bspline.html">v.surf.bspline</a>,
 <a href="v.surf.rst.html">v.surf.rst</a>,
-<a href="v.in.lidar.html">v.in.lidar</a>,
+<a href="v.in.pdal.html">v.in.pdal</a>,
 <a href="v.in.ascii.html">v.in.ascii</a>
 </em>
 
diff --git a/vector/vectorintro.html b/vector/vectorintro.html
index 4755ee1a0db..684bfd4bbcd 100644
--- a/vector/vectorintro.html
+++ b/vector/vectorintro.html
@@ -371,7 +371,7 @@ <h3>Lidar data processing</h3>
 
 Lidar point clouds (first and last return) are imported from text files
 with <a href="v.in.ascii.html">v.in.ascii</a> or from LAS files with
-<a href="v.in.lidar.html"> v.in.lidar</a>. Both modules recognize the
+<a href="v.in.pdal.html"> v.in.pdal</a>. Both modules recognize the
 -b flag to not build topology. Outlier detection is done with
 <a href="v.outlier.html">v.outlier</a> on both first and last return data.
 Then, with <a href="v.lidar.edgedetection.html">v.lidar.edgedetection</a>,
diff --git a/visualization/ximgview/ximgview.html b/visualization/ximgview/ximgview.html
index 1e07dd7eb38..4ece96b1676 100644
--- a/visualization/ximgview/ximgview.html
+++ b/visualization/ximgview/ximgview.html
@@ -33,7 +33,7 @@ <h2>SEE ALSO</h2>
 <em>
 <a href="pngdriver.html">PNG driver</a>,
 <a href="cairodriver.html">cairo driver</a>,
-<a href="wximgview.html">wximgview</a>
+<a href="wxpyimgview.html">wxpyimgview</a>
 </em>
 <br>
 <em>