From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 22 May 2018 12:18:17 +0000 (+0200)
Subject: man: Remove keylife/rekeymargin from ipsec.conf man page
X-Git-Tag: 5.6.3dr2~1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e6d17d561378e2239e19e516b65e30de5ba2cdea;p=thirdparty%2Fstrongswan.git

man: Remove keylife/rekeymargin from ipsec.conf man page

We continue to parse them but remove the documentation because mixing the two
sets of keywords in the same config might result in unexpected behavior.

References #2663.
---

diff --git a/man/ipsec.conf.5.in b/man/ipsec.conf.5.in
index eef6efaa0a..232408912f 100644
--- a/man/ipsec.conf.5.in
+++ b/man/ipsec.conf.5.in
@@ -538,10 +538,6 @@ The value \fB%forever\fP
 means 'never give up'.
 Relevant only locally, other end need not agree on it.
 .TP
-.B keylife
-synonym for
-.BR lifetime .
-.TP
 .BR left " = <ip address> | <fqdn> | " %any " | <range> | <subnet> "
 The IP address of the left participant's public-network interface
 or one of several magic values.
@@ -1135,10 +1131,6 @@ will suppress randomization.
 Relevant only locally, other end need not agree on it. Also see EXPIRY/REKEY
 below.
 .TP
-.B rekeymargin
-synonym for
-.BR margintime .
-.TP
 .BR replay_window " = " \-1 " | <number>"
 The IPsec replay window size for this connection. With the default of \-1
 the value configured with