dc-almeida · Nov 12, 2026 · Aug 31, 2026 · Aug 31, 2026 · Aug 31, 2026 · Sep 16, 2026
diff --git a/docs/cli.rst b/docs/cli.rst
@@ -8,8 +8,7 @@ the definitions (i.e., codelists) and model mappings for a project are valid.
 This can be useful to ensure that all yaml files can be parsed correctly
 and that definitions and mappings are internally consistent.
 
-Standard usage
---------------
+.. rubric:: Standard usage
 
 Run the following in a command line to ensure that a project folder is a valid
 configuration for the **nomenclature** package.
@@ -18,9 +17,17 @@ configuration for the **nomenclature** package.
 
   nomenclature validate-project /project/folder/
 
-Documentation
--------------
+.. rubric:: Table of contents
 
-.. click:: nomenclature:cli
-   :prog: nomenclature
-   :nested: full
+.. toctree::
+   :maxdepth: 1
+
+   cli/validate-yaml
+   cli/validate-project
+   cli/check-region-aggregation
+   cli/export-definitions
+   cli/list-missing-variables
+   cli/run-workflow
+   cli/validate-scenarios
+   cli/convert-xlsx-codelist-to-yaml
+   cli/parse-model-registration
diff --git a/docs/cli/check-region-aggregation.rst b/docs/cli/check-region-aggregation.rst
@@ -0,0 +1,7 @@
+Check region aggregation
+========================
+
+.. typer:: nomenclature.cli:app:check-region-aggregation
+   :prog: nomenclature check-region-aggregation
+   :preferred: svg
+   :make-sections:
diff --git a/docs/cli/convert-xlsx-codelist-to-yaml.rst b/docs/cli/convert-xlsx-codelist-to-yaml.rst
@@ -0,0 +1,7 @@
+Convert Excel codelist to YAML
+==============================
+
+.. typer:: nomenclature.cli:app:convert-xlsx-codelist-to-yaml
+   :prog: nomenclature convert-xlsx-codelist-to-yaml
+   :preferred: svg
+   :make-sections:
diff --git a/docs/cli/export-definitions.rst b/docs/cli/export-definitions.rst
@@ -0,0 +1,7 @@
+Export definitions
+==================
+
+.. typer:: nomenclature.cli:app:export-definitions
+   :prog: nomenclature export-definitions
+   :preferred: svg
+   :make-sections:
diff --git a/docs/cli/list-missing-variables.rst b/docs/cli/list-missing-variables.rst
@@ -0,0 +1,7 @@
+List missing variables
+======================
+
+.. typer:: nomenclature.cli:app:list-missing-variables
+   :prog: nomenclature list-missing-variables
+   :preferred: svg
+   :make-sections:
diff --git a/docs/cli/parse-model-registration.rst b/docs/cli/parse-model-registration.rst
@@ -0,0 +1,7 @@
+Parse model registration
+========================
+
+.. typer:: nomenclature.cli:app:parse-model-registration
+   :prog: nomenclature parse-model-registration
+   :preferred: svg
+   :make-sections:
diff --git a/docs/cli/run-workflow.rst b/docs/cli/run-workflow.rst
@@ -0,0 +1,7 @@
+Run workflow
+============
+
+.. typer:: nomenclature.cli:app:run-workflow
+   :prog: nomenclature run-workflow
+   :preferred: svg
+   :make-sections:
diff --git a/docs/cli/validate-project.rst b/docs/cli/validate-project.rst
@@ -0,0 +1,7 @@
+Validate project
+================
+
+.. typer:: nomenclature.cli:app:validate-project
+   :prog: nomenclature validate-project
+   :preferred: svg
+   :make-sections:
diff --git a/docs/cli/validate-scenarios.rst b/docs/cli/validate-scenarios.rst
@@ -0,0 +1,7 @@
+Validate scenarios
+==================
+
+.. typer:: nomenclature.cli:app:validate-scenarios
+   :prog: nomenclature validate-scenarios
+   :preferred: svg
+   :make-sections:
diff --git a/docs/cli/validate-yaml.rst b/docs/cli/validate-yaml.rst
@@ -0,0 +1,7 @@
+Validate YAML
+=============
+
+.. typer:: nomenclature.cli:app:validate-yaml
+   :prog: nomenclature validate-yaml
+   :preferred: svg
+   :make-sections:
diff --git a/docs/conf.py b/docs/conf.py
@@ -11,10 +11,12 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 # import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
 
+import sys
 from datetime import datetime
+from pathlib import Path
+
+sys.path.insert(0, str(Path(__file__).parent.parent))
 
 import nomenclature
 
@@ -40,7 +42,7 @@
     "sphinx.ext.autosummary",
     "sphinx.ext.intersphinx",
     "sphinx.ext.viewcode",
-    "sphinx_click",
+    "sphinxcontrib.typer",
 ]
 
 # Add any paths that contain templates here, relative to this directory.

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -36,8 +36,8 @@ coverage = "^7.3.3"
 ruff = "^0.15.7"
 
 [tool.poetry.group.docs.dependencies]
-sphinx = "^7.2.6"
-sphinx-click = "^5.1.0"
+sphinx = "8.2.3"
+sphinxcontrib-typer = "^0.10"
 numpydoc = "^1.6.0"
 
 [tool.ruff]