X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=web%2Fmanual.m4;h=55bb49a653bdfc10c5a84eaeb8c058080b2aa345;hb=cd5f0aa2b06b227f519600705fdde2a13f03424d;hp=5ceeac08af48642095e8b6c4d6fa7d0f2799fb22;hpb=4a30c5e28b85d674d30ce7fc49c905cff62b5d0e;p=paraslash.git

diff --git a/web/manual.m4 b/web/manual.m4
index 5ceeac08..55bb49a6 100644
--- a/web/manual.m4
+++ b/web/manual.m4
@@ -77,11 +77,11 @@ The paraslash executables
 
 *para_server*
 
-para_server streams binary audio data (MP3, OGG/Vorbis, OGG/Speex,
-M4A, WMA files) over local and/or remote networks. It listens on a
-TCP port and accepts commands such as play, stop, pause, next from
-authenticated clients. There are many more commands though, see the
-man page of para_server for a description of all commands.
+para_server streams binary audio data (MP3, ...) over local and/or
+remote networks. It listens on a TCP port and accepts commands such
+as play, stop, pause, next from authenticated clients. There are
+many more commands though, see the man page of para_server for a
+description of all commands.
 
 It supports three built-in network streaming protocols
 (senders/receivers): HTTP, DCCP, or UDP. This is explained in more
@@ -174,6 +174,9 @@ output plug-in and optional WAV/raw players for ALSA (Linux) and for
 coreaudio (Mac OS). para_write can also be used as a stand-alone WAV
 or raw audio player.
 
+*para_play*
+
+A command line audio player.
 
 *para_gui*
 
@@ -199,8 +202,16 @@ REFERENCE(Quick start, set up) a typical server and client.
 
 Requirements
 ~~~~~~~~~~~~
+For the impatient:
+
+	git clone git://git.tuebingen.mpg.de/osl
+	cd osl && make && sudo make install && sudo ldconfig
+	sudo apt-get install autoconf libssl-dev help2man gengetopt \
+              libmad0-dev libid3tag0-dev libasound2-dev libvorbis-dev \
+              libfaad-dev libspeex-dev libFLAC-dev libsamplerate-dev \
+              libasound2-dev libao-dev libreadline-dev libncurses-dev
 
-In any case you'll need
+Detailed description: In any case you'll need
 
 	- XREFERENCE(http://systemlinux.org/~maan/osl/, libosl).
 	The _object storage layer_ library is used by para_server. To
@@ -264,6 +275,10 @@ Optional:
 	or decode files encoded with the _Free Lossless Audio Codec_,
 	libFLAC (libFLAC-dev) must be installed.
 
+	- XREFERENCE(http://www.mega-nerd.com/SRC/index.html,
+	libsamplerate). The resample filter will only be compiled if
+	this library is installed. Debian package: libsamplerate-dev.
+
 	- XREFERENCE(ftp://ftp.alsa-project.org/pub/lib/, alsa-lib). On
 	Linux, you'll need to have ALSA's development package
 	libasound2-dev installed.
@@ -272,9 +287,13 @@ Optional:
 	libao). Needed to build the ao writer (ESD, PulseAudio,...).
 	Debian package: libao-dev.
 
+	- XREFERENCE(ftp://ftp.gnu.org/pub/gnu/ncurses, curses). Needed
+	for para_gui. Debian package: libncurses-dev.
+
 	- XREFERENCE(http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html,
 	GNU Readline). If this library (libreadline-dev) is installed,
-	para_client and para_audioc support interactive sessions.
+	para_client, para_audioc and para_play support interactive
+	sessions.
 
 Installation
 ~~~~~~~~~~~~
@@ -387,7 +406,7 @@ the directory /var/paraslash that has been created during installation:
 
        sudo chown $LOGNAME /var/paraslash
 
-Alternatively, use the --afs_socket Option to specify a different
+Alternatively, use the --afs-socket Option to specify a different
 location for the AFS command socket.
 
 For this first try, we'll use the info loglevel to make the output
@@ -573,7 +592,7 @@ The user_list file
 
 At startup para_server reads the user list file which contains one
 line per user. The default location of the user list file may be
-changed with the --user_list option.
+changed with the --user-list option.
 
 There should be at least one user in this file. Each user must have
 an RSA key pair. The public part of the key is needed by para_server
@@ -620,7 +639,7 @@ restricted on platforms that support UNIX socket credentials which
 allow para_audiod to obtain the Unix credentials of the connecting
 process.
 
-Use para_audiod's --user_allow option to allow connections only for
+Use para_audiod's --user-allow option to allow connections only for
 a limited set of users.
 
 -----------------------
@@ -1751,7 +1770,7 @@ a curses window. By default the command
 
 	para_audioc -- stat -p
 
-is executed, but this can be customized via the --stat_cmd option. In
+is executed, but this can be customized via the --stat-cmd option. In
 particular it possible to use
 
 	para_client -- stat -p