From owner-svn-src-all@FreeBSD.ORG Thu Jul 10 10:00:11 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1A45F1E1; Thu, 10 Jul 2014 10:00:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 081F027F3; Thu, 10 Jul 2014 10:00:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6AA0A5H087154; Thu, 10 Jul 2014 10:00:10 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6AA0A3J087153; Thu, 10 Jul 2014 10:00:10 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201407101000.s6AA0A3J087153@svn.freebsd.org> From: Gavin Atkinson Date: Thu, 10 Jul 2014 10:00:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268488 - head/usr.sbin/jail X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jul 2014 10:00:11 -0000 Author: gavin Date: Thu Jul 10 10:00:10 2014 New Revision: 268488 URL: http://svnweb.freebsd.org/changeset/base/268488 Log: Reword an awkward option description PR: 191726 Reported by: yaneurabeya gmail.com MFC after: 3 days Modified: head/usr.sbin/jail/jail.8 Modified: head/usr.sbin/jail/jail.8 ============================================================================== --- head/usr.sbin/jail/jail.8 Thu Jul 10 09:42:34 2014 (r268487) +++ head/usr.sbin/jail/jail.8 Thu Jul 10 10:00:10 2014 (r268488) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 16, 2014 +.Dd Jul 10, 2014 .Dt JAIL 8 .Os .Sh NAME @@ -655,8 +655,9 @@ file, instead of in the jail'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 will not be created or removed, as appropriate. .It Va exec.consolelog A file to direct command output (stdout and stderr) to.