Disobedience notices when tracks are adopted now.

[disorder] / README

diff --git a/README b/README
index 333b558bcbc1c9dc5dd9dfc81982b0d1f17a9afd..c69cf4c5a9e4c7f6c7d4933eb8ed2340062ba69b 100644 (file)
--- a/README
+++ b/README
@@ -25,7 +25,7 @@ effort.
 
 Build dependencies:
   Name             Tested              Notes
 
 Build dependencies:
   Name             Tested              Notes

-  libdb            4.3.29              not 4.2.x; 4.4+ might work.
+  libdb            4.3.29              not 4.2.x; 4.4-4.6 seem to work too

   libgc            6.8
   libvorbisfile    1.1.2
   libpcre          6.7                 need UTF-8 support
   libgc            6.8
   libvorbisfile    1.1.2
   libpcre          6.7                 need UTF-8 support


@@ -34,9 +34,9 @@ Build dependencies:
   libao            0.8.6
   libasound        1.0.13
   libFLAC          1.1.2
   libao            0.8.6
   libasound        1.0.13
   libFLAC          1.1.2

-  GNU C            4.1.2
-  GNU Make         3.81
-  GNU Sed          4.1.5
+  GNU C            4.1.2               }
+  GNU Make         3.81                } Non-GNU versions will NOT work
+  GNU Sed          4.1.5               }

   Python           2.4.4               (optional)
   GTK+             2.8.20              (if you want the GTK+ client)
   GLIB             2.12.4              (if you want the GTK+ client)
   Python           2.4.4               (optional)
   GTK+             2.8.20              (if you want the GTK+ client)
   GLIB             2.12.4              (if you want the GTK+ client)


@@ -88,10 +88,10 @@ platform, please get in touch.
      --without-gtk          Don't build GTK+ client (Disobedience)
      --without-python       Don't build Python support
 
      --without-gtk          Don't build GTK+ client (Disobedience)
      --without-python       Don't build Python support
 

-   If configure cannot figure out where your CGI programs live, you must set
-   cgidir on the command line, e.g.:
+   If configure cannot guess where your web server keeps its HTML documents and
+   CGI programs, you may have to tell it, for instance:

 
 

-     ./configure cgidir=/whatever/cgi-bin
+     ./configure cgiexecdir=/whatever/cgi-bin httpdir=/whatever/htdocs

 
    See README.client for setting up a standalone client (or read the
    disobedience man page).
 
    See README.client for setting up a standalone client (or read the
    disobedience man page).


@@ -229,26 +229,19 @@ You need to configure a number of things to make this work:
 
      disorder setup-guest --no-online-registration
 
 
      disorder setup-guest --no-online-registration
 

-3. Make sure that DisOrder can find its icons and stylesheet.  For example in
-   your web server configuration:
+3. Try it out.  The url will be (something like):

 
 

-     Alias /disorder/ /usr/local/share/disorder/static/
+     http://localhost/cgi-bin/disorder

 
 

-   Alternatively you could use a symlink from the right location in your
-   document root, provided your web server is configured to follow them.
+   You should be able to perform read-only operations straight away, and after
+   visiting the 'Login' page to authenticate, perform other operations like
+   adding a track to the queue.

 
 

-     cd /var/www
-     ln -s /usr/local/share/disorder/static disorder
-
-4. Try it out.  You should be able to perform read-only operations straight
-   away, and after visiting the 'Login' page to authenticate, perform other
-   operations like adding a track to the queue.
-
-5. If you run into problems, always look at the appropriate error log; the
+4. If you run into problems, always look at the appropriate error log; the

    message you see in your web browser will usually not be sufficient to
    diagnose the problem all by itself.
 
    message you see in your web browser will usually not be sufficient to
    diagnose the problem all by itself.
 

-6. If you have a huge number of top level directories, then you might find
+5. If you have a huge number of top level directories, then you might find

    that the 'Choose' page is unreasonably large.  If so add the following line
    to /etc/disorder/options.user:
      label sidebar.choosewhich choosealpha
    that the 'Choose' page is unreasonably large.  If so add the following line
    to /etc/disorder/options.user:
      label sidebar.choosewhich choosealpha


@@ -280,18 +273,18 @@ Portions Copyright (C) 1997-2006 Free Software Foundation, Inc.
 Binaries may derive extra copyright owners through linkage (binary distributors
 are expected to do their own legwork)
 
 Binaries may derive extra copyright owners through linkage (binary distributors
 are expected to do their own legwork)
 

-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.

 
 

-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307 USA
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 Local Variables:
 mode:text
 
 Local Variables:
 mode:text