Merge local host configuration with server configuration.

[oweals/tinc.git] / doc / tinc.conf.5.in

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index bc82b17637443a7708b1f470804b1a39c9a4f81d..2bfd5fef94f8b2f6f0afa5f47540ef49b54362ef 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -110,6 +110,13 @@ Note: it is not required that you put in the
 sign, but doing so improves readability.
 If you leave it out, remember to replace it with at least one space character.
 
 sign, but doing so improves readability.
 If you leave it out, remember to replace it with at least one space character.
 

+.Pp
+The server configuration is complemented with host specific configuration (see the next section).
+Although all configuration options for the local host listed in this document can also be put in
+.Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /tinc.conf ,
+it is recommended to put host specific configuration options in the host configuration file,
+as this makes it easy to exchange with other nodes.
+

 .Pp
 Here are all valid variables, listed in alphabetical order.
 The default value is given between parentheses.
 .Pp
 Here are all valid variables, listed in alphabetical order.
 The default value is given between parentheses.