diff options
| author | delphij <delphij@FreeBSD.org> | 2007-03-28 01:57:03 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2007-03-28 01:57:03 +0000 |
| commit | 71a2bc9dd5cc032bb7ed14887706b9e319949ad6 (patch) | |
| tree | a02168d453acd4b3964fb2e9a389b9c35023850d /contrib/netcat/nc.1 | |
| parent | 36c02922c8ea0fc0cd445574235fff00205c62dc (diff) | |
| download | FreeBSD-src-71a2bc9dd5cc032bb7ed14887706b9e319949ad6.zip FreeBSD-src-71a2bc9dd5cc032bb7ed14887706b9e319949ad6.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/netcat/nc.1')
| -rw-r--r-- | contrib/netcat/nc.1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/netcat/nc.1 b/contrib/netcat/nc.1 index d7b2f4e..20885a8 100644 --- a/contrib/netcat/nc.1 +++ b/contrib/netcat/nc.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nc.1,v 1.43 2006/01/31 09:34:12 jmc Exp $ +.\" $OpenBSD: nc.1,v 1.44 2006/12/02 01:08:30 jmc Exp $ .\" .\" Copyright (c) 1996 David Sacerdote .\" All rights reserved. @@ -345,8 +345,8 @@ As another example, an email may be submitted to an SMTP server using: .Bd -literal -offset indent $ nc localhost 25 \*(Lt\*(Lt EOF HELO host.example.com -MAIL FROM: \*(Ltuser@host.example.com\*(Gt -RCPT TO: \*(Ltuser2@host.example.com\*(Gt +MAIL FROM:\*(Ltuser@host.example.com\*(Gt +RCPT TO:\*(Ltuser2@host.example.com\*(Gt DATA Body of email. \&. |
