6 files changed, 36 insertions, 17 deletions
diff --git a/docs/infrastructure/ci.rst b/docs/infrastructure/ci.rst
index 97429a505..9cc6f7710 100644
--- a/docs/infrastructure/ci.rst
+++ b/docs/infrastructure/ci.rst
@@ -8,6 +8,8 @@
 Continuous Integration - CI
 ===========================
 
+NOTE: This section will be updated following migration to GitLab CI.
+
 Please see the details of CI from the chapters below.
 
 - :ref:`CI Overview <releng:ci-overview>`
diff --git a/docs/infrastructure/overview.rst b/docs/infrastructure/overview.rst
index 3b15c0ec3..b449b6073 100644
--- a/docs/infrastructure/overview.rst
+++ b/docs/infrastructure/overview.rst
@@ -4,6 +4,8 @@
 .. SPDX-License-Identifier: CC-BY-4.0
 .. (c) Open Platform for NFV Project, Inc. and its contributors
 
+NOTE: This document will be updated during the Anuket Lakelse Release.
+
 =======================
 Infrastructure Overview
 =======================
diff --git a/docs/infrastructure/xci.rst b/docs/infrastructure/xci.rst
index fe4eaf9de..435b010ab 100644
--- a/docs/infrastructure/xci.rst
+++ b/docs/infrastructure/xci.rst
@@ -8,9 +8,10 @@
 Cross Community Continuous Integration - XCI
 ============================================
 
-Please see the details of XCI from the chapters below.
+XCI is not an Anuket Infrastructure project.
+
+However, some details about XCI are in the chapters below.
 
 - :ref:`XCI Overview <xci-overview>`
-- :ref:`XCI Way of Working <xci-wow>`
 - :ref:`XCI Sandbox and User Guide <xci-user-guide>`
-- :ref:`XCI Developer Guide <xci-developer-guide>`
+
diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst
index 54b0798a8..b4fe68421 100644
--- a/docs/release/installation.introduction.rst
+++ b/docs/release/installation.introduction.rst
@@ -20,18 +20,28 @@ Each of the test Frameworks and other projects will have separate installations
 
 - :ref:`Airship Installation Guide <airship-installation>`
 - :ref:`Barometer Installation Guide <barometer-installation>`
-- :ref:`CIRV Installation Guide <cirv-installation>`
+- :ref:`CIRV-SDV Installation Guide <cirv-sdv-installation>`
 - :ref:`Kuberef Installation Guide <kuberef-installation>`
 - :ref:`ViNePERF installation Guide <vineperf-installation>`
 
+*   :doc:`Functest Installation Guide <functest:testing/user/configguide/index>`
+
 
 Anuket Test Frameworks
 ======================
 
-If you have elected to install the Anuket platform using the deployment toolchain provided by Anuket,
-your system will have been validated once the installation is completed.
-The basic deployment validation only addresses a small part of capabilities in
-the platform and you may want to execute more exhaustive tests. Some investigation will be required to
+If you have elected to install using the Anuket Kali Release toolchain,
+you can begin to test once the installation is completed.
+The basic deployment validation only addresses some of the capabilities in
+any platform and you may want to execute more exhaustive tests. Some investigation will be required to
 select the right test suites to run on your platform.
 
 Many of the Anuket test projects provide user-guide documentation and installation instructions in :ref:`this document <testing-userguide>`
+
+Anuket Reference Specifications
+===============================
+
+There is no need to "install" the Anuket Reference Specifications! You can view them here:
+
+.. *    :doc:`Anuket Reference Specifications <cntt-cntt:/index>`
+*    `Anuket Reference Specifications <https://cntt.readthedocs.io/en/stable-kali/index.html>`_
diff --git a/docs/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst
index d3a93deb1..21deb9004 100644
--- a/docs/release/userguide.introduction.rst
+++ b/docs/release/userguide.introduction.rst
@@ -51,12 +51,15 @@ Anuket wiki page at http://wiki.anuket.io for more details.
 Feature Configuration Guides
 ============================
 
-- :ref:`AIRSHIP Configuration Guide <airship-configguide>`
+- :ref:`AIRSHIP Configuration Guide <airship-installation>`
 - :ref:`Barometer Configuration Guide <barometer-configguide>`
-- :ref:`CIRV Configuration Guide <cirv-configguide>`
+- :ref:`CIRV-SDV Configuration Guide <cirv-sdv-configguide>`
 - :ref:`Kuberef Configuration Guide <kuberef-configguide>`
 - :ref:`ViNePERF Configuration Guide <vineperf-configguide>`
 
+*   :doc:`Functest Installation Guide <functest:testing/user/configguide/index>`
+
+
 
 
 Feature User Guides
@@ -64,10 +67,10 @@ Feature User Guides
 
 - :ref:`AIRSHIP User Guide <airship-userguide>`
 - :ref:`Barometer User Guide <barometer-userguide>`
-- :ref:`CIRV User Guide <cirv-userguide>`
+- :ref:`CIRV-SDV User Guide <cirv-sdv-userguide>`
 - :ref:`Kuberef User Guide <kuberef-userguide>`
 - :ref:`ViNePERF User Guide <vineperf-userguide>`
 
-
-* :doc:`ViNePERF Configuration and User Guide <vineperf:testing/user/configguide/index>`
+*   :doc:`ViNePERF Configuration and User Guide <vineperf:testing/user/configguide/index>`
+*   :doc:`Functest User Guide <functest:testing/user/userguide/index>`
 
diff --git a/docs/testing/testing-user.rst b/docs/testing/testing-user.rst
index 703a3ef7b..da626a1f3 100644
--- a/docs/testing/testing-user.rst
+++ b/docs/testing/testing-user.rst
@@ -10,14 +10,15 @@ Testing User Guides
 This page provides the links to the installation, configuration and user guides
 of the different test projects.
 
-Dovetail / OPNFV Verified Program
----------------------------------
+OPNFV Verified Program --> Anuket Assured Program
+-------------------------------------------------
 .. toctree::
    :maxdepth: 1
 
-* OVP releases on a separate schedule from the rest of OPNFV.  You may find
+* OVP releases were on a separate schedule from  OPNFV.  You may find
   the current status and latest documentation for OVP at
-  `<http://verified.opnfv.org>`_.
+  `<http://verified.opnfv.org>`_. The next incarnation of OVP will be the 
+  Anuket Assured Program.
 
 Functest
 --------