Merge playlist support.

[disorder] / doc / disorder.1.in

diff --git a/doc/disorder.1.in b/doc/disorder.1.in
index 784b37a99d5c78e9d1ab85075611bba3985e23a8..b61a825a5ff64fec5f5cae88836017fd34d11547 100644 (file)
--- a/doc/disorder.1.in
+++ b/doc/disorder.1.in
@@ -190,6 +190,11 @@ recently played one.
 .TP
 .B reconfigure
 Make the daemon reload its configuration file.
+.IP
+Not all configuration options can be modified during the lifetime of the
+server; of those that can't, some will just be ignored if they change while
+others will cause the new configuration to be rejected.
+See \fBdisorder_config\fR(5) for details.
 .TP
 .B remove \fITRACK\fR
 Remove a track from the queue.