diff --git a/doc/icecast2_admin.html b/doc/icecast2_admin.html index 440161a316cadfc70d1b5d1ac7d4f6958b90cbf8..0aa719eb0e14cd80843ca59721449a78f171b57b 100644 --- a/doc/icecast2_admin.html +++ b/doc/icecast2_admin.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation diff --git a/doc/icecast2_basicsetup.html b/doc/icecast2_basicsetup.html index 2ee06b8ab41e3777197490c63a1e6a96827fb4a2..d67add9acf809c8fb7729b37a1a69cbe09bcdd1a 100644 --- a/doc/icecast2_basicsetup.html +++ b/doc/icecast2_basicsetup.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation diff --git a/doc/icecast2_changes.html b/doc/icecast2_changes.html new file mode 100644 index 0000000000000000000000000000000000000000..a06281f3714e89eb496b1ecb03d342bc41c3c899 --- /dev/null +++ b/doc/icecast2_changes.html @@ -0,0 +1,49 @@ + + + + +Icecast v2.x Documentation + + + +
+

Icecast 2 Changes

+
+

+

+

Version 2.3

+

New Features

+

+

  • Streaming support for ogg speex, ogg flac, ogg midi +
  • intro file support - per mount settable +
  • on-demand relays, global and per-relay settable +
  • fallback to file, extends on the intro file handling. +
  • new mount-level settings +
      +
    1. public, type/subtype, genre settings, stream description, +
    2. stream url, stream name, bitrate + (override what is sent from the source client) +
    3. mp3 metadata interval +
    4. on-[dis]connect scripts can be stated per-mount, invoked at source + start/stop and take 1 arg which is the mountpoint. +
    +
  • New URL listener authenticator + .included is an example php-based application that can be used + in conjunction with the url authenticator to manage a simple + subscription-based broadcast. +
  • HTPasswd authenticator uses in-memory structures now. +
  • On demand files now can be fed through an authenticator + +
  • Update to admin/web xslt interface + +

    Fixes

    +
  • real/helix works +
  • win32 access log correct +
  • stats client is stable now (curl -X STATS http://admin@host:port/) +
  • show mountpoints on stats that are inactive but have an active fallback +
  • more updates over HUP possible + +

    +
  • + + diff --git a/doc/icecast2_config_file.html b/doc/icecast2_config_file.html index a02a7fa1a4e7f1512fb5629f450b2a17c74f3587..2a57b910fb83e16cf46d7bda0f5f72a0808719cd 100644 --- a/doc/icecast2_config_file.html +++ b/doc/icecast2_config_file.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation @@ -227,7 +227,7 @@ certain formats. <on-demand>0</on-demand> </relay> -

    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. +

    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.

    Master Relay

    @@ -238,13 +238,13 @@ The following diagram shows the basics of doing a Master relay. Note that Serve | | all mountpoints | | /mount1 | | <------------------- | | /mount2.ogg |-----| |-----| /mount3 - Icecast 2 Icecast 2 + Icecast 2 Icecast 2 Server 1 Server 2 (RELAY SERVER) (MASTER SERVER) configured with <master-server> - settings + settings

    @@ -253,7 +253,7 @@ A server is configured as a Master Server relay by specifying the <master-ser

    master-server

    -This is the IP for the server which contains the mountpoints to be relayed (Master Server). +This is the IP for the server which contains the mountpoints to be relayed (Master Server).

    master-server-port

    @@ -296,7 +296,7 @@ The following diagram shows the basics of doing a Specific Mountpoint relay. No configured with <relay> - settings + settings @@ -432,12 +432,12 @@ An optional value which will set the filename which will be a dump of the stream This optional value specifies a mountpoint that clients are automatically moved to if the source shuts down or is not streaming at the time a listener connects. Only one can be listed in each mount and should refer to another mountpoint on the same server that is streaming in the same -streaming format.
    +streaming format.
    If clients cannot fallback to another mountpoint, due to a missing fallback-mount or it states a mountpoint that is just not available, then those clients will be disconnected. If clients are falling back to a mountpoint and the fallback-mount is not actively streaming but defines a fallback-mount itself then those clients may be moved there instead. -This multi-level fallback allows clients to cascade several mountpoints. +This multi-level fallback allows clients to cascade several mountpoints.

    A fallback mount can also state a file that is located in webroot. This is useful for playing a pre-recorded file in the case of a stream going down. It will repeat until either the listener disconnects or a stream comes back available and takes the listeners back. @@ -486,7 +486,7 @@ listening clients back from the fallback mount.

    stream-url

    Setting this will add the specified URL to the stats (and therefore YP) for this - mountpoint even if the source client/relay provide one. The URL is generally for + mountpoint even if the source client/relay provide one. The URL is generally for directing people to a website.

    @@ -579,7 +579,7 @@ This path is used in conjunction with the chroot settings, and specified the bas

    logdir

    -This path specifies the base directory used for logging. Both the error.log and access.log will be created relative to this directory. +This path specifies the base directory used for logging. Both the error.log and access.log will be created relative to this directory.

    pidfile

    diff --git a/doc/icecast2_faq.html b/doc/icecast2_faq.html index 81ceddb8e6b196615808dff20c270f957f10cf93..e57c1283ba9775c498b97ef7193892bfae51125f 100644 --- a/doc/icecast2_faq.html +++ b/doc/icecast2_faq.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation diff --git a/doc/icecast2_glossary.html b/doc/icecast2_glossary.html index 9db8fc9c6350f52f5caecda2f3e49aae1defdb33..70f107a9ee45978758631891d00a22a079b02cee 100644 --- a/doc/icecast2_glossary.html +++ b/doc/icecast2_glossary.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation diff --git a/doc/icecast2_introduction.html b/doc/icecast2_introduction.html index 38080d355c5a1aeadcce03043446084f8f4f29ae..a0e62d0ddbc7110ec8980d4fe90de0cb79af4edc 100644 --- a/doc/icecast2_introduction.html +++ b/doc/icecast2_introduction.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation diff --git a/doc/icecast2_listenerauth.html b/doc/icecast2_listenerauth.html index e8455b7a79f30b4755297c6d0f7168a20d56e505..1c39c494eb4df0f6e62fee6073443ad25b1c1876 100644 --- a/doc/icecast2_listenerauth.html +++ b/doc/icecast2_listenerauth.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation diff --git a/doc/icecast2_relay.html b/doc/icecast2_relay.html index 5432fbcc23b119874f6276095e7b42a89c080e11..0c32c4f60330e88a20cb821db58467880b401b27 100644 --- a/doc/icecast2_relay.html +++ b/doc/icecast2_relay.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation @@ -35,7 +35,7 @@ In this example, this configuration is setup in the server which will be doing t

    Setting Up A Single-Broadcast Relay

    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:

    -
       
    +
         <relay>
             <server>192.168.1.11</server>
             <port>8001</port>
    diff --git a/doc/icecast2_stats.html b/doc/icecast2_stats.html
    index 245db791a51fc70cfc591ee6ffe3e9a5c6f33d22..d20613e7afe99b43b3aadac7f6b0da97c79d90ec 100644
    --- a/doc/icecast2_stats.html
    +++ b/doc/icecast2_stats.html
    @@ -2,7 +2,7 @@
     
     
     
    -Icecast v2.0 Documentation
    +Icecast v2.x Documentation
     
     
     
    diff --git a/doc/icecast2_win32.html b/doc/icecast2_win32.html
    index cab137a75fa8934296ff32c734076a5fe48a0f2a..5173e4af93d64bc1eabe11146c4dc13d1496fb73 100644
    --- a/doc/icecast2_win32.html
    +++ b/doc/icecast2_win32.html
    @@ -2,7 +2,7 @@
     
     
     
    -Icecast v2.0 Documentation
    +Icecast v2.x Documentation
     
     
     
    @@ -10,7 +10,7 @@
     

    Icecast 2 - Win32 Specific Documentation


    -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. +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. diff --git a/doc/icecast2_yp.html b/doc/icecast2_yp.html index ffc9c3bf6bdff99ff5d5a4dd34a84e0f425d4eb6..34e24e21524d602edc5590a5affd508253c24eb8 100644 --- a/doc/icecast2_yp.html +++ b/doc/icecast2_yp.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation diff --git a/doc/index.html b/doc/index.html index 29ccc8c53526ee3194cc84eeff963ff56a1d8240..b2f41bf5bf92f6fb68314a6e233334b37be64421 100644 --- a/doc/index.html +++ b/doc/index.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation @@ -10,6 +10,7 @@

    Icecast 2 Documentation Table of Contents


      +
    • Changes
    • Introduction
    • Basic Setup
    • Icecast Config File
    • @@ -27,11 +28,11 @@ icecast 2.x - README --------------------------------------------------------------------- -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 +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. Icecast is distributed under the GNU GPL, version 2. A copy of this @@ -71,10 +72,10 @@ Run To build and install this release. -A sample config file will be placed in /usr/local/etc (on UNIX) or in +A sample config file will be placed in /usr/local/etc (on UNIX) or in the current working directory (on Win32) and is called icecast.xml -Documentation for icecast is available in the doc directory, by +Documentation for icecast is available in the doc directory, by viewing doc/index.html in a browser. Please email us at icecast@xiph.org or icecast-dev@xiph.org, or come and see diff --git a/doc/index_win32.html b/doc/index_win32.html index 8359ea8db83c08599398e0ce1b2687a09a61ec6e..2c7a201ff030db70909982458d4b9052409c9ef5 100644 --- a/doc/index_win32.html +++ b/doc/index_win32.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation Win32 +Icecast v2.x Documentation Win32 @@ -10,7 +10,7 @@

      Icecast 2 - Win32 Specific Documentation


      -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. +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. diff --git a/doc/win32_section1.html b/doc/win32_section1.html index 3f83f0a4c05fbabec426752346b907eee85e5568..00aa946b19ea8f6514cde204dd03a705d9df83db 100644 --- a/doc/win32_section1.html +++ b/doc/win32_section1.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation diff --git a/doc/win32_section2.html b/doc/win32_section2.html index 29466e26a62fb72bd205a20903adccb3357a63b1..28f6d634decb16acd08d6b11dd74e3cb8ae4b2e8 100644 --- a/doc/win32_section2.html +++ b/doc/win32_section2.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation diff --git a/doc/win32_section3.html b/doc/win32_section3.html index 4a375e68d7104e278119b956dab37b99dd709946..428ce651a0e9aa06c65cdf9eb796338e47dc5dcb 100644 --- a/doc/win32_section3.html +++ b/doc/win32_section3.html @@ -2,7 +2,7 @@ -Icecast v2.0 Documentation +Icecast v2.x Documentation