Skip to content

Commit 4e97b0c

Browse files
committed
Update PR with @GaryGapinski and @wendellpiez feedback recs.
1 parent 3831d70 commit 4e97b0c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/specifications/profile-resolution/profile-resolution-specml.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ intermediate:
751751
</tagging>
752752
<p><req level="must" id="req-merge-use-first">When the
753753
&quot;use-first&quot;combination rule is applied, and controls that share a distinctive ID are found, the first control encountered MUST be kept, the rest MUST be discarded.
754-
&quot;First&quot; MUST be determined in document order by a top-down, depth-first traversal of the source profile&apos;s import hierarchy.
754+
&quot;First&quot; MUST be determined by a top-down, depth-first traversal of the source profile&apos;s in the order they occur within the import hierarchy of the docuent.
755755
</req></p>
756756
<mapping>
757757
<tagging whose="source_profile">
@@ -1016,7 +1016,7 @@ intermediate:
10161016
</li>
10171017
<li>
10181018
<p>
1019-
<code>keep</code>indicates that controls should be inserted in document order, using a depth-first traversal of the source profile&apos;s imports.
1019+
<code>keep</code>indicates that controls should be inserted using a depth-first traversal of the source profile&apos;s in the order they occur in the import hierarchy of the document.
10201020
</p>
10211021
</li>
10221022
</ul>
@@ -1362,7 +1362,7 @@ control:
13621362
<src>back-matter</src> in the input profile.
13631363
</p>
13641364
<ul>
1365-
<li><p><req level="must" id="req-backmatter">The output's backmatter MUST be generated by copying in each <src>resource</src> object from the backmatters of the imported catalogs/profiles in document order, then by copying in each <src>resource</src> object from the backmatter of the source profile itself in document order. These objects MUST be processed in the order they are defined in each respective document.</req></p></li>
1365+
<li><p><req level="must" id="req-backmatter">The output's backmatter MUST be generated by copying in each <src>resource</src> object from the backmatters of the imported catalogs/profiles in the order it occurs in the document, then by copying in each <src>resource</src> object from the backmatter of the source profile itself in the order it occurs in the document. These objects MUST be processed in the order they are defined in each respective document.</req></p></li>
13661366
<li>
13671367
<p><req level="must" id="req-backmatter-dupe">If a given
13681368
<src>resource</src> has the same

0 commit comments

Comments
 (0)