X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/62dc37489c39c8d20046b4d5e323707239491df6..109ef5da39009190b00f64c710971c665ac8659c:/examples/config.sample.in

diff --git a/examples/config.sample.in b/examples/config.sample.in
index 1bf4088..324f230 100644
--- a/examples/config.sample.in
+++ b/examples/config.sample.in
@@ -25,15 +25,15 @@ tracklength *.flac disorder-tracklength
 # is ISO-8859-1.
 collection fs ISO-8859-1 /export/mp3
 
-# Don't leave a gap between tracks.
-gap 0
-
 # Scratch tracks.  You can add your own tracks here.
 scratch pkgdatadir/slap.ogg
 scratch pkgdatadir/scratch.ogg
 
 # Trust the web user and root.  Trusted users can stop the server or
 # pretend to be other users.
+#
+# This line can be removed after upgrade to 2.1 or later, or if the initial
+# install is of 2.1 or later.
 trust www-data root
 
 # Run as user jukebox.  This must exist in /etc/passwd!
@@ -44,13 +44,3 @@ user jukebox
 mixer /dev/mixer
 # The channel to control
 channel pcm
-
-# URL of the web interface
-url http://jukebox.anjou.terraraq.org.uk/
-
-# Stopwords (i.e. ignored words) for the track search facility.
-stopword 01 02 03 04 05 06 07 08 09 10
-stopword 1 2 3 4 5 6 7 8 9
-stopword 11 12 13 14 15 16 17 18 19 20
-stopword 21 22 23 24 25 26 27 28 29 30
-stopword the a an and to too in on of we i am as im for is