diff --git a/gdal/doc/source/programs/gdal_fillnodata.rst b/gdal/doc/source/programs/gdal_fillnodata.rst
index 93da3cfe8575..c842794d823d 100644
--- a/gdal/doc/source/programs/gdal_fillnodata.rst
+++ b/gdal/doc/source/programs/gdal_fillnodata.rst
@@ -26,7 +26,7 @@ Description
 nodata areas) by interpolating from valid pixels around the edges of the area.
 
 Additional details on the algorithm are available in the
-:c:func:`GDALFillNodata` docs.
+:cpp:func:`GDALFillNodata` docs.
 
 .. option:: -q
 
diff --git a/gdal/doc/source/programs/gdal_sieve.rst b/gdal/doc/source/programs/gdal_sieve.rst
index b0dafc8195df..e645cac29fd6 100644
--- a/gdal/doc/source/programs/gdal_sieve.rst
+++ b/gdal/doc/source/programs/gdal_sieve.rst
@@ -30,4 +30,4 @@ The input dataset is read as integer data which means that floating point
 values are rounded to integers. Re-scaling source data may be necessary in
 some cases (e.g. 32-bit floating point data with min=0 and max=1).
 
-Additional details on the algorithm are available in the :c:func:`GDALSieveFilter` docs.
+Additional details on the algorithm are available in the :cpp:func:`GDALSieveFilter` docs.
diff --git a/gdal/doc/source/programs/vector_common_options.rst b/gdal/doc/source/programs/vector_common_options.rst
index 23855b9cc3af..e5b4078d90bf 100644
--- a/gdal/doc/source/programs/vector_common_options.rst
+++ b/gdal/doc/source/programs/vector_common_options.rst
@@ -15,7 +15,7 @@ All GDAL OGR command line programs support the following common options.
     List all vector formats supported by this GDAL build (read-only and
     read-write) and exit. The format support is indicated as follows:
     ``ro`` is read-only driver; ``rw`` is read or write (i.e. supports
-    :c:func:`CreateCopy`); ``rw+`` is read, write and update (i.e. supports
+    :cpp:func:`CreateCopy`); ``rw+`` is read, write and update (i.e. supports
     Create). A ``v`` is appended for formats supporting virtual IO
     (``/vsimem``, ``/vsigzip``, ``/vsizip``, etc). A ``s`` is appended for
     formats supporting subdatasets.
diff --git a/gdal/doc/source/tutorials/vector_api_tut.rst b/gdal/doc/source/tutorials/vector_api_tut.rst
index 858437823804..1a17e1b7328d 100644
--- a/gdal/doc/source/tutorials/vector_api_tut.rst
+++ b/gdal/doc/source/tutorials/vector_api_tut.rst
@@ -81,8 +81,8 @@ In C :
     }
 
 A GDALDataset can potentially have many layers associated with it.  The
-number of layers available can be queried with :c:func:`GDALDataset::GetLayerCount`
-and individual layers fetched by index using :c:func:`GDALDataset::GetLayer`.
+number of layers available can be queried with :cpp:func:`GDALDataset::GetLayerCount`
+and individual layers fetched by index using :cpp:func:`GDALDataset::GetLayer`.
 However, we will just fetch the layer by name.
 
 In C++ :
@@ -122,7 +122,7 @@ With GDAL 2.3 and C:
 
 If using older GDAL versions, while it isn't strictly necessary in this
 circumstance since we are starting fresh with the layer, it is often wise
-to call :c:func:`OGRLayer::ResetReading` to ensure we are starting at the beginning of
+to call :cpp:func:`OGRLayer::ResetReading` to ensure we are starting at the beginning of
 the layer.  We iterate through all the features in the layer using
 OGRLayer::GetNextFeature().  It will return NULL when we run out of features.
 
@@ -240,7 +240,7 @@ In C :
 
 There are a few more field types than those explicitly handled above, but
 a reasonable representation of them can be fetched with the
-:c:func:`OGRFeature::GetFieldAsString` method.  In fact we could shorten the above
+:cpp:func:`OGRFeature::GetFieldAsString` method.  In fact we could shorten the above
 by using GetFieldAsString() for all the types.
 
 Next we want to extract the geometry from the feature, and write out the point
@@ -289,7 +289,7 @@ In C :
         printf( "no point geometry\n" );
     }
 
-The :c:func:`wkbFlatten` macro is used above to convert the type for a wkbPoint25D
+The :cpp:func:`wkbFlatten` macro is used above to convert the type for a wkbPoint25D
 (a point with a z coordinate) into the base 2D geometry type code (wkbPoint).
 For each 2D geometry type there is a corresponding 2.5D type code.  The 2D
 and 2.5D geometry cases are handled by the same C++ class, so our code will