Fix some "make distcheck" errors.

[oweals/tinc.git] / doc / tinc.conf.5.in

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index 0f91b7f6aa52827e10872a37a25b28a06cf0363e..40ea1cc70918e31b4053f848fcc0b4b6866b4193 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -1,4 +1,4 @@
-.Dd 2016-02-27
+.Dd 2016-10-29

 .Dt TINC.CONF 5
 .\" Manual page created by:
 .\" Ivo Timmermans
 .Dt TINC.CONF 5
 .\" Manual page created by:
 .\" Ivo Timmermans


@@ -250,6 +250,10 @@ Tinc will expect packets read from the virtual network device
 to start with a four byte header containing the address family,
 followed by an IP header.
 This mode should support both IPv4 and IPv6 packets.
 to start with a four byte header containing the address family,
 followed by an IP header.
 This mode should support both IPv4 and IPv6 packets.

+.It utun Pq OS X
+Set type to utun.
+This is only supported on OS X version 10.6.8 and higher, but doesn't require the tuntaposx module.
+This mode should support both IPv4 and IPv6 packets.

 .It tap Pq BSD and Linux
 Set type to tap.
 Tinc will expect packets read from the virtual network device
 .It tap Pq BSD and Linux
 Set type to tap.
 Tinc will expect packets read from the virtual network device


@@ -464,9 +468,9 @@ Multiple
 .Va Address
 variables can be specified, in which case each address will be tried until a working
 connection has been established.
 .Va Address
 variables can be specified, in which case each address will be tried until a working
 connection has been established.

-.It Va Cipher Li = Ar cipher Pq blowfish
+.It Va Cipher Li = Ar cipher Pq aes-256-cbc

 The symmetric cipher algorithm used to encrypt UDP packets.
 The symmetric cipher algorithm used to encrypt UDP packets.

-Any cipher supported by OpenSSL is recognised.
+Any cipher supported by LibreSSL or OpenSSL is recognised.

 Furthermore, specifying
 .Qq none
 will turn off packet encryption.
 Furthermore, specifying
 .Qq none
 will turn off packet encryption.


@@ -479,9 +483,9 @@ Fragmentation Needed or Packet too Big messages are dropped by firewalls.
 This option sets the level of compression used for UDP packets.
 Possible values are 0 (off), 1 (fast zlib) and any integer up to 9 (best zlib),
 10 (fast lzo) and 11 (best lzo).
 This option sets the level of compression used for UDP packets.
 Possible values are 0 (off), 1 (fast zlib) and any integer up to 9 (best zlib),
 10 (fast lzo) and 11 (best lzo).

-.It Va Digest Li = Ar digest Pq sha1
+.It Va Digest Li = Ar digest Pq sha256

 The digest algorithm used to authenticate UDP packets.
 The digest algorithm used to authenticate UDP packets.

-Any digest supported by OpenSSL is recognised.
+Any digest supported by LibreSSL or OpenSSL is recognised.

 Furthermore, specifying
 .Qq none
 will turn off packet authentication.
 Furthermore, specifying
 .Qq none
 will turn off packet authentication.


@@ -653,7 +657,7 @@ its connection to the virtual network device.
 .El
 .Sh SEE ALSO
 .Xr tincd 8 ,
 .El
 .Sh SEE ALSO
 .Xr tincd 8 ,

-.Pa http://www.tinc-vpn.org/ ,
+.Pa https://www.tinc-vpn.org/ ,

 .Pa http://www.tldp.org/LDP/nag2/ .
 .Pp
 The full documentation for
 .Pa http://www.tldp.org/LDP/nag2/ .
 .Pp
 The full documentation for