From: Guus Sliepen <guus@tinc-vpn.org>
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.0.20~9
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=d07e8f96387f2a50f2e4f9eaf40e9034f8a5435f;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 9f88b4ab..365a3e33 100644
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -380,11 +380,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 tincd process will be adjusted.
 Increasing the priority may help to reduce latency and packet loss on the VPN.
diff --git a/doc/tinc.texi b/doc/tinc.texi
index 861495d0..70f36599 100644
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -1046,10 +1046,6 @@ This is the full path name of the RSA private key file that was
 generated by @samp{tincd --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 = <low|normal|high>
 When this option is used the priority of the tincd process will be adjusted.