diff options
Diffstat (limited to 'src/pluto/pluto.8')
| -rw-r--r-- | src/pluto/pluto.8 | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/pluto/pluto.8 b/src/pluto/pluto.8 index 1efb1a6f7..9ac537bd9 100644 --- a/src/pluto/pluto.8 +++ b/src/pluto/pluto.8 @@ -1,14 +1,8 @@ .TH IPSEC_PLUTO 8 "28 March 1999" .SH NAME -<<<<<<< HEAD -ipsec pluto \- IPsec IKE keying daemon -.br -ipsec whack \- control interface for IPSEC keying daemon -======= pluto \- IPsec IKE keying daemon and control interface .PP whack \- control interface for IKE keying daemon ->>>>>>> upstream/4.5.1 .SH SYNOPSIS .na .nh @@ -1015,11 +1009,7 @@ specifies the name of the operation to be performed \fBup-host\fP, \fBup-client\fP, \fBdown-host\fP, or \fBdown-client\fP). If the address family for security gateway to security gateway communications is IPv6, then -<<<<<<< HEAD -a suffix of -v6 is added to the verb. -======= a suffix of \-v6 is added to the verb. ->>>>>>> upstream/4.5.1 .TP \fBPLUTO_CONNECTION\fP is the name of the connection for which we are routing. @@ -1581,11 +1571,7 @@ rejected with ECONNREFUSED (kernel supplied no details)''. John Denker suggests that this command is useful for tracking down the source of these problems: .br -<<<<<<< HEAD - tcpdump -i eth0 icmp[0] != 8 and icmp[0] != 0 -======= tcpdump \-i eth0 icmp[0] != 8 and icmp[0] != 0 ->>>>>>> upstream/4.5.1 .br Substitute your public interface for eth0 if it is different. .LP |