add some missing content and markup and optimize some indentation

ok tedu@

diff --git a/doas.1 b/doas.1
index e075b6b68cd70c703627dea66c137c6cc837187c..19d5969734f6c7078e1f44aa428327ec6e316776 100644 (file)
--- a/doas.1
+++ b/doas.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: doas.1,v 1.2 2015/07/17 17:11:18 tedu Exp $
+.\" $OpenBSD: doas.1,v 1.3 2015/07/17 20:24:41 tedu Exp $

 .\"
 .\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
 .\"
 .\"
 .\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
 .\"


@@ -22,7 +22,7 @@
 .Sh SYNOPSIS
 .Nm doas
 .Op Fl u Ar user
 .Sh SYNOPSIS
 .Nm doas
 .Op Fl u Ar user

-command
+.Ar command

 .Op Ar args
 .Sh DESCRIPTION
 The
 .Op Ar args
 .Sh DESCRIPTION
 The

diff --git a/doas.conf.5 b/doas.conf.5
index da2996f666fcf6a2ce18c2f1382b95e84d2d3bc5..a72f0847e66b64d7cc14ee2a9100a5add895d562 100644 (file)
--- a/doas.conf.5
+++ b/doas.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: doas.conf.5,v 1.1 2015/07/16 20:44:21 tedu Exp $
+.\" $OpenBSD: doas.conf.5,v 1.2 2015/07/16 21:24:07 nicm Exp $

 .\"
 .\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
 .\"
 .\"
 .\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
 .\"


@@ -28,33 +28,37 @@ in the
 configuration file.
 .Pp
 The rules have the following format:
 configuration file.
 .Pp
 The rules have the following format:

-.Bd -literal -offset indent
-permit|deny [options] [identity] [as target] [cmd command]
+.Bd -ragged -offset indent
+.Ic permit Ns | Ns Ic deny
+.Op Ar options
+.Op Ar identity
+.Op Ic as Ar target
+.Op Ic cmd Ar command

 .Ed
 .Pp
 Rules consist of the following parts:
 .Ed
 .Pp
 Rules consist of the following parts:

-.Bl -tag -width tenletters
-.It permit|deny
+.Bl -tag -width 11n
+.It Ic permit Ns | Ns Ic deny

 The action to be taken if this rule matches.
 The action to be taken if this rule matches.

-.It options
+.It Ar options

 Options are:
 Options are:

-.Bl -tag -width tenletters
-.It nopass
+.Bl -tag -width keepenv
+.It Ic nopass

 The user is not required to enter a password.
 The user is not required to enter a password.

-.It keepenv
+.It Ic keepenv

 The user's environment is maintained.
 The default is to reset the environment.
 The user's environment is maintained.
 The default is to reset the environment.

-.It keepenv { [variable names] }
+.It Ic keepenv { Oo variable names Oc Ic }

 Reset the environment, but keep the specified variables.
 .El
 Reset the environment, but keep the specified variables.
 .El

-.It identity
+.It Ar identity

 The username to match.
 Groups may be specified by prepending a colon (:).
 Numeric IDs are also accepted.
 The username to match.
 Groups may be specified by prepending a colon (:).
 Numeric IDs are also accepted.

-.It as target
+.It Ic as Ar target

 The target user the running user is allowed to run the command as.
 The default is root.
 The target user the running user is allowed to run the command as.
 The default is root.

-.It cmd command
+.It Ic cmd Ar command

 The command the user is allowed or denied to run.
 The default is all commands.
 Be advised that it's best to specify absolute paths.
 The command the user is allowed or denied to run.
 The default is all commands.
 Be advised that it's best to specify absolute paths.


@@ -68,3 +72,12 @@ and additionally permits tedu to run procmap as root without a password.
 permit :wheel
 permit nopass tedu cmd /usr/sbin/procmap
 .Ed
 permit :wheel
 permit nopass tedu cmd /usr/sbin/procmap
 .Ed

+.Sh SEE ALSO
+.Xr doas 1
+.Sh HISTORY
+The
+.Nm
+configuration file first appeared in
+.Ox 5.8 .
+.Sh AUTHORS
+.An Ted Unangst Aq Mt tedu@openbsd.org