From 70d772a41d445260caff84f093d3de26d05a73d2 Mon Sep 17 00:00:00 2001 From: Feng Date: Mon, 29 Feb 2016 23:37:15 +0800 Subject: [PATCH] at the same time --- README.md | 4 ++-- docs/source/config.rst | 2 +- docs/source/guide.rst | 2 +- docs/source/index.rst | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ef607ae8d..c38e8ec88 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ emqttd is a massively scalable and clusterable MQTT V3.1/V3.1.1 broker written in Erlang/OTP. -emqttd is fully open source and licensed under the Apache Version 2.0. emqttd implements both MQTT V3.1 and V3.1.1 protocol specifications, and supports WebSocket, STOMP, SockJS, CoAP and MQTT-SN in the same time. +emqttd is fully open source and licensed under the Apache Version 2.0. emqttd implements both MQTT V3.1 and V3.1.1 protocol specifications, and supports WebSocket, STOMP, SockJS, CoAP and MQTT-SN at the same time. emqttd requires Erlang R17+ to build. @@ -51,7 +51,7 @@ Module | Description emqttd_auth_clientid | Authentication with ClientIds emqttd_auth_username | Authentication with Username and Password emqttd_auth_ldap | Authentication with LDAP -emqttd_mod_presence | Publish presence message to $SYS topics when client connected or disconnected +emqttd_mod_presence | Publish presence message when client connected or disconnected emqttd_mod_subscription | Subscribe topics when client connected emqttd_mod_rewrite | Topic path rewrite like HTTP rewrite module diff --git a/docs/source/config.rst b/docs/source/config.rst index e2d6b070f..19d1bbf53 100644 --- a/docs/source/config.rst +++ b/docs/source/config.rst @@ -235,7 +235,7 @@ The broker provides Username, ClientId, LDAP and anonymous authentication module {anonymous, []} ]}, -The modules enabled in the same time compose an authentication chain: +The modules enabled at the same time compose an authentication chain: ---------------- ---------------- ------------- Client --> | Username | -ignore-> | ClientID | -ignore-> | Anonymous | diff --git a/docs/source/guide.rst b/docs/source/guide.rst index 7f7667509..26d550ae1 100644 --- a/docs/source/guide.rst +++ b/docs/source/guide.rst @@ -43,7 +43,7 @@ Enable an authentication module in etc/emqttd.config:: .. NOTE:: "%" comments the line. -If we enable several modules in the same time, the authentication process:: +If we enable several modules at the same time, the authentication process:: ---------------- ---------------- ------------- Client --> | Username | -ignore-> | ClientID | -ignore-> | Anonymous | diff --git a/docs/source/index.rst b/docs/source/index.rst index fbfc37e6c..f5dd4a15b 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -9,7 +9,7 @@ emqttd - Erlang MQTT Broker emqttd(Erlang MQTT Broker) is a massively scalable and clusterable MQTT V3.1/V3.1.1 broker written in Erlang/OTP. -emqttd is fully open source and licensed under the Apache Version 2.0. emqttd implements both MQTT V3.1 and V3.1.1 protocol specifications, and supports WebSocket, STOMP, SockJS, CoAP and MQTT-SN in the same time. +emqttd is fully open source and licensed under the Apache Version 2.0. emqttd implements both MQTT V3.1 and V3.1.1 protocol specifications, and supports WebSocket, STOMP, SockJS, CoAP and MQTT-SN at the same time. Latest release of the emqttd broker is scaling to 1.3 million MQTT connections on a 12 Core, 32G CentOS server.