Merge branch 'master' into dev

README.md

@@ -75,7 +75,7 @@ cd emqttd && make && make dist
 
 ## 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

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() |
 %%               {ipaddr, esockd_access:cidr()} |