espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 05:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/issues_from_github' into 'master'

Browse Source 
Docs: Minor PRs from GitHub

See merge request idf/esp-idf!3930
This commit is contained in:
Ivan Grokhotkov
2018-12-11 11:22:33 +08:00
parent 230147a169 19cf1bb7db
commit 1e20664952
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/api-guides/jtag-debugging/building-openocd-macos.rst
View File

@@ -22,7 +22,7 @@ Install Dependencies
Install packages that are required to compile OpenOCD using Homebrew:: 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 Build OpenOCD
============= =============

8
docs/en/api-reference/protocols/mqtt.rst
View File

@@ -18,10 +18,10 @@ Features
Application Example Application Example
------------------- -------------------
* :example:`protocols/mqtt/tcp`: MQTT over tcp, defalut port 1883 * :example:`protocols/mqtt/tcp`: MQTT over tcp, default port 1883
* :example:`protocols/mqtt/ssl`: MQTT over tcp, defalut port 8883 * :example:`protocols/mqtt/ssl`: MQTT over tcp, default port 8883
* :example:`protocols/mqtt/ws`: MQTT over Websocket, defalut port 80 * :example:`protocols/mqtt/ws`: MQTT over Websocket, default port 80
* :example:`protocols/mqtt/wss`: MQTT over Websocket Secure, defalut port 443 * :example:`protocols/mqtt/wss`: MQTT over Websocket Secure, default port 443
Configuration Configuration