Merging of the entire pre5 branch.

[oweals/tinc.git] / doc / sample-config / tinc.conf

diff --git a/doc/sample-config/tinc.conf b/doc/sample-config/tinc.conf
index ea5216ea78721622848fa6d73e76517c5478e672..f5f0aa6369237ea77b28d07417a0cba3a24d7557 100644 (file)
--- a/doc/sample-config/tinc.conf
+++ b/doc/sample-config/tinc.conf
@@ -16,8 +16,10 @@ Name = alpha
 ConnectTo = beta
 
 # The tap device tinc will use. Required.
-# Default is /dev/tap0
-TapDevice = /dev/tap1
+# Default is /dev/tap0 for ethertap or FreeBSD,
+# /dev/tun0 for Solaris and OpenBSD,
+# and /dev/misc/net/tun for Linux tun/tap device.
+Device = /dev/misc/net/tun
 
 # The file in which the private key for this host is stored. Required.
 PrivateKeyFile = /etc/tinc/example/rsa_key.priv