summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2014-03-13 10:12:12 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2014-03-13 10:12:12 +0000
commitd09d5cc58c2b906fb96fc9ce1a74b658116d1de6 (patch)
tree3a275e8a3db39c435a5fa32af1ea56a11db3ad2a /usr.sbin
parent294f333991cc0953b2b7a5f671ab1aa29d1e7b82 (diff)
Unhook httpd(8) from build; man page bits
tweaks jmc@ OK krw@, gilles@, lteo@, tedu@, todd@, benno@, sthen@ "The time is right." and much help getting the show on the road deraadt@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/openssl/openssl.113
-rw-r--r--usr.sbin/tcpdrop/tcpdrop.810
2 files changed, 8 insertions, 15 deletions
diff --git a/usr.sbin/openssl/openssl.1 b/usr.sbin/openssl/openssl.1
index 03e195a8b03..8c1a33f3881 100644
--- a/usr.sbin/openssl/openssl.1
+++ b/usr.sbin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.92 2013/07/16 11:13:33 schwarze Exp $
+.\" $OpenBSD: openssl.1,v 1.93 2014/03/13 10:12:11 florian Exp $
.\" ====================================================================
.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
.\"
@@ -112,7 +112,7 @@
.\"
.\" OPENSSL
.\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: March 13 2014 $
.Dt OPENSSL 1
.Os
.Sh NAME
@@ -8867,10 +8867,6 @@ to implement an automatic email-based TSA with
.Xr procmail
and
.Xr perl 1 .
-HTTP server support is provided in the form of
-a separate
-.Xr httpd 8
-module.
Pure TCP/IP is not supported.
.Pp
The file containing the last serial number of the TSA is not
@@ -8879,9 +8875,6 @@ This is a problem if more than one instance of
.Nm OpenSSL
is trying to create a time stamp
response at the same time.
-This is not an issue when using the
-.Xr httpd 8
-server module, which does proper locking.
.Pp
Look for the FIXME word in the source files.
.Pp
@@ -10455,7 +10448,7 @@ certificates.
.\" SEE ALSO
.\"
.Sh SEE ALSO
-.Xr httpd 8 ,
+.Xr nginx 8 ,
.Xr sendmail 8 ,
.Xr ssl 8 ,
.Xr starttls 8
diff --git a/usr.sbin/tcpdrop/tcpdrop.8 b/usr.sbin/tcpdrop/tcpdrop.8
index eec5c64268d..87c66e1a4fd 100644
--- a/usr.sbin/tcpdrop/tcpdrop.8
+++ b/usr.sbin/tcpdrop/tcpdrop.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tcpdrop.8,v 1.11 2013/07/16 11:13:34 schwarze Exp $
+.\" $OpenBSD: tcpdrop.8,v 1.12 2014/03/13 10:12:11 florian Exp $
.\"
.\" Copyright (c) 2004 Markus Friedl <markus@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: July 16 2013 $
+.Dd $Mdocdate: March 13 2014 $
.Dt TCPDROP 8
.Os
.Sh NAME
@@ -43,12 +43,12 @@ port
Addresses and ports can be specified by name or numeric value.
.Sh EXAMPLES
If a connection to
-.Xr httpd 8
+.Xr nginx 8
is causing congestion on a network link, one can drop the TCP session
in charge:
.Bd -literal -offset indent
-$ fstat | grep 'httpd.*internet.*\*(Lt--'
-www httpd 21307 3* internet stream tcp \e
+$ fstat | grep 'nginx.*internet.*\*(Lt--'
+www nginx 21307 3* internet stream tcp \e
0xd1007ca8 192.168.5.41:80 \*(Lt-- 192.168.5.1:26747
.Ed
.Pp