Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ constraints.
<annotation>
<documentation>
Identifies a single constraint to be bound to the client
context. This attribute may not be used in conjunection with
context. This attribute may not be used in conjunction with
the &lt;code&gt;category&lt;/code&gt; attribute.
</documentation>
</annotation>
Expand All @@ -187,7 +187,7 @@ Identifies a constraint category to be bound to the client
context. The referenced category and all of its constraints, sub-categories, and their constraints are bound.
&lt;/p&gt;
&lt;p&gt;
This attribute may not be used in conjunection with
This attribute may not be used in conjunction with
the &lt;code&gt;constraint&lt;/code&gt; attribute.
&lt;/p&gt;
</documentation>
Expand Down