Merge branch 'master' into 1.0release

 The MIT License (MIT)
 The MIT License (MIT)
 
 
-Copyright (c) 2013-2014 winlin
+Copyright (c) 2013-2015 SRS(simple-rtmp-server)
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 this software and associated documentation files (the "Software"), to deal in

@@ -232,7 +232,7 @@ git clone https://gitlab.com/winlinvip/srs-gitlab.git
 
 
 <pre>
 <pre>
 git clone https://github.com/simple-rtmp-server/srs &&
 git clone https://github.com/simple-rtmp-server/srs &&
-cd simple-rtmp-server/trunk
+cd srs/trunk
 </pre>
 </pre>
 
 
 <strong>Step 2:</strong> build SRS,
 <strong>Step 2:</strong> build SRS,