CHANGES -> CHANGES.html in debian scripts too

[disorder] / README

diff --git a/README b/README
index 1c7e72dde96b87c98d17ee30ee4d8eef717a2d1b..8aa4ccd5cba9c9743ee9a274a18dad834af5aee7 100644 (file)
--- a/README
+++ b/README
@@ -13,8 +13,8 @@ DisOrder is a multi-user software jukebox.
      GTK+ interface that runs on Linux and Mac systems.
    * Playing tracks can be paused or cancelled ("scratched").
 
      GTK+ interface that runs on Linux and Mac systems.
    * Playing tracks can be paused or cancelled ("scratched").
 

-See CHANGES for details of recent changes to DisOrder and README.upgrades for
-upgrade instructions.
+See CHANGES.html for details of recent changes to DisOrder and README.upgrades
+for upgrade instructions.

 
 Platform support:
   Linux            Well tested on Debian
 
 Platform support:
   Linux            Well tested on Debian


@@ -71,8 +71,9 @@ IMPORTANT: If you are upgrading from an earlier version, see README.upgrades.
 Debian/Ubuntu: steps 1 to 6 are dealt with automatically if you use the .deb
 files.
 
 Debian/Ubuntu: steps 1 to 6 are dealt with automatically if you use the .deb
 files.
 

-OX X/FreeBSD/other Linux: after installation (step 1) 'sudo bash scripts/setup'
-covers steps 3 to 6.  If it doesn't work on your platform, please get in touch.
+OX X/FreeBSD/other Linux: after installation (step 1 and 2), running
+'sudo bash scripts/setup' will cover steps 3 to 6.  If it doesn't work on your
+platform, please get in touch.

 
 1. Build the software.  Do something like this:
 
 
 1. Build the software.  Do something like this:
 


@@ -203,9 +204,15 @@ You need to configure a number of things to make this work:
 
      mail_sender webmaster@example.com
 
 
      mail_sender webmaster@example.com
 

-   By default the web interface sends mail by connecting to the SMTP port of
-   127.0.0.1.  You can override this with the smtp_server directive, for
-   exampler:
+   By default the web interface sends mail via the system sendmail executable
+   (typically /usr/sbin/sendmail or /usr/lib/sendmail).  You can override this
+   with the sendmail directive, for example:
+
+     sendmail /usr/sbin/my-sendmail
+
+   The executable you choose must support the -bs option.  Alternatively you
+   can tell it to connect to an SMTP server via TCP, with the smtp_server
+   directive.  For example:

 
      smtp_server mail.example.com
 
 
      smtp_server mail.example.com
 


@@ -234,7 +241,7 @@ You need to configure a number of things to make this work:
 4. Install disorder.cgi in an appropriate location.  Remember to make it
    executable.  Example:
 
 4. Install disorder.cgi in an appropriate location.  Remember to make it
    executable.  Example:
 

-     install -m 755 server/disorder.cgi /usr/lib/cgi-bin/disorder
+     install -m 755 cgi/disorder.cgi /usr/lib/cgi-bin/disorder

 
 5. Try it out.  You should be able to perform read-only operations straight
    away, and after visiting the 'Login' page to authenticate, perform other
 
 5. Try it out.  You should be able to perform read-only operations straight
    away, and after visiting the 'Login' page to authenticate, perform other


@@ -272,6 +279,7 @@ Portions copyright (C) 2007 Mark Wooding
 Portions extracted from MPG321, http://mpg321.sourceforge.net/
   Copyright (C) 2001 Joe Drew
   Copyright (C) 2000-2001 Robert Leslie
 Portions extracted from MPG321, http://mpg321.sourceforge.net/
   Copyright (C) 2001 Joe Drew
   Copyright (C) 2000-2001 Robert Leslie

+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)