From 3b44e24db0cd61b41e9f029f96729ed81fe91550 Mon Sep 17 00:00:00 2001
From: XuanZe <119524428@qq.com>
Date: Tue, 20 Mar 2018 16:52:11 +0800
Subject: [PATCH 1/2] Update index.rst. Merges
 https://github.com/espressif/esp-idf/pull/1747

---
 docs/zh_CN/index.rst | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/zh_CN/index.rst b/docs/zh_CN/index.rst
index 9aaab7c30..7fa2d991f 100644
--- a/docs/zh_CN/index.rst
+++ b/docs/zh_CN/index.rst
@@ -1,47 +1,47 @@
-ESP-IDF Programming Guide
+ESP-IDF 编程指南
 =========================
 
-This is the documentation for Espressif IoT Development Framework (`esp-idf <https://github.com/espressif/esp-idf>`_). ESP-IDF is the official development framework for the `ESP32 <https://espressif.com/en/products/hardware/esp32/overview>`_ chip.
+这是乐鑫 IoT 开发开发框架 (`esp-idf <https://github.com/espressif/esp-idf>`_)的文档. ESP-IDF 是`ESP32 <https://www.espressif.com/zh-hans/products/hardware/esp32/overview>`_ 芯片的官方开发框架.
 
 ==================  ==================  ==================
-|快速入门|_          |API Reference|_    |H/W Reference|_
+|快速入门|_          |API 参考|_         |H/W 参考|_
 ------------------  ------------------  ------------------
-`快速入门`_          `API Reference`_    `H/W Reference`_
+`快速入门`_          `API 参考`_         `H/W 参考`_
 ------------------  ------------------  ------------------
-|API Guides|_       |Contribute|_       |Resources|_
+|API 指南|_          |贡献代码|_         |相关资源|_
 ------------------  ------------------  ------------------
-`API Guides`_       `Contribute`_       `Resources`_
+`API 指南`_          `贡献代码`_         `相关资源`_
 ==================  ==================  ==================
 
 
 .. |快速入门| image:: ../_static/get-started.gif
 .. _快速入门: get-started/index.html
 
-.. |API Reference| image:: ../_static/api-reference.gif
-.. _API Reference: api-reference/index.html
+.. |API 参考| image:: ../_static/api-reference.gif
+.. _API 参考: api-reference/index.html
 
-.. |H/W Reference| image:: ../_static/hw-reference.gif
-.. _H/W Reference: hw-reference/index.html
+.. |H/W 参考| image:: ../_static/hw-reference.gif
+.. _H/W 参考: hw-reference/index.html
 
-.. |Api Guides| image:: ../_static/api-guides.gif
-.. _Api Guides: api-guides/index.html
+.. |Api 指南| image:: ../_static/api-guides.gif
+.. _API 指南: api-guides/index.html
 
-.. |Contribute| image:: ../_static/contribute.gif
-.. _Contribute: contribute/index.html
+.. |贡献代码| image:: ../_static/contribute.gif
+.. _贡献代码: contribute/index.html
 
-.. |Resources| image:: ../_static/resources.gif
-.. _Resources: resources.html
+.. |相关资源| image:: ../_static/resources.gif
+.. _相关资源: resources.html
 
 
 .. toctree::
    :hidden:
 
    快速入门 <get-started/index>
-   API Reference <api-reference/index>
-   H/W Reference <hw-reference/index>
-   API Guides <api-guides/index>
-   Contribute <contribute/index>
-   Resources <resources>
+   API 参考 <api-reference/index>
+   H/W 参考 <hw-reference/index>
+   API 指南 <api-guides/index>
+   贡献代码 <contribute/index>
+   相关资源 <resources>
    Copyrights <COPYRIGHT>
    About <about>
 

From 684d211af33a1c35fa1ee3058865e178118311c4 Mon Sep 17 00:00:00 2001
From: krzychb <krzychb@gazeta.pl>
Date: Wed, 9 May 2018 07:45:54 +0200
Subject: [PATCH 2/2] Corrected link rendering and additional translations

---
 docs/en/index.rst    | 4 ++--
 docs/zh_CN/index.rst | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/en/index.rst b/docs/en/index.rst
index f3445d8dc..681d526d4 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -23,8 +23,8 @@ This is the documentation for Espressif IoT Development Framework (`esp-idf <htt
 .. |H/W Reference| image:: ../_static/hw-reference.gif
 .. _H/W Reference: hw-reference/index.html
 
-.. |Api Guides| image:: ../_static/api-guides.gif
-.. _Api Guides: api-guides/index.html
+.. |API Guides| image:: ../_static/api-guides.gif
+.. _API Guides: api-guides/index.html
 
 .. |Contribute| image:: ../_static/contribute.gif
 .. _Contribute: contribute/index.html
diff --git a/docs/zh_CN/index.rst b/docs/zh_CN/index.rst
index 7fa2d991f..4b773da8a 100644
--- a/docs/zh_CN/index.rst
+++ b/docs/zh_CN/index.rst
@@ -1,7 +1,7 @@
 ESP-IDF 编程指南
 =========================
 
-这是乐鑫 IoT 开发开发框架 (`esp-idf <https://github.com/espressif/esp-idf>`_)的文档. ESP-IDF 是`ESP32 <https://www.espressif.com/zh-hans/products/hardware/esp32/overview>`_ 芯片的官方开发框架.
+这是乐鑫 IoT 开发开发框架 (`esp-idf <https://github.com/espressif/esp-idf>`_) 的文档. ESP-IDF 是 `ESP32 <https://www.espressif.com/zh-hans/products/hardware/esp32/overview>`_ 芯片的官方开发框架.
 
 ==================  ==================  ==================
 |快速入门|_          |API 参考|_         |H/W 参考|_
@@ -23,7 +23,7 @@ ESP-IDF 编程指南
 .. |H/W 参考| image:: ../_static/hw-reference.gif
 .. _H/W 参考: hw-reference/index.html
 
-.. |Api 指南| image:: ../_static/api-guides.gif
+.. |API 指南| image:: ../_static/api-guides.gif
 .. _API 指南: api-guides/index.html
 
 .. |贡献代码| image:: ../_static/contribute.gif
@@ -42,7 +42,7 @@ ESP-IDF 编程指南
    API 指南 <api-guides/index>
    贡献代码 <contribute/index>
    相关资源 <resources>
-   Copyrights <COPYRIGHT>
-   About <about>
+   版权 <COPYRIGHT>
+   关于 <about>
 
 * :ref:`genindex`