X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=web%2Fmanual.m4;h=62ebf3a8e5f897135fc20e1d754e1e6ce6ff5436;hp=3f5f148fba7819ac03395792ebabec54d84ed6a4;hb=9bb2e6ed4206247fdee844c0a1f3326e85a7ab59;hpb=a28eef552dc779eac12c1df430522dc4e20ae428

diff --git a/web/manual.m4 b/web/manual.m4
index 3f5f148f..62ebf3a8 100644
--- a/web/manual.m4
+++ b/web/manual.m4
@@ -232,14 +232,6 @@ Detailed description: In any case you'll need
 	scripts which run during compilation require the EMPH(Bourne
 	again shell).  It is most likely already installed.
 
-	- XREFERENCE(http://www.openssl.org/, openssl) or
-	XREFERENCE(ftp://ftp.gnupg.org/gcrypt/libgcrypt/, libgcrypt).
-	At least one of these two libraries is needed as the backend
-	for cryptographic routines on both the server and the client
-	side. Both openssl and libgcrypt are usually shipped with the
-	distro, but you might have to install the development package
-	(libssl-dev or libgcrypt-dev on debian systems) as well.
-
 	- XREFERENCE(ftp://ftp.gnu.org/pub/gnu/gengetopt/, gengetopt)
 	is needed to generate the C code for the command line parsers
 	of all paraslash executables.
@@ -249,6 +241,14 @@ Detailed description: In any case you'll need
 
 Optional:
 
+	- XREFERENCE(http://www.openssl.org/, openssl) or
+	XREFERENCE(ftp://ftp.gnupg.org/gcrypt/libgcrypt/, libgcrypt).
+	At least one of these two libraries is needed as the backend
+	for cryptographic routines on both the server and the client
+	side. Both openssl and libgcrypt are usually shipped with the
+	distro, but you might have to install the development package
+	(libssl-dev or libgcrypt-dev on debian systems) as well.
+
 	- XREFERENCE(http://www.underbit.com/products/mad/, libmad).
 	To compile in MP3 support for paraslash, the development
 	package must be installed. It is called libmad0-dev on
@@ -406,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
@@ -592,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
@@ -639,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.
 
 -----------------------
@@ -1770,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