X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=doc%2Ftinc.texi;h=3495fce601ee68c0d6fb9a515db8874e6b3fe572;hp=fc0d475ab80c5b2bd45dae9134c735c94cd1644c;hb=8af6d64fd9dfdd684a56534249e12d201628055c;hpb=3e924045ccaab1441b77ff43a2d7eb759b313f7b

diff --git a/doc/tinc.texi b/doc/tinc.texi
index fc0d475a..3495fce6 100644
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -793,6 +793,9 @@ The actual configuration of the daemon is done in the file
 @file{@value{sysconfdir}/tinc/@var{netname}/tinc.conf} and at least one other file in the directory
 @file{@value{sysconfdir}/tinc/@var{netname}/hosts/}.
 
+An optionnal directory @file{@value{sysconfdir}/tinc/@var{netname}/conf.d} can be added from which
+any .conf file will be read.
+
 These file consists of comments (lines started with a #) or assignments
 in the form of
 
@@ -1194,6 +1197,8 @@ traffic.
 When this option is enabled tinc will only use Subnet statements which are
 present in the host config files in the local
 @file{@value{sysconfdir}/tinc/@var{netname}/hosts/} directory.
+Subnets learned via connections to other nodes and which are not
+present in the local host config files are ignored.
 
 @cindex TunnelServer
 @item TunnelServer = <yes|no> (no) [experimental]