doc updates, and some minor changes for the sample conf files.

svn path=/icecast/trunk/icecast/; revision=14437

conf/icecast_shoutcast_compat.xml.in

@@ -19,13 +19,6 @@
         <yp-url-timeout>15</yp-url-timeout>
         <yp-url>http://dir.xiph.org/cgi-bin/yp-cgi</yp-url>
     </directory>
-    <!-- This is the manufactured mount name for your shoutcast 
-         compatible stream. Since the shoutcast DSP (and NSV encoder)
-         cannot specify a mountpoint, you must enter it here -->
-    <shoutcast-mount>/stream</shoutcast-mount>
-    <!-- Use this if you are streaming NSV using the nullsoft NSV encoder
-    <shoutcast-mount>/stream.nsv</shoutcast-mount>
-    -->
     <!-- This is the hostname other people will use to connect to your server.
     It affects mainly the urls generated by Icecast for playlists and yp
     listings. -->
@@ -36,12 +29,7 @@
              the shoutcast DSP actually will connect the
              encoder to this port + 1 -->
         <port>8000</port>
-    </listen-socket>
-    <listen-socket>
-        <!-- This port *must* be one larger than the one defined
-             above and defined as 'shoutcast-compat' -->
-        <port>8001</port>
-        <shoutcast-compat>1</shoutcast-compat>
+        <shoutcast-mount>/stream</shoutcast-mount>
     </listen-socket>
     <fileserve>1</fileserve>
     <paths>

conf/icecast_urlauth.xml.in

@@ -3,12 +3,10 @@
     <limits>
         <clients>100</clients>
         <sources>2</sources>
-        <threadpool>5</threadpool>
         <queue-size>524288</queue-size>
         <client-timeout>30</client-timeout>
         <header-timeout>15</header-timeout>
         <source-timeout>10</source-timeout>
-        <burst-on-connect>1</burst-on-connect>
         <burst-size>65535</burst-size>
     </limits>
     <authentication>
@@ -41,7 +39,7 @@
     <logging>
         <accesslog>access.log</accesslog>
         <errorlog>error.log</errorlog>
-      	<loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+      	<loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
     </logging>
     <security>
         <chroot>0</chroot>

doc/Makefile.am

@@ -7,7 +7,8 @@ doc_DATA = index.html icecast2_admin.html icecast2_basicsetup.html \
 	icecast2_config_file.html icecast2_faq.html icecast2_glossary.html \
 	icecast2_introduction.html icecast2_relay.html icecast2_stats.html \
 	icecast2_win32.html icecast2_yp.html icecast2_listenerauth.html icecast2_changes.html \
-	listener_auth1.jpg listener_auth2.jpg listener_auth3.jpg
+	listener_auth1.jpg listener_auth2.jpg listener_auth3.jpg \
+	masterslave.png relay.png
 
 EXTRA_DIST = Index.hhk icecast2.hhc icecast2.hhp index_win32.html \
 	stats1.jpg style.css win32_section1.html win32_section2.html \

doc/icecast2_listenerauth.html

@@ -51,8 +51,8 @@ do apply to intro files or fallback streams.
 <h3>Configuring Users and Passwords</h3>
 <p>Once the appropriate entries are made to the config file, connect your source client (using the mountpoint you named in the config file).  To configure users and passwords for this stream you must use the web-based admin interface.  Navigate to http://server:ip/admin/stats.xsl to begin.  If you have configured everything properly, you should see a screen like the following :</p>
 <img src="listener_auth1.jpg" alt="Screenshot of http://server:ip/admin/stats.xsl" />
-<p>You will see a red key in front of all mountpoint configured for listener authentication.  Also note that this page will only show CONNECTED mountpoints.</p>
-<p>To manage users and passwords for this mountpoint, click on the red key or follow the "Manage Authentication" link.  The following screen will be shown :</p>
+<p>You will see a lock in front of all mountpoint configured for listener authentication.  Also note that this page will only show CONNECTED mountpoints.</p>
+<p>To manage users and passwords for this mountpoint, click on the lock or follow the "Manage Authentication" link.  The following screen will be shown :</p>
 <img src="listener_auth2.jpg" alt="Screenshot of Manage Authentication" />
 <p>This screen will show all the users configured for this mountpoint.  Adding users is as simple as entering a username and password in the fields and clicking "Add New User".  Note that usernames MUST be unique and there are NO restrictions on passwords.  You can delete users by clicking the appropriate delete link next to each user.</p>
 <br />