Merge branch 'srs.master'

AUTHORS.txt

@@ -1,7 +1,10 @@
-Authors ordered by first contribution.
+PRIMARY ordered by first contribution.
-
 * winlin<winlin@vip.126.com>
+
+AUTHORS ordered by first contribution.
 * wenjie.zhao<740936897@qq.com>
+
+CONTRIBUTORS ordered by first contribution.
 * xiangcheng.liu<liuxc0116@foxmail.com>
 * naijia.liu<youngcow@youngcow.net>
 * alcoholyi<alcoholyi@qq.com>

README.md

@@ -149,19 +149,17 @@ StreamServers：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https
 [FMS/AMS](http://www.adobe.com/products/adobe-media-server-standard.html)
 
 ## AUTHORS
-The PRIMARY AUTHORS are (and/or have been)(Authors ordered by first contribution): 
+
-* winlin([winterserver](#)): [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) 
+There are three types of people that have contributed to the SRS project:
-* wenjie([wenjiegit](https://github.com/wenjiegit/simple-rtmp-server)): [http://blog.chinaunix.net/uid/25006789.html](http://blog.chinaunix.net/uid/25006789.html) 
+* PRIMARY: Contribute important features and >10% code. Names of all 
-
+PRIMARY response in NetConnection.connect and metadata. 
-About the primary AUTHORS: 
+* AUTHORS: Contribute features and 1%~10% code. Names of all 
-* Contribute important features to SRS. 
+PRIMARY response in NetConnection.connect and metadata. 
-* Names of all PRIMARY AUTHORS response in NetConnection.connect and metadata. 
+* CONTRIBUTORS: Submit patches, report bugs, add translations, help answer 
-* Names of all CONTRIBUTORS response in api/v1/authors.
+newbie questions, and generally make SRS that much better.
-
+
-And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
+About all PRIMARY, AUTHORS and CONTRIBUTORS, read 
-people who have submitted patches, reported bugs, added translations, helped
+[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt).
-answer newbie questions, and generally made SRS that much better: 
-[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt)
 
 A big THANK YOU goes to:
 * [chnvideo](chnvideo.com) co-founders([wiseyoung](mailto:wiseyoung@chnvideo.com), [trueice](mailto:trueice@chnvideo.com), [leijian](mailto:leijian@chnvideo.com)) for [big supports](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#bigthanks).