Merge branch 'bugfix/github_prs' into 'master'

Merge some small fixes from Github

See merge request idf/esp-idf!2500

docs/en/get-started/eclipse-setup-windows.rst

@@ -61,6 +61,9 @@ Project Properties
 
      * In the list of providers, click "CDT GCC Build Output Parser" and type ``xtensa-esp32-elf-`` at the beginning of the Compiler command pattern, and wrap remaining part with brackets. This means the full Compiler command pattern should be ``xtensa-esp32-elf-((g?cc)|([gc]\+\+)|(clang))``
 
+Navigate to "C/C++ General" -> "Indexer" property page:
+
+* Uncheck "Allow heuristic resolution of includes". When this option is enabled Eclipse sometimes fails to find correct header directories.
 
 Building in Eclipse
 -------------------

docs/en/get-started/eclipse-setup.rst

@@ -63,6 +63,10 @@ Navigate to "C/C++ General" -> "Preprocessor Include Paths" property page:
 
 * In the list of providers, click "CDT GCC Build Output Parser" and type ``xtensa-esp32-elf-`` at the beginning of the Compiler command pattern. This means the full Compiler command pattern should be ``xtensa-esp32-elf-(g?cc)|([gc]\+\+)|(clang)``
 
+Navigate to "C/C++ General" -> "Indexer" property page:
+
+* Uncheck "Allow heuristic resolution of includes". When this option is enabled Eclipse sometimes fails to find correct header directories.
+
 .. _eclipse-build-project:
 
 Building in Eclipse

docs/zh_CN/get-started/eclipse-setup-windows.rst

@@ -44,7 +44,7 @@ Windows 平台上的 Eclipse 配置
 
 * 点击 “C/C++ Build” 属性页。
 
-	* 取消选中 “Use default build command”，然后输入命令：``python${IDF_PATH}/tools/windows/eclipse_make.py``，开始自定义创建。
+	* 取消选中 “Use default build command”，然后输入命令：``python ${IDF_PATH}/tools/windows/eclipse_make.py``，开始自定义创建。
 
 * 点击 “C/C++ Build” 下的 “Environment” 属性页面。