From owner-svn-src-all@freebsd.org  Tue Feb  2 22:55:04 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 DB41EA9990D;
 Tue,  2 Feb 2016 22:55:04 +0000 (UTC) (envelope-from jhb@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 AF4B71CE2;
 Tue,  2 Feb 2016 22:55:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12Mt3Jp092017;
 Tue, 2 Feb 2016 22:55:03 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12Mt33F092015;
 Tue, 2 Feb 2016 22:55:03 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201602022255.u12Mt33F092015@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 2 Feb 2016 22:55:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295174 - in head: lib/libdevctl usr.sbin/devctl
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.20
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: Tue, 02 Feb 2016 22:55:05 -0000

Author: jhb
Date: Tue Feb  2 22:55:03 2016
New Revision: 295174
URL: https://svnweb.freebsd.org/changeset/base/295174

Log:
  - Note that devctl(8) will appear in 10.3 first.
  - Add missing devctl_set_driver entry to namelist in devlist(3).
  - Fix sorting of function prototypes in devlist(3).
  
  MFC after:	3 days

Modified:
  head/lib/libdevctl/devctl.3
  head/usr.sbin/devctl/devctl.8

Modified: head/lib/libdevctl/devctl.3
==============================================================================
--- head/lib/libdevctl/devctl.3	Tue Feb  2 22:34:48 2016	(r295173)
+++ head/lib/libdevctl/devctl.3	Tue Feb  2 22:55:03 2016	(r295174)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 26, 2014
+.Dd February 2, 2016
 .Dt DEVCTL 3
 .Os
 .Sh NAME
@@ -35,6 +35,7 @@
 .Nm devctl_disable ,
 .Nm devctl_enable ,
 .Nm devctl_resume ,
+.Nm devctl_set_driver ,
 .Nm devctl_suspend
 .Nd device control library
 .Sh LIBRARY
@@ -52,9 +53,9 @@
 .Ft int
 .Fn devctl_resume "const char *device"
 .Ft int
-.Fn devctl_suspend "const char *device"
-.Ft int
 .Fn devctl_set_driver "const char *device" "const char *driver" "bool force"
+.Ft int
+.Fn devctl_suspend "const char *device"
 .Sh DESCRIPTION
 The
 .Nm
@@ -287,7 +288,7 @@ The new device driver failed to attach.
 The
 .Nm
 library first appeared in
-.Fx 11.0 .
+.Fx 10.3 .
 .Sh BUGS
 If a device is suspended individually via
 .Fn devctl_suspend

Modified: head/usr.sbin/devctl/devctl.8
==============================================================================
--- head/usr.sbin/devctl/devctl.8	Tue Feb  2 22:34:48 2016	(r295173)
+++ head/usr.sbin/devctl/devctl.8	Tue Feb  2 22:55:03 2016	(r295174)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 5, 2015
+.Dd February 2, 2016
 .Dt DEVCTL 8
 .Os
 .Sh NAME
@@ -134,4 +134,4 @@ the device will not be changed.
 The
 .Nm
 utility first appeared in
-.Fx 11.0 .
+.Fx 10.3 .