docs: Move the conformance and the CI docs to a top level Testing section.

They're related subjects, and deserve top level display.

Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5510>

diff --git a/docs/ci/index.rst b/docs/ci/index.rst
index 3ba56beaff2e5885125fd8735c3946bf1ba9c70c..9c34f5090d86a922278ca65c0d1b7e1ad7485fb9 100644 (file)
--- a/docs/ci/index.rst
+++ b/docs/ci/index.rst
@@ -1,5 +1,5 @@
-Continuous Integration & Testing
-================================
+Continuous Integration
+======================
 
 
 GitLab CI

diff --git a/docs/contents.rst b/docs/contents.rst
index f825ba8cbdc2b52d134aea940e74331f59cf6a33..141a6c31fbc016ba64a1cc36cd14d914377edc0c 100644 (file)
--- a/docs/contents.rst
+++ b/docs/contents.rst
@@ -10,7 +10,6 @@
    faq
    relnotes
    thanks
-   conform
 
 .. toctree::
    :maxdepth: 2
@@ -61,13 +60,20 @@
    devinfo
    codingstyle
    submittingpatches
-   ci/index
    releasing
    release-calendar
    sourcedocs
    dispatch
    gallium/index
 
+.. toctree::
+   :maxdepth: 1
+   :caption: Testing
+   :hidden:
+
+   conform
+   ci/index
+
 .. toctree::
    :maxdepth: 1
    :caption: Links