Date: Tue, 22 Jan 2013 18:15:44 +0000 (UTC) From: David Chisnall <theraven@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245809 - head/usr.bin/dtc Message-ID: <201301221815.r0MIFigc062055@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 .
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301221815.r0MIFigc062055>