diff --git a/docs/source/commands.rst b/docs/source/commands.rst index 91a29be72..3e2376a6c 100644 --- a/docs/source/commands.rst +++ b/docs/source/commands.rst @@ -596,11 +596,11 @@ Trace MQTT packets, messages(sent/received) by ClientId or Topic. +-----------------------------------+-----------------------------------+ | trace client | Trace a client | +-----------------------------------+-----------------------------------+ -| trace client off | Stop to trace the client | +| trace client off | Stop tracing the client | +-----------------------------------+-----------------------------------+ | trace topic | Trace a topic | +-----------------------------------+-----------------------------------+ -| trace topic off | Stop to trace the topic | +| trace topic off | Stop tracing the topic | +-----------------------------------+-----------------------------------+ trace client @@ -615,11 +615,11 @@ Start to trace a client:: trace client off --------------------------- -Stop to trace the client:: +Stop tracing the client:: $ ./bin/emqttd_ctl trace client clientid off - stop to trace client clientid successfully. + stop tracing client clientid successfully. trace topic ----------------------------- @@ -633,11 +633,11 @@ Start to trace a topic:: trace topic off ----------------------- -Stop to trace the topic:: +Stop tracing the topic:: $ ./bin/emqttd_ctl trace topic topic off - stop to trace topic topic successfully. + stop tracing topic topic successfully. trace list ---------- diff --git a/docs/source/getstarted.rst b/docs/source/getstarted.rst index b5fc505b7..5e4b8af16 100644 --- a/docs/source/getstarted.rst +++ b/docs/source/getstarted.rst @@ -11,7 +11,7 @@ Overview emqttd(Erlang MQTT Broker) is an open source MQTT broker written in Erlang/OTP. Erlang/OTP is a concurrent, fault-tolerant, soft-realtime and distributed programming platform. MQTT is an extremely lightweight publish/subscribe messaging protocol powering IoT, M2M and Mobile applications. -The emqttd project is aimed to implement a scalable, distributed, extensible open-source MQTT broker for IoT, M2M and Mobile applications that hope to handle ten millions of concurrent MQTT clients. +The emqttd project is aimed to implement a scalable, distributed, extensible open-source MQTT broker for IoT, M2M and Mobile applications that hope to handle millions of concurrent MQTT clients. Highlights of the emqttd broker: @@ -93,7 +93,7 @@ Web Dashboard A Web Dashboard will be loaded automatically when the emqttd broker is started successfully. -The Dashboard helps to check running status of the broker, monitor statistics and metrics of MQTT packets, query clients, sessions, topics and subscriptions. +The Dashboard helps check running status of the broker, monitor statistics and metrics of MQTT packets, query clients, sessions, topics and subscriptions. +------------------+---------------------------+ | Default Address | http://localhost:18083 | @@ -109,7 +109,7 @@ The Dashboard helps to check running status of the broker, monitor statistics an Modules and Plugins ------------------- -The Authentication and ACL mechanism is usually implemented by a Module or Plugin. +The Authentication and Authorization(ACL) are usually implemented by a Module or Plugin. Modules ------- diff --git a/docs/source/index.rst b/docs/source/index.rst index 753bfb4af..fbfc37e6c 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -7,7 +7,7 @@ emqttd - Erlang MQTT Broker =========================== -emqttd(Erlang MQTT Broker) is a massively scalable, clusterable MQTT V3.1/V3.1.1 broker written in Erlang/OTP. +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. diff --git a/docs/source/install.rst b/docs/source/install.rst index cd5ac17b2..9e09ee1f4 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -120,7 +120,7 @@ We could install the broker on Mac OS X to develop and debug MQTT applications. Download Mac Package from: http://emqtt.io/downloads/macosx -Configure 'lager' log level in 'etc/emqttd.config', all MQTT messages recevied/sent will be printd on console: +Configure 'lager' log level in 'etc/emqttd.config', all MQTT messages recevied/sent will be printed on console: .. code:: erlang @@ -132,7 +132,7 @@ Configure 'lager' log level in 'etc/emqttd.config', all MQTT messages recevied/s ]} ]}, -The install and boot process on Mac is same to Linux. +The install and boot process on Mac are same to Linux. --------------------- Installing on Windows diff --git a/src/emqttd_cli.erl b/src/emqttd_cli.erl index 645556044..c1d1f68bf 100644 --- a/src/emqttd_cli.erl +++ b/src/emqttd_cli.erl @@ -405,9 +405,9 @@ trace(["topic", Topic, LogFile]) -> trace(_) -> ?USAGE([{"trace list", "query all traces"}, {"trace client ","trace client with ClientId"}, - {"trace client off", "stop to trace client"}, + {"trace client off", "stop tracing client"}, {"trace topic ", "trace topic with Topic"}, - {"trace topic off", "stop to trace Topic"}]). + {"trace topic off", "stop tracing Topic"}]). trace_on(Who, Name, LogFile) -> case emqttd_trace:start_trace({Who, iolist_to_binary(Name)}, LogFile) of @@ -420,9 +420,9 @@ trace_on(Who, Name, LogFile) -> trace_off(Who, Name) -> case emqttd_trace:stop_trace({Who, iolist_to_binary(Name)}) of ok -> - ?PRINT("stop to trace ~s ~s successfully.~n", [Who, Name]); + ?PRINT("stop tracing ~s ~s successfully.~n", [Who, Name]); {error, Error} -> - ?PRINT("stop to trace ~s ~s error: ~p.~n", [Who, Name, Error]) + ?PRINT("stop tracing ~s ~s error: ~p.~n", [Who, Name, Error]) end. %%--------------------------------------------------------------------