From: Guus Sliepen Date: Wed, 14 Nov 2012 09:44:35 +0000 (+0100) Subject: Remove text saying you must have one of PrivateKey or PrivateKeyFile in tinc.conf. X-Git-Tag: release-1.1pre4~21 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=818c92e6583006bf2e38f1027044925df6cf0ca0;p=tinc Remove text saying you must have one of PrivateKey or PrivateKeyFile in tinc.conf. --- diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in index 029df1fa..ba753f4a 100644 --- a/doc/tinc.conf.5.in +++ b/doc/tinc.conf.5.in @@ -402,11 +402,6 @@ The private RSA key of this tinc daemon. It will allow this tinc daemon to authenticate itself to other daemons. .It Va PrivateKeyFile Li = Ar filename Po Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /rsa_key.priv Pc The file in which the private RSA key of this tinc daemon resides. -Note that there must be exactly one of -.Va PrivateKey -or -.Va PrivateKeyFile -specified in the configuration file. .It Va ProcessPriority Li = low | normal | high When this option is used the priority of the .Nm tincd diff --git a/doc/tinc.texi b/doc/tinc.texi index e163b1e8..452f9f51 100644 --- a/doc/tinc.texi +++ b/doc/tinc.texi @@ -1165,10 +1165,6 @@ This is the full path name of the RSA private key file that was generated by @samp{tincctl generate-keys}. It must be a full path, not a relative directory. -Note that there must be exactly one of PrivateKey -or PrivateKeyFile -specified in the configuration file. - @cindex ProcessPriority @item ProcessPriority = When this option is used the priority of the tincd process will be adjusted.