From owner-svn-src-all@freebsd.org  Thu Apr 14 18:03:56 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5BEDFADAAD3;
 Thu, 14 Apr 2016 18:03:56 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 2A42D1487;
 Thu, 14 Apr 2016 18:03:56 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3EI3t3Q082567;
 Thu, 14 Apr 2016 18:03:55 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3EI3taI082565;
 Thu, 14 Apr 2016 18:03:55 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201604141803.u3EI3taI082565@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 14 Apr 2016 18:03:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297980 - head/sbin/reboot
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.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Apr 2016 18:03:56 -0000

Author: markj
Date: Thu Apr 14 18:03:55 2016
New Revision: 297980
URL: https://svnweb.freebsd.org/changeset/base/297980

Log:
  Include -a in the nextboot(8) usage string.
  
  X-MFC-With: r297772

Modified:
  head/sbin/reboot/nextboot.8
  head/sbin/reboot/nextboot.sh

Modified: head/sbin/reboot/nextboot.8
==============================================================================
--- head/sbin/reboot/nextboot.8	Thu Apr 14 17:25:50 2016	(r297979)
+++ head/sbin/reboot/nextboot.8	Thu Apr 14 18:03:55 2016	(r297980)
@@ -32,9 +32,8 @@
 .Nd "specify an alternate kernel and boot flags for the next reboot"
 .Sh SYNOPSIS
 .Nm
-.Op Fl a
+.Op Fl af
 .Op Fl e Ar variable=value
-.Op Fl f
 .Op Fl k Ar kernel
 .Op Fl o Ar options
 .Nm

Modified: head/sbin/reboot/nextboot.sh
==============================================================================
--- head/sbin/reboot/nextboot.sh	Thu Apr 14 17:25:50 2016	(r297979)
+++ head/sbin/reboot/nextboot.sh	Thu Apr 14 18:03:55 2016	(r297980)
@@ -50,7 +50,7 @@ add_kenv()
 
 display_usage() {
 	cat <<-EOF
-	Usage: nextboot [-e variable=value] [-f] [-k kernel] [-o options]
+	Usage: nextboot [-af] [-e variable=value] [-k kernel] [-o options]
 	       nextboot -D
 	EOF
 }