diff options
author | Jason McIntyre <jmc@cvs.openbsd.org> | 2015-07-24 15:25:09 +0000 |
---|---|---|
committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2015-07-24 15:25:09 +0000 |
commit | 54b287b5c9cf957bb97e3ee19c6462da353a4648 (patch) | |
tree | 4d3a94a78138568feea1a9372cd767a636b4d5dd /usr.sbin | |
parent | c68fe3a9b6225854662c7957fd4d6beec199b3cc (diff) |
an TLS -> a TLS; from thanos tsouanas
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/relayctl/relayctl.8 | 6 | ||||
-rw-r--r-- | usr.sbin/relayd/relayd.conf.5 | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/relayctl/relayctl.8 b/usr.sbin/relayctl/relayctl.8 index b271baafe72..fd6fcdfecea 100644 --- a/usr.sbin/relayctl/relayctl.8 +++ b/usr.sbin/relayctl/relayctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: relayctl.8,v 1.30 2014/12/12 10:05:10 reyk Exp $ +.\" $OpenBSD: relayctl.8,v 1.31 2015/07/24 15:25:08 jmc Exp $ .\" .\" Copyright (c) 2007 - 2013 Reyk Floeter <reyk@openbsd.org> .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: December 12 2014 $ +.Dd $Mdocdate: July 24 2015 $ .Dt RELAYCTL 8 .Os .Sh NAME @@ -156,7 +156,7 @@ This indicates that .Xr relayd 8 was running low on resources, file descriptors, or was too busy to run the request. -It can also indicate that an TLS or TCP protocol error occurred or +It can also indicate that a TLS or TCP protocol error occurred or that the connection was unexpectedly aborted. .Pp .It Em tls connect failed diff --git a/usr.sbin/relayd/relayd.conf.5 b/usr.sbin/relayd/relayd.conf.5 index a8f554239f3..b694f02b75e 100644 --- a/usr.sbin/relayd/relayd.conf.5 +++ b/usr.sbin/relayd/relayd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: relayd.conf.5,v 1.163 2015/05/15 20:40:26 reyk Exp $ +.\" $OpenBSD: relayd.conf.5,v 1.164 2015/07/24 15:25:08 jmc Exp $ .\" .\" Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> .\" Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: May 15 2015 $ +.Dd $Mdocdate: July 24 2015 $ .Dt RELAYD.CONF 5 .Os .Sh NAME @@ -358,7 +358,7 @@ SMTP, NNTP, and FTP. If the .Ic tls keyword is present, -the transaction will occur in an TLS tunnel. +the transaction will occur in a TLS tunnel. .It Ic check tcp Use a simple TCP connect to check that hosts are up. .It Ic check tls @@ -703,7 +703,7 @@ authenticated and encrypted relays. TLS is the successor of the original Secure Sockets Layer (SSL) protocol, but the term SSL is sometimes still used in modern TLS-based applications. .Xr relayd 8 -can operate as an TLS client or server to offer a variety of options +can operate as a TLS client or server to offer a variety of options for different use cases related to TLS. .Bl -tag -width Ds .It Ic TLS client @@ -728,7 +728,7 @@ keyword in the relay .Ic listen statements, .Xr relayd 8 -will accept connections from clients as an TLS server. +will accept connections from clients as a TLS server. This mode is also known as .Dq SSL/TLS acceleration . See the @@ -758,7 +758,7 @@ will listen for incoming connections which have been diverted to the local socket by PF. Before accepting and negotiating the incoming TLS connection as a server, it will look up the original destination address on the -diverted socket, and pre-connect to the target server as an TLS client +diverted socket, and pre-connect to the target server as a TLS client to obtain the remote TLS certificate. It will update or patch the obtained TLS certificate by replacing the included public key with its local server key because it doesn't have @@ -791,7 +791,7 @@ replaces these IDs with random values to compensate for predictable values generated by some hosts. .It Ic http protocol Handle the HyperText Transfer Protocol -(HTTP, or "HTTPS" if encapsulated in an TLS tunnel). +(HTTP, or "HTTPS" if encapsulated in a TLS tunnel). .It Xo .Op Ic tcp .Ic protocol @@ -1521,7 +1521,7 @@ To start, first generate a new local CA key and certificate: -keyout /etc/ssl/private/ca.key -out /etc/ssl/ca.crt .Ed .Pp -An TLS server key and self-signed cert for 127.0.0.1 are also required; +A TLS server key and self-signed cert for 127.0.0.1 are also required; see .Ic listen on in the |