Merge branch 'master' into 1.1

[meshlink] / doc / tinc.texi

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 66300eae8d01760e1f7605efaaf4b7c25830d440..40a297a3e9531034224d746232c5e2ea39eda1e9 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -982,7 +982,7 @@ tinc's efficiency, even stopping the daemon for a few seconds everytime
 it does a lookup if your DNS server is not responding.
 
 This does not affect resolving hostnames to IP addresses from the
-configuration file.
+configuration file, but whether hostnames should be resolved while logging.
 
 @cindex Interface
 @item Interface = <@var{interface}>
@@ -2060,8 +2060,18 @@ If no @var{value} is given, all configuration variables with the same name will
 Start an editor for the given configuration file.
 You do not need to specify the full path to the file.
 
-@item start
-Start @samp{tincd}.
+@item export
+Export the host configuration file of the local node to standard output.
+
+@item export-all
+Export all host configuration files to standard output.
+
+@item import [--force]
+Import host configuration file(s) from standard input.
+Already existing host configuration files are not overwritten unless the option --force is used.
+
+@item start [tincd options]
+Start @samp{tincd}, optionally with the given extra options.
 
 @item stop
 Stop @samp{tincd}.
@@ -2098,6 +2108,10 @@ Dump a list of all meta connections with ourself.
 @item dump graph
 Dump a graph of the VPN in dotty format.
 
+@item info @var{node} | @var{subnet} | @var{address}
+Show information about a particular @var{node}, @var{subnet} or @var{address}.
+If an @var{address} is given, any matching subnet will be shown.
+
 @item purge
 Purges all information remembered about unreachable nodes.
 
@@ -2149,6 +2163,7 @@ tincctl -n vpn init foo
 tincctl -n vpn config Subnet 192.168.1.0/24
 tincctl -n vpn config bar.Address bar.example.com
 tincctl -n vpn config ConnectTo bar
+tincctl -n vpn export | gpg --clearsign | mail -s "My config" vpnmaster@@example.com
 @end example
 
 @c ==================================================================