2 files changed, 11 insertions, 10 deletions
diff --git a/llvm/docs/Reference.rst b/llvm/docs/Reference.rst
index 882d0dc9ab1..3fbceba1181 100644
--- a/llvm/docs/Reference.rst
+++ b/llvm/docs/Reference.rst
@@ -14,7 +14,6 @@ LLVM and API reference documentation.
    BlockFrequencyTerminology
    BranchWeightMetadata
    Bugpoint
-   CFIVerify
    CommandGuide/index
    Coroutines
    DependenceGraphs/index
@@ -129,9 +128,9 @@ LLVM IR
 :doc:`GlobalISel`
   This describes the prototype instruction selection replacement, GlobalISel.
 
-=======
-Testing
-=======
+=====================
+Testing and Debugging
+=====================
 
 :doc:`LLVM Testing Infrastructure Guide <TestingGuide>`
    A reference manual for using the LLVM testing infrastructure.
@@ -139,6 +138,10 @@ Testing
 :doc:`TestSuiteGuide`
   Describes how to compile and run the test-suite benchmarks.
 
+
+:doc:`GwpAsan`
+  A sampled heap memory error detection toolkit designed for production use.
+
 ====
 XRay
 ====
@@ -184,16 +187,10 @@ Additional Topics
 :doc:`ScudoHardenedAllocator`
   A library that implements a security-hardened `malloc()`.
 
-:doc:`GwpAsan`
-  A sampled heap memory error detection toolkit designed for production use.
-
 :doc:`Dependence Graphs <DependenceGraphs/index>`
   A description of the design of the various dependence graphs such as
   the DDG (Data Dependence Graph).
 
-:doc:`CFIVerify`
-  A description of the verification tool for Control Flow Integrity.
-
 :doc:`SpeculativeLoadHardening`
   A description of the Speculative Load Hardening mitigation for Spectre v1.
 
diff --git a/llvm/docs/UserGuides.rst b/llvm/docs/UserGuides.rst
index abaa98cc9e7..16437783603 100644
--- a/llvm/docs/UserGuides.rst
+++ b/llvm/docs/UserGuides.rst
@@ -19,6 +19,7 @@ intermediate LLVM representation.
    Benchmarking
    BigEndianNEON
    BuildingADistribution
+   CFIVerify
    CMake
    CMakePrimer
    CodeGenerator
@@ -75,6 +76,9 @@ Clang
 :doc:`CoverageMappingFormat`
   This describes the format and encoding used for LLVM’s code coverage mapping.
 
+:doc:`CFIVerify`
+  A description of the verification tool for Control Flow Integrity.
+
 LLVM Builds and Distributions
 -----------------------------