8 files changed, 29 insertions, 39 deletions
diff --git a/doc/releases/v3.6.0.rst b/doc/releases/v3.6.0.rst
index 345c5f18..9868693b 100644
--- a/doc/releases/v3.6.0.rst
+++ b/doc/releases/v3.6.0.rst
@@ -51,7 +51,7 @@ This caused no end of bug reports!
 The new approach is for libtiff to read all tags from TIFF files.  Those that
 aren't recognised as "core tags" (those having an associated ``FIELD_`` value, 
 and place for storage in the :c:struct:`TIFFDirectory` structure) are now read into a 
-dynamic list of extra tags (:c:member:`td_customValues` in :c:struct:`TIFFDirectory`).  When a new
+dynamic list of extra tags (``td_customValues`` in :c:struct:`TIFFDirectory`).  When a new
 tag code is encountered for the first time in a given TIFF file, a new 
 anonymous tag definition is created for the tag in the tag definition list. 
 The type, and some other metadata is worked out from the instance encountered.
@@ -133,7 +133,7 @@ Library changes
 * :file:`libtiff/tif_lzw.c`: fixed so that decoder state isn't allocated till
   :c:func:`LZWSetupDecode`.  Needed to read LZW files in "``r+``" mode.
   
-* :file:`libtiff/tif_dir.c`: fixed up the :c:member:`tif_postdecode` settings responsible
+* :file:`libtiff/tif_dir.c`: fixed up the ``tif_postdecode`` settings responsible
   for byte swapping complex image data.
   
 * :file:`libtiff/tif_open.c`: Removed error if opening a compressed file
@@ -175,11 +175,11 @@ Library changes
   Hacked :file:`tif_jpeg.c` to fetch :c:macro:`TIFFTAG_YCBCRSUBSAMPLING` from the jpeg
   data stream if it isn't present in the tiff tags as per bug :bugzilla-rs:`168`.
 
-* :file:`libtiff/tif_jpeg.c`: Fixed problem with setting of :c:var:`nrows` in
+* :file:`libtiff/tif_jpeg.c`: Fixed problem with setting of ``nrows`` in
   :c:func:`JPEGDecode` as per bug :bugzilla-rs:`129`.
 
 * :file:`libtiff/tif_read.c`, :file:`libtiff/tif_write.c`: :c:func:`TIFFReadScanline` and
-  :c:func:`TIFFWriteScanline` now set :c:member:`tif_row` explicitly in case the codec has
+  :c:func:`TIFFWriteScanline` now set ``tif_row`` explicitly in case the codec has
   fooled with the value as per bug :bugzilla-rs:`129`.
 
 * :file:`libtiff/tif_ojpeg.c`: Major upgrade from Scott.  Details in bug :bugzilla-rs:`156`.
@@ -202,7 +202,7 @@ Library changes
   for correct handling of unconfigured codecs (we should not try to read
   data or to define data size without correct codecs). See bug :bugzilla-rs:`119`.
 
-* :file:`tif_dirread.c`: avoid div-by-zero if :c:var:`rowbytes` is zero in chop func as
+* :file:`tif_dirread.c`: avoid div-by-zero if ``rowbytes`` is zero in chop func as
   per bug :bugzilla-rs:`111`.
 
 * :file:`libtiff/tiff.h`, :file:`libtiff/tif_dir.c`, :file:`libtiff/tif_dir.h`,
@@ -221,7 +221,7 @@ Library changes
 * :file:`libtiff/tif_dir.c`, :file:`libtiff/tif_dir.h`, :file:`libtiff/tif_dirinfo.c`,
   :file:`libtiff/tif_dirread.c`, :file:`libtiff/tif_dirwrite.c`:
   Added routine :c:func:`TIFFDataWidth` for determining
-  :c:enum:`TIFFDataType` sizes instead of working with :c:var:`tiffDataWidth` array
+  :c:enum:`TIFFDataType` sizes instead of working with ``tiffDataWidth`` array
   directly as per bug :bugzilla-rs:`109`.
 
 * :file:`libtiff/tif_dirinfo.c`, :file:`libtiff/tif_dirwrite.c`: Added possibility to
@@ -236,7 +236,7 @@ Library changes
   decodestrip function returns anything not greater than zero as per bug
   :bugzilla-rs:`97`.
 
-* :file:`libtiff/tif_jpeg.c`: fixed computation of :c:var:`segment_width` for
+* :file:`libtiff/tif_jpeg.c`: fixed computation of ``segment_width`` for
   tiled files to avoid error about it not matching the
   ``cinfo.d.image_width`` values ("JPEGPreDecode: Improper JPEG strip/tile
   size.") for ITIFF files.  Apparently the problem was incorporated since
diff --git a/doc/releases/v3.6.1.rst b/doc/releases/v3.6.1.rst
index bb7cbdf4..a849e2fa 100644
--- a/doc/releases/v3.6.1.rst
+++ b/doc/releases/v3.6.1.rst
@@ -127,7 +127,7 @@ Contributed software changes
 ----------------------------
 
 * :file:`contrib/pds/tif_pdsdirread.c`, :file:`contrib/pds/tif_pdsdirwrite.c`:
-  Use :c:func:`TIFFDataWidth` function instead of :c:var:`tiffDataWidth` array.
+  Use :c:func:`TIFFDataWidth` function instead of ``tiffDataWidth[]`` array.
 
 LZW compression kit changes
 ---------------------------
diff --git a/doc/releases/v3.7.0.rst b/doc/releases/v3.7.0.rst
index b04ea491..26a98d72 100644
--- a/doc/releases/v3.7.0.rst
+++ b/doc/releases/v3.7.0.rst
@@ -44,7 +44,7 @@ Library changes
 * Preliminary support for BigTIFF files: now libtiff can
   recognize and reject to open such images. ;-)
 
-* :file:`libtiff/tif_dir.c`: Initialize :c:member:`td_tilewidth` and :c:member:`td_tilelength` fields
+* :file:`libtiff/tif_dir.c`: Initialize ``td_tilewidth`` and ``td_tilelength`` fields
   of the :c:struct:`TIFFDirectory` structure with the 0 instead of -1 to avoid
   confusing integer overflows in :c:func:`TIFFTileRowSize` for striped images.
 
@@ -59,7 +59,7 @@ Library changes
 Tools changes
 -------------
 
-* :file:`tiffcmp.c` (:c:func:`leof`): Renamed from "``eof``" in order to avoid
+* :file:`tiffcmp.c` (``leof()``): Renamed from ``eof()`` in order to avoid
   conflict noticed under MinGW.
 
 * :file:`tiff2pdf.c`: Fixed ``TransferFunction`` tag handling reported
diff --git a/doc/releases/v3.7.1.rst b/doc/releases/v3.7.1.rst
index bf8bffe2..1fed2172 100644
--- a/doc/releases/v3.7.1.rst
+++ b/doc/releases/v3.7.1.rst
@@ -53,25 +53,21 @@ Library changes
   :bugzilla-rs:`713`
 
 * :file:`tif_getimage.c`: Support for multiple-alpha-channelled
-  RGB-images as per bug
-  :bugzilla-rs:`718`
+  RGB-images as per bug :bugzilla-rs:`718`
 
 * :file:`tif_getimage.c`: ``#define A1`` bracketing for clean build on
   SunPro compiler.
 
 * :file:`tif_dirwrite.c`: Always write :c:macro:`TIFFTAG_SUBIFD` using ``LONG`` type
-  as per bugs
-  :bugzilla-rs:`703` and
-  :bugzilla-rs:`704`.
+  as per bugs :bugzilla-rs:`703` and :bugzilla-rs:`704`.
 
-* :file:`tif_win32.c`: Use :c:expr:`char*` strings instead of :c:type:`TCHAR` in windowed
-  mode as per bug
-  :bugzilla-rs:`697`
+* :file:`tif_win32.c`: Use :c:expr:`char*` strings instead of ``TCHAR`` in windowed
+  mode as per bug :bugzilla-rs:`697`
 
 * :file:`tif_dir.c`, :file:`tif_dirread.c`: Remove :c:func:`TIFFReassignTagToIgnore`
   call from the :c:func:`TIFFReadDirectory` function. :c:func:`TIFFReassignTagToIgnore`
-  must be removed in the future, as it was never used properly. As per
-  bug :bugzilla-rs:`692`
+  must be removed in the future, as it was never used properly. As per bug
+  :bugzilla-rs:`692`
 
 * :file:`tif_jpeg.c`: Added a work-around in order to allow
   compilation with the heavily modified version of libjpeg delivered
@@ -115,8 +111,7 @@ Library changes
   :bugzilla-rs:`662`
 
 * :file:`tif_write.c`: Fixed wrong ``if()`` statement in
-  :c:func:`TIFFAppendToStrip` function as per bug
-  :bugzilla-rs:`660`
+  :c:func:`TIFFAppendToStrip` function as per bug :bugzilla-rs:`660`
 
 * :file:`tif_dirinfo.c`: Change definition for ``TIFFTAG_EXTRASAMPLES``
   field. The caller should supply a count when setting this field. As
diff --git a/doc/releases/v3.7.3.rst b/doc/releases/v3.7.3.rst
index 1e4ef5fc..47d3c00b 100644
--- a/doc/releases/v3.7.3.rst
+++ b/doc/releases/v3.7.3.rst
@@ -70,7 +70,7 @@ Library changes
 * :file:`tif_jpeg.c`: Cleanup the codec state depending on :c:macro:`TIFF_CODERSETUP`
   flag (to fix memory leaks).
 
-* :file:`tif_dirwrite.c`: Use :c:member:`tdir_count` when calling
+* :file:`tif_dirwrite.c`: Use ``tdir_count`` when calling
   :c:func:`TIFFCvtNativeToIEEEDouble` in the :c:func:`TIFFWriteDoubleArray` function as
   per bug :bugzilla-rs:`845`
 
diff --git a/doc/releases/v3.8.0.rst b/doc/releases/v3.8.0.rst
index 5ba27287..4a54bdc9 100644
--- a/doc/releases/v3.8.0.rst
+++ b/doc/releases/v3.8.0.rst
@@ -103,29 +103,24 @@ Tools changes
 -------------
 
 * :file:`tiffcp.c`: Added many error reporting messages; fixed integer
-  overflow as per bug
-  :bugzilla-rs:`789`
+  overflow as per bug :bugzilla-rs:`789`
 
 * :file:`tiffcp.c`: Return non-zero status when reading fails.
 
 * :file:`fax2tiff.c`: Properly calculate sizes of temporary arrays
-  as per bug
-  :bugzilla-rs:`943`
+  as per bug :bugzilla-rs:`943`
 
 * :file:`fax2tiff.c`: Added option `-r` to set RowsPerStrip parameter
-  as per bug
-  :bugzilla-rs:`944`
+  as per bug :bugzilla-rs:`944`
 
-* :file:`tiffdump.c`: Fixed :c:var:`typeshift` and :c:var:`typemask` arrays initialization
-  problem as per bug
-  :bugzilla-rs:`946`
+* :file:`tiffdump.c`: Fixed ``typeshift`` and ``typemask`` arrays
+  initialization problem as per bug :bugzilla-rs:`946`
 
 * :file:`bmp2tiff.c`: Fixed possible integer overflow error as per bug
   :bugzilla-rs:`965`
 
 * :file:`tiffsplit.c`: Copy fax related fields over split parts
-  as per bug
-  :bugzilla-rs:`983`
+  as per bug :bugzilla-rs:`983`
 
 * :file:`tiffdump.c`: Fixed crash when reading malformed tags.
 
diff --git a/doc/releases/v3.8.1.rst b/doc/releases/v3.8.1.rst
index e6bd081c..3878788b 100644
--- a/doc/releases/v3.8.1.rst
+++ b/doc/releases/v3.8.1.rst
@@ -111,8 +111,8 @@ Tools changes
 * :file:`ppm2tiff.c`: Added support for PBM files as per bug
   :bugzilla-rs:`1044`
 
-* :file:`tiff2pdf.c`: Functions :c:func:`t2p_sample_rgbaa_to_rgb` and
-  :c:func:`t2p_sample_rgba_to_rgb` was used in place of each other, that was
+* :file:`tiff2pdf.c`: Functions ``t2p_sample_rgbaa_to_rgb()`` and
+  ``t2p_sample_rgba_to_rgb()`` were used in place of each other, that was
   resulted in problems with RGBA images with associated alpha.
   As per bug
   :bugzilla-rs:`1097`
diff --git a/doc/releases/v3.9.0.rst b/doc/releases/v3.9.0.rst
index e256199b..2befcb11 100644
--- a/doc/releases/v3.9.0.rst
+++ b/doc/releases/v3.9.0.rst
@@ -91,7 +91,7 @@ Library changes
 
 * :file:`tif_fax3.c`: fix leak of ``FAXCS`` state (per bug :bugzilla-rs:`1603`).
 
-* :file:`tif_fax3.c`: Make :c:func:`find0span` and :c:func:`find1span` non-inline
+* :file:`tif_fax3.c`: Make ``find0span()`` and ``find1span()`` non-inline
   to make MSVC 6.0 compiler happy.
 
 * :file:`tif_codec.c`: Avoid :c:macro:`NULL` pointer dereferencing for exotic
@@ -189,8 +189,8 @@ Tools changes
 * :file:`tools/tiff2ps.c`: Remove spurious message printed to
   ``stderr``.
 
-* :file:`tools/tiffsplit.c`: fix ``sampleformat`` to be :c:type:`shortv` instead
-  of :c:type:`longv`.
+* :file:`tools/tiffsplit.c`: fix ``sampleformat`` to be ``shortv`` instead
+  of ``longv``.
 
 * :file:`tools/rgb2ycbcr.c`, :file:`tools/tiff2rgba.c`: Applied patch for
   :cve:`2009-2347` libtiff: integer overflows in various