Merge branch '2.0release' into develop

@@ -623,8 +623,9 @@ vhost with-hls.srs.com {
         hls_cleanup     on;
         # the timeout in seconds to dispose the hls,
         # dispose is to remove all hls files, m3u8 and ts files.
-        # when timeout or server terminate, dispose hls.
-        # @remark 0 to disable dispose.
+        # when publisher timeout dispose hls.
+        # @remark 0 to disable dispose for publisher.
+        # @remark apply for publisher timeout only, while "etc/init.d/srs stop" always dispose hls.
         # default: 0
         hls_dispose     0;
         # the max size to notify hls,