[xiph-commits] r7631 - in icecast/branches/kh/icecast: . conf doc

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2004-08-25 09:12:37 -0700 (Wed, 25 Aug 2004)
New Revision: 7631

Modified:
   icecast/branches/kh/icecast/NEWS
   icecast/branches/kh/icecast/conf/icecast.xml.in
   icecast/branches/kh/icecast/doc/icecast2_config_file.html
Log:
doc updates


Modified: icecast/branches/kh/icecast/NEWS
===================================================================
--- icecast/branches/kh/icecast/NEWS	2004-08-25 15:56:20 UTC (rev 7630)
+++ icecast/branches/kh/icecast/NEWS	2004-08-25 16:12:37 UTC (rev 7631)
@@ -19,6 +19,15 @@
 . authenticated relays, those that match the relay user/pass, bypass the 
 max-listener check
 
+kh52
+. A lot of resync work with trunk
+. add queue shrinking, reduces queues to either last listener or burst
+. minor race fix, mp3 url update lock.
+. allow for xsl files to show inactive mounts but with active fallbacks
+. Add <hidden> attribute to <mount> to prevent xsl display
+. add <burst-on-connect> flag to maintain compatability with trunk
+. doc updates
+
 kh51
 . make config lock a rwlock instead of mutex, removes unneccesary stalling
   and removes possible (although not reported) deadlock cases

Modified: icecast/branches/kh/icecast/conf/icecast.xml.in
===================================================================
--- icecast/branches/kh/icecast/conf/icecast.xml.in	2004-08-25 15:56:20 UTC (rev 7630)
+++ icecast/branches/kh/icecast/conf/icecast.xml.in	2004-08-25 16:12:37 UTC (rev 7631)
@@ -108,6 +108,7 @@
         <fallback-mount>/example2.ogg</fallback-mount>
         <fallback-override>1</fallback-override>
         <fallback-when-full>1</fallback-when-full>
+        <hidden>1</hidden>
         <no-yp>1</no-yp>
         <authentication type="htpasswd">
                 <option name="filename" value="myauth"/>

Modified: icecast/branches/kh/icecast/doc/icecast2_config_file.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_config_file.html	2004-08-25 15:56:20 UTC (rev 7630)
+++ icecast/branches/kh/icecast/doc/icecast2_config_file.html	2004-08-25 16:12:37 UTC (rev 7631)
@@ -343,6 +343,12 @@
 This optional setting allows for providing a burst size which overrides the default burst size
 as defined in limits.  The value is in bytes.
 </div>
+<h4>hidden</h4>
+<div class=indentedbox>
+Enable this to prevent this mount from being shown on the xsl pages.  This is mainly
+for cases where a local relay is configured and you do not want the source of the local
+relay to be shown
+</div>
 <h4>authentication</h4>
 <div class=indentedbox>
 This specifies that the named mount point will require listener authentication.  Currently, we only support a file-based authentication scheme (type=htpasswd).  Users and encrypted password are placed in this file (separated by a :) and all requests for this mountpoint will require that a user and password be supplied for authentication purposes.  These values are passed in via normal HTTP Basic Authentication means (i.e. http://user:password@stream:port/mountpoint.ogg).  Users and Passwords are maintained via the web admin interface.  A mountpoint configured with an authenticator will display a red key next to the mount point name on the admin screens.  You can read more about listener authentication <a href="icecast2_listenerauth.html">here</a>.