From: Guus Sliepen Date: Sat, 27 Feb 2016 13:22:36 +0000 (+0100) Subject: Small fixes for the documentation. X-Git-Tag: release-1.0.27~19 X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=48fb63f9c2bc0b838c1f3684cfc230c143bef11f;ds=sidebyside Small fixes for the documentation. --- diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in index 2a1a09bf..8e5ce493 100644 --- a/doc/tinc.conf.5.in +++ b/doc/tinc.conf.5.in @@ -54,7 +54,7 @@ But it is highly recommended that you use this feature of because it will be so much clearer whom your daemon talks to. Hence, we will assume that you use it. .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 @@ -362,7 +362,7 @@ If .Va Name is .Li $HOST , -but no such environment variable exist, the hostname will be read using the gethostnname() system call. +but no such environment variable exist, the hostname will be read using the gethostname() system call. .It Va PingInterval Li = Ar seconds Pq 60 The number of seconds of inactivity that .Nm tinc diff --git a/doc/tinc.texi b/doc/tinc.texi index 2edf4271..44891cd7 100644 --- a/doc/tinc.texi +++ b/doc/tinc.texi @@ -1014,12 +1014,12 @@ while no routing table is managed. @cindex Name @item Name = <@var{name}> [required] This is a symbolic name for this connection. -The name should consist only of alphanumeric and underscore characters (a-z, A-Z, 0-9 and _). +The name must consist only of alphanumeric and underscore characters (a-z, A-Z, 0-9 and _). 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. If Name is $HOST, but no such environment variable exist, -the hostname will be read using the gethostnname() system call. +the hostname will be read using the gethostname() system call. @cindex PingInterval @item PingInterval = <@var{seconds}> (60)