From owner-svn-src-all@FreeBSD.ORG  Tue Jan 22 18:15:44 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5FE00DDD;
 Tue, 22 Jan 2013 18:15:44 +0000 (UTC)
 (envelope-from theraven@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3B669A8E;
 Tue, 22 Jan 2013 18:15:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MIFiid062056;
 Tue, 22 Jan 2013 18:15:44 GMT
 (envelope-from theraven@svn.freebsd.org)
Received: (from theraven@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MIFigc062055;
 Tue, 22 Jan 2013 18:15:44 GMT
 (envelope-from theraven@svn.freebsd.org)
Message-Id: <201301221815.r0MIFigc062055@svn.freebsd.org>
From: David Chisnall <theraven@FreeBSD.org>
Date: Tue, 22 Jan 2013 18:15:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245809 - head/usr.bin/dtc
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.14
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jan 2013 18:15:44 -0000

Author: theraven
Date: Tue Jan 22 18:15:43 2013
New Revision: 245809
URL: http://svnweb.freebsd.org/changeset/base/245809

Log:
  Fix the missing sentence that ended in the middle in the man page for dtc (also
  spotted by gavin).

Modified:
  head/usr.bin/dtc/dtc.1

Modified: head/usr.bin/dtc/dtc.1
==============================================================================
--- head/usr.bin/dtc/dtc.1	Tue Jan 22 18:14:35 2013	(r245808)
+++ head/usr.bin/dtc/dtc.1	Tue Jan 22 18:15:43 2013	(r245809)
@@ -250,7 +250,10 @@ specification, but is in fact a label.
 The /include/ directive is not part of the standard, however it is implemented
 with the semantics compatible with the elinux.org tool.  It must appear in the
 top level of a file, and imports a new root definition.  If a file, plus all of
-its inclusions, contains multiple roots then they 
+its inclusions, contains multiple roots then they are merged.  All nodes that
+are present in the second but not the first are imported.  Any that appear in
+both are recursively merged, with properties from the second replacing those
+from the first and properties child nodes being recursively merged.
 .Sh HISTORY
 A dtc tool first appeared in
 .Fx 9.0 .