From 5fde8906036e93e4b6d392495699517a038e289e Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 25 Nov 2014 09:50:57 +0800 Subject: [PATCH] update PRIMARY, AUTHORS, CONTRIBUTORS rule --- AUTHORS.txt | 7 +++++-- README.md | 24 +++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) mode change 100755 => 100644 AUTHORS.txt diff --git a/AUTHORS.txt b/AUTHORS.txt old mode 100755 new mode 100644 index b148da659..23cd8718d --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,7 +1,10 @@ -Authors ordered by first contribution. - +PRIMARY ordered by first contribution. * winlin + +AUTHORS ordered by first contribution. * wenjie.zhao<740936897@qq.com> + +CONTRIBUTORS ordered by first contribution. * xiangcheng.liu * naijia.liu * alcoholyi diff --git a/README.md b/README.md index 462b4c45c..f524d1fae 100755 --- a/README.md +++ b/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) -* wenjie([wenjiegit](https://github.com/wenjiegit/simple-rtmp-server)): [http://blog.chinaunix.net/uid/25006789.html](http://blog.chinaunix.net/uid/25006789.html) - -About the primary AUTHORS: -* Contribute important features to SRS. -* Names of all PRIMARY AUTHORS response in NetConnection.connect and metadata. -* Names of all CONTRIBUTORS response in api/v1/authors. - -And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS -- -people who have submitted patches, reported bugs, added translations, helped -answer newbie questions, and generally made SRS that much better: -[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt) + +There are three types of people that have contributed to the SRS project: +* PRIMARY: Contribute important features and >10% code. Names of all +PRIMARY response in NetConnection.connect and metadata. +* AUTHORS: Contribute features and 1%~10% code. Names of all +PRIMARY response in NetConnection.connect and metadata. +* CONTRIBUTORS: Submit patches, report bugs, add translations, help answer +newbie questions, and generally make SRS that much better. + +About all PRIMARY, AUTHORS and CONTRIBUTORS, read +[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).