aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2020-07-06 21:04:05 -0700
committerMarge Bot <[email protected]>2020-07-08 20:13:11 +0000
commita2ca7e09fe66d8e5a13b46952a265b56f6695206 (patch)
treeb2f0e1d7ab9fa3e4ac3acee71d3d7c7692196c7f /docs
parent9af82b50264698e90d8914e9499d6301f875483a (diff)
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 <[email protected]> Reviewed-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5510>
Diffstat (limited to 'docs')
-rw-r--r--docs/ci/index.rst4
-rw-r--r--docs/contents.rst10
2 files changed, 10 insertions, 4 deletions
diff --git a/docs/ci/index.rst b/docs/ci/index.rst
index 3ba56beaff2..9c34f5090d8 100644
--- 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 f825ba8cbdc..141a6c31fbc 100644
--- a/docs/contents.rst
+++ b/docs/contents.rst
@@ -10,7 +10,6 @@
faq
relnotes
thanks
- conform
.. toctree::
:maxdepth: 2
@@ -61,7 +60,6 @@
devinfo
codingstyle
submittingpatches
- ci/index
releasing
release-calendar
sourcedocs
@@ -70,6 +68,14 @@
.. toctree::
:maxdepth: 1
+ :caption: Testing
+ :hidden:
+
+ conform
+ ci/index
+
+.. toctree::
+ :maxdepth: 1
:caption: Links
:hidden: