Explorar o código

Merge branch 'master' into dev

Feng Lee %!s(int64=10) %!d(string=hai) anos
pai
achega
d3b67571fc
Modificáronse 3 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      README.md
  2. 0 0
      plugins/emqttd_auth_mysql/.placehodler
  3. 1 1
      rel/files/acl.config

+ 1 - 1
README.md

@@ -75,7 +75,7 @@ cd emqttd && make && make dist
 
 
 ## GetStarted
 ## GetStarted
 
 
-Read [emqtt wiki](https://github.com/emqtt/emqttd/wiki) for detaied installation and configuration guide.
+Read [emqtt wiki](https://github.com/emqtt/emqttd/wiki) for detailed installation and configuration guide.
 
 
 
 
 ## Benchmark
 ## Benchmark

+ 0 - 0
plugins/emqttd_auth_mysql/.placehodler


+ 1 - 1
rel/files/acl.config

@@ -1,6 +1,6 @@
 %%%-----------------------------------------------------------------------------
 %%%-----------------------------------------------------------------------------
 %% 
 %% 
-%% [ACL Design](https://github.com/emqtt/emqttd/wiki/ACL-Design)
+%% [ACL](https://github.com/emqtt/emqttd/wiki/ACL)
 %% 
 %% 
 %% -type who() :: all | binary() |
 %% -type who() :: all | binary() |
 %%               {ipaddr, esockd_access:cidr()} |
 %%               {ipaddr, esockd_access:cidr()} |