Change all multi-word options to dashes instead of underscores.

[paraslash.git] / web / manual.m4

diff --git a/web/manual.m4 b/web/manual.m4
index 22abf76f85364e8d899029cad661f03fe8fefe17..55bb49a653bdfc10c5a84eaeb8c058080b2aa345 100644 (file)
--- a/web/manual.m4
+++ b/web/manual.m4
@@ -77,11 +77,11 @@ The paraslash executables
 
 *para_server*
 
 
 *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
 
 It supports three built-in network streaming protocols
 (senders/receivers): HTTP, DCCP, or UDP. This is explained in more


@@ -202,8 +202,16 @@ REFERENCE(Quick start, set up) a typical server and client.
 
 Requirements
 ~~~~~~~~~~~~
 
 Requirements
 ~~~~~~~~~~~~

+For the impatient:

 
 

-In any case you'll need
+       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
+
+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
 
        - XREFERENCE(http://systemlinux.org/~maan/osl/, libosl).
        The _object storage layer_ library is used by para_server. To


@@ -398,7 +406,7 @@ the directory /var/paraslash that has been created during installation:
 
        sudo chown $LOGNAME /var/paraslash
 
 
        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
 location for the AFS command socket.
 
 For this first try, we'll use the info loglevel to make the output


@@ -584,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
 
 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
 
 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


@@ -631,7 +639,7 @@ restricted on platforms that support UNIX socket credentials which
 allow para_audiod to obtain the Unix credentials of the connecting
 process.
 
 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.
 
 -----------------------
 a limited set of users.
 
 -----------------------


@@ -1762,7 +1770,7 @@ a curses window. By default the command
 
        para_audioc -- stat -p
 
 
        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
 particular it possible to use
 
        para_client -- stat -p