yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'emq20'

This commit is contained in:
Feng 2016-11-02 22:57:50 +08:00
parent 5c6dc79fb8 bbe060bc0a
commit cff0de09cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/getstarted.rst
View File

@ -81,7 +81,7 @@ Installing on Mac, for example:
Installing from Source Installing from Source
---------------------- ----------------------
.. NOTE:: emqttd broker requires Erlang R18+ to build since 1.1 release. .. NOTE:: The *EMQ* broker requires Erlang R18+ to build since 1.1 release.
.. code-block:: bash .. code-block:: bash
@ -128,7 +128,7 @@ The *EMQ* broker could be extended by Plugins. A plugin is an Erlang applicatio
+-------------------------+--------------------------------------------+ +-------------------------+--------------------------------------------+
| `emq_auth_http`_ | Authentication/ACL with HTTP API | | `emq_auth_http`_ | Authentication/ACL with HTTP API |
+-------------------------+--------------------------------------------+ +-------------------------+--------------------------------------------+
| `emq_auth_mysql` _ | Authentication with MySQL | | `emq_auth_mysql`_ | Authentication with MySQL |
+-------------------------+--------------------------------------------+ +-------------------------+--------------------------------------------+
| `emq_auth_pgsql`_ | Authentication with PostgreSQL | | `emq_auth_pgsql`_ | Authentication with PostgreSQL |
+-------------------------+--------------------------------------------+ +-------------------------+--------------------------------------------+