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 029df1f..ba753f4 100644 (file)
--- 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.
 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
 .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 e163b1e..452f9f5 100644 (file)
--- 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.
 
 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 = <low|normal|high>
 When this option is used the priority of the tincd process will be adjusted.
 @cindex ProcessPriority
 @item ProcessPriority = <low|normal|high>
 When this option is used the priority of the tincd process will be adjusted.