From 5a31c1e5b115cb69c8cf34ff1512d4abc8303de0 Mon Sep 17 00:00:00 2001 From: XuanZe <119524428@qq.com> Date: Sat, 10 Mar 2018 14:29:16 +0800 Subject: [PATCH 1/3] fix : cpp:type. Merges https://github.com/espressif/esp-idf/pull/1700 --- components/vfs/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/vfs/README.rst b/components/vfs/README.rst index 2b2a6bc9f..b99c72134 100644 --- a/components/vfs/README.rst +++ b/components/vfs/README.rst @@ -15,7 +15,7 @@ FS registration -To register an FS driver, application needs to define in instance of esp_vfs_t structure and populate it with function pointers to FS APIs: +To register an FS driver, application needs to define in instance of :cpp:type:`esp_vfs_t` structure and populate it with function pointers to FS APIs: .. highlight:: c From 4a9b44e0c82bf94a370892e6074dcdf3a95859e8 Mon Sep 17 00:00:00 2001 From: krzychb Date: Wed, 14 Mar 2018 22:03:54 +0100 Subject: [PATCH 2/3] Included update made in MR !2012, that has been then lost when resolving merge conflicts of MR !1901 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ef3b5bdd0..8448bf404 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ docs/*/sphinx-warning-log-sanitized.txt docs/*/xml/ docs/*/xml_in/ docs/*/man/ +docs/doxygen_sqlite3.db # Unit test app files tools/unit-test-app/sdkconfig From f32abada86b275c7df1354af601706cddfe75a2b Mon Sep 17 00:00:00 2001 From: John Date: Tue, 13 Mar 2018 05:52:04 -0400 Subject: [PATCH 3/3] Update building-openocd-linux.rst. Merges https://github.com/espressif/esp-idf/pull/1714 replace - for -- in line 16 to make it run --- docs/en/api-guides/jtag-debugging/building-openocd-linux.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/api-guides/jtag-debugging/building-openocd-linux.rst b/docs/en/api-guides/jtag-debugging/building-openocd-linux.rst index cdc27a535..ca6a08777 100644 --- a/docs/en/api-guides/jtag-debugging/building-openocd-linux.rst +++ b/docs/en/api-guides/jtag-debugging/building-openocd-linux.rst @@ -13,7 +13,7 @@ Download Sources of OpenOCD The sources for the ESP32-enabled variant of OpenOCD are available from Espressif GitHub under https://github.com/espressif/openocd-esp32. To download the sources, use the following commands:: cd ~/esp - git clone –recursive https://github.com/espressif/openocd-esp32.git + git clone --recursive https://github.com/espressif/openocd-esp32.git The clone of sources should be now saved in ``~/esp/openocd-esp32`` directory.