little cleanup;

systrace(1) ok provos@

2 files changed, 35 insertions, 29 deletions

diff --git a/bin/systrace/systrace.1 b/bin/systrace/systrace.1
index d7cddbc668e..08167915f72 100644
--- a/bin/systrace/systrace.1
+++ b/bin/systrace/systrace.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: systrace.1,v 1.31 2002/12/09 19:43:53 ian Exp $
+.\"	$OpenBSD: systrace.1,v 1.32 2003/03/28 09:56:06 jmc Exp $
 .\"
 .\" Copyright 2002 Niels Provos <provos@citi.umich.edu>
 .\" All rights reserved.
@@ -38,6 +38,7 @@
 .Nd generate and enforce system call policies
 .Sh SYNOPSIS
 .Nm systrace
+.Bk -words
 .Op Fl aAituU
 .Op Fl d Ar policydir
 .Op Fl g Ar gui
@@ -45,6 +46,7 @@
 .Op Fl c Ar uid:gid
 .Op Fl p Ar pid
 .Ar command ...
+.Ek
 .Sh DESCRIPTION
 The
 .Nm
@@ -58,7 +60,7 @@ Alternatively, it might be used to protect the system
 from software bugs (such as buffer overflows) by constraining a
 daemon's access to the system.
 Its privilege elevation feature can be used to obviate the
-need to run large, untrusted programs as root when only one or two 
+need to run large, untrusted programs as root when only one or two
 system calls require root privilege.
 .Pp
 The access policy can be generated interactively or obtained from a
@@ -111,7 +113,7 @@ Specifies the
 and
 .Va gid
 that the monitored application should be executed with,
-which must be specified as nonnegative integers (not as names).
+which must be specified as non-negative integers (not as names).
 This is useful in conjunction with privilege elevation and requires
 root privilege.
 .It Fl f Ar file
@@ -166,7 +168,7 @@ detach
 have special meanings when used with a
 .Va permit
 rule for the
-.Va execve
+.Xr execve 2
 system call.
 When using
 .Do
@@ -181,7 +183,7 @@ detach,
 detaches from a process after successfully
 completing
 the
-.Va execve
+.Xr execve 2
 system call.
 .Pp
 The filter operations have the following meaning:
@@ -213,10 +215,10 @@ the specified regular expression.
 By appending the
 .Va log
 statement to a rule, a matching system call and its arguments
-is logged to
+are logged to
 .Xr syslog 3 .
 This is useful, for example, to log all invocations of the
-.Va execve
+.Xr execve 2
 system call.
 .Pp
 Policy entries may contain an appended predicate.
@@ -228,8 +230,12 @@ Predicates have the following format:
 A rule is added to the configured policy only if its predicate
 evaluates to true.
 .Pp
-The environment variables $HOME, $USER and $CWD are substituted in rules.
-Comments, begun by an unquoted '#' character and 
+The environment variables
+.Ev $HOME , $USER
+and
+.Ev $CWD
+are substituted in rules.
+Comments, begun by an unquoted '#' character and
 continuing to the end of the line, are ignored.
 .Sh PRIVILEGE ELEVATION
 With
@@ -263,9 +269,9 @@ and
 .Va gid
 are elevated only for the duration of the system call, and are restored
 to the old values afterwards (except for the
-.Va seteuid
-or
-.Va setegid
+.Xr seteuid 2
+and
+.Xr setegid 2
 system calls).
 .Sh FILES
 .Bl -tag -width xHOME/xsystrace -compact
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 4445ad6fde2..2732bd092e4 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.49 2003/03/10 15:37:30 jmc Exp $
+.\"	$OpenBSD: make.1,v 1.50 2003/03/28 09:56:06 jmc Exp $
 .\"	$OpenPackages$
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
@@ -48,13 +48,13 @@
 .Op Fl d Ar flags
 .Op Fl f Ar makefile
 .Op Fl I Ar directory
-.Bk -words
 .Op Fl j Ar max_jobs
 .Op Fl m Ar directory
-.Ek
 .Op Fl V Ar variable
 .Op Ar variable Ns No = Ns Ar value
+.Bk -words
 .Op Ar target ...
+.Ek
 .Sh DESCRIPTION
 .Nm
 is a program designed to simplify the maintenance of other programs.
@@ -107,7 +107,7 @@ that do not depend on the target whose creation caused the error.
 Display the commands that would have been executed, but do not actually
 execute them.
 .It Fl q
-Do not execute any commands, but exit with status 0 if the specified targets 
+Do not execute any commands, but exit with status 0 if the specified targets
 are up-to-date, and 1 otherwise.
 .It Fl r
 Do not use the built-in rules specified in the system makefile.
@@ -196,8 +196,8 @@ Turns compatibility mode off, unless the
 .Ar B
 flag is also specified.
 .It Fl m Ar directory
-Specify a directory in which to search for 
-.Pa sys.mk 
+Specify a directory in which to search for
+.Pa sys.mk
 and makefiles included
 via the <...> style.
 Multiple directories can be added to form a search path.
@@ -245,7 +245,7 @@ and are usually created from them.
 The exact relationship between the target and the source is determined
 by the operator that separates them.
 Note that the use of several targets is merely a shorthand for duplicate
-rules. 
+rules.
 Specifically,
 .Bd -literal
 target1 target2: depa depb
@@ -306,7 +306,7 @@ The
 .Ic \&!
 operator is a BSD extension.
 .Pp
-As an extension, targets and sources may contain the shell wildcard 
+As an extension, targets and sources may contain the shell wildcard
 expressions
 .Ql ? ,
 .Ql * ,
@@ -341,7 +341,7 @@ operator is used.
 .Pp
 If a command line begins with a combination of the characters,
 .Ql Ic @ ,
-.Ql Ic \- 
+.Ql Ic \-
 and/or
 .Ql Ic + ,
 the command is treated specially.
@@ -356,7 +356,7 @@ causes the command to be executed even if
 has been specified (This can be useful to debug recursive Makefiles).
 .El
 .Pp
-The command is always executed using 
+The command is always executed using
 .Pa /bin/sh
 in
 .Qq set -e
@@ -798,7 +798,7 @@ is the substring of
 to be replaced in
 .Ar new_string
 .El
-All modifiers are BSD extensions,  except for the standard
+All modifiers are BSD extensions, except for the standard
 .At V
 style variable substitution.
 .Sh INCLUDE STATEMENTS, CONDITIONALS AND FOR LOOPS
@@ -1043,11 +1043,11 @@ The syntax of a for loop is:
 After the for
 .Ar expression
 is evaluated, it is split into words.
-On each iteration of the loop, one word is assigned to each 
+On each iteration of the loop, one word is assigned to each
 .Ar variable ,
 in order,
-and these 
-.Ar variables 
+and these
+.Ar variables
 are substituted in the
 .Ic make-rules
 inside the body of the for loop.
@@ -1306,7 +1306,7 @@ The determination of
 .Va .OBJDIR
 is contorted to the point of absurdity.
 .Pp
-If you specify the same target several times in normal dependency rules,
+If the same target is specified several times in normal dependency rules,
 .Nm
 silently ignores all commands after the first non empty set of commands,
 e.g., in
@@ -1331,7 +1331,7 @@ The evaluation of
 in a test is very simple-minded.
 Currently, the only form that works is
 .Ql .if ${VAR} op something \.
-For instance, you should write tests as
+For instance, tests should be written as
 .Ql .if ${VAR} = "string" ,
 not the other way around, which doesn't work.
 .Pp
@@ -1379,6 +1379,6 @@ A+=$I
 .Ed
 A will evaluate to a b c d after the loop, not z b c d.
 .Pp
-The 
+The
 .Ql +
 command modificator is ignored in parallel make mode.