3 files changed, 22 insertions, 29 deletions
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 00135bc0af3..6fb28026796 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hier.7,v 1.130 2014/08/23 07:25:54 jmc Exp $
+.\"	$OpenBSD: hier.7,v 1.131 2014/08/26 19:33:48 robert Exp $
 .\"	$NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: August 23 2014 $
+.Dd $Mdocdate: August 26 2014 $
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -117,9 +117,6 @@ System mail configuration files.
 .It mtree/
 .Xr mtree 8
 configuration files.
-.It nginx/
-.Xr nginx 8
-configuration files.
 .It npppd/
 .Xr npppd 8
 configuration files.
@@ -643,8 +640,8 @@ Periodically cleaned by
 Configuration files for
 .Xr unbound 8 .
 .It www/
-ServerRoot point for
-.Xr nginx 8 .
+Configuration files for
+.Xr httpd 8 .
 .It yp/
 Files for the
 .Xr yp 8
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index cbae239924d..9782c3b2a28 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.8,v 1.24 2014/08/23 07:25:54 jmc Exp $
+.\"	$OpenBSD: intro.8,v 1.25 2014/08/26 19:33:48 robert Exp $
 .\"	$NetBSD: intro.8,v 1.3 1994/11/30 19:36:24 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)intro.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: August 23 2014 $
+.Dd $Mdocdate: August 26 2014 $
 .Dt INTRO 8
 .Os
 .Sh NAME
@@ -72,11 +72,11 @@ System daemons are controlled by the script
 which is in turn configured by
 .Xr rc.conf 8 .
 For example the HTTP daemon
-.Xr nginx 8
+.Xr httpd 8
 is controlled by the following line from
 .Xr rc.conf 8 :
 .Bd -literal -offset indent
-nginx_flags=NO
+httpd_flags=NO
 .Ed
 .Pp
 Thus it is not started by default.
@@ -86,15 +86,11 @@ administrators should edit the file
 which overrides
 .Xr rc.conf 8 .
 So to enable
-.Xr nginx 8 ,
+.Xr httpd 8 ,
 the following line might be added to
 .Pa /etc/rc.conf.local :
 .Bd -literal -offset indent
-nginx_flags=""
-.Ed
-or
-.Bd -literal -offset indent -compact
-nginx_flags="-u"
+httpd_flags=""
 .Ed
 .Pp
 As can be seen above,
@@ -185,7 +181,7 @@ Relevant
 .Xr rc.conf 8
 variables:
 .Va rbootd_flags .
-.Ss nginx web server (HTTP)
+.Ss httpd web server (HTTP)
 On
 .Ox
 it will
@@ -193,14 +189,14 @@ it will
 to
 .Pa /var/www .
 Detailed information is available in
-.Xr nginx 8
+.Xr httpd 8
 and
-.Xr nginx.conf 5 .
+.Xr httpd.conf 5 .
 .Pp
 Relevant
 .Xr rc.conf 8
 variables:
-.Va nginx_flags .
+.Va httpd_flags .
 .Ss NFS server
 If this is an NFS server,
 edit
diff --git a/share/man/man8/ssl.8 b/share/man/man8/ssl.8
index 4447dbf839d..04bd3855224 100644
--- a/share/man/man8/ssl.8
+++ b/share/man/man8/ssl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssl.8,v 1.57 2014/04/12 16:08:10 jmc Exp $
+.\"	$OpenBSD: ssl.8,v 1.58 2014/08/26 19:33:48 robert Exp $
 .\"
 .\" Copyright (c) 1999 Theo de Raadt, Bob Beck
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 12 2014 $
+.Dd $Mdocdate: August 26 2014 $
 .Dt SSL 8
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@ The SSL libraries (libssl and libcrypto) implement the SSL version 3
 and TLS version 1 protocols.
 SSL and TLS are most commonly used by the HTTPS protocol for encrypted
 web transactions, as can be done with
-.Xr nginx 8 .
+.Xr httpd 8 .
 The libcrypto library is also used by various programs such as
 .Xr ssh 1 ,
 .Xr sshd 8 ,
@@ -58,7 +58,7 @@ This is most commonly seen by users as the RSA routines failing in
 applications such as
 .Xr ssh 1
 and
-.Xr nginx 8 .
+.Xr httpd 8 .
 .Pp
 It is important to remember when using a random data source for certificate
 and key generation that the random data source should not be visible by
@@ -90,7 +90,7 @@ If a passphrase is not used, you will need to be absolutely sure your
 key file is kept secure.
 .Sh GENERATING RSA SERVER CERTIFICATES FOR WEB SERVERS
 To support HTTPS transactions in
-.Xr nginx 8
+.Xr httpd 8
 you will need to generate an RSA certificate.
 .Bd -literal -offset indent
 # openssl genrsa -out /etc/ssl/private/server.key 2048
@@ -127,7 +127,7 @@ With
 and
 .Pa /etc/ssl/private/server.key
 in place, you should be able to start
-.Xr nginx 8
+.Xr httpd 8
 with SSL configured, enabling HTTPS transactions with your machine on port 443.
 .Pp
 You will most likely want to generate a self-signed certificate in the
@@ -139,7 +139,7 @@ you can switch to using the new certificate by replacing the self-signed
 .Pa /etc/ssl/server.crt
 with the certificate signed by your Certificate Authority, and then
 restarting
-.Xr nginx 8 .
+.Xr httpd 8 .
 .Sh GENERATING DSA SERVER CERTIFICATES
 Generating a DSA certificate involves several steps.
 First, generate parameters for DSA keys.
@@ -226,7 +226,7 @@ to use SSL/TLS.
 .Xr ssl 3 ,
 .Xr arandom 4 ,
 .Xr isakmpd 8 ,
-.Xr nginx 8 ,
+.Xr httpd 8 ,
 .Xr rc 8 ,
 .Xr sendmail 8 ,
 .Xr sshd 8 ,