X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=web%2Fmanual.m4;h=1fd0ed1972378554bc9c277ddd9c6e0b70f7c5c0;hb=b2e4347baf722d13e4936cf2138750f05c43c3da;hp=0963306e226bf3bdbd7e03ba591a8cfc970c2946;hpb=0f4910b50116416fefb09ca67a615679067ef359;p=paraslash.git

diff --git a/web/manual.m4 b/web/manual.m4
index 0963306e..1fd0ed19 100644
--- a/web/manual.m4
+++ b/web/manual.m4
@@ -208,7 +208,7 @@ For the impatient:
 	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 \
+              libfaad-dev libspeex-dev libFLAC-dev libsamplerate-dev realpath \
               libasound2-dev libao-dev libreadline-dev libncurses-dev \
               libopus-dev
 
@@ -222,7 +222,7 @@ Detailed description: In any case you'll need
 
 	- XREFERENCE(ftp://ftp.gnu.org/pub/gnu/gcc, gcc) or
 	XREFERENCE(http://clang.llvm.org, clang). All gcc versions
-	>= 3.3 are currently supported. Clang version 1.1 or newer
+	>= 4.2 are currently supported. Clang version 1.1 or newer
 	should work as well.
 
 	- XREFERENCE(ftp://ftp.gnu.org/pub/gnu/make, gnu make) is
@@ -956,12 +956,13 @@ is not set, the empty string is matched against the pattern.
 	frequency ~ <num>
 	channels ~ <num>
 	num_played ~ <num>
+	image_id ~ <num>
+	lyrics_id ~ <num>
 
 Takes a comparator ~ of the set {<, =, <=, >, >=, !=} and a number
 <num>. Matches an audio file iff the condition <val> ~ <num> is
 satisfied where val is the corresponding value of the audio file
-(value of the year tag, bitrate in kbit/s, frequency in Hz, channel
-count, play count).
+(value of the year tag, bitrate in kbit/s, etc.).
 
 The year tag is special as its value is undefined if the audio file
 has no year tag or the content of the year tag is not a number. Such
@@ -2010,21 +2011,19 @@ Doxygen
 ~~~~~~~
 
 Doxygen is a documentation system for various programming
-languages. The paraslash project uses Doxygen for generating the API
-reference on the web pages, but good source code documentation is
-also beneficial to people trying to understand the code structure
-and the interactions between the various source files.
+languages. The API reference on the paraslash web page is generated
+by doxygen.
 
 It is more illustrative to look at the source code for examples than
-to describe the conventions for documenting the source in this manual,
-so we only describe which parts of the code need doxygen comments,
-but leave out details on documentation conventions.
+to describe the conventions in this manual, so we only describe which
+parts of the code need doxygen comments, but leave out details on
+documentation conventions.
 
 As a rule, only the public part of the C source is documented with
 Doxygen. This includes structures, defines and enumerations in header
 files as well as public (non-static) C functions.  These should be
-documented completely. For example each parameter and the return
-value of a public function should get a descriptive comment.
+documented completely. For example, each parameter and the return
+value of a public function should get a descriptive doxygen comment.
 
 No doxygen comments are necessary for static functions and for
 structures and enumerations in C files (which are used only within
@@ -2215,7 +2214,6 @@ Application web pages
 ~~~~~~~~~~~~~~~~~~~~~
 
 	- XREFERENCE(http://people.tuebingen.mpg.de/maan/paraslash/, paraslash)
-	- XREFERENCE(http://paraslash.systemlinux.org/, paraslash (alternative page))
 	- XREFERENCE(http://xmms2.org/wiki/Main_Page, xmms)
 	- XREFERENCE(http://www.mpg123.de/, mpg123)
 	- XREFERENCE(http://gstreamer.freedesktop.org/, gstreamer)