From: Guus Sliepen Date: Sat, 27 Feb 2016 13:22:36 +0000 (+0100) Subject: Small fixes for the documentation. X-Git-Tag: release-1.1pre12~61 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=e3f80e9167ecef8db8add9359b6660ecdcaeb7af;p=tinc Small fixes for the documentation. # Conflicts: # doc/tinc.texi --- diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in index 68fa59e7..4fc70cf7 100644 --- a/doc/tinc.conf.5.in +++ b/doc/tinc.conf.5.in @@ -42,7 +42,7 @@ the configuration file should be and the host configuration files are now expected to be in .Pa @sysconfdir@/tinc/hosts/ . .Sh NAMES -Each tinc daemon should have a name that is unique in the network which it will be part of. +Each tinc daemon must have a name that is unique in the network which it will be part of. The name will be used by other tinc daemons for identification. The name has to be declared in the .Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /tinc.conf diff --git a/doc/tinc.texi b/doc/tinc.texi index 0e0be411..53ce4a3c 100644 --- a/doc/tinc.texi +++ b/doc/tinc.texi @@ -1139,7 +1139,7 @@ until the burst has passed. @cindex Name @item Name = <@var{name}> [required] This is a symbolic name for this connection. -The name should consist only of alfanumeric and underscore characters (a-z, A-Z, 0-9 and _), and is case sensitive. +The name must consist only of alfanumeric and underscore characters (a-z, A-Z, 0-9 and _), and is case sensitive. If Name starts with a $, then the contents of the environment variable that follows will be used. In that case, invalid characters will be converted to underscores.