envoyproxy · htuch · Apr 22, 2019 · Apr 21, 2019 · Apr 21, 2019 · Apr 21, 2019
diff --git a/api/XDS_PROTOCOL.md b/api/XDS_PROTOCOL.md
diff --git a/api/xds_protocol.rst b/api/xds_protocol.rst
diff --git a/docs/build.sh b/docs/build.sh
@@ -32,6 +32,7 @@ else
 fi
 
 SCRIPT_DIR=$(dirname "$0")
+API_DIR=$(dirname "$dir")/api
 BUILD_DIR=build_docs
 [[ -z "${DOCS_OUTPUT_DIR}" ]] && DOCS_OUTPUT_DIR=generated/docs
 [[ -z "${GENERATED_RST_DIR}" ]] && GENERATED_RST_DIR=generated/rst
@@ -159,6 +160,12 @@ do
   [ -n "${CPROFILE_ENABLED}" ] && cp -f bazel-bin/"${p}".profile "$(dirname "${DEST}")"
 done
 
+mkdir -p ${GENERATED_RST_DIR}/api-docs
+
+cp -f $API_DIR/xds_protocol.rst "${GENERATED_RST_DIR}/api-docs/xds_protocol.rst"
+
+rsync -rav  $API_DIR/diagrams "${GENERATED_RST_DIR}/api-docs"
+
 rsync -av "${SCRIPT_DIR}"/root/ "${SCRIPT_DIR}"/conf.py "${GENERATED_RST_DIR}"
 
 sphinx-build -W --keep-going -b html "${GENERATED_RST_DIR}" "${DOCS_OUTPUT_DIR}"
diff --git a/docs/root/api/api.rst b/docs/root/api/api.rst
@@ -0,0 +1,11 @@
+.. _api:
+
+API 
+===
+
+.. toctree::
+  :glob:
+  :maxdepth: 2
+
+  ../api-v2/api
+  ../api-docs/xds_protocol
diff --git a/docs/root/index.rst b/docs/root/index.rst
@@ -18,5 +18,5 @@ Envoy documentation
   configuration/configuration
   operations/operations
   extending/extending
-  api-v2/api
+  api/api
   faq/overview
diff --git a/docs/root/intro/arch_overview/cluster_manager.rst b/docs/root/intro/arch_overview/cluster_manager.rst
@@ -25,6 +25,8 @@ distribution.
 * Cluster manager :ref:`configuration <config_cluster_manager>`.
 * CDS :ref:`configuration <config_cluster_manager_cds>`.
 
+.. _arch_overview_cluster_warming:
+
 Cluster warming
 ---------------
 

diff --git a/docs/root/intro/intro.rst b/docs/root/intro/intro.rst
@@ -13,3 +13,4 @@ Introduction
   getting_help
   version_history
   deprecated
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@ Introduction
		getting_help
		version_history
		deprecated

Copy link Contributor Author ramaraochavali Apr 22, 2019 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. added this new line to be consistent with all other files