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

merge master

This commit is contained in:
Feng 2016-08-29 14:09:57 +08:00
parent 19fd92b41b 824c960c26
commit 5bd07bf536
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/source/changes.rst
View File

@ -11,12 +11,32 @@ Changes
Version 2.0 (West of West Lake)
-------------------------------
*Release Date: 2016-08-12*
*Release Date: 2016-08-29*
Improve the design of PubSub and Router:
.. images:: _static/images/publish.png
.. _release_1.1.3:
-------------
Version 1.1.3
-------------
*Release Date: 2016-08-19*
Support './bin/emqttd_ctl users list' CLI (#621)
Cannot publish payloads with a size of the order 64K using WebSockets (#643)
Optimize the procedures that retrieve the Broker version and Borker description in the tick timer (PR#627)
Fix SSL certfile, keyfile config (#651)
-------------
Version 1.1.2
-------------
.. _release_1.1.2:
-------------

34
docs/source/install.rst
View File

@ -19,19 +19,19 @@ Download Packages
Download binary packages from: http://emqtt.io/downloads
+-----------+-----------------------------------+
| Debian | http://emqtt.io/downloads/debian |
+-----------+-----------------------------------+
| Ubuntu | http://emqtt.io/downloads/ubuntu |
+-----------+-----------------------------------+
| CentOS | http://emqtt.io/downloads/centos |
+-----------+-----------------------------------+
| FreeBSD | http://emqtt.io/downloads/freebsd |
+-----------+-----------------------------------+
| Mac OS X | http://emqtt.io/downloads/macosx |
+-----------+-----------------------------------+
| Windows | http://emqtt.io/downloads/windows |
+-----------+-----------------------------------+
+-----------+------------------------------------------+
| Debian | http://emqtt.io/downloads/latest/debian |
+-----------+------------------------------------------+
| Ubuntu | http://emqtt.io/downloads/latest/ubuntu |
+-----------+------------------------------------------+
| CentOS | http://emqtt.io/downloads/latest/centos |
+-----------+------------------------------------------+
| FreeBSD | http://emqtt.io/downloads/latest/freebsd |
+-----------+------------------------------------------+
| Mac OS X | http://emqtt.io/downloads/latest/macosx |
+-----------+------------------------------------------+
| Windows | http://emqtt.io/downloads/latest/windows |
+-----------+------------------------------------------+
The package name consists of platform, version and release time.
@ -43,7 +43,7 @@ For example: emqttd-centos64-1.1-beta-20160601.zip
Installing on Linux
-------------------
Download CentOS Package from: http://emqtt.io/downloads/centos, and then unzip:
Download CentOS Package from: http://emqtt.io/downloads/latest/centos, and then unzip:
.. code-block:: bash
@ -116,7 +116,7 @@ Stop the broker::
Installing on FreeBSD
---------------------
Download FreeBSD Package from: http://emqtt.io/downloads/freebsd
Download FreeBSD Package from: http://emqtt.io/downloads/latest/freebsd
The installing process is same to Linux.
@ -128,7 +128,7 @@ Installing on Mac OS X
We could install the broker on Mac OS X to develop and debug MQTT applications.
Download Mac Package from: http://emqtt.io/downloads/macosx
Download Mac Package from: http://emqtt.io/downloads/latest/macosx
Configure 'lager' log level in 'etc/emqttd.config', all MQTT messages recevied/sent will be printed on console:
@ -150,7 +150,7 @@ The install and boot process on Mac are same to Linux.
Installing on Windows
---------------------
Download Package from: http://emqtt.io/downloads/windows.
Download Package from: http://emqtt.io/downloads/latest/windows.
Unzip the package to install folder. Open the command line window and 'cd' to the folder.