From b5383b7b855c9364c82aff97af31c29aac692108 Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Tue, 22 Jan 2013 18:15:43 +0000 Subject: [PATCH] Fix the missing sentence that ended in the middle in the man page for dtc (also spotted by gavin). --- usr.bin/dtc/dtc.1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.bin/dtc/dtc.1 b/usr.bin/dtc/dtc.1 index 79c3bee956cc..a51aaec056c2 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 .