mention plm and update the mysql description.

Also, selector is now the prefered word, rather than dbtool.

diff --git a/FEATURES b/FEATURES
index b567f1135d31628df3d5196b6c4791d0bbef5f37..17d5051c81647e982e4c713ca09e65b36eb503d0 100644 (file)
--- a/FEATURES
+++ b/FEATURES
@@ -21,19 +21,33 @@ configurable audio streaming software
        converts the stream according to the given --filter command
        line options and writes the transformed stream to stdout.
 
-mysql-based audio file selector:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       the (optional) mysql database tool manages some statistics on
-       your audio files. It contacts the mysql server to decide which
-       song to play next by sending a user-defined sql-query. This
-       allows rather sophisticated configurations and is explained
-       in detail in README.mysql.
+configurable audio file selectors:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       There are three audio file selectors (aka "database tools")
+       available:
+
+               - random
+               - plm (playlist manager)
+               - mysql
+
+       The first two of these are rather simple, and they are always
+       supported. They allow streaming of randomly selected files
+       or files given by a playlist respectively.
+
+       The (optional) mysql selector is more involved. It manages
+       statistics on your audio files and audio file selection is
+       done by sending a user-defined sql-query to the mysql server.
+       This allows rather sophisticated configurations and is
+       explained in detail in README.mysql.
+
+       It is possible to switch between all supported selectors at
+       any time.
 
 small memory footprint:
 ~~~~~~~~~~~~~~~~~~~~~~~
        paraslash is lightweight. The stripped binary of para_server
        with all its features compiled in (mysql/random dbtool,
-       mp3/ogg support, http/ortp support) is about 100K on i386
+       mp3/ogg support, http/ortp support) is about 110K on i386
        under Linux. para_audiod is even smaller.
 
 command line interface, including shell:

diff --git a/NEWS b/NEWS
index 81f317d17f6698ce214521402608cd12dc0ec636..f3069da0b833653b680a5f332703ff331ca9739f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,17 @@ NEWS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        o update to gengetopt-2.16
 
+       o switch from cvs to git
+
+       o the new ipc subsystem
+
+       o new database tool: plm, the playlist manager
+
+       o dopey renamed to random. It is now the default database tool.
+       Use the --dbtool option to choose another dbtool at startup, or
+       the cdt command to switch between the supported dbtools.
+
+
 0.2.10 (2006-02-17) "cyclic attractor"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/README b/README
index 2c0dc76ddfd52f8da2c3296292c39a90126905f1..3f8e62ce20a31498406395e31982273bced8046a 100644 (file)
--- a/README
+++ b/README
@@ -8,9 +8,8 @@ It contains the following programs:
 
 - para_server (obligatory):
 
-        This server listens on a specified tcp port and accepts the
-        usual commands such as play, stop, pause, next. However, there
-        are many more commands.
+       This server listens on a tcp port and accepts commands such as
+       play, stop, pause, next. However, there are many more commands.
 
        For audio streaming, at least one sender must be activated.
        At the moment, paraslash contains two internal senders:
@@ -25,20 +24,19 @@ It contains the following programs:
        All senders have the same set of commands that allow to
        control the access permissions of the stream.
 
-       para_server needs a database tool to work, mainly to determine
-       which song to stream next. There are two database tools
-       available: mysql and random. The former is recommended as
-       the random database tool is only meant as a fallback and
-       as a starting point for people that want to write their own
-       database tool for paraslash.
+       para_server needs a "database tool" to work, mainly to
+       determine which song to stream next. There are three such
+       tools available: random, plm and mysql. The former chooses
+       audio files randomly and plm, the playlist manager, can handle
+       playlists. Both are always supported.
 
-       The mysql database tool connects to a mysql server which
-       holds information on your audio files. It has several unusual
-       features, see README.mysql for details.
+       The (optional) mysql database tool connects to a mysql server
+       which holds information on your audio files. It has several
+       unusual features, see README.mysql for details.
 
 - para_client (obligatory):
 
-        The client program to connect to para_server.
+       The client program to connect to para_server.
 
 - para_recv (optional)