README.config: clarifications

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/README.config b/README.config
index 3c3a169b30fc531b49741e03b90378b1bef9b1b0..42e623db1cf3686ee0a661fe7bf132b41d1aab39 100644 (file)
--- a/README.config
+++ b/README.config
@@ -6,19 +6,30 @@ Sections
   [<client>]
   [<servername>]      often [SERVER]
   [COMMON]
+  [DEFAULT]
 
 Keys are looked up in that order, unless otherwise specified.
 <client> is the client's virtual address.
 <servername> must be a valid DNS hostname and not look like an address.
 
+Things not in a section are an error.
 
-Both client and server read all files
+
+Both client and server read the files
   /etc/hippotat/main.cfg
-  /etc/hippotat/config.d
-  /etc/hippotat/server.d
+  /etc/hippotat/config.d/*
+  /etc/hippotat/secrets.d/*
 and in each case if it's a directory, all contained files whose
 names consists of only ascii alphanumerics plus '-' and '_'.
+
 The ini file format sections from these files are all unioned.
+Later files (in the list above, or alphabetically later) can
+override settings from earlier ones.
+
+Note that although it is conventional for information for a particular
+server or client to be in a file named after that endpoint, there is
+no semantic link: all the files are always read and the appropriate
+section from each is applied to every endpoint.
 
 (If main.cfg does not exist, master.cfg will be tried for backward
 compatibility reasons.)