From bb4936b4d5bcd2352b85f375b6f00489d7d9af78 Mon Sep 17 00:00:00 2001 From: Stephen Bird Date: Sun, 2 Dec 2018 18:42:50 -0800 Subject: [PATCH 1/2] Add missing dependency. Merges https://github.com/espressif/esp-idf/pull/2781 --- docs/en/api-guides/jtag-debugging/building-openocd-macos.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/api-guides/jtag-debugging/building-openocd-macos.rst b/docs/en/api-guides/jtag-debugging/building-openocd-macos.rst index b56696732d..5ff74ebc65 100644 --- a/docs/en/api-guides/jtag-debugging/building-openocd-macos.rst +++ b/docs/en/api-guides/jtag-debugging/building-openocd-macos.rst @@ -22,7 +22,7 @@ Install Dependencies Install packages that are required to compile OpenOCD using Homebrew:: - brew install automake libtool libusb wget gcc@4.9 + brew install automake libtool libusb wget gcc@4.9 pkg-config Build OpenOCD ============= @@ -51,4 +51,4 @@ Next Steps To carry on with debugging environment setup, proceed to section :ref:`jtag-debugging-configuring-esp32-target`. - \ No newline at end of file + From 19cf1bb7db45f5a33fbfe8b51a3e7fba9e3d8a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noe=C3=ABl=20Moeskops?= Date: Sun, 2 Dec 2018 16:37:27 +0100 Subject: [PATCH 2/2] Typo fix in mqtt.rst. changed 'defalut' to 'default' Merges https://github.com/espressif/esp-idf/pull/2780 --- docs/en/api-reference/protocols/mqtt.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/api-reference/protocols/mqtt.rst b/docs/en/api-reference/protocols/mqtt.rst index c5a22aa740..3fa366b0ca 100644 --- a/docs/en/api-reference/protocols/mqtt.rst +++ b/docs/en/api-reference/protocols/mqtt.rst @@ -18,10 +18,10 @@ Features Application Example ------------------- - * :example:`protocols/mqtt/tcp`: MQTT over tcp, defalut port 1883 - * :example:`protocols/mqtt/ssl`: MQTT over tcp, defalut port 8883 - * :example:`protocols/mqtt/ws`: MQTT over Websocket, defalut port 80 - * :example:`protocols/mqtt/wss`: MQTT over Websocket Secure, defalut port 443 + * :example:`protocols/mqtt/tcp`: MQTT over tcp, default port 1883 + * :example:`protocols/mqtt/ssl`: MQTT over tcp, default port 8883 + * :example:`protocols/mqtt/ws`: MQTT over Websocket, default port 80 + * :example:`protocols/mqtt/wss`: MQTT over Websocket Secure, default port 443 Configuration