- be more consistent when referring to ServerRoot

- document DocumentRoot more explicitly
- don't use .Va for everything

ok henning@

1 files changed, 30 insertions, 22 deletions

diff --git a/usr.sbin/httpd/httpd.8 b/usr.sbin/httpd/httpd.8
index f9b78541bd1..25270c4c0be 100644
--- a/usr.sbin/httpd/httpd.8
+++ b/usr.sbin/httpd/httpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: httpd.8,v 1.21 2004/12/14 09:21:49 jmc Exp $
+.\"	$OpenBSD: httpd.8,v 1.22 2004/12/14 15:32:32 jmc Exp $
 .\" Copyright (c) 1995-1997 David Robinson. All rights reserved.
 .\" Copyright (c) 1997-1999 The Apache Group. All rights reserved.
 .\" Copyright (c) 1998-1999 Bob Beck. All rights reserved.
@@ -95,12 +95,15 @@ By default,
 will
 .Xr chroot 2
 to the
-.Ar serverroot
+.Dq ServerRoot
+path,
+serving documents from the
+.Dq DocumentRoot
 path.
 As a result of the default secure behaviour,
 .Nm
 cannot access any objects outside
-.Va ServerRoot
+.Dq ServerRoot
 \- this security measure is taken in case
 .Nm
 is compromised.
@@ -108,21 +111,22 @@ This is not without drawbacks, though:
 .Pp
 CGI programs may fail due to the limited environment available inside
 this chroot space.
-UserDir, of course, cannot access files outside the directory space.
+.Dq UserDir ,
+of course, cannot access files outside the directory space.
 Other modules will also have issues.
-DocumentRoot directories or any other files needed must be inside
-.Va ServerRoot .
-For this to work, pathnames inside the
-.Va config
-file do not need adjustment relative to
-.Va ServerRoot .
+.Dq DocumentRoot
+directories or any other files needed must be inside
+.Dq ServerRoot .
+For this to work,
+pathnames inside the configuration file do not need adjustment relative to
+.Dq ServerRoot .
 For this option to remain secure, it is important that no files or directories
 writable by user
 .Ar www
 or group
 .Ar www
 are created inside the
-.Va ServerRoot .
+.Dq ServerRoot .
 .Pp
 The
 .Fl u
@@ -147,22 +151,26 @@ The options are as follows:
 .Bl -tag -width Ds
 .It Fl C Ar directive
 Process the configuration
-.Va directive
+.Ar directive
 before reading config files.
 .It Fl c Ar directive
 Process the configuration
-.Va directive
+.Ar directive
 after reading config files.
 .It Fl D Ar parameter
 Sets a configuration
-.Va parameter
+.Ar parameter
 which can be used with
 <IfDefine>...</IfDefine> sections in the configuration files
 to conditionally skip or process commands.
 .It Fl d Ar serverroot
-Set the initial value for the ServerRoot directive to
-.Va serverroot .
-This can be overridden by the ServerRoot command in the configuration file.
+Set the initial value for the
+.Dq ServerRoot
+directive to
+.Ar serverroot .
+This can be overridden by the
+.Dq ServerRoot
+command in the configuration file.
 The default is
 .Pa /var/www .
 .It Fl F
@@ -170,10 +178,10 @@ Run the main process in foreground.
 For process supervisors.
 .It Fl f Ar config
 Execute the commands in the file
-.Va config
+.Ar config
 on startup.
 If
-.Va config
+.Ar config
 does not begin with a /, then it is taken to be a path relative to
 the ServerRoot.
 The default is
@@ -212,7 +220,7 @@ By default
 will
 .Xr chroot 2
 to the
-.Va serverroot
+.Dq ServerRoot
 path.
 The
 .Fl u
@@ -238,9 +246,9 @@ The documents served by
 should not be owned by the user which
 .Nm
 is running as (usually user
-.Va www
+.Ar www
 and group
-.Va www ) .
+.Ar www ) .
 They must, however, be readable by this user.
 .Sh FILES
 .Bl -tag -width /etc/passwd -compact