diff --git a/docs/api/storage/nvs_flash.rst b/docs/api/storage/nvs_flash.rst
index e2ac34ada8..00094d8697 100644
--- a/docs/api/storage/nvs_flash.rst
+++ b/docs/api/storage/nvs_flash.rst
@@ -1,11 +1,11 @@
-.. include:: ../../components/nvs_flash/README.rst
+.. include:: ../../../components/nvs_flash/README.rst
 
 Application Example
 -------------------
 
 Two examples are provided in ESP-IDF examples directory:
 
-`07_nvs_rw_value <https://github.com/espressif/esp-idf/blob/master/examples/07_nvs_rw_value/main/nvs_rw_value.c>`_
+`storage/nvs_rw_value <https://github.com/espressif/esp-idf/blob/master/examples/storage/nvs_rw_value/main/nvs_rw_value.c>`_
 
   Demonstrates how to read and write a single integer value using NVS.
 
@@ -13,7 +13,7 @@ Two examples are provided in ESP-IDF examples directory:
 
   Example also shows how to check if read / write operation was successful, or certain value is not initialized in NVS. Diagnostic is provided in plain text to help track program flow and capture any issues on the way.
 
-`08_nvs_rw_blob <https://github.com/espressif/esp-idf/blob/master/examples/08_nvs_rw_blob/main/nvs_rw_blob.c>`_
+`storage/nvs_rw_blob <https://github.com/espressif/esp-idf/blob/master/examples/storage/nvs_rw_blob/main/nvs_rw_blob.c>`_
 
   Demonstrates how to read and write a single integer value and a blob (binary large object) using NVS to preserve them between ESP32 module restarts.
 
diff --git a/docs/api/storage/spi_flash.rst b/docs/api/storage/spi_flash.rst
index 5903c0902d..209b413779 100644
--- a/docs/api/storage/spi_flash.rst
+++ b/docs/api/storage/spi_flash.rst
@@ -1,11 +1,11 @@
-.. include:: ../../components/spi_flash/README.rst
+.. include:: ../../../components/spi_flash/README.rst
 
 Application Example
 -------------------
 
 `Instructions`_
 
-.. _Instructions: template.html
+.. _Instructions: ../template.html
 
 API Reference
 -------------
diff --git a/docs/api/storage/vfs.rst b/docs/api/storage/vfs.rst
index 71550f111c..d4e5d24ab7 100644
--- a/docs/api/storage/vfs.rst
+++ b/docs/api/storage/vfs.rst
@@ -1,9 +1,11 @@
-.. include:: ../../components/vfs/README.rst
+.. include:: ../../../components/vfs/README.rst
 
 Application Example
 -------------------
 
-`Instructions <http://esp-idf.readthedocs.io/en/latest/api/template.html>`_
+`Instructions`_
+
+.. _Instructions: ../template.html
 
 API Reference
 -------------
diff --git a/docs/api/system/log.rst b/docs/api/system/log.rst
index d2f2fcd073..d812740bb2 100644
--- a/docs/api/system/log.rst
+++ b/docs/api/system/log.rst
@@ -1,17 +1,15 @@
-.. include:: ../../components/log/README.rst
+.. include:: ../../../components/log/README.rst
 
 Application Example
 -------------------
 
 `Instructions`_
 
+.. _Instructions: ../template.html
+
 API Reference
 -------------
 
-`Instructions`_
-
-.. _Instructions: template.html
-
 Header Files
 ^^^^^^^^^^^^
 
diff --git a/docs/ulp.rst b/docs/ulp.rst
index 9db42e633e..4ee6ed7a2f 100644
--- a/docs/ulp.rst
+++ b/docs/ulp.rst
@@ -1 +1 @@
-.. include:: ../../components/ulp/README.rst
+.. include:: ../components/ulp/README.rst