diff options
| author |   reyk <reyk@openbsd.org> | 2014-12-18 09:00:19 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2014-12-18 09:00:19 +0000 |
| commit | d016e418a8f8dc0251184bae3b1b7cefff8f5ebe (patch) | |
| tree | 769ec2eefe6b508299db03092d74e6bfaff8a2c1 | |
| parent | Unmap the MP hatch and ACPI resume trampolines when not in active use. (diff) | |
| download | wireguard-openbsd-d016e418a8f8dc0251184bae3b1b7cefff8f5ebe.tar.xz wireguard-openbsd-d016e418a8f8dc0251184bae3b1b7cefff8f5ebe.zip | |
"tcp nodelay" shouldn't be discussing relaying SSH; this was a remnant
from relayd.conf.5.
From Ross L Richardson
| -rw-r--r-- | usr.sbin/httpd/httpd.conf.5 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/httpd/httpd.conf.5 b/usr.sbin/httpd/httpd.conf.5 index 736b7055ea0..ee22c7fe1b3 100644 --- a/usr.sbin/httpd/httpd.conf.5 +++ b/usr.sbin/httpd/httpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.conf.5,v 1.37 2014/12/12 14:45:59 reyk Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.38 2014/12/18 09:00:19 reyk Exp $ .\" .\" Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org> .\" @@ -14,7 +14,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: December 18 2014 $ .Dt HTTPD.CONF 5 .Os .Sh NAME @@ -270,8 +270,7 @@ according to RFC 5082. Change the default time-to-live value in the IP headers. .It Oo Ic no Oc Ic nodelay Enable the TCP NODELAY option for this connection. -This is recommended to avoid delays in the relayed data stream, -e.g. for SSH connections. +This is recommended to avoid delays in the data stream. .It Oo Ic no Oc Ic sack Use selective acknowledgements for this connection. .It Ic socket buffer Ar number |