Merge branch 'master' into 1.1

[meshlink] / doc / tinc.texi

diff --git a/doc/tinc.texi b/doc/tinc.texi
index a5ef8e6c4812c1be05d188839ef3b5eb76663bf5..3dc9eca46d899ca1aab790fdb587c5134fcbfab8 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -749,6 +749,13 @@ and carriage returns are ignored.  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.
 
 in the `=' sign, but doing so improves readability.  If you leave it
 out, remember to replace it with at least one space character.
 

+The server configuration is complemented with host specific configuration (see
+the next section). Although all host configuration options for the local node
+listed in this document can also be put in
+@file{@value{sysconfdir}/tinc/@var{netname}/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.
+

 In this section all valid variables are listed in alphabetical order.
 The default value is given between parentheses,
 other comments are between square brackets.
 In this section all valid variables are listed in alphabetical order.
 The default value is given between parentheses,
 other comments are between square brackets.