X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=doc%2Ftinc.texi;h=ba1f9b51523e26af62c9813af3010c4be6bceb13;hp=b86bc09cc553ce4d1db237afae29bb87fbc68e46;hb=d5113a9a37d72616d6cd50f6f63b3dd7ebcf8e04;hpb=2769a110fe286365babfe7591eb7418f31bf02d6

diff --git a/doc/tinc.texi b/doc/tinc.texi
index b86bc09c..ba1f9b51 100644
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -718,6 +718,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
 
@@ -1102,6 +1105,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]