From owner-svn-src-stable-10@freebsd.org  Sun Aug  2 09:35:54 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 1C44A9AFCAE;
 Sun,  2 Aug 2015 09:35:54 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 0B0A5A71;
 Sun,  2 Aug 2015 09:35:54 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t729ZrKT052011;
 Sun, 2 Aug 2015 09:35:53 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t729ZrWX052010;
 Sun, 2 Aug 2015 09:35:53 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201508020935.t729ZrWX052010@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sun, 2 Aug 2015 09:35:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r286190 - stable/10/sbin/devd
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Aug 2015 09:35:54 -0000

Author: trasz
Date: Sun Aug  2 09:35:53 2015
New Revision: 286190
URL: https://svnweb.freebsd.org/changeset/base/286190

Log:
  MFC r285673:
  
  Add CARP events description to devd.conf(5).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sbin/devd/devd.conf.5
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/devd/devd.conf.5
==============================================================================
--- stable/10/sbin/devd/devd.conf.5	Sun Aug  2 09:34:03 2015	(r286189)
+++ stable/10/sbin/devd/devd.conf.5	Sun Aug  2 09:35:53 2015	(r286190)
@@ -41,7 +41,7 @@
 .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 .\" SOFTWARE.
 .\"
-.Dd May 13, 2015
+.Dd July 11, 2015
 .Dt DEVD.CONF 5
 .Os
 .Sh NAME
@@ -336,6 +336,26 @@ Processor state/configuration ($notify=0
 Thermal zone events.
 .El
 .Pp
+.It Li CARP
+Events related to the
+.Xr carp 8
+protocol.
+.Bl -tag -width ".Sy Subsystem" -compact
+.It Sy Subsystem
+.It Ar vhid@interface
+The
+.Dq subsystem
+contains the actual CARP vhid and the name of the network interface
+on which the event took place.
+.Bl -tag -width ".Li MASTER" -compact
+.It Sy Type
+.It Li MASTER
+Node become the master for a virtual host.
+.It Li BACKUP
+Node become the backup for a virtual host.
+.El
+.El
+.Pp
 .It Li IFNET
 Events related to the network subsystem.
 .Bl -tag -width ".Sy Subsystem" -compact