[xiph-commits] r18380 - in icecast/branches/icecast-webm: . doc web

[giles at svn.xiph.org]

Author: giles
Date: 2012-06-12 16:53:40 -0700 (Tue, 12 Jun 2012)
New Revision: 18380

Modified:
   icecast/branches/icecast-webm/
   icecast/branches/icecast-webm/doc/icecast2_win32.html
   icecast/branches/icecast-webm/doc/index_win32.html
   icecast/branches/icecast-webm/web/status.xsl
Log:
Merge recent changes from trunk.

Commits r18358 through r18379.



Property changes on: icecast/branches/icecast-webm
___________________________________________________________________
Modified: svn:mergeinfo
   - /icecast/trunk/icecast:18296-18357
   + /icecast/trunk/icecast:18296-18379

Modified: icecast/branches/icecast-webm/doc/icecast2_win32.html
===================================================================
--- icecast/branches/icecast-webm/doc/icecast2_win32.html	2012-06-12 22:18:34 UTC (rev 18379)
+++ icecast/branches/icecast-webm/doc/icecast2_win32.html	2012-06-12 23:53:40 UTC (rev 18380)
@@ -13,7 +13,8 @@
 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>
 <p>
-Most of the features of icecast2 are available in the win32 port.
+Most of the features of icecast2 are available in the win32 port. <br />
+A notable absence is IPv6 support.
 </p>
 <h2>Server Status Tab</h2>
 <p>

Modified: icecast/branches/icecast-webm/doc/index_win32.html
===================================================================
--- icecast/branches/icecast-webm/doc/index_win32.html	2012-06-12 22:18:34 UTC (rev 18379)
+++ icecast/branches/icecast-webm/doc/index_win32.html	2012-06-12 23:53:40 UTC (rev 18380)
@@ -13,7 +13,8 @@
 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>
 <p>
-All of the features of icecast2 are available in the win32 port.
+Most of the features of icecast2 are available in the win32 port. <br />
+A notable absence is IPv6 support.
 </p>
 </div>
 </body>

Modified: icecast/branches/icecast-webm/web/status.xsl
===================================================================
--- icecast/branches/icecast-webm/web/status.xsl	2012-06-12 22:18:34 UTC (rev 18379)
+++ icecast/branches/icecast-webm/web/status.xsl	2012-06-12 23:53:40 UTC (rev 18380)
@@ -54,7 +54,7 @@
                         <td align="right">
                             <a href="{@mount}.m3u">M3U</a>
                             <a href="{@mount}.xspf">XSPF</a>
-                            <a href="{@mount}.vclt">VCLT</a>
+                            <!-- <a href="{@mount}.vclt">VCLT</a> -->
                         </td>
                     </xsl:otherwise>
                 </xsl:choose>