summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorgavin <gavin@FreeBSD.org>2014-08-13 12:35:11 +0000
committergavin <gavin@FreeBSD.org>2014-08-13 12:35:11 +0000
commit60b4865344a8596f0cc00d65319ff7afb4affe53 (patch)
tree5976cea6ba3a204fd725feee67c6e44640e1995c /usr.sbin
parent3d15d9c9c13f63c04fff379601342348978849b0 (diff)
downloadFreeBSD-src-60b4865344a8596f0cc00d65319ff7afb4affe53.zip
FreeBSD-src-60b4865344a8596f0cc00d65319ff7afb4affe53.tar.gz
Merge r268488 from head:
Reword an awkward option description PR: 191726 Submitted by: yaneurabeya gmail.com
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/jail/jail.85
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 9dd7d26..0c4c094 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -653,8 +653,9 @@ file, instead of in the prison's file.
The user to run commands as, when running in the system environment.
The default is to run the commands as the current user.
.It Va exec.timeout
-The maximum amount of time to wait for a command to complete.
-If a command is still running after this many seconds have passed,
+The maximum amount of time to wait for a command to complete, in
+seconds.
+If a command is still running after this timeout has passed,
the jail not be created or removed.
.It Va exec.consolelog
A file to direct command output (stdout and stderr) to.
OpenPOWER on IntegriCloud