Merge branch 'master' into 1.1

[meshlink] / doc / tinc.texi

diff --git a/doc/tinc.texi b/doc/tinc.texi
index b595aec1741f0b6ffaac91519065238513e97ab0..90d3c281588b0f7712d78d5ca8a5ec120c9dbcf8 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -262,7 +262,7 @@ alias char-major-10-200 tun
 @subsection Configuration of FreeBSD kernels
 
 For FreeBSD version 4.1 and higher, tun and tap drivers are included in the default kernel configuration.
-Using tap devices is recommended.
+The tap driver can be loaded with @code{kldload if_tap}, or by adding @code{if_tap_load="YES"} to @file{/boot/loader.conf}. 
 
 
 @c ==================================================================
@@ -276,6 +276,7 @@ which adds a tap device to OpenBSD which should work with tinc,
 but with recent versions of OpenBSD,
 a tun device can act as a tap device by setting the link0 option with ifconfig.
 
+
 @c ==================================================================
 @node       Configuration of NetBSD kernels
 @subsection Configuration of NetBSD kernels