its20 CVS commit

Update of /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20
In directory hutz:/tmp/cvs-serv13734

Modified Files:
	its20.html its20.odd 
Log Message:
fix in disambiguation section

Index: its20.odd
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/its20.odd,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- its20.odd	12 Nov 2012 22:39:49 -0000	1.222
+++ its20.odd	12 Nov 2012 22:48:10 -0000	1.223
@@ -3253,13 +3253,6 @@
 						    </list>
 						  </item>
 						</list>
-					  <p>When specifying the target identity, 
-					    the user <ref target="#rfc2119">MUST</ref> use only one of the two addressing modes:</p>
-					  <list>
-							<item>Using <att>disambigSource</att> and <att>disambigIdent</att> to specify the collection
-								and the identifier itself.</item>
-							<item>Using <att>disambigIdentRef</att> using a IRI for the disambiguation target</item>
-						</list>
 						<exemplum xml:id="EX-disambiguation-html5-local-1">
 							<head>Local mixed usage of Usage of <att>disambigClassRef</att>, <att>disambigGranularity</att>, 
 								and <att>disambigIdentRef</att> in HTML.</head>

Index: its20.html
===================================================================
RCS file: /w3ccvs/WWW/International/multilingualweb/lt/drafts/its20/its20.html,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- its20.html	12 Nov 2012 22:39:49 -0000	1.225
+++ its20.html	12 Nov 2012 22:48:09 -0000	1.226
@@ -2073,9 +2073,7 @@
 						                disambiguation identifier collection source.</p></li><li><p>A <code>disambigIdent</code> attribute that contains a string, representing the 
 						                disambiguation identifier for the disambiguation target that is valid within the specified 
 						                disambiguation source.</p></li></ul></li><li><p>When addressing <a href="#disambiguation-use-cases" shape="rect">mode 2</a>:</p><ul><li><p>A <code>disambigIdentRef</code> attribute that contains a IRI that represents a unique 
-						                identifier for the disambiguation target.</p></li></ul></li></ul></p></li></ul></p></li></ul><p>When specifying the target identity, 
-					    the user <a href="#rfc2119" shape="rect">MUST</a> use only one of the two addressing modes:</p><ul><li><p>Using <code>disambigSource</code> and <code>disambigIdent</code> to specify the collection
-								and the identifier itself.</p></li><li><p>Using <code>disambigIdentRef</code> using a IRI for the disambiguation target</p></li></ul><div class="exampleOuter"><div class="exampleHeader"><a name="EX-disambiguation-html5-local-1" id="EX-disambiguation-html5-local-1" shape="rect"/>Example 52: Local mixed usage of Usage of <code>disambigClassRef</code>, <code>disambigGranularity</code>, 
+						                identifier for the disambiguation target.</p></li></ul></li></ul></p></li></ul></p></li></ul><div class="exampleOuter"><div class="exampleHeader"><a name="EX-disambiguation-html5-local-1" id="EX-disambiguation-html5-local-1" shape="rect"/>Example 52: Local mixed usage of Usage of <code>disambigClassRef</code>, <code>disambigGranularity</code>, 
 								and <code>disambigIdentRef</code> in HTML.</div><div class="exampleInner"><pre xml:space="preserve"><strong class="hl-tag" style="color: blue">&lt;!DOCTYPE html&gt;</strong>
 <strong class="hl-tag" style="color: #000096">&lt;html</strong> <span class="hl-attribute" style="color: #F5844C">lang</span>=<span class="hl-value" style="color: #993300">"en"</span><strong class="hl-tag" style="color: #000096">&gt;</strong>
   <strong class="hl-tag" style="color: #000096">&lt;head&gt;</strong>
@@ -3798,7 +3796,7 @@
             <em>This section is informative.</em>
          </p><p>Several constraints of ITS markup cannot be validated with ITS schemas. The
 					following <a title="Rule-based validation&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;-- Schematron" href="#schematron" shape="rect">[Schematron]</a> document allows for
-					validating some of these constraints.</p><div class="exampleOuter"><div class="exampleHeader"><a name="d0e10017" id="d0e10017" shape="rect"/>Example 104: Testing constraints in ITS markup</div><div class="exampleInner"><pre xml:space="preserve"><strong class="hl-tag" style="color: #000096">&lt;schema</strong> <span class="hl-attribute" style="color: #F5844C">xmlns</span>=<span class="hl-value" style="color: #993300">"http://www.ascc.net/xml/schematron"</span><strong class="hl-tag" style="color: #000096">&gt;</strong>
+					validating some of these constraints.</p><div class="exampleOuter"><div class="exampleHeader"><a name="d0e9996" id="d0e9996" shape="rect"/>Example 104: Testing constraints in ITS markup</div><div class="exampleInner"><pre xml:space="preserve"><strong class="hl-tag" style="color: #000096">&lt;schema</strong> <span class="hl-attribute" style="color: #F5844C">xmlns</span>=<span class="hl-value" style="color: #993300">"http://www.ascc.net/xml/schematron"</span><strong class="hl-tag" style="color: #000096">&gt;</strong>
   <em class="hl-comment" style="color: silver">&lt;!-- Schematron document to test constraints for global and local ITS markup.
  For ITS markup definitions, see http://www.w3.org/TR/its/ . --&gt;</em>
   <strong class="hl-tag" style="color: #000096">&lt;ns</strong> <span class="hl-attribute" style="color: #F5844C">prefix</span>=<span class="hl-value" style="color: #993300">"its"</span> <span class="hl-attribute" style="color: #F5844C">uri</span>=<span class="hl-value" style="color: #993300">"http://www.w3.org/2005/11/its"</span><strong class="hl-tag" style="color: #000096">/&gt;</strong>
@@ -3845,7 +3843,7 @@
          </p><p>The following <a title="Namespace-based Validation&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;Dispatching Language (NVDL)" href="#nvdl" shape="rect">[NVDL]</a> document allows validation of
 					ITS markup which has been added to a host vocabulary. Only ITS elements and
 					attributes are checked. Elements and attributes of host language are ignored
-					during validation against this NVDL document/schema.</p><div class="exampleOuter"><div class="exampleHeader"><a name="d0e10039" id="d0e10039" shape="rect"/>Example 105: NVDL schema for ITS</div><div class="exampleInner"><pre xml:space="preserve"><span class="hl-directive" style="color: maroon">&lt;?xml version="1.0" encoding="UTF-8"?&gt;</span>
+					during validation against this NVDL document/schema.</p><div class="exampleOuter"><div class="exampleHeader"><a name="d0e10018" id="d0e10018" shape="rect"/>Example 105: NVDL schema for ITS</div><div class="exampleInner"><pre xml:space="preserve"><span class="hl-directive" style="color: maroon">&lt;?xml version="1.0" encoding="UTF-8"?&gt;</span>
 <strong class="hl-tag" style="color: #000096">&lt;rules</strong> <span class="hl-attribute" style="color: #F5844C">xmlns</span>=<span class="hl-value" style="color: #993300">"http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"</span><strong class="hl-tag" style="color: #000096">&gt;</strong>
   <strong class="hl-tag" style="color: #000096">&lt;namespace</strong> <span class="hl-attribute" style="color: #F5844C">ns</span>=<span class="hl-value" style="color: #993300">"http://www.w3.org/2005/11/its"</span><strong class="hl-tag" style="color: #000096">&gt;</strong>
     <strong class="hl-tag" style="color: #000096">&lt;validate</strong> <span class="hl-attribute" style="color: #F5844C">schema</span>=<span class="hl-value" style="color: #993300">"its20-elements.rng"</span><strong class="hl-tag" style="color: #000096">/&gt;</strong>   

Received on Monday, 12 November 2012 22:48:13 UTC