[xiph-commits] r7800 - icecast/branches/kh/icecast/doc

karl at motherfish-iii.xiph.org karl at motherfish-iii.xiph.org
Sun Sep 19 12:10:18 PDT 2004


Author: karl
Date: 2004-09-19 12:10:18 -0700 (Sun, 19 Sep 2004)
New Revision: 7800

Modified:
   icecast/branches/kh/icecast/doc/icecast2_admin.html
   icecast/branches/kh/icecast/doc/icecast2_basicsetup.html
   icecast/branches/kh/icecast/doc/icecast2_config_file.html
   icecast/branches/kh/icecast/doc/icecast2_faq.html
   icecast/branches/kh/icecast/doc/icecast2_glossary.html
   icecast/branches/kh/icecast/doc/icecast2_introduction.html
   icecast/branches/kh/icecast/doc/icecast2_listenerauth.html
   icecast/branches/kh/icecast/doc/icecast2_relay.html
   icecast/branches/kh/icecast/doc/icecast2_stats.html
   icecast/branches/kh/icecast/doc/icecast2_win32.html
   icecast/branches/kh/icecast/doc/icecast2_yp.html
   icecast/branches/kh/icecast/doc/index.html
   icecast/branches/kh/icecast/doc/index_win32.html
   icecast/branches/kh/icecast/doc/style.css
   icecast/branches/kh/icecast/doc/win32_section1.html
   icecast/branches/kh/icecast/doc/win32_section2.html
   icecast/branches/kh/icecast/doc/win32_section3.html
Log:
documentation resync from trunk


Modified: icecast/branches/kh/icecast/doc/icecast2_admin.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_admin.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/icecast2_admin.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,111 +1,118 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Icecast 2 Admin Interface</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
-<br>
-<br>
-<br>
+<hr id='titlebar' />
+<br />
+<br />
+<br />
 <h2>Overview</h2>
 <p>This section contains information about the admin interface of icecast.  Through this interface the user can manipulate many server features.  From it you can gather statistics, mov	e listeners from mountpoint to mountpoint, disconnect connected sources, disconnect connected listeners, and many other activities.  Each function is enumerated here as well as an example usage of the function.</p>
 <p>Each of these functions requires authentication via the &lt;admin-username&gt; and &lt;admin-password&gt; specified in the icecast config file. It is also important to note that in all the examples 192.168.1.10 is used as the example host and 8000 is used as the example port for the icecast server.</p>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 <h2>Admin Functions (mount specific)</h2>
 <p>All these admin functions are mount specific in that they only apply to a particular mountpoint (as opposed to applying to the entire server).  Each of these functions requires a mountpoint to be specified as input.
+</p>
 <h3>Metadata Update</h3>
 <h4>description</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This function provides the ability for either a source client or any external program to update the metadata information for a particular mountpoint.  Currently the only metadata supported is song title and only for MP3 streams.
 </div>
 <h4>example</h4>
 <pre>
-http://192.168.1.10:8000/admin/metadata?mount=/mystream&mode=updinfo&song=ACDC+Back+In+Black
+http://192.168.1.10:8000/admin/metadata?mount=/mystream&amp;mode=updinfo&amp;song=ACDC+Back+In+Black
 </pre>
-<br>
-<br>
+<br />
+<br />
 <h3>Fallback Update</h3>
 <h4>description</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This function provides the ability for either a source client or any external program to update the "fallback mountpoint" for a particular mountpoint.  Fallback mounts are those that are used in the even of a source client disconnection.  If a source client disconnects for some reason that all currently connected clients are sent immediately to the fallback mountpoint.
 </div>
 <h4>example</h4>
 <pre>
-http://192.168.1.10:8000/admin/fallbacks?mount=/mystream.ogg&fallback=/myfallback.ogg
+http://192.168.1.10:8000/admin/fallbacks?mount=/mystream.ogg&amp;fallback=/myfallback.ogg
 </pre>
-<br>
-<br>
+<br />
+<br />
 <h3>List Clients</h3>
 <h4>description</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This function lists all the clients currently connected to a specific mountpoint.  The results are sent back in XML form.
 </div>
 <h4>example</h4>
 <pre>
 http://192.168.1.10:8000/admin/listclients?mount=/mystream.ogg
 </pre>
-<br>
-<br>
+<br />
+<br />
 <h3>Move Clients (Listeners)</h3>
 <h4>description</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This function provides the ability to migrate currently connected listeners from one mountpoint to another.  This function requires 2 mountpoints to be passed in: mount (the *from* mountpoint) and destination (the *to* mountpoint).  After processing this function all currently connected listeners on mount will be connected to destination.  Note that the destination mountpoint must exist and have a sounce client already feeding it a stream.
 </div>
 <h4>example</h4>
 <pre>
-http://192.168.1.10:8000/admin/moveclients?mount=/mystream.ogg&destination=/mynewstream.ogg
+http://192.168.1.10:8000/admin/moveclients?mount=/mystream.ogg&amp;destination=/mynewstream.ogg
 </pre>
-<br>
-<br>
+<br />
+<br />
 <h3>Kill Client (Listener)</h3>
 <h4>description</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This function provides the ability to disconnect a specific listener of a currently connected mountpoint.  Listeners are identified by a unique id that can be retrieved by via the "List Clients" admin function.  This id must be passed in to the request.  After processing this request, the listener will no longer be connected to the mountpoint.
 </div>
 <h4>example</h4>
 <pre>
-http://192.168.1.10:8000/admin/killclient?mount=/mystream.ogg&id=21
+http://192.168.1.10:8000/admin/killclient?mount=/mystream.ogg&amp;id=21
 </pre>
-<br>
-<br>
+<br />
+<br />
 <h3>Kill Source</h3>
 <h4>description</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This function will provide the ability to disconnect a specific mountpoint from the server.  The mountpoint to be disconnected is specified via the variable "mount".
 </div>
 <h4>example</h4>
 <pre>
 http://192.168.1.10:8000/admin/killsource?mount=/mystream.ogg
 </pre>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 <h2>Admin Functions (general)</h2>
 <h3>Stats</h3>
 <h4>description</h4>
-<div class=indentedbox>
-This admin function provides the ability to query the internal statistics kept by the icecast server.  Almost all information about the internal workings of the server such as the mountpoints connected, how many client requests have been served, how many listeners for each mountpoint, etc, are available via this admin function.<br>
+<div class="indentedbox">
+This admin function provides the ability to query the internal statistics kept by the icecast server.  Almost all information about the internal workings of the server such as the mountpoints connected, how many client requests have been served, how many listeners for each mountpoint, etc, are available via this admin function.<br />
 Note that this admin function can also be invoked via the http://server:port/admin/stats.xml syntax, however this syntax should not be used and will eventually become deprecated.
 </div>
 <h4>example</h4>
 <pre>
 http://192.168.1.10:8000/admin/stats
 </pre>
-<br>
-<br>
+<br />
+<br />
 <h3>List Mounts</h3>
 <h4>description</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This admin function provides the ability to view all the currently connected mountpoints.
 </div>
 <h4>example</h4>
 <pre>
 http://192.168.1.10:8000/admin/listmounts
 </pre>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 <h2>Web-Based Admin Interface</h2>
 <p>As an alternative to manually invoking these URLs, a web-based admin interface was developed.  This interface provides the same functions that were identified and described above but presents them in a little nicer way.  The Web-Based Admin Interface to icecast is shipped with icecast provided in the "admin" directory and comes ready to use.  All the user needs to do is set the path to this directory in the config file via the &lt;adminroot&gt; config variable.</p>
 <p>The Web-Based Admin Interface is a series of XSLT files which are used to display all the XML obtained via the URL admin interface.  This can be changed and modified to suit the user's need.  Knowledge of XSLT and transformations from XML to HTML are required in order to make changes to these scripts.</p>
@@ -115,7 +122,7 @@
 </pre>
 <p>From this URL all of the other admin functions can be exercised.</p>
 <p>Modification of existing XSLT transforms in /admin is allowed, but new files cannot be created here. Creation of new XSLT transforms as well as modification of existing transforms is allowed in /web. These work using the document returned by /admin/stats.xml. To see the XML document that is applied to each admin XSLT, just change the .xsl to .xml in your request (i.e. /admin/listclients.xml). You can then code your XSLT transform accordingly.
-<br>
+</p>
 </div>
 </body>
 </html>

Modified: icecast/branches/kh/icecast/doc/icecast2_basicsetup.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_basicsetup.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/icecast2_basicsetup.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,31 +1,42 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Icecast 2 Basic Setup</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
-<br>
-<br>
-<br>
+<hr id='titlebar' />
+<p>
+<br />
+<br />
+<br />
+</p>
 <h2>Basic Requirements</h2>
 <p>This section will describe the essential requirements in setting up a simple Internet radio station.  It is by no means a complete list but should give you enough to get started.</p>
 <p>There are two major components involved: the streaming server (icecast in this case) and the source client.  The icecast server will be the place where all listeners of your station will connect.  The source client (in general) runs on a separate machine than icecast, but does not necessarily need to.  Source clients send the content to icecast and provide the stream data (encoded audio) that is then relayed out to listeners by icecast.</p>
 <p>It is important to note that not all source clients work with icecast2.  You will need to check to make sure that icecast2 is supported by your chosen source client.</p>
-
-<br>
-<br>
-<br>
+<p>
+<br />
+<br />
+<br />
+</p>
 <h2>The Basics</h2>
 <p>Each icecast server can house multiple broadcasts (or mountpoints) each containing a separate stream of content.  A listener can only listen to a single mountpoint at a time.  This means you can have a single icecast server contain either multiple broadcasts with different content, or possibly the same broadcast but with streams of different bitrates or qualities.  In this case each broadcast or stream is a separate mountpoint.</p>
 <p>At this point, the steps outlined here related to the Unix version or Win32 console version of icecast.  Icecast is also available in a Win32 GUI version, and the steps are similar in setup, but not quite the same.</p>
 <p>The first step in the process is to find and install the icecast2 server itself.  How to do this is not contained within this documentation.  After installation you should have and icecast binary and 3 directories</p>
-<center>
-<table border=1 width=75%>
+<div style="text-align:center;">
+<table border="1" width="75%">
 <tr><td>conf</td><td>Contains the icecast configuration file (icecast.xml) which defines all the configuration parameters for the server.</td></tr>
 <tr><td>admin</td><td>Contains xslt files which are used by the icecast server to provide a web-based front end to the administration capabilities of the server.</td></tr>
 <tr><td>logs</td><td>This is a blank directory which (if specified in the config file) will contain all the logs (there are 2) for icecast.</td></tr>
 </table>
-</center>
-<p>The next step is to edit the icecast.xml file and set the appropriate values.  Most of the default values are fine as provided, and for a basic setup the following entries should be changed :<br><br>
+</div>
+<p>The next step is to edit the icecast.xml file and set the appropriate values.  Most of the default values are fine as provided, and for a basic setup the following entries should be changed :
+<br /><br />
+</p>
 <pre>
 &lt;source-password&gt; - will be used by the source client
 &lt;admin-password&gt; - will be used to access admin features of icecast
@@ -43,17 +54,19 @@
 [2003-10-31  13:04:49] INFO main/main.c icecast server started
 </pre>
 <p>You can also verify that it started by visiting the following URL : http://yourip:port/admin/stats.xml.  You should be prompted for a username and password.  Enter the username "admin" and the password you entered for &lt;admin-password&gt;.  If all is well, you should see an small XML tree which represents icecast statistics (more about that later).</p>
-<p>Now that the icecast server is started you must now configure your source client.  The information you will need for the source client is the following : <br>
-<br>
-IP address and Port of the icecast server - both of these come from &lt;listen-socket&gt;<br>
-source password - from &lt;source-password&gt;<br>
+<p>Now that the icecast server is started you must now configure your source client.  The information you will need for the source client is the following : <br />
+<br />
+IP address and Port of the icecast server - both of these come from &lt;listen-socket&gt;<br />
+source password - from &lt;source-password&gt;
+</p>
 <p>Additionally, you will need to choose a mountpoint and specify this in the source client.  Icecast does not need to know about each mount point (although you can configure settings for specific mountpoint - this is covered under Advanced configuration) there are, however, some points to mention regarding mountpoints.  All Ogg Vorbis streams should have mountpoints that end in .ogg (i,e. /mystream.ogg).  This is due to the lazy way most media players infer the type of stream.  MP3 streams usually do not contain an extension (/mystream).  Mount points also should not contain any spaces or odd characters (again due to the lazy way many of the media players are coded).</p>
 <p>Once you have configured your source client, you should be able to connect it to the icecast server.  Verify that it is connected by hitting the stats.xml URL that was mentioned above.</p>
 <p>Now that you have the source connnected, listening to the stream involves simply opening the appropriate following URL in a browser: http://yourip:port/mounpointyouspecified.m3u.  So, for instance, if you attached your source client to an icecast server located at 192.168.1.10:8000 with a mountpoint of /mystream.ogg, then you would open : http://192.168.1.10:8000/mystream.ogg.m3u.  Note that the .m3u extention will serve up a link that opens most media players.  Also it is important to note that m3u need not contain only MP3 stream, it can contain streams of arbitrary content-type and is used by icecast to serve a playlist that represents your broadcast to listening clients.  Alternatively you can open up the stream URL directly within your media player (http://192.168.1.10:8000/mystream.ogg in this case)</p>
-
-<br>
-<br>
-<br>
+<p>
+<br />
+<br />
+<br />
+</p>
 </div>
 </body>
 </html>

Modified: icecast/branches/kh/icecast/doc/icecast2_config_file.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_config_file.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/icecast2_config_file.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,25 +1,34 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Icecast 2 Config File</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
+<hr id='titlebar' />
 <h3>Overview</h3>
 <p>
 This section will describe each section of the config file and is grouped into the following sections:
 </p>
-<li><a href="#limits">Limits</a>
-<li><a href="#authentication">Authentication</a>
-<li><a href="#yp">YP Directory Settings</a>
-<li><a href="#misc">Misc Server settings</a>
-<li><a href="#relay">Relay settings</a>
-<li><a href="#mount">Mount Specific settings</a>
-<li><a href="#path">File path settings</a>
-<li><a href="#log">Logging</a>
-<li><a href="#security">Security</a>
-
-<br>
-<br>
-<br>
+<ul>
+<li><a href="#limits">Limits</a></li>
+<li><a href="#authentication">Authentication</a></li>
+<li><a href="#yp">YP Directory Settings</a></li>
+<li><a href="#misc">Misc Server settings</a></li>
+<li><a href="#relay">Relay settings</a></li>
+<li><a href="#mount">Mount Specific settings</a></li>
+<li><a href="#path">File path settings</a></li>
+<li><a href="#log">Logging</a></li>
+<li><a href="#security">Security</a></li>
+</ul>
+<p>
+<br />
+<br />
+<br />
+</p>
 <a name="limits"></a>
 <h2>Limits</h2>
 <pre>
@@ -38,47 +47,49 @@
 <p>This section contains server level settings that, in general, do not need to be changed.  Only modify this section if you are know what you are doing.
 </p>
 <h4>clients</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Total number of concurrent clients supported by the server.  Listeners are considered clients, but so is accesses to any static content (i.e. fileserved content) and also any requests to gather stats.  These are max *concurrent* connections for the entire server (not per mountpoint).
 </div>
 <h4>sources</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Maximum number of connected sources supported by the server.
 </div>
 <h4>threadpool</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This is the number of threads that are started to handle client connections.  You may need to increase this value if you are running a high traffic stream.  This recommended value is for a small to medium traffic server.
 </div>
 <h4>queue-size</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This is the maximum size (in bytes) of a client (listener) queue.  A listener may temporarily lag behind due to network congestion and in this case an internal queue is maintained for each listener.  If the queue grows larger than this config value, then the listener will be removed from the stream.
 </div>
 <h4>client-timeout</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This does not seem to be used.
 </div>
 <h4>header-timeout</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The maximum time (in seconds) to wait for a request to come in once the client has made a connection to the server.  In general this value should not need to be tweaked.
 </div>
 <h4>source-timeout</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 If a connected source does not send any data within this timeout period (in seconds), then the source connection will be removed from the server.
 </div>
 <h4>burst-on-connect</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 With this enabled, a connecting client will be sent a burst of audio data from the stream.  This will have the effect of reducing the startup time for the stream from the perspective of the listener.  This is due to the fact that most media players have local buffers that must be filled before the stream begins to play.  This may introduce a small latency in the stream (difference in time between when the source plays a clip and the listener hears a clip).  If this latency is important to you, then you can disable this feature.  The latency is bitrate-dependent, but as an example, for a 128kbps stream, the latency between the source and the player is ~ 1.5 secs WITHOUT burst on connect, and WITH burst on connect the latency is 3 secs.
 </div>
 <h4>burst-size</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The burst size is the amount of data (in bytes) to burst to a client at connection time. Like
 burst-on-connect, this is to quickly fill the pre-buffer used by media players. The default
 is 64kbytes which is a typical size used by most clients so changing it is not usually required.
 This setting applies to all mountpoints.
 </div>
-<br>
-<br>
-<br>
+<p>
+<br />
+<br />
+<br />
+</p>
 <a name="authentication"></a>
 <h2>Authentication</h2>
 <pre>
@@ -92,21 +103,23 @@
 <p>This section contains all the users and passwords used for administration purposes or to connect sources and relays.
 </p>
 <h4>source-password</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The unencrypted password used by sources to connect to icecast2.  Currently, the username for all source connections must be 'source'.  This is likely to change in the future.
 </div>
 <h4>relay-password</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Currently not used.
 </div>
 <h4>admin-user</h4>
 <h4>admin-password</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The username/password used for all administration functions.  This includes retrieving statistics, accessing the web-based administration screens, etc.  A list of these functions can be found in the "Administration" section of the manual.
 </div>
-<br>
-<br>
-<br>
+<p>
+<br />
+<br />
+<br />
+</p>
 <a name="yp"></a>
 <h2>YP Directory Settings</h2>
 <pre>
@@ -118,16 +131,18 @@
 <p>This section contains all the settings for listing a stream on any of the Icecast2 YP Directory servers.  Multiple occurances of this section can be specified in order to be listed on multiple directory servers.
 </p>
 <h4>yp-url-timeout</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This value is the maximum time icecast2 will wait for a response from a particular directory server.  The recommended value should be sufficient for most directory servers.
 </div>
 <h4>yp-url</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The URL which icecast2 uses to communicate with the Directory server.  The value for this setting is provided by the owner of the Directory server.
 </div>
-<br>
-<br>
-<br>
+<p>
+<br />
+<br />
+<br />
+</p>
 <a name="misc"></a>
 <h2>Misc Server Settings</h2>
 <pre>
@@ -148,20 +163,22 @@
 <p>This section contains miscellaneous server settings.  Note that multiple listen-socket sections may be configured in order to have icecast2 listen on multiple network interfaces.  If a bind-address is not specified for a particular listen-socket, then the hostname parameter will be used to specify the address that will be bound.
 </p>
 <h4>port</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The TCP port that will be used to accept client connections.
 </div>
 <h4>bind-address</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 And option IP address that can be used to bind to a specific network card.  If not supplied, then &lt;hostname&gt; will be used.
 </div>
 <h4>fileserve</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This flag turns on the icecast2 fileserver from which static files can be served.  All files are served relative to the path specified in the &lt;paths&gt;&lt;webroot&gt; configuration setting.
 </div>
-<br>
-<br>
-<br>
+<p>
+<br />
+<br />
+<br />
+</p>
 <a name="relay"></a>
 <h2>Relay Settings</h2>
 <pre>
@@ -181,10 +198,11 @@
     &lt;/relay&gt;
 </pre>
 <p>This section contains the server's relay settings. There are two types of relays: a "Master server relay" or a "Specific Mountpoint relay."  A Master server relay is only supported between icecast2 servers and is used to relays all mountpoints on a remote icecast2 server.   
-
+</p>
 <h3>Master Relay</h3>
+<p>
 The following diagram shows the basics of doing a Master relay.  Note that Server 1 is configured with the &lt;master-server&gt;, &lt;master-server-port&gt;, etc settings and Server 2 is the server from which Server 1 will pull all attached mountpoints and relay them.  Using a Master Server relay, ALL mountpoints on Server 2 will be relayed.  If only specific mountpoints need to be relayed, then you must configure Server 1 as a "Specific Mountpoint Relay".  Both Master server relays and Specific Mountpoint relays begin their "relaying" when the Server is started.
-
+</p>
 <pre>
       |-----|                       |-----|
       |     |  all mountpoints      |     | /mount1
@@ -199,46 +217,46 @@
      settings 
 
 </pre>
-
+<p>
 A server is configured as a Master Server relay by specifying the &lt;master-server&gt;, &lt;master-server-port&gt;,&lt;master-update-interval&gt;,&lt;master-password&gt; values in the config file.  The server that is being relayed does not need any special configuration.
+</p>
 
-</p>
 <h4>master-server</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This is the IP for the server which contains the mountpoints to be relayed (Master Server).  
 </div>
 <h4>master-server-port</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This is the TCP Port for the server which contains the mountpoints to be relayed (Master Server).
 </div>
 <h4>master-update-interval</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The interval (in seconds) that the Relay Server will poll the Master Server for any new mountpoints to relay.
 </div>
 <h4>master-username</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This is the username to authenticate with the master. The default is "relay". This is used to
 get hold of the streamlist and can be used to authenticate master relays. The master server
 will compare with the relay-user.
 </div>
 <h4>master-password</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 As with master-username, this is the password to authenticate with the master server. The
 relay-password on the master server is used for comparison.
 </div>
 <h4>master-redirect-port</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 When a slave starts a master relay using authentication, then a host and port can also be sent to
 inform the master for the purposes of redirecting clients to the slave. The host is provided by
 the hostname setting and this specifies the port to redirect listeners to.
 </div>
 <h4>relays-on-demand</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Changes the default on-demand setting, so a stream is only relayed if listeners are connected.
 (1=enabled, 0=disabled).
 </div>
 
-<br>
+<br />
 <h3>Specific Mountpoint Relay</h3>
 The following diagram shows the basics of doing a Specific Mountpoint relay.  Note that Server 1 is configured with the &lt;relay&gt; settings and Server 2 is the server from which Server 1 will pull the specified mountpoint(s) and relay them.  Using a Specific Mountpoint Relay, only those mountpoints specified on Server 1 will be relayed from Server 2.
 
@@ -271,36 +289,38 @@
     &lt;/relay&gt;
 </pre>
 
-</p>
+
 <h4>server</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This is the IP for the server which contains the mountpoint to be relayed.
 </div>
 <h4>port</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This is the TCP Port for the server which contains the mountpoint to be relayed.
 </div>
 <h4>mount</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The mountpoint located on the remote server.  If you are relaying a shoutcast stream, this must be '/'.
 </div>
 <h4>local-mount</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The name to use for the local mountpoint.  This is what the mount will be named on the RELAY SERVER.
 </div>
 <h4>relay-shoutcast-metadata</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 If you are relaying a Shoutcast stream, you need to specify this indicator to also relay the metadata (song titles) that is part of the Shoutcast stream (1=enabled, 0=disabled).
 </div>
 <h4>on-demand</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 An on-demand relay will only retrieve the stream if there are listeners connected
 (1=enabled, 0=disabled).
 </div>
 
-<br>
-<br>
-<br>
+<p>
+<br />
+<br />
+<br />
+</p>
 <a name="mount"></a>
 <h2>Mount Specific Settings</h2>
 <pre>
@@ -323,52 +343,54 @@
 <p>This section contains settings which apply only to a specific mountpoint.  Within this section you can reserve a specific mountpoint and set a source username/password for that mountpoint (not yet implemented) as well as specify individual settings which will apply only to the supplied mountpoint.
 </p>
 <h4>mount-name</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The name of the mount point for which these settings apply.
 </div>
 <h4>username</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 An optional value which will set the username that a source must use to connect using this mountpoint.
 </div>
 <h4>password</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 An optional value which will set the password that a source must use to connect using this mountpoint.
 </div>
 <h4>max-listeners</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 An optional value which will set the maximum number of listeners that can be attached to this mountpoint.
 </div>
 <h4>dump-file</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 An optional value which will set the filename which will be a dump of the stream coming through on this mountpoint.
 </div>
 <h4>fallback-mount</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This specifies a mountpoint that is used in the case of a source disconnect.  If listeners are connected to the mount specified by the &lt;mount-name&gt; config value, then if the source is disconnected; all currently connected clients will be moved to the fallback-mount.
 </div>
 <h4>fallback-override</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 When enabled, this allows a connecting source client or relay on this mountpoint to move
 listening clients back from the fallback mount.
 </div>
 <h4>burst-size</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 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>
+<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>
+<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>.
 </div>
-<br>
-<br>
-<br>
+<p>
+<br />
+<br />
+<br />
+</p>
 <a name="path"></a>
 <h2>Path Settings</h2>
 <pre>
@@ -384,32 +406,34 @@
 <p>This section contains paths which are used for various things within icecast.  All paths should not end in a '/'.
 </p>
 <h4>basedir</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This path is used in conjunction with the chroot settings, and specified the base directory that is chrooted to when the server is started.  This feature is not supported on win32.
 </div>
 <h4>logdir</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This path specifies the base directory used for logging. Both the error.log and access.log will be created relative to this directory.  
 </div>
 <h4>pidfile</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This pathname specifies the file to write at startup and to remove at normal shutdown. The file contains the process id of the icecast process. This could be read and used for sending signals icecast.
 </div>
 <h4>webroot</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This path specifies the base directory used for all static file requests.  This directory can contain all standard file types (including mp3s and ogg vorbis files).  For example, if webroot is set to /var/share/icecast2, and a request for http://server:port/mp3/stuff.mp3 comes in, then the file /var/share/icecast2/mp3/stuff.mp3 will be served.
 </div>
 <h4>adminroot</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This path specifies the base directory used for all admin requests.  More specifically, this is used to hold the XSLT scripts used for the web-based admin interface.  The admin directory contained within the icecast distribution contains these files.
 </div>
 <h4>alias source="/foo" dest="/bar"</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Aliases are used to provide a way to create multiple mountpoints that refer to the same mountpoint.
 </div>
-<br>
-<br>
-<br>
+<p>
+<br />
+<br />
+<br />
+</p>
 <a name="log"></a>
 <h2>Logging Settings</h2>
 <pre>
@@ -422,25 +446,26 @@
 <p>This section contains information relating to logging within icecast.  There are two logfiles currently generated by icecast, an error.log (where all log messages are placed) and an access.log (where all stream/admin/http requests are logged).
 </p>
 <p>Note that on non-win32 platforms, a HUP signal can be sent to icecast in which the log files are re-opened for appending giving the ability move/remove the log files.
+</p>
 <h4>accesslog</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Into this file, all requests made to the icecast2 will be logged.  This file is relative to the path specified by the &lt;logdir&gt; config value.
 </div>
 <h4>errorlog</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 All icecast generated log messages will be written to this file.  If the loglevel is set too high (Debug for instance) then this file can grow fairly large over time.  Currently, there is no log-rotation implemented.
 </div>
 <h4>loglevel</h4>
-<div class=indentedbox>
-Indicates what messages are logged by icecast.  Log messages are categorized into one of 4 types, Debug, Info, Warn, and Error.<br><br>The following mapping can be used to set the appropraite value :
+<div class="indentedbox">
+Indicates what messages are logged by icecast.  Log messages are categorized into one of 4 types, Debug, Info, Warn, and Error.<br /><br />The following mapping can be used to set the appropraite value :
+<ul>
+<li>loglevel = 4 - Debug, Info, Warn, Error messages are printed</li>
+<li>loglevel = 3 - Info, Warn, Error messages are printed</li>
+<li>loglevel = 2 - Warn, Error messages are printed</li>
+<li>loglevel = 1 - Error messages only are printed</li>
+</ul>
 </div>
-<br>
-<br>
-<li>loglevel = 4 - Debug, Info, Warn, Error messages are printed
-<li>loglevel = 3 - Info, Warn, Error messages are printed
-<li>loglevel = 2 - Warn, Error messages are printed
-<li>loglevel = 1 - Error messages only are printed
-<br>
+<br />
 <a name="security"></a>
 <h2>Security Settings</h2>
 <pre>
@@ -455,11 +480,11 @@
 <p>This section contains configuration settings that can be used to secure the icecast server by performing a chroot to a secured location.  This is currently not supported on win32.
 </p>
 <h4>chroot</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 An indicator which specifies whether a chroot() will be done when the server is started.  The chrooted path is specified by the &lt;basedir&gt; configuration value.
 </div>
 <h4>changeowner</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 This section indicates the user and group that will own the icecast process when it is started.  These need to be valid users on the system.
 </div>
 </div>

Modified: icecast/branches/kh/icecast/doc/icecast2_faq.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_faq.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/icecast2_faq.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,14 +1,20 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Icecast 2 FAQ</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
-<br>
-<br>
-<br>
+<hr id='titlebar' />
+<br />
+<br />
+<br />
 <h2>General Questions</h2>
 <h4>What is Icecast?</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 <p>
 Icecast, the project, is a collection of programs and libraries for
 streaming audio over the Internet. This includes:
@@ -22,13 +28,13 @@
 </div>
 
 <h4>What is icecast, the program?</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 <p>
-icecast streams audio to listeners, and is compatible with Nullsoft’s Shoutcast.
+icecast streams audio to listeners, and is compatible with Nullsoft`s Shoutcast.
 </p>
 </div>
 <h4>What is libshout ?</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 <p>
 	From the README:
 </p>
@@ -41,7 +47,7 @@
 </div>
 
 <h4>What is IceS?</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 <p>
 	IceS is a program that sends audio data to an icecast server to broadcast to clients.
 	IceS can either read audio data from disk,
@@ -50,11 +56,11 @@
 </div>
 
 <h4>How can I view the stream status page?</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 		<p>
 			Check your icecast configuration file for an element
 			called &lt;webroot&gt;. This directory contains web stuff.
-			In it, place a file called “status.xsl” that
+			In it, place a file called "status.xsl" that
 			transforms an <acronym>XML</acronym> file containing stream
 			data into a web page
 			(either <acronym>XHTML</acronym> or <acronym>HTML</acronym>).
@@ -67,13 +73,13 @@
 
 		<p>
 			In addition, the web directory can
-			hold multiple status transforms, if you can’t decide which
+			hold multiple status transforms, if you can't decide which
 			one you want.
 		</p>
 </div>
 
 <h4>What can I use to listen to an Icecast stream?</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 		<p>
 			We maintain a list of Icecast-compatible audio players at
 			http://www.icecast.org/

Modified: icecast/branches/kh/icecast/doc/icecast2_glossary.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_glossary.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/icecast2_glossary.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,34 +1,40 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Icecast 2 Glossary</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
-<br>
-<br>
-<br>
-<a name="source client"></a>
+<hr id='titlebar' />
+<br />
+<br />
+<br />
+<a name="source_client"></a>
 <h4>source client</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 A source client is an external program which is responsible for sending content data to icecast.  Some source clients that support icecast2 are Oddcast, ices2, ices0.3, and DarkIce.
 </div>
-<a name="slave server"></a>
+<a name="slave_server"></a>
 <h4>slave server (Relay)</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The slave server in a relay configuration is the server that is pulling the data from the master server. It acts as a listening client to the master server.
 </div>
-<a name="master server"></a>
+<a name="master_server"></a>
 <h4>master server (Relay)</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The master server in a relay configuration is the server that has the stream that is being relayed.
 </div>
 <a name="mountpoint"></a>
 <h4>mountpoint</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 A mountpoint is a resource on the icecast server that represents a single broadcast stream.  Mountpoints are named similar to files (/mystream.ogg, /mymp3stream).  When listeners connect to icecast2, they must specify the mountpoint in the request (i.e. http://192.168.1.10:8000/mystream.ogg).  Additionally, source clients must specify a mountpoint when they connect as well.  Statistics are kept track of by mountpoint.  Mountpoints are a fundamental aspect of icecast2 and how it is organized.
 </div>
 <a name="fallback"></a>
 <h4>fallback mountpoint</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 A fallback mountpoint is configured with a parent mountpoint.  In the event of the parent mountpoint losing connection with icecast, Icecast will then move all clients currently connected to the now defunct mountpoint to it's fallback mountpoint.
 </div>
 

Modified: icecast/branches/kh/icecast/doc/icecast2_introduction.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_introduction.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/icecast2_introduction.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,43 +1,57 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Icecast 2 Introduction</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
-<br>
-<br>
-<br>
+<hr id='titlebar' />
+<br />
+<br />
+<br />
 <h2>What is Icecast ?</h2>
 <p>Icecast is a streaming media server which currently supports Ogg Vorbis and MP3 audio streams.  It can be used to create an Internet radio station or a privately running jukebox and many things in between.  It is very versatile in that new formats can be added relatively easily and supports open standards for commuincation and interaction.</p>
-<br>
+<br />
 <p>There are two major parts to most streaming media servers: the component providing the content (what we call <b>source clients</b>) and the component which is responsible for serving that content to listeners (this is the function of icecast).
 </p>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 <h2>What platforms are supported ?</h2>
 <p>Currently the following Unix platforms are supported:</p>
-<li>Linux (Most flavors including Redhat and Debian)
-<li>FreeBSD
-<li>OpenBSD
-<li>Solaris
+<ul>
+<li>Linux (Most flavors including Redhat and Debian)</li>
+<li>FreeBSD</li>
+<li>OpenBSD</li>
+<li>Solaris</li>
+</ul>
 <p>Currently the following Windows platforms are supported:</p>
-<li>Windows NT
-<li>Windows 2000
-<li>Windows XP
-<br>
-<br>
-<br>
+<ul>
+<li>Windows NT</li>
+<li>Windows 2000</li>
+<li>Windows XP</li>
+</ul>
+<br />
+<br />
+<br />
 <h2>Where do I go for questions?</h2>
 <p>There are many ways to contact the icecast development team</p>
 <h3>Best Ways</h3>
-<li>Icecast mailing list <a href="http://www.xiph.org/archives">http://www.xiph.org/archives</a>
-<li>Icecast Developers mailing list <a href="http://www.xiph.org/archives">http://www.xiph.org/archives</a>
-<li>Icecast IRC chat room - irc.freenode.net : #icecast
+<ul>
+<li>Icecast mailing list <a href="http://www.xiph.org/archives">http://www.xiph.org/archives</a></li>
+<li>Icecast Developers mailing list <a href="http://www.xiph.org/archives">http://www.xiph.org/archives</a></li>
+<li>Icecast IRC chat room - irc.freenode.net : #icecast</li>
+</ul>
 <h3>Alternate Ways</h3>
-<li>team at icecast.org
-<br>
-<br>
-<br>
+<ul>
+<li>team at icecast.org</li>
+</ul>
+<br />
+<br />
+<br />
 </div>
 </body>
 </html>

Modified: icecast/branches/kh/icecast/doc/icecast2_listenerauth.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_listenerauth.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/icecast2_listenerauth.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,17 +1,23 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Icecast 2 Listener Authentication</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
-<br>
-<br>
-<br>
+<hr id='titlebar' />
+<br />
+<br />
+<br />
 <h2>Listener Authentication</h2>
 <p>Listener authentication is a feature of icecast which allows you to secure certain mountpoint so that in order to listen, a listener must provide a username and password.  With this feature a simple pay-for-play operation can be setup.  This section will show you the basics of setting up and maintaining this component.</p>
 
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 <h2>HTPASSWD Listener Authentication</h2>
 <h3>Config File Entries</h3>
 <p>In order to use listener authentication, you MUST configure a mount specific option.  This means that you have to provide a &lt;mount&gt; section in the main icecast config file.  The following is an example :</p>
@@ -25,28 +31,28 @@
     &lt;/mount&gt;
 </pre>
 <p>To support listener authentication you MUST provide at a minimum &lt;mount-name&gt; and &lt;authentication&gt;.  The mount-name is the name of the mountpoint that you will use to connect your source client with and authentication configures what type of icecast2 authenticator to use.  Currently, only a single type "htpasswd" is implemented.  New authenticators will be added later.  Each authenticator has a variable number of options that are required and these are specified as shown in the example.  The htpasswd authenticator requires a few parameters.  The first, filename, specifies the name of the file to use to store users and passwords.  Note that this file need not exist (and probably will not exist when you first set it up).  Icecast has built-in support for managing users and passwords via the web admin interface.  More on this later in this section.  The second option, allow_duplicate_users, if set to 0, will prevent multiple connections using the same username.  Setting this value to 1 will enable mutltiple connections from the same username on a given mountpoint.  Note there is no way to specify a "max connections" for a particular user.
-
+</p>
 <p>Icecast supports a mixture of streams that require listener authentication and those that do not.  Only mounts that are named in the config file can be configured for listener authentication.</p>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 <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 border=1 src="listener_auth1.jpg">
+<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>
-<img border=1 src="listener_auth2.jpg">
+<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>
-<br>
-<br>
+<br />
+<br />
+<br />
 <h3>Finishing it all off</h3>
 <p>Ok, so you've created your users, and you have everything setup properly, how do your users login ?  Well, we've provided a simple login form that you can use for this purpose.  This page (http://server:port/auth.xsl) will bring up a form that users can use to enter their username and password.</p>
-<img border=1 src="listener_auth3.jpg">
+<img src="listener_auth3.jpg" alt="Screenshot of http://server:port/auth.xsl" />
 <p>This page will serve a m3u with the username and password and in most cases should open the correct media player and begin playing your stream</p>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 <h2>A note about players and authentication</h2>
 <p>We do not have an exaustive list of players that support listener authentication.  We use standard HTTP basic authentication, and in general, many media players support this if they support anything at all.  Winamp and Foobar2000 support HTTP basic authentication on windows, and XMMS supports it on unix platforms.</p>
 </div>

Modified: icecast/branches/kh/icecast/doc/icecast2_relay.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_relay.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/icecast2_relay.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,20 +1,26 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Icecast 2 Relaying</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
-<br>
-<br>
-<br>
+<hr id='titlebar' />
+<br />
+<br />
+<br />
 <h2>Overview</h2>
 <p>Relaying is the process by which one server mirrors one or more streams from a remote server.  The servers need not be of the same type (i.e. icecast can relay from Shoutcast).  Relaying is used primarily for large broadcasts that need to distribute listening clients across multiple physical machines.</p>
-<br>
-<br>
+<br />
+<br />
 <h2>Type of Relays</h2>
 <p>There are two types of relays that icecast supports.  The first type is when both master and slave servers are icecast2 servers.  In this case, a "master-slave" relay can be setup such that all that needs to be done is configure the slave server with the connection information (serverip:port) of the master server and the slave will mirror all mountpoints on the master server.  The slave will also periodically check the master server to see if any new mountpoints have attached and if so will relay those as well.  The second type of relay is a "single-broadcast" relay.  In this case, the slave server is configured with a serverip+port+mount and only the mountpoint specified is relayed.  In order to relay a broadcast stream on a Shoutcast server, you must use the "single-broadcast" relay and specify a mountpoint of "/".</p>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 <h2>Setting Up A Master-Slave Relay</h2>
 <p>In order to setup a relay of this type both servers (the one you wish to relay and the one doing the relaying) need to be icecast2 servers. The following configuration snippet is used as an example:</p>
 <pre>
@@ -24,9 +30,9 @@
     &lt;master-password&gt;hackme&lt;/master-password&gt;
 </pre>
 In this example, this configuration is setup in the server which will be doing the relaying (slave server).  The master server in this case need not be configured (and actually is unaware of the relaying being performed) as a relay.  When the slave server is started, it will connect to the master server located at 192.168.1.11:8001 and will begin to relay all mountpoints connected to the master server.  Additionally, every master-update-interval (120 seconds in this case) the slave server will poll the master server to see if any new mountpoints have connected, and if so, the slave server will relay those as well.  Note that the names of the mountpoints on the slave server will be identical to those on the master server.
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 <h2>Setting Up A Single-Broadcast Relay</h2>
 <p>In this case, the master server need not be an icecast2 server.  Supported master servers for a single-broadcast relay are Shoutcast, Icecast1.x, and of course Icecast2. The following configuration snippet is used as an example:</p>
 <pre>   
@@ -39,9 +45,9 @@
     &lt;/relay&gt;
 </pre>
 <p>In this example, this configuration is also setup in the server which will be doing the relaying (slave server).  The master server in this case need not be configured (and actually is unaware of the relaying being performed) as a relay.  When the slave server is started, it will connect to the master server located at 192.168.1.11:8001 and will begin to relay only the mountpoint specified (/example.ogg in this case).  Using this type of relay, the user can override the local mountpoint name and make it something entirely different than the one on the master server.  Additionally, if the server is a Shoutcast server, then the &lt;mount&gt; must be specified as /.  And if you want the Shoutcast relay stream to have metadata contained within it (Shoutcast metadata is embedded in the stream itself) then the &lt;relay-shoutcast-metadata&gt; needs to be set to 1.</p>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 </div>
 </body>
 </html>

Modified: icecast/branches/kh/icecast/doc/icecast2_stats.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_stats.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/icecast2_stats.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,11 +1,17 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Icecast 2 Server Statistics</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
-<br>
-<br>
-<br>
+<hr id='titlebar' />
+<br />
+<br />
+<br />
 <h2>Overview</h2>
 <p>This section contains information about the server statistics available from icecast.  An example stats XML tree will be shown and each element will be described.  The following example stats tree will be used:</p>
 <pre>
@@ -30,54 +36,55 @@
 </pre>
 <h3>General Statistics</h3>
 <h4>client-connections</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Client connections are basically anything that is not a source connection.  These include listeners (not concurrent, but cumulative), any admin function accesses, and any static content (file serving) accesses.
 </div>
 <h4>source-connections</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Source connections are the number of times (cumulative not currently connected) a source has connected to icecast.
 </div>
 <h4>connections</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The total of client + source connections.
 </div>
 <h4>sources</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The total of currently connected sources (mountpoints).
 </div>
 <h3>Source-specific Statistics</h3>
 <h4>artist</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Artist of the current song (metadata set by source client).
 </div>
 <h4>title</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Title of the current song (metadata set by source client).
 </div>
 <h4>audio-info</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Information about the bitrate/samplerate/quality of the stream (set by source client). Also used for YP entries.
 </div>
 <h4>ice-bitrate</h4>
 <h4>ice-samplerate</h4>
 <h4>ice-channels</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Information about the bitrate/samplerate/quality of the stream (set by source client).
 </div>
 <h4>listeners</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 The number of currently connected listeners.
 </div>
 <h4>public</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Flag that indicates whether this mount is being listed on a YP (sey by source client).
 </div>
 <h4>type</h4>
-<div class=indentedbox>
+<div class="indentedbox">
 Media type of the stream.
 </div>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
+</div>
 </body>
 </html>

Modified: icecast/branches/kh/icecast/doc/icecast2_win32.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_win32.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/icecast2_win32.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,8 +1,14 @@
-<!doctype html public "-//w3c//dtd html 3.2//en">
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
 <div class="boxtest">
 <h1>Icecast 2 - Win32 Specific Documentation</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
+<hr id='titlebar' />
 <p>
 The win32 port of icecast2 is simply a UI framework around the core icecast2 server.  The win32 version of icecast2 directly uses the main executable of icecast (statically included) and simply provides a GUI interface to icecast2. 
 </p>
@@ -21,7 +27,7 @@
 	The number of sources that have attempted connections
 	Total number of attempted connections to the server
 </pre>
-</p>
+
 <p>
 The Server Status tab contains at a minimal the global stats for the server.  Additionally, you may add source specific stats to this tab.  The intent is to provide a single "dashboard view" of what's going on in the server.  To add source statistics to the Server Status tab, see the section on the Stats tab.
 </p>
@@ -29,10 +35,10 @@
 <p>
 Any stat that is contained on the Server Status tab can be displayed as the icecast2 window title.  This provides yet another mechanism by which you can view activities on the server.  To enable this feature, right click on any stat in the Server Status tab as seen below :
 </p>
-<img src="windowtitle.jpg">
-<br>
-<br>
-<br>
+<img src="windowtitle.jpg" alt="Screenshot of Icecast Windows GUI - Server Status Tab" />
+<br />
+<br />
+<br />
 <h3>Removing source level stats from the Server Status Tab</h3>
 <p>
 To remove a source level stat that you have inserted onto the Server Status Tab, simple right click that statistic and select "Delete from Global Stats".  The stat will be deleted from the Server Status tab, but will still remain on the source level Stats tab.
@@ -47,7 +53,7 @@
 <p>
 The stats tab contains a view of all the connected mountpoints and the statistics that go along with them.  Each connected mountpoint is displayed in the left pane of the window, and all stats for the selected mountpoint are displayed in the right pane of the window.
 </p>
-<img src="stats1.jpg">
+<img src="stats1.jpg" alt="Screenshot of Icecast Windows GUI - Stats Tab" />
 
 </div>
 </body>

Modified: icecast/branches/kh/icecast/doc/icecast2_yp.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_yp.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/icecast2_yp.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,17 +1,23 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Icecast 2 YP Directories</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
-<br>
-<br>
-<br>
+<hr id='titlebar' />
+<br />
+<br />
+<br />
 <h2>Overview</h2>
 <p>A YP (Yellow Pages) directory is a listing of broadcast streams.  Icecast2 has it own YP directory located at http://dir.xiph.org.  Currently icecast2 can only be listed in an icecast2-supported YP directory.  This means that you cannot list your stream in the Shoutcast YP directory.</p>
 <p>In the icecast2 configuration file are all the currently available YP directory servers.  Listing your stream in a YP is a combination of settings in the icecast configuration file and also in your source client.</p>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 <h2>Configuring icecast2 for YP Support</h2>
 <p>First of all, icecast must have been built with YP support.  This is automatically done if you have libcurl installed.  If libcurl is not detected when icecats is compiled, then YP support is disabled.</p>
 <p>If icecast has been built with YP support, then the following configuration options control the YP directory settings:</p>
@@ -22,15 +28,15 @@
     &lt;directory&gt;
 </pre>
 <p>Multiple directory XML chunks can be specified in order to be listed in multiple directories.</p>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 <h2>Configuring Your Source Client for YP Support</h2>
 <p>This is usually covered in the source client documentation.  More specifically, the source client needs to provide the HTTP header ice-public:1 on connect in order to enable YP listing of the stream.</p>
 <p>If a mountpoint is being listed on a YP, then you will see some additional statistics relating to the YP such as last-touch, currently-playing, etc.</p>
-<br>
-<br>
-<br>
+<br />
+<br />
+<br />
 </div>
 </body>
 </html>

Modified: icecast/branches/kh/icecast/doc/index.html
===================================================================
--- icecast/branches/kh/icecast/doc/index.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/index.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,24 +1,29 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Icecast 2 Documentation Table of Contents</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
+<hr id='titlebar' />
+<ul>
+<li><a href="icecast2_introduction.html">Introduction</a></li>
+<li><a href="icecast2_basicsetup.html">Basic Setup</a></li>
+<li><a href="icecast2_config_file.html">Icecast Config File</a></li>
+<li><a href="icecast2_admin.html">Admin Interface</a></li>
+<li><a href="icecast2_stats.html">Server Statistics</a></li>
+<li><a href="icecast2_relay.html">Relaying</a></li>
+<li><a href="icecast2_yp.html">Listing in a YP directory</a></li>
+<li><a href="icecast2_listenerauth.html">Listener Authentication</a></li>
+<li><a href="icecast2_win32.html">Win32 specific documentation</a></li>
+<li><a href="icecast2_glossary.html">Glossary</a></li>
+<li><a href="icecast2_faq.html">FAQ</a></li>
+</ul>
+<pre>
 
-<li><a href="icecast2_introduction.html">Introduction</a>
-<li><a href="icecast2_basicsetup.html">Basic Setup</a>
-<li><a href="icecast2_config_file.html">Icecast Config File</a>
-<li><a href="icecast2_admin.html">Admin Interface</a>
-<li><a href="icecast2_stats.html">Server Statistics</a>
-<li><a href="icecast2_relay.html">Relaying</a>
-<li><a href="icecast2_yp.html">Listing in a YP directory</a>
-<li><a href="icecast2_listenerauth.html">Listener Authentication</a>
-<li><a href="icecast2_win32.html">Win32 specific documentation</a>
-<li><a href="icecast2_glossary.html">Glossary</a>
-<li><a href="icecast2_faq.html">FAQ</a>
-
-
-
-<pre>
 icecast 2.x - README
 ---------------------------------------------------------------------
 
@@ -29,6 +34,8 @@
 relatively easily and supports open standards for commuincation and 
 interaction.
 
+Icecast is distributed under the GNU GPL, version 2. A copy of this
+license is included with this software in the COPYING file.
 
 Prerequisites
 ---------------------------------------------------------------------
@@ -68,9 +75,12 @@
 the current working directory (on Win32) and is called icecast.xml
 
 Documentation for icecast is available in the doc directory, by 
-viewing doc/icecast2_TOC.html in a browser.
+viewing doc/index.html in a browser.
 
 Please email us at icecast at xiph.org or icecast-dev at xiph.org, or come and see
 us at irc.freenode.net, channel #icecast, if you have any troubles.
 
 </pre>
+</div>
+</body>
+</html>

Modified: icecast/branches/kh/icecast/doc/index_win32.html
===================================================================
--- icecast/branches/kh/icecast/doc/index_win32.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/index_win32.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,12 +1,14 @@
-<!doctype html public "-//w3c//dtd html 3.2//en">
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<html>
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<title>Icecast2 Win32</title>
+<title>Icecast v2.0 Documentation Win32</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
 </head>
+<body>
 <div class="boxtest">
 <h1>Icecast 2 - Win32 Specific Documentation</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
+<hr id='titlebar' />
 <p>
 The win32 port of icecast2 is simply a UI framework around the core icecast2 server.  The win32 version of icecast2 uses directly the main executable of icecast (statically included) and simply provides a nicer, friendlier interface to icecast2. 
 </p>
@@ -15,5 +17,4 @@
 </p>
 </div>
 </body>
-
 </html>

Modified: icecast/branches/kh/icecast/doc/style.css
===================================================================
--- icecast/branches/kh/icecast/doc/style.css	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/style.css	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,20 +1,20 @@
-.ahem { display: none }
 body { 
 	font-family:'Lucida Grande', Verdana, Geneva, Lucida, sans-serif;
 	background:#000000; 
-	link:#FFFFFF; 
-	text:#323232; 
-	vlink:#FFFFFF; 
-	alink:#FFFFFF;
 }
 a {
-    font-weight: bold;
-    text-decoration: none;
+	font-weight: bold;
+	text-decoration: none;
 }
-
-a:link	{	color: #ff0; }
-a:visited { color: #cc3; }
-a:hover	{	color: #f00; }
+a:link { 
+	color: #ff0; 
+}
+a:visited { 
+	color: #cc3; 
+}
+a:hover	{
+	color: #f00; 
+}
 code,pre { 
 	font-size:90%; 
 	color:#ffffff;
@@ -25,55 +25,61 @@
 td {
 	color:#ffffff;
 }
-pre { padding:0.5em }
-blockquote { margin:0.5em }
-blockquote p { margin:0 }
+blockquote { 
+	margin:0.5em 
+}
+blockquote p { 
+	margin:0 
+}
 
-.width300 { width:300px; background:red }
-.width400 { width:400px; background:blue }
-
-p.ruletest { color:red }
-
+.width300 { 
+	width:300px; 
+	background:red 
+}
+.width400 { 
+	width:400px; 
+	background:blue 
+}
+p.ruletest { 
+	color:red 
+}
 div.boxtest { 
- border:2px solid; 
- padding:30px; 
- background: #555555;
- width:80%;;
- color:#ffffff;
+	border:2px solid; 
+	padding:30px; 
+	background: #555555;
+	width:80%;;
+	color:#ffffff;
 }
-
 div.smallbox{ 
- border:2px solid; 
- padding:40px; 
- background: #ffc; 
- width:600px;
- text:#FFFFFF;
+	border:2px solid; 
+	padding:40px; 
+	background: #ffc; 
+	width:600px;
+	text:#ffffff;
 }
-
 div.indentedbox { 
- border:0px solid; 
- padding:10px; 
- background: #779; 
+	border:0px solid; 
+	padding:10px; 
+	background: #779; 
 }
-
-
 div.content { 
- border:20px solid; 
- padding:30px;
- background: #ffc;
+	border:20px solid; 
+	padding:30px;
+	background: #ffc;
+	width:400px; 
+	voice-family: "\"}\""; 
+	voice-family:inherit;
+	width:300px;
 }
-
-div.content { 
- width:400px; 
- voice-family: "\"}\""; 
- voice-family:inherit;
- width:300px;
+html>body .content { 
+	width:300px 
 } 
-  /* CSS1 UAs should see and use 2nd width */
-
-html>body .content { width:300px } 
-
-p.ruletest { color: blue }
-
-
-
+p.ruletest { 
+	color: blue 
+}
+#titlebar{
+	background-color:#007b79;
+	border:0px;
+	height:10px;
+	width:100%;
+}

Modified: icecast/branches/kh/icecast/doc/win32_section1.html
===================================================================
--- icecast/branches/kh/icecast/doc/win32_section1.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/win32_section1.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,8 +1,14 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Server Status Tab</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
+<hr id='titlebar' />
 <h3>Overview</h3>
 <p>
 The server status tab contains information regarding statistics that are global to the server.  There are two types of statistics in icecast2, source level and global statistics.  Global statistics are those that are accumilations of stats from all sources offered by the server.  Source level statistics are stats which apply only to a single source attached to the server.
@@ -15,7 +21,6 @@
 	The number of sources that have attempted connections
 	Total number of attempted connections to the server
 </pre>
-</p>
 <p>
 The Server Status tab contains at a minimal the global stats for the server.  Additionally, you may add source specific stats to this tab.  The intent is to provide a single "dashboard view" of what's going on in the server.  To add source statistics to the Server Status tab, see the section on the <a href="win32_section3.html">Stats</a> tab.
 </p>
@@ -23,12 +28,11 @@
 <p>
 Any stat that is contained on the Server Status tab can be displayed as the icecast2 window title.  This provides yet another mechanism by which you can view activities on the server.  To enable this feature, right click on any stat in the Server Status tab as seen below :
 </p>
-<img src="windowtitle.jpg">
-<p>
+<img src="windowtitle.jpg" />
 <h3>Removing source level stats from the Server Status Tab</h3>
 <p>
 To remove a source level stat that you have inserted onto the Server Status Tab, simple right click that statistic and select "Delete from Global Stats".  The stat will be deleted from the Server Status tab, but will still remain on the source level Stats tab.
 </p>
-
-</p>
 </div>
+</body>
+</html>

Modified: icecast/branches/kh/icecast/doc/win32_section2.html
===================================================================
--- icecast/branches/kh/icecast/doc/win32_section2.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/win32_section2.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,9 +1,17 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
-<body bgcolor="#efefef" text="#323232" link="#0000ff" vlink="#800080" alink="#ff0000">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Editing A Config File</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
+<hr id='titlebar' />
 <p>
 Editing the icecast2 configuration file is a very simple process.  For a description of what each field means, see the main icecast documenation.  Changes to the icecast2 configuration can only be done while the server is stopped.  To edit the current server configuration file, select "Configuration/Edit Configuration" from the main menu.
 </p>
 </div>
+</body>
+</html>

Modified: icecast/branches/kh/icecast/doc/win32_section3.html
===================================================================
--- icecast/branches/kh/icecast/doc/win32_section3.html	2004-09-19 17:18:27 UTC (rev 7799)
+++ icecast/branches/kh/icecast/doc/win32_section3.html	2004-09-19 19:10:18 UTC (rev 7800)
@@ -1,9 +1,18 @@
-<LINK REL=STYLESHEET TYPE= "text/css" HREF= "style.css">
-<div class=boxtest>
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Icecast v2.0 Documentation</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body>
+<div class="boxtest">
 <h1>Stats Tab</h1>
-<table width=100%><tr><td bgcolor="#007B79" height="10" align="center"></td></tr></table>
+<hr id='titlebar' />
 <p>
 Explanation of the stats tab here
 </p>
-<img src="stats1.jpg"><br>
+<img src="stats1.jpg" /><br />
 </div>
+</body>
+</html>



More information about the commits mailing list