summaryrefslogtreecommitdiffstats
path: root/usr.bin/dtc/dtc.1
diff options
context:
space:
mode:
authortheraven <theraven@FreeBSD.org>2013-01-22 18:15:43 +0000
committertheraven <theraven@FreeBSD.org>2013-01-22 18:15:43 +0000
commit2cb81619fc6d79190e367d56a0d62a508d352840 (patch)
tree0b7e68f621ccb53fb9302b390b4c9954f28477d3 /usr.bin/dtc/dtc.1
parent62ccfde083ad68e21b73038749618e4a52342d71 (diff)
downloadFreeBSD-src-2cb81619fc6d79190e367d56a0d62a508d352840.zip
FreeBSD-src-2cb81619fc6d79190e367d56a0d62a508d352840.tar.gz
Fix the missing sentence that ended in the middle in the man page for dtc (also
spotted by gavin).
Diffstat (limited to 'usr.bin/dtc/dtc.1')
-rw-r--r--usr.bin/dtc/dtc.15
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/dtc/dtc.1 b/usr.bin/dtc/dtc.1
index 79c3bee..a51aaec 100644
--- a/usr.bin/dtc/dtc.1
+++ b/usr.bin/dtc/dtc.1
@@ -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 .
OpenPOWER on IntegriCloud