From 6003670c9622c3a6881a9376d944e38fe4f57cb9 Mon Sep 17 00:00:00 2001 From: giles Date: Tue, 12 Jun 2012 23:53:40 +0000 Subject: [PATCH] Merge recent changes from trunk. Commits r18358 through r18379. svn path=/icecast/branches/icecast-webm/; revision=18380 --- doc/icecast2_win32.html | 3 ++- doc/index_win32.html | 3 ++- web/status.xsl | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/icecast2_win32.html b/doc/icecast2_win32.html index 5173e4af..0248e6f9 100644 --- a/doc/icecast2_win32.html +++ b/doc/icecast2_win32.html @@ -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.

-Most of the features of icecast2 are available in the win32 port. +Most of the features of icecast2 are available in the win32 port.
+A notable absence is IPv6 support.

Server Status Tab

diff --git a/doc/index_win32.html b/doc/index_win32.html index 2c7a201f..5fcec6a8 100644 --- a/doc/index_win32.html +++ b/doc/index_win32.html @@ -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.

-All of the features of icecast2 are available in the win32 port. +Most of the features of icecast2 are available in the win32 port.
+A notable absence is IPv6 support.

diff --git a/web/status.xsl b/web/status.xsl index f3c67d56..9ebfdbf8 100644 --- a/web/status.xsl +++ b/web/status.xsl @@ -54,7 +54,7 @@ M3U XSPF - VCLT +