NCAS-CMS · sadielbartholomew · Aug 15, 2025 · Aug 13, 2025 · Aug 13, 2025 · Aug 13, 2025
diff --git a/docs/_templates/autosummary/base.rst b/docs/_templates/autosummary/base.rst
@@ -0,0 +1,6 @@
+{{ fullname | escape | underline}}
+
+.. currentmodule:: {{ module }}
+
+.. auto{{ objtype }}:: {{ objname }}
+
diff --git a/docs/_templates/function.rst b/docs/_templates/function.rst
@@ -4,4 +4,4 @@
 .. currentmodule:: cfdm
 .. default-role:: obj
 
-.. autofunction:: {{ fullname }}
+.. autofunction:: {{ objname }}
diff --git a/docs/source/api_reference.rst b/docs/source/api_reference.rst
@@ -11,17 +11,17 @@ Version |release| for version |version| of the CF conventions.
 
 * **Construct classes**
 
-  * :ref:`cfdm.Field <cfdm-Field>`
-  * :ref:`cfdm.Domain <cfdm-Domain>`
-  * :ref:`cfdm.AuxiliaryCoordinate <cfdm-AuxiliaryCoordinate>`
-  * :ref:`cfdm.CellMeasure <cfdm-CellMeasure>`
-  * :ref:`cfdm.CellMethod <cfdm-CellMethod>`
-  * :ref:`cfdm.Coordinatereference <cfdm-Coordinatereference>`
-  * :ref:`cfdm.DimensionCoordinate <cfdm-DimensionCoordinate>`
-  * :ref:`cfdm.DomainAncillary <cfdm-DomainAncillary>`
-  * :ref:`cfdm.DomainAxis <cfdm-DomainAxis>`
-  * :ref:`cfdm.FieldAncillary <cfdm-FieldAncillary>`
-    
+  * :py:class:`cfdm.Field`
+  * :py:class:`cfdm.Domain`
+  * :py:class:`cfdm.AuxiliaryCoordinate`
+  * :py:class:`cfdm.CellMeasure`
+  * :py:class:`cfdm.CellMethod`
+  * :py:class:`cfdm.Coordinatereference`
+  * :py:class:`cfdm.DimensionCoordinate`
+  * :py:class:`cfdm.DomainAncillary`
+  * :py:class:`cfdm.DomainAxis`
+  * :py:class:`cfdm.FieldAncillary`
+
 .. toctree::
    :maxdepth: 2
 

diff --git a/docs/source/class/cfdm.NetCDFIndexer.rst b/docs/source/class/cfdm.NetCDFIndexer.rst
diff --git a/docs/source/class/cfdm.NumpyArray.rst b/docs/source/class/cfdm.NumpyArray.rst
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -69,7 +69,7 @@ def _get_date():
 # -- General configuration ----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = "2.3.1"
+needs_sphinx = "7.0.0"
 
 # rst_prolog = """
 # .. |CF| replace:: """+_get_cf_version()+"""
@@ -96,10 +96,16 @@ def _get_date():
     "sphinxcontrib.spelling",
 ]
 
+
 # Boolean indicating whether to scan all found documents for
 # autosummary directives, and to generate stub pages for each
 # (http://sphinx-doc.org/latest/ext/autosummary.html)
-autosummary_generate = True
+
+# SLB, DH NOTE: we don't want to generate these stubs as they use templates
+# from _templates/autosummary which override our custom sub-section lists
+# in our class/*.rst reference files, which we want to use directly! So this
+# flag setting is crucial.
+autosummary_generate = False
 
 # Both the class’ and the __init__ method’s docstring are concatenated
 # and inserted.
@@ -116,8 +122,6 @@ def _get_date():
 # This value is a list of autodoc directive flags that should be
 # automatically applied to all autodoc
 # directives. (http://sphinx-doc.org/latest/ext/autodoc.html)
-# autodoc_default_flags = [
-#     'members', 'inherited-members', 'show-inheritance']  # deprecated
 autodoc_default_options = {
     "members": True,
     "inherited-members": True,

diff --git a/docs/source/functions.rst b/docs/source/functions.rst
@@ -31,8 +31,8 @@ Mathematical operations
    :toctree: function/
    :template: function.rst
 
-   cf.atol
-   cf.rtol
+   cfdm.atol
+   cfdm.rtol
 
 Resource management
 -------------------
@@ -42,8 +42,8 @@ Resource management
    :toctree: function/
    :template: function.rst
 
-   cf.configuration
-   cf.chunksize
+   cfdm.configuration
+   cfdm.chunksize
 
 Miscellaneous
 -------------

diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -90,9 +90,9 @@ properly, although the defaults are usually sufficient.
 **conda**
 ---------
 
-The cfdm package is in the :ref:`conda-forge
-<https://anaconda.org/conda-forge/cfdm>` conda channel. To install
-cfdm with all of its :ref:`dependencies <Dependencies>` run
+The cfdm package is in the
+`conda-forge <https://anaconda.org/conda-forge/cfdm>`_  conda channel.
+To install cfdm with all of its :ref:`dependencies <Dependencies>` run:
 
 .. code-block:: console
    :caption: *Install with conda.*

diff --git a/docs/source/tutorial.rst b/docs/source/tutorial.rst
@@ -548,8 +548,9 @@ properties may be removed with the `~Field.clear_properties` and
     'standard_name': 'air_temperature',
     'units': 'K'}
 
-All of the methods related to the properties are listed :ref:`here
-<Field-Properties>`.
+
+All of the methods related to the properties are listed
+:ref:`here <Field-Properties>`.
 
 ----
 

diff --git a/release_docs b/release_docs
@@ -10,10 +10,7 @@ fi
 version=`python -c "import cfdm; print(cfdm.__version__)"`
 
 sphinx_version=`python -c "import sphinx; print(sphinx.__version__)"`
-if [[ $sphinx_version != "2.4.5"  ]] ; then
-  echo "ERROR: Must (sadly) use sphinx version 2.4.5. Got $sphinx_version"
-  exit 3
-fi
+echo "NOTE: Using sphinx version: $sphinx_version"
 
 if [[ $1 = "latest" ]] ; then 
   dir=$PWD/docs