Merge branch 'refs/heads/t/markdown'

[paraslash.git] / web / manual.md

diff --git a/web/manual.md b/web/manual.md
index 7d2c4cf3105ed47ccac28effbb3295c7240eb6bc..3b9c270973b7419b82c7587be912817608c5ddd5 100644 (file)
--- a/web/manual.md
+++ b/web/manual.md
@@ -189,7 +189,7 @@ Requirements
        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
 
@@ -204,7 +204,7 @@ code repository, execute
                git clone git://git.tuebingen.mpg.de/osl
 
 - [gcc](ftp://ftp.gnu.org/pub/gnu/gcc) or
-[clang](http://clang.llvm.org). All gcc versions >= 3.3 are currently
+[clang](http://clang.llvm.org). All gcc versions >= 4.2 are currently
 supported. Clang version 1.1 or newer should work as well.
 
 - [gnu make](ftp://ftp.gnu.org/pub/gnu/make) is also shipped with the
@@ -926,12 +926,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
@@ -2198,7 +2199,6 @@ Application web pages
 ---------------------
 
 - [paraslash](http://people.tuebingen.mpg.de/maan/paraslash/)
-- [alternative page](http://paraslash.systemlinux.org/)
 - [xmms](http://xmms2.org/wiki/Main_Page)
 - [mpg123](http://www.mpg123.de/)
 - [gstreamer](http://gstreamer.freedesktop.org/)