From a91e643b53967a3c095980ac25198a5678092a3d Mon Sep 17 00:00:00 2001
From: darkeye <darkeye@caa462fc-51d2-11de-8b28-e1b452efc53a>
Date: Sun, 17 Apr 2005 10:58:28 +0000
Subject: [PATCH] added mention of Darwin Streaming Server and AAC to the
 documentation

---
 darkice/trunk/man/darkice.1     | 60 ++++++++++++++++++++-------------
 darkice/trunk/man/darkice.cfg.5 |  8 +++--
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/darkice/trunk/man/darkice.1 b/darkice/trunk/man/darkice.1
index 253880d..02d64df 100644
--- a/darkice/trunk/man/darkice.1
+++ b/darkice/trunk/man/darkice.1
@@ -1,4 +1,4 @@
-.TH darkice 1 "April 14, 2005" "DarkIce" "DarkIce live audio streamer"
+.TH darkice 1 "April 17, 2005" "DarkIce" "DarkIce live audio streamer"
 .SH NAME
 darkice \- an icecast / shoutcast live audio streamer
 .SH SYNOPSIS
@@ -6,22 +6,33 @@ darkice \- an icecast / shoutcast live audio streamer
 [options] -c config.file
 .SH DESCRIPTION
 .PP
-.B DarkIce
-is an
-.B IceCast
-,
-.B IceCast2
-and
-.B ShoutCast
-live audio streamer. It takes audio input from a
-sound card, encodes it into mp3 and/or Ogg Vorbis,
-and sends the streams to one or more
-.B IceCast
-,
-.B ShoutCast
-and/or
-.B IceCast2
-servers.
+DarkIce as a live audio streamer. It records audio from an audio interface (e.g. sound card), encodes it and sends it to a streaming server.
+DarkIce can record from:
+
+    * OSS audio devices
+    * ALSA audio devices
+    * Solaris audio interface
+    * Jack sources
+
+DarkIce can encode in the following formats:
+
+    * mp3 - using the lame library
+    * Ogg Vorbis
+    * AAC - using the faac library
+
+DarkIce can send the encoded stream to the following streaming servers:
+
+    * ShoutCast
+    * IceCast 1.3.x and 2.x
+    * Darwin Streaming Server
+
+Darkice runs on the following operating systems:
+
+    * FreeBSD
+    * Linux on intel and PowerPC
+    * MacOS X
+    * NetBSD / OpenBSD
+    * SUN Solaris
 
 .B DarkIce
 uses
@@ -33,13 +44,6 @@ Therefore it is recommended that
 .B DarkIce
 is run as root.
 
-.B DarkIce
-uses the
-.B Lame
-mp3 encoder as a library to encode audio intput to mp3, and uses the
-.B Ogg Vorbis
-library to encode into Ogg Vorbis.
-
 .SH OPTIONS
 .TP
 .BI "\-c " config.file
@@ -106,6 +110,10 @@ homepage:
 homepage:
 .I http://www.shoutcast.com/
 
+.B Darwin Streaming Server
+homepage:
+.I http://developer.apple.com/darwin/projects/streaming/
+
 .B Lame
 homepage:
 .I http://www.mp3dev.org/mp3/
@@ -114,6 +122,10 @@ homepage:
 homepage:
 .I http://www.xiph.org/ogg/vorbis/
 
+.B faac
+homepage:
+.I http://www.audiocoding.com/
+
 .B DarkSnow
 GTK front-end:
 .I http://darksnow.radiolivre.org/index.en.html
diff --git a/darkice/trunk/man/darkice.cfg.5 b/darkice/trunk/man/darkice.cfg.5
index 2128d17..98f6cbf 100644
--- a/darkice/trunk/man/darkice.cfg.5
+++ b/darkice/trunk/man/darkice.cfg.5
@@ -1,4 +1,4 @@
-.TH darkice.cfg 5 "April 14, 2005" "DarkIce" "DarkIce live audio streamer"
+.TH darkice.cfg 5 "April 17, 2005" "DarkIce" "DarkIce live audio streamer"
 .SH NAME
 darkice.cfg \- configuration file for darkice
 .SH DESCRIPTION
@@ -86,8 +86,10 @@ Number of channels to record (e.g. 1 for mono, 2 for stereo)
 .B [icecast-x]
 
 This section describes an output to an
-.B IceCast
-server, while encoding
+.B IceCast 1.3.x
+server or
+.B Darwin Streaming Server
+, while encoding
 with a lame encoder. There may be at most 8 outputs, numbered from 0 ... 7.
 The number is included in the section name (e.g. [icecast-0] ... [icecast-7]).
 The stream will be reachable at