Mark Forwarding and DirectOnly options as being experimental.

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index 8f5237f..bc82b17 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -199,13 +199,13 @@ Tinc will expect packets read from the virtual network device
 to start with an Ethernet header.
 .El
 
 to start with an Ethernet header.
 .El
 

-.It Va DirectOnly Li = yes | no Pq no
+.It Va DirectOnly Li = yes | no Po no Pc Bq experimental

 When this option is enabled, packets that cannot be sent directly to the destination node,
 but which would have to be forwarded by an intermediate node, are dropped instead.
 When combined with the IndirectData option,
 packets for nodes for which we do not have a meta connection with are also dropped.
 
 When this option is enabled, packets that cannot be sent directly to the destination node,
 but which would have to be forwarded by an intermediate node, are dropped instead.
 When combined with the IndirectData option,
 packets for nodes for which we do not have a meta connection with are also dropped.
 

-.It Va Forwarding Li = off | internal | kernel Pq internal
+.It Va Forwarding Li = off | internal | kernel Po internal Pc Bq experimental

 This option selects the way indirect packets are forwarded.
 .Bl -tag -width indent
 
 This option selects the way indirect packets are forwarded.
 .Bl -tag -width indent
 

diff --git a/doc/tinc.texi b/doc/tinc.texi
index a938c27..dd7bc62 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -819,14 +819,14 @@ to start with an Ethernet header.
 @end table
 
 @cindex DirectOnly
 @end table
 
 @cindex DirectOnly

-@item DirectOnly = <yes|no> (no)
+@item DirectOnly = <yes|no> (no) [experimental]

 When this option is enabled, packets that cannot be sent directly to the destination node,
 but which would have to be forwarded by an intermediate node, are dropped instead.
 When combined with the IndirectData option,
 packets for nodes for which we do not have a meta connection with are also dropped.
 
 @cindex Forwarding
 When this option is enabled, packets that cannot be sent directly to the destination node,
 but which would have to be forwarded by an intermediate node, are dropped instead.
 When combined with the IndirectData option,
 packets for nodes for which we do not have a meta connection with are also dropped.
 
 @cindex Forwarding

-@item Forwarding = <off|internal|kernel> (internal)
+@item Forwarding = <off|internal|kernel> (internal) [experimental]

 This option selects the way indirect packets are forwarded.
 
 @table @asis
 This option selects the way indirect packets are forwarded.
 
 @table @asis