note about configuration required by disobedience

diff --git a/.bzrignore b/.bzrignore
index a5b7b639037d7745915739b7efbf7fd62f73bdd9..24e1ed6a98444a8087520e08e193b6d0dafed54c 100644 (file)
--- 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 d82f09ebe4c39b98358dd90b87cbba6e47eda72a..e989c6186e1ec78b62f2d95933a539a4ac8e1415 100644 (file)
--- 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