diff --git a/docs/getting_started/build-options.rst b/docs/getting_started/build-options.rst
index ecb32c1..03fa3c1 100644
--- a/docs/getting_started/build-options.rst
+++ b/docs/getting_started/build-options.rst
@@ -100,19 +100,25 @@
 
 8. Perform a Cppcheck static analysis:
 
+Refer to :ref:`Cppcheck Application Note` for details on installing and running cppcheck
+static analysis.
+
 .. code-block:: bash
 
     cmake -DRMM_CONFIG=fvp_defcfg -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -S ${RMM_SOURCE_DIR} -B ${RMM_BUILD_DIR}
     cmake --build ${RMM_BUILD_DIR} -- cppcheck
-    cat ${BUILD_DIR}/tools/cppcheck/cppcheck.xml
+    cat ${RMM_BUILD_DIR}/tools/cppcheck/cppcheck.xml
 
 9. Perform a Cppcheck static analysis with MISRA:
 
+Refer to :ref:`Cppcheck Application Note` for details on installing and running cppcheck
+static analysis.
+
 .. code-block:: bash
 
     cmake -DRMM_CONFIG=fvp_defcfg -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -S ${RMM_SOURCE_DIR} -B ${RMM_BUILD_DIR}
     cmake --build ${RMM_BUILD_DIR} -- cppcheck-misra
-    cat ${BUILD_DIR}/tools/cppcheck/cppcheck_misra.xml
+    cat ${RMM_BUILD_DIR}/tools/cppcheck/cppcheck_misra.xml
 
 10. Perform a checkpatch analysis:
 
@@ -244,6 +250,8 @@
     cmake -DRMM_CONFIG=host_defcfg -DHOST_VARIANT=host_cbmc -S ${RMM_SOURCE_DIR} -B ${RMM_BUILD_DIR}
     cmake --build ${RMM_BUILD_DIR} -- cbmc-coverage cbmc-analysis cbmc-assert
 
+Refer to :ref:`CBMC` Application Note for details on installing and running CBMC.
+
 .. _build_options_table:
 
 ###################
diff --git a/docs/getting_started/getting-started.rst b/docs/getting_started/getting-started.rst
index b8c8f87..367b1d6 100644
--- a/docs/getting_started/getting-started.rst
+++ b/docs/getting_started/getting-started.rst
@@ -1,6 +1,8 @@
 .. SPDX-License-Identifier: BSD-3-Clause
 .. SPDX-FileCopyrightText: Copyright TF-RMM Contributors.
 
+.. _getting_started:
+
 #############
 Prerequisite
 #############
@@ -28,12 +30,12 @@
 arm64/AArch64 Ubuntu and other Linux distributions should also work fine,
 provided that the necessary tools and libraries can be installed.
 
+.. _tool_dependencies:
+
 ##########################
 Tool & Dependency overview
 ##########################
 
-.. _tool_dependencies:
-
 The following tools are required to obtain and build |RMM|:
 
 .. csv-table:: Tool dependencies
@@ -53,7 +55,7 @@
    "docutils",">v2.38.0","Documentation"
    "gcovr",">=v4.2","Tools(Coverage analysis)"
    "CBMC",">=5.84.0","Tools(CBMC analysis)"
-   "CPPcheck",">=2.13.4","Tools(CPPcheck)"
+   "Cppcheck",">=2.13.4","Tools(Cppcheck)"
 
 .. _getting_started_toolchain:
 
@@ -159,7 +161,7 @@
 
 On Ubuntu, ``gcovr`` tool can be installed in two different ways:
 
-Using the pagckage manager:
+Using the package manager:
 
 .. code-block:: bash
 
@@ -209,6 +211,9 @@
 You can read more about Git hooks in the *githooks* page of the `Git hooks
 documentation`_.
 
+General contribution guidelines for contributors can be found in
+:ref:`Contributor's Guide`.
+
 #################################
 Install Cppcheck and dependencies
 #################################
@@ -218,7 +223,7 @@
     The installation of Cppcheck is an optional step. This is required only
     if using the Cppcheck static analysis.
 
-The recommended version of Cppcheck is indicated :ref:`above<tool_dependencies>`.
+The recommended version of Cppcheck is indicated in :ref:`tool_dependencies`.
 See :ref:`Cppcheck Application Note` for installation steps and details
 on how to use it within RMM build system.
 
@@ -235,6 +240,23 @@
 website https://www.cprover.org/cbmc/ or from the official github
 https://github.com/diffblue/cbmc
 
+Refer to :ref:`CBMC` Application Notes for details on installation and
+running CBMC analysis on TF-RMM sources.
+
+##################
+Install Clang-tidy
+##################
+
+Clang-tidy is included in LLVM release package. It can also be installed via
+package manager :
+
+.. code-block:: bash
+
+    sudo apt-get install clang-tidy
+
+Note that the ``RMM_TOOLCHAIN`` needs to be set to `llvm` to run clang-tidy
+build targets from RMM build system.
+
 ###########################
 Performing an Initial Build
 ###########################