From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 1 Jul 2007 22:07:20 +0000 (+0100)
Subject: note about configuration required by disobedience
X-Git-Tag: debian-1_5_99dev8~297
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/a8161466d71d155152affeb9bf5c3ffa2cdbdb0d

note about configuration required by disobedience
---

diff --git a/.bzrignore b/.bzrignore
index a5b7b63..24e1ed6 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -83,3 +83,5 @@ server/disorderd
 server/trackname
 sounds/Makefile
 templates/Makefile
+.bzr.backup
+doc/disorder-speaker.8.html
diff --git a/doc/disobedience.1.in b/doc/disobedience.1.in
index d82f09e..e989c61 100644
--- a/doc/disobedience.1.in
+++ b/doc/disobedience.1.in
@@ -210,6 +210,20 @@ This an odd-numbered row in the queue or recently played track list.
 .TP
 .B disobedience.*.row-even
 This an even-numbered row in the queue or recently played track list.
+.SH CONFIGURATION
+If you are using
+.B disobedience
+on the same host as the server then no additional configuration should be
+required.
+.PP
+If it is running on a different host then the server will need a
+.B listen
+directive in its configuration and the clien a matching
+.B connect
+directive.  Also the client will need user passwords, either in
+.IR pkgconfdir/config. USER
+or
+.IR ~ USER /.disorder.passwd .
 .SH "SEE ALSO"
 .BR disorder_config (5)
 .PP