diff --git a/docs/en/esp32s2/esp32-s2-devkitc-1/user_guide.rst b/docs/en/esp32s2/esp32-s2-devkitc-1/user_guide.rst
index 6778ada8..5dabb0b3 100644
--- a/docs/en/esp32s2/esp32-s2-devkitc-1/user_guide.rst
+++ b/docs/en/esp32s2/esp32-s2-devkitc-1/user_guide.rst
@@ -116,7 +116,7 @@ The development board has a variety of variants to choose from, as shown in the
    :widths: 41 24 9 8 18
 
    * - Ordering Code
-     - On-board Module [#]_
+     - On-board Module
      - Flash
      - PSRAM
      - Antenna
@@ -134,30 +134,27 @@ The development board has a variety of variants to choose from, as shown in the
      - 8 MB
      - 2 MB
      - External antenna connector
-   * - ESP32-S2-DevKitC-1
-     - ESP32-S2-SOLO
+   * - ESP32-S2-DevKitC-1 (EOL)
+     - ESP32-S2-SOLO (EOL)
      - 4 MB
      - ---
      - PCB on-board antenna
-   * - ESP32-S2-DevKitC-1U
-     - ESP32-S2-SOLO-U
+   * - ESP32-S2-DevKitC-1U (EOL)
+     - ESP32-S2-SOLO-U (EOL)
      - 4 MB
      - ---
      - External antenna connector
-   * - ESP32-S2-DevKitC-1R
-     - ESP32-S2-SOLO
+   * - ESP32-S2-DevKitC-1R (EOL)
+     - ESP32-S2-SOLO (EOL)
      - 4 MB
      - 2 MB
      - PCB on-board antenna
-   * - ESP32-S2-DevKitC-1RU
-     - ESP32-S2-SOLO-U
+   * - ESP32-S2-DevKitC-1RU (EOL)
+     - ESP32-S2-SOLO-U (EOL)
      - 4 MB
      - 2 MB
      - External antenna connector
 
-.. [#] The ESP32-S2-SOLO-2 and ESP32-S2-SOLO-2U modules use chip revision v1.0, and the rest use chip revision v0.0. For more information about chip revisions, please refer to `ESP32-S2 Series SoC Errata`_.
-
-
 Retail Orders
 ^^^^^^^^^^^^^
 
diff --git a/docs/en/esp32s2/esp32-s2-devkitm-1/user_guide.rst b/docs/en/esp32s2/esp32-s2-devkitm-1/user_guide.rst
index 04a6c0bd..552d3199 100644
--- a/docs/en/esp32s2/esp32-s2-devkitm-1/user_guide.rst
+++ b/docs/en/esp32s2/esp32-s2-devkitm-1/user_guide.rst
@@ -48,7 +48,7 @@ The development board has a variety of variants to choose from, as shown in the
    :widths: 41 24 9 8 18
 
    * - Ordering Code
-     - On-board Module [#]_
+     - On-board Module
      - Flash
      - PSRAM
      - Antenna
@@ -66,31 +66,27 @@ The development board has a variety of variants to choose from, as shown in the
      - 4 MB
      - 2 MB
      - External antenna connector
-   * - ESP32-S2-DevKitM-1
-     - ESP32-S2-MINI-1
+   * - ESP32-S2-DevKitM-1 (EOL)
+     - ESP32-S2-MINI-1 (EOL)
      - 4 MB
      - ---
      - PCB on-board antenna
-   * - ESP32-S2-DevKitM-1U
-     - ESP32-S2-MINI-1U
+   * - ESP32-S2-DevKitM-1U (EOL)
+     - ESP32-S2-MINI-1U (EOL)
      - 4 MB
      - ---
      - External antenna connector
-   * - ESP32-S2-DevKitM-1R
-     - ESP32-S2-MINI-1
+   * - ESP32-S2-DevKitM-1R (EOL)
+     - ESP32-S2-MINI-1 (EOL)
      - 4 MB
      - 2 MB
      - PCB on-board antenna
-   * - ESP32-S2-DevKitM-1RU
-     - ESP32-S2-MINI-1U
+   * - ESP32-S2-DevKitM-1RU (EOL)
+     - ESP32-S2-MINI-1U (EOL)
      - 4 MB
      - 2 MB
      - External antenna connector
 
-
-.. [#] The ESP32-S2-MINI-2 and ESP32-S2-MINI-2U modules use chip revision v1.0, and the rest use chip revision v0.0. For more information about chip revisions, please refer to `ESP32-S2 Series SoC Errata`_.
-
-
 Retail Orders
 ^^^^^^^^^^^^^
 
diff --git a/docs/zh_CN/esp32s2/esp32-s2-devkitc-1/user_guide.rst b/docs/zh_CN/esp32s2/esp32-s2-devkitc-1/user_guide.rst
index 3f1712c4..b9cc7326 100644
--- a/docs/zh_CN/esp32s2/esp32-s2-devkitc-1/user_guide.rst
+++ b/docs/zh_CN/esp32s2/esp32-s2-devkitc-1/user_guide.rst
@@ -116,7 +116,7 @@ ESP32-S2-DevKitC-1 是一款入门级开发板,具备完整的 Wi-Fi 功能。
    :widths: 35 25 10 10 20
 
    * - 订购代码
-     - 搭载模组 [#]_
+     - 搭载模组
      - Flash
      - PSRAM
      - 天线
@@ -134,30 +134,35 @@ ESP32-S2-DevKitC-1 是一款入门级开发板,具备完整的 Wi-Fi 功能。
      - 8 MB
      - 2 MB
      - 外部天线连接器
-   * - ESP32-S2-DevKitC-1
+   * - ESP32-S2-DevKitC-1(停产)
      - ESP32-S2-SOLO
+
+       (停产)
      - 4 MB
      - ---
      - PCB 板载天线
-   * - ESP32-S2-DevKitC-1U
+   * - ESP32-S2-DevKitC-1U(停产)
      - ESP32-S2-SOLO-U
+
+       (停产)
      - 4 MB
      - ---
      - 外部天线连接器
-   * - ESP32-S2-DevKitC-1R
+   * - ESP32-S2-DevKitC-1R(停产)
      - ESP32-S2-SOLO
+
+       (停产)
      - 4 MB
      - 2 MB
      - PCB 板载天线
-   * - ESP32-S2-DevKitC-1RU
+   * - ESP32-S2-DevKitC-1RU(停产)
      - ESP32-S2-SOLO-U
+
+       (停产)
      - 4 MB
      - 2 MB
      - 外部天线连接器
 
-.. [#] ESP32-S2-SOLO-2 和 ESP32-S2-SOLO-2U 模组使用 v1.0 版本芯片,其余模组使用 v0.0 版本芯片。更多关于芯片版本的信息,请参考 `《ESP32-S2 系列芯片勘误表》`_。
-
-
 零售订单
 ^^^^^^^^
 
diff --git a/docs/zh_CN/esp32s2/esp32-s2-devkitm-1/user_guide.rst b/docs/zh_CN/esp32s2/esp32-s2-devkitm-1/user_guide.rst
index 45dc88bb..3eb8f9db 100644
--- a/docs/zh_CN/esp32s2/esp32-s2-devkitm-1/user_guide.rst
+++ b/docs/zh_CN/esp32s2/esp32-s2-devkitm-1/user_guide.rst
@@ -48,49 +48,53 @@ ESP32-S2-DevKitM-1 是乐鑫一款入门级开发板。板上模组大部分管
    :widths: 30 30 10 10 20
 
    * - 订购代码
-     - 搭载模组 [#]_
+     - 搭载模组
      - Flash
      - PSRAM
      - 天线
    * - ESP32-S2-DevKitM-1-N4R2
-     - ESP32-S2-MINI-1-2
+     - ESP32-S2-MINI-2
 
        (推荐)
      - 4 MB
      - 2 MB
      - PCB 板载天线
    * - ESP32-S2-DevKitM-1U-N4R2
-     - ESP32-S2-MINI-1-2U
+     - ESP32-S2-MINI-2U
 
        (推荐)
      - 4 MB
      - 2 MB
      - 外部天线连接器
-   * - ESP32-S2-DevKitM-1
+   * - ESP32-S2-DevKitM-1(停产)
      - ESP32-S2-MINI-1
+
+       (停产)
      - 4 MB
      - ---
      - PCB 板载天线
-   * - ESP32-S2-DevKitM-1U
+   * - ESP32-S2-DevKitM-1U(停产)
      - ESP32-S2-MINI-1U
+
+       (停产)
      - 4 MB
      - ---
      - 外部天线连接器
-   * - ESP32-S2-DevKitM-1R
+   * - ESP32-S2-DevKitM-1R(停产)
      - ESP32-S2-MINI-1
+
+       (停产)
      - 4 MB
      - 2 MB
      - PCB 板载天线
-   * - ESP32-S2-DevKitM-1RU
+   * - ESP32-S2-DevKitM-1RU(停产)
      - ESP32-S2-MINI-1U
+
+       (停产)
      - 4 MB
      - 2 MB
      - 外部天线连接器
 
-
-.. [#] ESP32-S2-MINI-2 和 ESP32-S2-MINI-2U 模组使用 v1.0 版本芯片,其余模组使用 v0.0 版本芯片。更多关于芯片版本的信息,请参考 `《ESP32-S2 系列芯片勘误表》`_。
-
-
 零售订单
 ^^^^^^^^