Merge branch 'featrue/remove_esp32-S2_preview_v4.2' into 'release/v4.2'

docs: ESP-IDF v4.2 fully supports ESP32-S2, remove documentation that describe preview support (v4.2) See merge request espressif/esp-idf!11467
espressif · Dec 4, 2020 · c40f259 · c40f259
2 parents 901dce4 + 1f3d858
commit c40f259
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 87 deletions.
diff --git a/docs/conf_common.py b/docs/conf_common.py
@@ -159,8 +159,7 @@
               'api-reference/peripherals/secure_element.rst',
               'hw-reference/esp32/**'] + LEGACY_DOCS
 
-ESP32S2_DOCS = ['esp32s2.rst',
-                'hw-reference/esp32s2/**',
+ESP32S2_DOCS = ['hw-reference/esp32s2/**',
                 'api-guides/ulps2_instruction_set.rst',
                 'api-guides/dfu.rst',
                 'api-reference/peripherals/hmac.rst',

diff --git a/docs/en/esp32s2.rst b/docs/en/esp32s2.rst
diff --git a/docs/en/index.rst b/docs/en/index.rst
@@ -47,7 +47,6 @@ This is the documentation for Espressif IoT Development Framework (`esp-idf <htt
 .. toctree::
    :hidden:
 
-   :esp32s2: ESP32-S2 Preview Support <esp32s2>
    Get Started <get-started/index>
    API Reference <api-reference/index>
    H/W Reference <hw-reference/index>

diff --git a/docs/zh_CN/esp32s2.rst b/docs/zh_CN/esp32s2.rst
diff --git a/docs/zh_CN/index.rst b/docs/zh_CN/index.rst
@@ -50,7 +50,6 @@ ESP-IDF 是 `ESP32 <https://www.espressif.com/zh-hans/products/hardware/esp32/ov
 .. toctree::
    :hidden:
 
-   :esp32s2: ESP32-S2 预览 <esp32s2>
    快速入门 <get-started/index>
    API 参考 <api-reference/index>
    H/W 参考 <hw-reference/index>