diff --git a/docs/_static/esp32-s2-devkitm-1-v1-block-diagram.png b/docs/_static/esp32-s2-devkitm-1-v1-block-diagram.png
index 8219120531..5cdeade382 100644
Binary files a/docs/_static/esp32-s2-devkitm-1-v1-block-diagram.png and b/docs/_static/esp32-s2-devkitm-1-v1-block-diagram.png differ
diff --git a/docs/en/get-started/index.rst b/docs/en/get-started/index.rst
index 950af44d9a..90ba95231b 100644
--- a/docs/en/get-started/index.rst
+++ b/docs/en/get-started/index.rst
@@ -97,7 +97,7 @@ If you have one of {IDF_TARGET_NAME} official development boards listed below, y
         :maxdepth: 1
 
         ESP32-S2-Saola-1 <../hw-reference/esp32s2/user-guide-saola-1-v1.2>
-        ESP32-S2-DevKitM-1(U) <../hw-reference/esp32s2/user-guide-devkitm-1-v1>
+        ESP32-S2-DevKitM-1 <../hw-reference/esp32s2/user-guide-devkitm-1-v1>
         ESP32-S2-DevKitC-1 <../hw-reference/esp32s2/user-guide-s2-devkitc-1>
         ESP32-S2-Kaluga-Kit <../hw-reference/esp32s2/user-guide-esp32-s2-kaluga-1-kit>
 
diff --git a/docs/en/hw-reference/esp32s2/user-guide-devkitm-1-v1.rst b/docs/en/hw-reference/esp32s2/user-guide-devkitm-1-v1.rst
index f135f0babd..a4b04ccef5 100644
--- a/docs/en/hw-reference/esp32s2/user-guide-devkitm-1-v1.rst
+++ b/docs/en/hw-reference/esp32s2/user-guide-devkitm-1-v1.rst
@@ -1,14 +1,12 @@
-=====================
-ESP32-S2-DevKitM-1(U)
-=====================
+==================
+ESP32-S2-DevKitM-1
+==================
 
 :link_to_translation:`zh_CN:[中文]`
 
-This user guide provides information on Espressif's small-sized development board ESP32-S2-DevKitM-1(U).
+This user guide provides information on Espressif's small-sized development board ESP32-S2-DevKitM-1.
 
-ESP32-S2-DevKitM-1(U) is a general-purpose development board based on `ESP32-S2FH4 <https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_en.pdf>`__ chip, which falls into ESP32-S2 chip series. With a rich peripheral set and optimized pinout, this board allows rapid prototyping.
-
-ESP32-S2-DevKitM-1 is embedded with `ESP32-S2-MINI-1 <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-1_esp32-s2-mini-1u_datasheet_en.pdf>`__ module (on-board PCB antenna), while ESP32-S2-DevKitM-1U with `ESP32-S2-MINI-1U <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-1_esp32-s2-mini-1u_datasheet_en.pdf>`__ module (external antenna connector).
+ESP32-S2-DevKitM-1 is entry-level development board. Most of the I/O pins on the module are broken out to the pin headers on both sides for easy interfacing. Developers can either connect peripherals with jumper wires or mount ESP32-S2-DevKitM-1 on a breadboard.
 
 +----------------------+-----------------------+
 | |ESP32-S2-DevKitM-1| | |ESP32-S2-DevKitM-1U| |
@@ -22,32 +20,80 @@ ESP32-S2-DevKitM-1 is embedded with `ESP32-S2-MINI-1 <https://www.espressif.com/
 
 The document consists of the following major sections:
 
-- `Getting started`_: Provides an overview of the ESP32-S2-DevKitM-1(U) and hardware/software setup instructions to get started.
-- `Hardware reference`_: Provides more detailed information about the ESP32-S2-DevKitM-1(U)'s hardware.
-- `Hardware Revision Details`_: Revision history, known issues, and links to user guides for previous versions (if any) of ESP32-S2-DevKitM-1(U).
+- `Getting started`_: Provides an overview of the ESP32-S2-DevKitM-1 and hardware/software setup instructions to get started.
+- `Hardware reference`_: Provides more detailed information about the ESP32-S2-DevKitM-1's hardware.
+- `Hardware Revision Details`_: Revision history, known issues, and links to user guides for previous versions (if any) of ESP32-S2-DevKitM-1.
 - `Related Documents`_: Gives links to related documentation.
 
 Getting Started
 ===============
 
-This section describes how to get started with ESP32-S2-DevKitM-1(U). It begins with a few introductory sections about the ESP32-S2-DevKitM-1(U), then Section `Start Application Development`_ provides instructions on how to get the ESP32-S2-DevKitM-1(U) ready and flash firmware into it.
-
-Overview
---------
-
-ESP32-S2-DevKitM-1(U) is entry-level development board equipped with either ESP32-S2-MINI-1 or ESP32-S2-MINI-1U module. Most of the I/O pins on the module are broken out to the pin headers on both sides for easy interfacing. Developers can either connect peripherals with jumper wires or mount ESP32-S2-DevKitM-1(U) on a breadboard.
+This section describes how to get started with ESP32-S2-DevKitM-1. It begins with a few introductory sections about the ESP32-S2-DevKitM-1, then Section `Start Application Development`_ provides instructions on how to get the ESP32-S2-DevKitM-1 ready and flash firmware into it.
 
 Contents and Packaging
 ----------------------
 
+.. _user-guide-s2-devkitm-1-v1-ordering-info:
+
+Ordering Information
+^^^^^^^^^^^^^^^^^^^^
+
+The development board has a variety of variants to choose from, as shown in the table below.
+
+.. list-table::
+   :header-rows: 1
+   :widths: 41 24 9 8 18
+
+   * - Ordering Code
+     - On-board Module [#]_
+     - Flash
+     - PSRAM
+     - Antenna
+   * - ESP32-S2-DevKitM-1-N4R2
+     - ESP32-S2-MINI-2
+
+       (Recommended)
+     - 4 MB
+     - 2 MB
+     - PCB on-board antenna
+   * - ESP32-S2-DevKitM-1U-N4R2
+     - ESP32-S2-MINI-2U
+
+       (Recommended)
+     - 4 MB
+     - 2 MB
+     - External antenna connector
+   * - ESP32-S2-DevKitM-1
+     - ESP32-S2-MINI-1
+     - 4 MB
+     - ---
+     - PCB on-board antenna
+   * - ESP32-S2-DevKitM-1U
+     - ESP32-S2-MINI-1U
+     - 4 MB
+     - ---
+     - External antenna connector
+   * - ESP32-S2-DevKitM-1R
+     - ESP32-S2-MINI-1
+     - 4 MB
+     - 2 MB
+     - PCB on-board antenna     
+   * - ESP32-S2-DevKitM-1RU
+     - ESP32-S2-MINI-1U
+     - 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
 ^^^^^^^^^^^^^
 
-If you order a few samples, each ESP32-S2-DevKitM-1(U) comes in an individual package in either antistatic bag or any packaging depending on your retailer.
+If you order a few samples, each ESP32-S2-DevKitM-1 comes in an individual package in either antistatic bag or any packaging depending on your retailer.
 
 For retail orders, please go to https://www.espressif.com/en/contact-us/get-samples.
 
-
 Wholesale Orders
 ^^^^^^^^^^^^^^^^
 
@@ -82,8 +128,8 @@ The key components of the board are described in a clockwise direction.
 
    * - Key Component
      - Description
-   * - ESP32-S2-MINI-1 or ESP32-S2-MINI-1U
-     - ESP32-S2-MINI-1 and ESP32-S2-MINI-1U are two powerful, generic Wi-Fi MCU modules that integrate ESP32-S2FH4 chip. ESP32-S2-MINI-1 comes with a PCB antenna, and ESP32-S2-MINI-1U with an external antenna connector. They both feature a 4 MB external SPI flash.
+   * - On-board module (ESP32-S2-MINI-1 or ESP32-S2-MINI-1U in figures above)
+     - ESP32-S2-MINI series modules with an on-board PCB antenna or a connector for an external antenna. This series of modules, known for its small size, have a flash and/or a PSRAM integrated in the chip package. For more information, please refer to :ref:`user-guide-s2-devkitm-1-v1-ordering-info`.
    * - Pin Headers
      - All available GPIO pins (except for the SPI bus for flash) are broken out to the pin headers on the board. Users can program ESP32-S2FH4 chip to enable multiple functions such as SPI, I2S, UART, I2C, touch sensors, PWM etc. For details, please see :ref:`user-guide-devkitm-1-v1-header-blocks`.
    * - 3.3 V Power On LED
@@ -101,20 +147,17 @@ The key components of the board are described in a clockwise direction.
    * - 5 V to 3.3 V LDO
      - Power regulator that converts a 5 V supply into a 3.3 V output.
    * - External Antenna Connector
-     - On **ESP32-S2-MINI-1U** module only. For connector dimensions, please refer to Section External Antenna Connector Dimensions in `ESP32-S2-MINI-1 & ESP32-S2-MINI-1U Datasheet <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-1_esp32-s2-mini-1u_datasheet_en.pdf>`_.
+     - On **ESP32-S2-MINI-2U** and **ESP32-S2-MINI-1U** module only. For connector dimensions, please refer to Section External Antenna Connector Dimensions in module datasheet.
 
 Start Application Development
 -----------------------------
 
-Before powering up your ESP32-S2-DevKitM-1(U), please make sure that it is in good condition with no obvious signs of damage.
+Before powering up your ESP32-S2-DevKitM-1, please make sure that it is in good condition with no obvious signs of damage.
 
 Required Hardware
 ^^^^^^^^^^^^^^^^^
 
-- ESP32-S2-DevKitM-1(U)
-
-  + For ESP32-S2-DevKitM-1U, an antenna is also required.
-
+- ESP32-S2-DevKitM-1
 - USB 2.0 cable (Standard-A to Micro-B)
 - Computer running Windows, Linux, or macOS
 
@@ -125,7 +168,7 @@ Required Hardware
 Software Setup
 ^^^^^^^^^^^^^^
 
-Please proceed to :doc:`../../get-started/index`, where Section :ref:`get-started-step-by-step` will quickly help you set up the development environment and then flash an application example into your ESP32-S2-DevKitM-1(U).
+Please proceed to :doc:`../../get-started/index`, where Section :ref:`get-started-step-by-step` will quickly help you set up the development environment and then flash an application example into your ESP32-S2-DevKitM-1.
 
 .. note::
 
@@ -142,10 +185,10 @@ A block diagram below shows the components of ESP32-S2-DevKitM-1 and their inter
 .. figure:: ../../../_static/esp32-s2-devkitm-1-v1-block-diagram.png
     :align: center
     :scale: 70%
-    :alt: ESP32-S2-DevKitM-1(U) (click to enlarge)
+    :alt: ESP32-S2-DevKitM-1 (click to enlarge)
     :figclass: align-center
 
-    ESP32-S2-DevKitM-1(U) (click to enlarge)
+    ESP32-S2-DevKitM-1 (click to enlarge)
 
 Power Supply Options
 ^^^^^^^^^^^^^^^^^^^^
@@ -163,7 +206,7 @@ It is recommended to use the first option: Micro-USB Port.
 Header Block
 ------------
 
-The two tables below provide the **Name** and **Function** of the pin headers on both sides of the board (J1 and J3). The pin header names are shown in :ref:`user-guide-devkitm-1-v1-board-front`. The numbering is the same as in the `ESP32-S2-DevKitM-1(U) Schematics <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Schematics.pdf>`_ (PDF).
+The two tables below provide the **Name** and **Function** of the pin headers on both sides of the board (J1 and J3). The pin header names are shown in :ref:`user-guide-devkitm-1-v1-board-front`. The numbering is the same as in the `ESP32-S2-DevKitM-1 Schematics <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Schematics.pdf>`_ (PDF).
 
 J1
 ^^^
@@ -228,10 +271,10 @@ Pin Layout
 .. figure:: ../../../_static/esp32-s2-devkitm-1-v1-pin-layout.png
     :align: center
     :scale: 15%
-    :alt: ESP32-S2-DevKitM-1(U) (click to enlarge)
+    :alt: ESP32-S2-DevKitM-1 (click to enlarge)
     :figclass: align-center
 
-    ESP32-S2-DevKitM-1(U) Pin Layout (click to enlarge)
+    ESP32-S2-DevKitM-1 Pin Layout (click to enlarge)
 
 Hardware Revision Details
 =========================
@@ -240,11 +283,18 @@ This is the first revision of this board released.
 
 Related Documents
 =================
-* `ESP32-S2-DevKitM-1(U) Schematics <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Schematics.pdf>`_ (PDF)
-* `ESP32-S2-DevKitM-1(U) PCB Layout <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_PCB_Layout.pdf>`_ (PDF)
-* `ESP32-S2-DevKitM-1(U) Dimensions <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Dimensions.pdf>`_ (PDF)
-* `ESP32-S2 Series Datasheet <https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_en.pdf>`_ (PDF)
-* `ESP32-S2-MINI-1 & ESP32-S2-MINI-1U Datasheet <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-1_esp32-s2-mini-1u_datasheet_en.pdf>`_ (PDF)
+* `ESP32-S2 Series Chip Revision v1.0 Datasheet`_ (PDF)
+* `ESP32-S2 Series Chip Revision v0.0 Datasheet <https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_en.pdf>`_ (PDF)
+* `ESP32-S2 Series SoC Errata`_ (PDF)
+* `ESP32-S2-MINI-2 & ESP32-S2-MINI-2U Module Datasheet <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-2_esp32-s2-mini-2u_datasheet_en.pdf>`_ (PDF)
+* `ESP32-S2-MINI-1 & ESP32-S2-MINI-1U Module Datasheet <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-1_esp32-s2-mini-1u_datasheet_en.pdf>`_ (PDF)
+* `ESP32-S2-DevKitM-1 Schematics <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Schematics.pdf>`_ (PDF)
+* `ESP32-S2-DevKitM-1 PCB Layout <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_PCB_Layout.pdf>`_ (PDF)
+* `ESP32-S2-DevKitM-1 Dimensions <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Dimensions.pdf>`_ (PDF)
 * `ESP Product Selector <https://products.espressif.com/#/product-selector?names=>`_
 
 For other design documentation for the board, please contact us at `sales@espressif.com <sales@espressif.com>`_.
+
+.. _NRND: https://www.espressif.com/en/products/longevity-commitment?id=nrnd
+.. _ESP32-S2 Series Chip Revision v1.0 Datasheet: https://www.espressif.com/sites/default/files/documentation/esp32-s2-v1.0_datasheet_en.pdf
+.. _ESP32-S2 Series SoC Errata: https://espressif.com/sites/default/files/documentation/esp32-s2_errata_en.pdf
diff --git a/docs/zh_CN/get-started/index.rst b/docs/zh_CN/get-started/index.rst
index 9fc5370ad3..e58adb2fd1 100644
--- a/docs/zh_CN/get-started/index.rst
+++ b/docs/zh_CN/get-started/index.rst
@@ -97,7 +97,7 @@
         :maxdepth: 1
 
         ESP32-S2-Saola-1 <../hw-reference/esp32s2/user-guide-saola-1-v1.2>
-        ESP32-S2-DevKitM-1(U) <../hw-reference/esp32s2/user-guide-devkitm-1-v1>
+        ESP32-S2-DevKitM-1 <../hw-reference/esp32s2/user-guide-devkitm-1-v1>
         ESP32-S2-DevKitC-1 <../hw-reference/esp32s2/user-guide-s2-devkitc-1>
         ESP32-S2-Kaluga-Kit <../hw-reference/esp32s2/user-guide-esp32-s2-kaluga-1-kit>
 
diff --git a/docs/zh_CN/hw-reference/esp32s2/user-guide-devkitm-1-v1.rst b/docs/zh_CN/hw-reference/esp32s2/user-guide-devkitm-1-v1.rst
index f4e1670afb..962706ce0a 100644
--- a/docs/zh_CN/hw-reference/esp32s2/user-guide-devkitm-1-v1.rst
+++ b/docs/zh_CN/hw-reference/esp32s2/user-guide-devkitm-1-v1.rst
@@ -1,14 +1,12 @@
-=====================
-ESP32-S2-DevKitM-1(U)
-=====================
+==================
+ESP32-S2-DevKitM-1
+==================
 
 :link_to_translation:`en: [English]`
 
-本指南介绍了乐鑫的小型开发板 ESP32-S2-DevKitM-1(U)。
+本指南介绍了乐鑫的小型开发板 ESP32-S2-DevKitM-1。
 
-ESP32-S2-DevKitM-1(U) 是一款基于 `ESP32-S2FH4 <https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_cn.pdf>`__ 芯片（ESP32-S2 系列）的通用型开发板。该款开发板具有丰富的外设和优化的引脚布局，令产品开发更快捷。
-
-ESP32-S2-DevKitM-1 搭载的是 `ESP32-S2-MINI-1 <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-1_esp32-s2-mini-1u_datasheet_cn.pdf>`__ 模组 （PCB 板载天线），ESP32-S2-DevKitM-1U 搭载的是 `ESP32-S2-MINI-1U <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-1_esp32-s2-mini-1u_datasheet_cn.pdf>`__ 模组 （外部天线连接器）。
+ESP32-S2-DevKitM-1 是乐鑫一款入门级开发板。板上模组大部分管脚均已引出至两侧排针，开发人员可根据实际需求，轻松通过跳线连接多种外围设备，同时也可将开发板插在面包板上使用。
 
 +----------------------+-----------------------+
 | |ESP32-S2-DevKitM-1| | |ESP32-S2-DevKitM-1U| | 
@@ -22,36 +20,84 @@ ESP32-S2-DevKitM-1 搭载的是 `ESP32-S2-MINI-1 <https://www.espressif.com/site
 
 本指南包括如下内容：
 
-- `入门指南`_: 简要介绍了 ESP32-S2-DevKitM-1(U) 和硬件、软件设置指南。
-- `硬件参考`_: 详细介绍了 ESP32-S2-DevKitM-1(U) 的硬件。
+- `入门指南`_: 简要介绍了 ESP32-S2-DevKitM-1 和硬件、软件设置指南。
+- `硬件参考`_: 详细介绍了 ESP32-S2-DevKitM-1 的硬件。
 - `硬件版本`_：介绍硬件历史版本和已知问题，并提供链接至历史版本开发板的入门指南（如有）。
 - `相关文档`_: 列出了相关文档的链接。
 
 入门指南
 ========
 
-本节介绍了如何快速上手 ESP32-S2-DevKitM-1(U)。开头部分介绍了 ESP32-S2-DevKitM-1(U)，`开始开发应用`_ 小节介绍了怎样在 ESP32-S2-DevKitM-1(U) 上烧录固件及相关准备工作。
-
-概述
-----
-
-ESP32-S2-DevKitM-1(U) 是乐鑫一款搭载 ESP32-S2-MINI-1 或 ESP32-S2-MINI-1U 模组的入门级开发板。板上模组大部分管脚均已引出至两侧排针，开发人员可根据实际需求，轻松通过跳线连接多种外围设备，同时也可将开发板插在面包板上使用。
-
+本节介绍了如何快速上手 ESP32-S2-DevKitM-1。开头部分介绍了 ESP32-S2-DevKitM-1，`开始开发应用`_ 小节介绍了怎样在 ESP32-S2-DevKitM-1 上烧录固件及相关准备工作。
 
 内含组件和包装
 --------------
 
+.. _user-guide-devkitm-1-v1-ordering-info:
+
+订购信息
+^^^^^^^^
+
+该开发板有多种型号可供选择，详见下表。
+
+.. list-table::
+   :header-rows: 1
+   :widths: 30 30 10 10 20
+
+   * - 订购代码
+     - 搭载模组 [#]_
+     - Flash
+     - PSRAM
+     - 天线
+   * - ESP32-S2-DevKitM-1-N4R2
+     - ESP32-S2-MINI-1-2
+
+       （推荐）
+     - 4 MB
+     - 2 MB
+     - PCB 板载天线
+   * - ESP32-S2-DevKitM-1U-N4R2
+     - ESP32-S2-MINI-1-2U
+
+       （推荐）
+     - 4 MB
+     - 2 MB
+     - 外部天线连接器
+   * - ESP32-S2-DevKitM-1
+     - ESP32-S2-MINI-1
+     - 4 MB
+     - ---
+     - PCB 板载天线
+   * - ESP32-S2-DevKitM-1U
+     - ESP32-S2-MINI-1U
+     - 4 MB
+     - ---
+     - 外部天线连接器
+   * - ESP32-S2-DevKitM-1R
+     - ESP32-S2-MINI-1
+     - 4 MB
+     - 2 MB
+     - PCB 板载天线     
+   * - 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 系列芯片勘误表》`_。
+
 零售订单
 ^^^^^^^^
 
-如购买样品，每个 ESP32-S2-DevKitM-1(U) 开发板将以防静电袋或零售商选择的其他方式包装。
+如购买样品，每个 ESP32-S2-DevKitM-1 开发板将以防静电袋或零售商选择的其他方式包装。
 
 零售订单请前往 https://www.espressif.com/zh-hans/company/contact/buy-a-sample。
 
 批量订单
 ^^^^^^^^
 
-如批量购买，ESP32-S2-DevKitM-1(U) 开发板将以大纸板箱包装。
+如批量购买，ESP32-S2-DevKitM-1 开发板将以大纸板箱包装。
 
 批量订单请前往 https://www.espressif.com/zh-hans/contact-us/sales-questions。
 
@@ -82,8 +128,8 @@ ESP32-S2-DevKitM-1(U) 是乐鑫一款搭载 ESP32-S2-MINI-1 或 ESP32-S2-MINI-1U
 
    * - 主要组件
      - 介绍
-   * - ESP32-S2-MINI-1 或 ESP32-S2-MINI-1U
-     - ESP32-S2-MINI-1 和 ESP32-S2-MINI-1U 是集成 ESP32-S2FH4 的通用型 Wi-Fi MCU 模组，ESP32-S2-MINI-1 采用 PCB 板载天线，ESP32-S2-MINI-1U 采用外部天线连接器。两款模组均配置了 4 MB SPI flash。
+   * - 板载模组（上图中为 ESP32-S2-MINI-1 或 ESP32-S2-MINI-1U）
+     - ESP32-S2-MINI 系列模组，可搭载 PCB 板载天线或外部天线连接器。该系列模组尺寸小，flash 和/或 PSRAM 集成在芯片封装内。更多信息，详见 :ref:`user-guide-devkitm-1-v1-ordering-info`。
    * - Pin Headers（排针）
      - 所有可用 GPIO 管脚（除 flash 的 SPI 总线）均已引出至开发板的排针。用户可对 ESP32-S2FH4 芯片编程，使能 SPI、I2S、UART、I2C、触摸传感器、PWM 等多种功能。请查看 :ref:`user-guide-devkitm-1-v1-header-blocks` 获取更多信息。
    * - 3.3 V Power On LED（3.3 V 电源指示灯）
@@ -101,20 +147,17 @@ ESP32-S2-DevKitM-1(U) 是乐鑫一款搭载 ESP32-S2-MINI-1 或 ESP32-S2-MINI-1U
    * - 5 V to 3.3 V LDO（5 V 转 3.3 V LDO）
      - 电源转换器，输入 5 V，输出 3.3 V。
    * - External Antenna Connector（外部天线连接器）
-     - 仅 **ESP32-S2-MINI-1U** 模组带有外部天线连接器。连接器尺寸，请参考 `《ESP32-S2-MINI-1 & ESP32-S2-MINI-1U 技术规格书》 <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-1_esp32-s2-mini-1u_datasheet_cn.pdf>`_ 的外部天线连接器尺寸章节。
+     - 仅 **ESP32-S2-MINI-2U** 和 **ESP32-S2-MINI-1U** 模组带有外部天线连接器。连接器尺寸，请参考模组规格书的 外部天线连接器尺寸章节。
 
 开始开发应用
 ------------
 
-通电前，请确保 ESP32-S2-DevKitM-1(U) 完好无损。
+通电前，请确保 ESP32-S2-DevKitM-1 完好无损。
 
 必备硬件
 ^^^^^^^^
 
-- ESP32-S2-DevKitM-1(U)
-
-  + 如使用 ESP32-S2-DevKitM-1U，还需准备天线
-
+- ESP32-S2-DevKitM-1
 - USB 2.0 数据线（标准 A 型转 Micro-B 型）
 - 电脑 （Windows、Linux 或 macOS）
 
@@ -125,7 +168,7 @@ ESP32-S2-DevKitM-1(U) 是乐鑫一款搭载 ESP32-S2-MINI-1 或 ESP32-S2-MINI-1U
 软件设置
 ^^^^^^^^
 
-请前往 :doc:`../../get-started/index`，在 :ref:`get-started-step-by-step` 一节查看如何快速设置开发环境，将应用程序烧录至 ESP32-S2-DevKitM-1(U)。
+请前往 :doc:`../../get-started/index`，在 :ref:`get-started-step-by-step` 一节查看如何快速设置开发环境，将应用程序烧录至 ESP32-S2-DevKitM-1。
 
 .. 注解::
     
@@ -137,20 +180,20 @@ ESP32-S2-DevKitM-1(U) 是乐鑫一款搭载 ESP32-S2-MINI-1 或 ESP32-S2-MINI-1U
 功能框图
 --------
 
-ESP32-S2-DevKitM-1(U) 的主要组件和连接方式如下图所示。
+ESP32-S2-DevKitM-1 的主要组件和连接方式如下图所示。
 
 .. figure:: ../../../_static/esp32-s2-devkitm-1-v1-block-diagram.png
     :align: center
     :scale: 70%
-    :alt: ESP32-S2-DevKitM-1(U) （点击放大）
+    :alt: ESP32-S2-DevKitM-1 （点击放大）
     :figclass: align-center
 
-    ESP32-S2-DevKitM-1(U) （点击放大）
+    ESP32-S2-DevKitM-1 （点击放大）
 
 电源选项
 ^^^^^^^^
 
-您可从以下三种供电方式中任选其一给 ESP32-S2-DevKitM-1(U) 供电：
+您可从以下三种供电方式中任选其一给 ESP32-S2-DevKitM-1 供电：
 
 - Micro-USB 接口供电（默认）
 - 5V 和 GND 排针供电
@@ -163,7 +206,7 @@ ESP32-S2-DevKitM-1(U) 的主要组件和连接方式如下图所示。
 排针
 ----
 
-下表列出了开发板两侧排针（J1 和 J3）的 **名称** 和 **功能**，排针的名称如图 :ref:`user-guide-devkitm-1-v1-board-front` 所示，排针的序号与 `ESP32-S2-DevKitM-1(U) 原理图 <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Schematics.pdf>`_ (PDF)一致。
+下表列出了开发板两侧排针（J1 和 J3）的 **名称** 和 **功能**，排针的名称如图 :ref:`user-guide-devkitm-1-v1-board-front` 所示，排针的序号与 `ESP32-S2-DevKitM-1 原理图 <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Schematics.pdf>`_ (PDF)一致。
 
 J1
 ^^^
@@ -228,10 +271,10 @@ J3
 .. figure:: ../../../_static/esp32-s2-devkitm-1-v1-pin-layout.png
     :align: center
     :scale: 15%
-    :alt: ESP32-S2-DevKitM-1(U) 管脚布局（点击放大）
+    :alt: ESP32-S2-DevKitM-1 管脚布局（点击放大）
     :figclass: align-center
 
-    ESP32-S2-DevKitM-1(U) 管脚布局（点击放大）
+    ESP32-S2-DevKitM-1 管脚布局（点击放大）
 
 硬件版本
 ==========
@@ -240,11 +283,18 @@ J3
 
 相关文档
 ========
-* `ESP32-S2-DevKitM-1(U) 原理图 <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Schematics.pdf>`_ (PDF)
-* `ESP32-S2-DevKitM-1(U) PCB 布局 <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_PCB_Layout.pdf>`_ (PDF)
-* `ESP32-S2-DevKitM-1(U) 尺寸图 <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Dimensions.pdf>`_ (PDF)
-* `ESP32-S2 系列技术规格书 <https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_cn.pdf>`_ (PDF)
-* `ESP32-S2-MINI-1 & ESP32-S2-MINI-1U 技术规格书 <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-1_esp32-s2-mini-1u_datasheet_cn.pdf>`_ (PDF)
+* `ESP32-S2 系列芯片 v1.0 版本技术规格书`_ (PDF)
+* `ESP32-S2 系列芯片 v0.0 版本技术规格书 <https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_cn.pdf>`_ (PDF)
+* `《ESP32-S2 系列芯片勘误表》`_ (PDF)
+* `《ESP32-S2-MINI-2 & ESP32-S2-MINI-2U 技术规格书》 <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-2_esp32-s2-mini-2u_datasheet_cn.pdf>`_ (PDF)
+* `《ESP32-S2-MINI-1 & ESP32-S2-MINI-1U 技术规格书》 <https://www.espressif.com/sites/default/files/documentation/esp32-s2-mini-1_esp32-s2-mini-1u_datasheet_cn.pdf>`_ (PDF)
+* `ESP32-S2-DevKitM-1 原理图 <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Schematics.pdf>`_ (PDF)
+* `ESP32-S2-DevKitM-1 PCB 布局 <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_PCB_Layout.pdf>`_ (PDF)
+* `ESP32-S2-DevKitM-1 尺寸图 <https://dl.espressif.com/dl/schematics/ESP32-S2-DevKitM-1_V1_Dimensions.pdf>`_ (PDF)
 * `乐鑫产品选型工具 <https://products.espressif.com/#/product-selector?names=>`__ 
 
 有关本开发板的更多设计文档，请联系我们的商务部门 `sales@espressif.com <sales@espressif.com>`_。
+
+.. _不推荐用于新设计: https://www.espressif.com/zh-hans/products/longevity-commitment
+.. _ESP32-S2 系列芯片 v1.0 版本技术规格书: https://www.espressif.com/sites/default/files/documentation/esp32-s2-v1.0_datasheet_cn.pdf
+.. _《ESP32-S2 系列芯片勘误表》: https://espressif.com/sites/default/files/documentation/esp32-s2_errata_cn.pdf