WWW/2002/ws/ra/edcopies wsenum.html,1.69,1.70 wsenum.xml,1.62,1.63 wseventing.html,1.97,1.98 wseventing.xml,1.89,1.90 wsfrag.html,1.22,1.23 wsfrag.xml,1.23,1.24 wsmex.html,1.65,1.66 wsmex.xml,1.55,1.56 wsrt.html,1.55,1.56 wst.html,1.68,1.69 wst.xml,1.66,1.67

Update of /w3ccvs/WWW/2002/ws/ra/edcopies
In directory hutz:/tmp/cvs-serv16726

Modified Files:
	wsenum.html wsenum.xml wseventing.html wseventing.xml 
	wsfrag.html wsfrag.xml wsmex.html wsmex.xml wsrt.html wst.html 
	wst.xml 
Log Message:
minor editoral cleanup - thanks katy!


Index: wst.xml
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wst.xml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- wst.xml	5 Oct 2009 19:09:17 -0000	1.66
+++ wst.xml	6 Oct 2009 12:29:43 -0000	1.67
@@ -1619,27 +1619,25 @@
      The wstrp:TransferResource policy assertion is a nested policy container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-Transfer is required to communicate with the
-     subject. In order to indicate that the subject supports WS-Transfer
+     subject and that the subject is a WS-Transfer Resource.
+    </p>
+    
+    <p>
+     In order to indicate that the subject supports WS-Transfer
      but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wstrp:TransferResource assertion. This indicates two policy
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
      alternatives, one which contains the policy assertion, and another
      which does not.
     </p>
 
     <p>
-     The inclusion of this assertion implies support for the WS-Transfer 
-     specification and that the subject is a WS-Transfer resource.
-    </p>
-
-    <p>
      The normative outline of this assertion is:
     </p>
 
     <example>
-     <eg>&lt;wstrp:TransferResource [wsp:Optional="<emph>xs:boolean</emph>"]? ...>
+     <eg>&lt;wstrp:TransferResource ...>
   &lt;wstrp:PutOperationSupported .../> ?
   &lt;wstrp:DeleteOperationSupported .../> ?
   &lt;wstrp:FaultOnPutDenied.../> ?
@@ -1748,19 +1746,17 @@
      container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-Transfer is required to communicate with the
-     subject. In order to indicate that the subject supports WS-Transfer
-     but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wstrp:TransferResourceFactory assertion. This indicates two 
-     policy alternatives, one which contains the policy assertion, and another
-     which does not.
+     subject and that the subject is a WS-Transfer Resource Factory. 
     </p>
-
+    
     <p>
-     The inclusion of this assertion implies support for the WS-Transfer 
-     specification and that the subject is a Resource Factory.
+     In order to indicate that the subject supports WS-Transfer
+     but does not require its use, an additional policy alternative should
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
+     alternatives, one which contains the policy assertion, and another
+     which does not.
     </p>
 
     <p>
@@ -1768,7 +1764,7 @@
     </p>
 
     <example>
-     <eg>&lt;wstrp:TransferResourceFactory [wsp:Optional="<emph>xs:boolean</emph>"]? ...>
+     <eg>&lt;wstrp:TransferResourceFactory ...>
   &lt;wstrp:Dialect ...> <emph>xs :anyURI</emph> &lt;/wstrp:Dialect> *
   ...
 &lt;/wstrp:TransferResourceFactory></eg>
@@ -2253,8 +2249,8 @@
 
    <example>
     <eg>&lt;xs:schema
-    targetNamespace="http://www.w3.org/2009/09/ws-evp"
-    xmlns:tns="http://www.w3.org/2009/09/ws-evp"
+    targetNamespace="http://www.w3.org/2009/09/ws-trp"
+    xmlns:tns="http://www.w3.org/2009/09/ws-trp"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     blockDefault="#all">


Index: wseventing.html
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wseventing.html,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- wseventing.html	5 Oct 2009 21:50:18 -0000	1.97
+++ wseventing.html	6 Oct 2009 12:29:42 -0000	1.98
@@ -75,21 +75,21 @@
 8 <a href="#ImplConsideration">Implementation Considerations</a><br/>
 9 <a href="#metadata">WS-Eventing Metadata</a><br/>
 &nbsp;&nbsp;&nbsp;9.1 <a href="#iddiv2_1_2075">EventSource Assertion</a><br/>
-&nbsp;&nbsp;&nbsp;9.2 <a href="#iddiv2_1_2145">SubscriptionManager Assertion</a><br/>
+&nbsp;&nbsp;&nbsp;9.2 <a href="#iddiv2_1_2142">SubscriptionManager Assertion</a><br/>
 10 <a href="#acks">Acknowledgements</a><br/>
 11 <a href="#refs">References</a><br/>
-&nbsp;&nbsp;&nbsp;11.1 <a href="#iddiv2_1_2219">Normative References</a><br/>
-&nbsp;&nbsp;&nbsp;11.2 <a href="#iddiv2_1_2340">Informative References</a><br/>
+&nbsp;&nbsp;&nbsp;11.1 <a href="#iddiv2_1_2213">Normative References</a><br/>
+&nbsp;&nbsp;&nbsp;11.2 <a href="#iddiv2_1_2334">Informative References</a><br/>
 </p>
 <h3><a name="appendices" id="appendices"/>Appendices</h3><p class="toc">A <a href="#Advertising">Advertising Event Information</a><br/>
 &nbsp;&nbsp;&nbsp;A.1 <a href="#ETypes">Event Types &amp; Event Descriptions</a><br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.1 <a href="#iddiv3_1_2646">Retrieving Event Descriptions</a><br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2 <a href="#iddiv3_1_2662">Bindings for Event Descriptions</a><br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2.1 <a href="#iddiv4_1_2667">Binding for Unwrapped Notifications</a><br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2.2 <a href="#iddiv4_1_2685">Binding for Wrapped Notifications</a><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.1 <a href="#iddiv3_1_2640">Retrieving Event Descriptions</a><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2 <a href="#iddiv3_1_2656">Bindings for Event Descriptions</a><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2.1 <a href="#iddiv4_1_2661">Binding for Unwrapped Notifications</a><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.1.2.2 <a href="#iddiv4_1_2679">Binding for Wrapped Notifications</a><br/>
 &nbsp;&nbsp;&nbsp;A.2 <a href="#NWSDL">Notification WSDLs</a><br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.2.1 <a href="#iddiv3_1_2712">Retrieving Notification WSDLs</a><br/>
-&nbsp;&nbsp;&nbsp;A.3 <a href="#iddiv2_1_2728">Multiple Event Information Metadata Sections</a><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A.2.1 <a href="#iddiv3_1_2706">Retrieving Notification WSDLs</a><br/>
+&nbsp;&nbsp;&nbsp;A.3 <a href="#iddiv2_1_2722">Multiple Event Information Metadata Sections</a><br/>
 B <a href="#Schema">XML Schema</a><br/>
 C <a href="#WSDL">WSDL</a><br/>
 D <a href="#wrappedWSDL">WSDL for Standard Wrapped Delivery</a><br/>
@@ -1496,20 +1496,18 @@
      The wsevp:EventSource policy assertion is a nested policy container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-Eventing is required to communicate with the
-     subject. In order to indicate that the subject supports WS-Eventing
+     subject and that the subject is a WS-Eventing Event Source. 
+    </p><p>
+     In order to indicate that the subject supports WS-Eventing
      but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wsevp:EventSource assertion. This indicates two policy
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
      alternatives, one which contains the policy assertion, and another
      which does not.
     </p><p>
-     The inclusion of this assertion implies support for the WS-Eventing 
-     specification and that the subject is an Event Source. 
-    </p><p>
      The normative outline of this assertion is:
-    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wsevp:EventSource [wsp:Optional="<em>xs:boolean</em>"]? ...&gt;
+    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wsevp:EventSource ...&gt;
   &lt;wsevp:DateTimeSupported .../&gt; ?
   &lt;wsevp:FilterDialect ...&gt; <em>xs:anyURI</em> &lt;/wsevp:FilterDialect&gt; * 
   &lt;wsevp:MaxExpires ...&gt; <em>xs:duration</em> &lt;/wsevp:MaxExpires&gt; ? 
@@ -1537,7 +1535,7 @@
          When present, this parameter indicates support for the specified 
          event delivery format  Name URI.
         </p></dd></dl></div><div class="div2">
-<h3><a name="iddiv2_1_2145" id="iddiv2_1_2145"/>9.2 SubscriptionManager Assertion</h3><p>
+<h3><a name="iddiv2_1_2142" id="iddiv2_1_2142"/>9.2 SubscriptionManager Assertion</h3><p>
      The mechanism for indicating that a binding or endpoint conforms to the
      WS-Eventing specification's definition of a Subscription Manager 
      is through the use of the Web Services
@@ -1558,20 +1556,18 @@
      The wsevp:SubscriptionManager policy assertion is a nested policy container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-Eventing is required to communicate with the
-     subject. In order to indicate that the subject supports WS-Eventing
+     subject and that the subject is a WS-Eventing Subscription Manager.
+    </p><p>
+     In order to indicate that the subject supports WS-Eventing
      but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wsevp:SubscriptionManager assertion. This indicates two 
-     policy alternatives, one which contains the policy assertion, and another
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
+     alternatives, one which contains the policy assertion, and another
      which does not.
     </p><p>
-     The inclusion of this assertion implies support for the WS-Eventing 
-     specification and that the subject is a Subscription Manager. 
-    </p><p>
      The normative outline of this assertion is:
-    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wsevp:SubscriptionManager [wsp:Optional="<em>xs:boolean</em>"]? ...&gt;
+    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wsevp:SubscriptionManager ...&gt;
   &lt;wsevp:DateTimeSupported .../&gt; ?
   &lt;wsevp:GetStatusOperationSupported .../&gt; ?
   &lt;wsevp:UnsubscribeOperationSupported .../&gt; ?
@@ -1623,7 +1619,7 @@
       Yves Lafon (W3C).
    </p></div><div class="div1">
 <h2><a name="refs" id="refs"/>11 References</h2><div class="div2">
-<h3><a name="iddiv2_1_2219" id="iddiv2_1_2219"/>11.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
+<h3><a name="iddiv2_1_2213" id="iddiv2_1_2213"/>11.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
         Key words for use in RFCs to Indicate Requirement Levels
        </cite></a>
        , S. Bradner, Author.
@@ -1670,7 +1666,7 @@
        , A. Vedamuthu, et al., Editors.
        World Wide Web Consortium (W3C), 4 September 2007.
       Available at <a href="http://www.w3.org/TR/ws-policy-attach">http://www.w3.org/TR/ws-policy-attach</a>.</dd></dl></div><div class="div2">
-<h3><a name="iddiv2_1_2340" id="iddiv2_1_2340"/>11.2 Informative References</h3><dl><dt class="label"><a name="WSMC" id="WSMC"/>WS-MakeConnection</dt><dd><a href="http://docs.oasis-open.org/ws-rx/wsmc/v1.1/wsmc.doc"><cite>
+<h3><a name="iddiv2_1_2334" id="iddiv2_1_2334"/>11.2 Informative References</h3><dl><dt class="label"><a name="WSMC" id="WSMC"/>WS-MakeConnection</dt><dd><a href="http://docs.oasis-open.org/ws-rx/wsmc/v1.1/wsmc.doc"><cite>
         OASIS Standard, "Web Services Make Connection (WS-MakeConnection) 1.1"
         Web Services Make Connection (WS-MakeConnection)
        </cite></a>
@@ -1860,7 +1856,7 @@
      serve as a description of the Event Type used in 
      <a href="#Table1">Example 2-1</a> and <a href="#EDExample">Example A-1</a>. 
     </p><div class="exampleOuter">
-<div class="exampleHeader"><a name="idexample_1_2636" id="idexample_1_2636"/>Example A-2: EventDescriptions</div><div class="exampleInner"><pre>(01) &lt;wse:EventDescriptions 
+<div class="exampleHeader"><a name="idexample_1_2630" id="idexample_1_2630"/>Example A-2: EventDescriptions</div><div class="exampleInner"><pre>(01) &lt;wse:EventDescriptions 
 (02)        targetNamespace="http://www.example.org/oceanwatch/notifications"
 (03)        xmlns:wse="http://www.w3.org/2009/09/ws-evt"
 (04)        xmlns:ow="http://www.example.org/oceanwatch"&gt;
@@ -1880,7 +1876,7 @@
      GED for this Event Type is defined on line (08) as being of type 
      "{http://www.example.org/oceanwatch}:WindReportType". 
     </p><div class="div3">
-<h4><a name="iddiv3_1_2646" id="iddiv3_1_2646"/>A.1.1 Retrieving Event Descriptions</h4><p>
+<h4><a name="iddiv3_1_2640" id="iddiv3_1_2640"/>A.1.1 Retrieving Event Descriptions</h4><p>
       Although there are many ways in which an Event Source can make its 
       EventDescriptions available, this specification RECOMMENDS the use of 
       the mechanisms described in WS-MetadataExchange <a href="#MEX">[WS-MetadataExchange]</a>.
@@ -1891,7 +1887,7 @@
       be equal to the value of its wse:EventDescriptions/@targetNamespace. An 
       Event Source MUST NOT have more than one EventDescriptions document.
      </p></div><div class="div3">
-<h4><a name="iddiv3_1_2662" id="iddiv3_1_2662"/>A.1.2 Bindings for Event Descriptions</h4><p>
+<h4><a name="iddiv3_1_2656" id="iddiv3_1_2656"/>A.1.2 Bindings for Event Descriptions</h4><p>
       For any Notification Format it SHOULD be possible to determine how a 
       given wse:eventType will appear on the wire as a Notification in a 
       Subscription created with that format. The following sections define 
@@ -1903,7 +1899,7 @@
       Format, implementations MAY provide a Notification WSDL (see below) 
       that explicitly describes the Notification operations. 
      </p><div class="div4">
-<h5><a name="iddiv4_1_2667" id="iddiv4_1_2667"/>A.1.2.1 Binding for Unwrapped Notifications</h5><p>
+<h5><a name="iddiv4_1_2661" id="iddiv4_1_2661"/>A.1.2.1 Binding for Unwrapped Notifications</h5><p>
        The information about an Event Type contained in the wse:eventType 
        element binds to a Unwrapped Notification for that type as follows:
       </p><ul><li><p>
@@ -1917,7 +1913,7 @@
          of the wse:eventType element corresponding to the type of the 
          Event being transmitted.
         </p></li></ul></div><div class="div4">
-<h5><a name="iddiv4_1_2685" id="iddiv4_1_2685"/>A.1.2.2 Binding for Wrapped Notifications</h5><p>
+<h5><a name="iddiv4_1_2679" id="iddiv4_1_2679"/>A.1.2.2 Binding for Wrapped Notifications</h5><p>
        The information about an Event Type contained in the eventType element 
        binds to a Wrapped Notification for that type as follows: 
       </p><ul><li><p>
@@ -1941,7 +1937,7 @@
      successful Subscribe request that used a particular Format IRI. The 
      following is an example of a Notification WSDL: 
     </p><div class="exampleOuter">
-<div class="exampleHeader"><a name="idexample_1_2706" id="idexample_1_2706"/>Example A-3: Notification WSDL</div><div class="exampleInner"><pre>(01) &lt;wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+<div class="exampleHeader"><a name="idexample_1_2700" id="idexample_1_2700"/>Example A-3: Notification WSDL</div><div class="exampleInner"><pre>(01) &lt;wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
 (02)                   targetNamespace="http://www.example.org/oceanwatch/notifications"
 (03)                   xmlns:xs="http://www.w3.org/2001/XMLSchema"
 (04)                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
@@ -1976,7 +1972,7 @@
 (33)     &lt;/wsdl:operation&gt;
 (34)   &lt;/wsdl:binding&gt;
 (35) &lt;/wsdl:definitions&gt;</pre></div></div><div class="div3">
-<h4><a name="iddiv3_1_2712" id="iddiv3_1_2712"/>A.2.1 Retrieving Notification WSDLs</h4><p>
+<h4><a name="iddiv3_1_2706" id="iddiv3_1_2706"/>A.2.1 Retrieving Notification WSDLs</h4><p>
       Although there are many ways in which an Event Source can make 
       Notification WSDLs available, this specification RECOMMENDS the use of 
       the mechanisms described in WS-MetadataExchange <a href="#MEX">[WS-MetadataExchange]</a>.
@@ -1992,7 +1988,7 @@
       Format IRI/@Identifier, there MUST NOT exist more than one 
       Notification WSDL document. 
      </p></div></div><div class="div2">
-<h3><a name="iddiv2_1_2728" id="iddiv2_1_2728"/>A.3 Multiple Event Information Metadata Sections</h3><p>
+<h3><a name="iddiv2_1_2722" id="iddiv2_1_2722"/>A.3 Multiple Event Information Metadata Sections</h3><p>
      When WS-MetadataExchange is used to retrieve metadata about an Event 
      Source, recipients of mex:Metadata elements that contain Metadata 
      Sections with both the 

Index: wsfrag.xml
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsfrag.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- wsfrag.xml	5 Oct 2009 19:09:17 -0000	1.23
+++ wsfrag.xml	6 Oct 2009 12:29:43 -0000	1.24
@@ -1655,19 +1655,17 @@
      The wsfrp:Fragment policy assertion is a nested policy container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-Fragment is required to communicate with the
-     subject. In order to indicate that the subject supports WS-Fragment
-     but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wsfrp:Fragment assertion. This indicates two policy
-     alternatives, one which contains the policy assertion, and another
-     which does not.
+     subject and that the subject is a WS-Transfer Resource. 
     </p>
 
     <p>
-     The inclusion of this assertion implies support for the WS-Fragment
-     specification.
+     In order to indicate that the subject supports WS-Fragment
+     but does not require its use, an additional policy alternative should
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
+     alternatives, one which contains the policy assertion, and another
+     which does not.
     </p>
 
     <p>
@@ -1675,7 +1673,7 @@
     </p>
 
     <example>
-     <eg>&lt;wsfrp:Fragment [wsp:Optional="<emph>xs:boolean</emph>"]? ...>
+     <eg>&lt;wsfrp:Fragment ...>
   &lt;wsfrp:Language ...> <emph>xs:anyURI</emph> &lt;/wsfrp:Language> * 
   ... 
 &lt;/wsfrp:Fragment></eg>
@@ -1966,8 +1964,8 @@
 
    <example>
     <eg>&lt;xs:schema
-    targetNamespace="http://www.w3.org/2009/09/ws-evp"
-    xmlns:tns="http://www.w3.org/2009/09/ws-evp"
+    targetNamespace="http://www.w3.org/2009/09/ws-frp"
+    xmlns:tns="http://www.w3.org/2009/09/ws-frp"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     blockDefault="#all">

Index: wsfrag.html
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsfrag.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- wsfrag.html	5 Oct 2009 19:09:17 -0000	1.22
+++ wsfrag.html	6 Oct 2009 12:29:42 -0000	1.23
@@ -67,7 +67,7 @@
 &nbsp;&nbsp;&nbsp;9.1 <a href="#iddiv2_1_1439">Fragment Assertion</a><br/>
 10 <a href="#acks">Acknowledgements</a><br/>
 11 <a href="#refs">References</a><br/>
-&nbsp;&nbsp;&nbsp;11.1 <a href="#iddiv2_1_1495">Normative References</a><br/>
+&nbsp;&nbsp;&nbsp;11.1 <a href="#iddiv2_1_1492">Normative References</a><br/>
 </p>
 <h3><a name="appendices" id="appendices"/>Appendices</h3><p class="toc">A <a href="#Appendix_I__E2_80_93_XSD">XML Schema</a><br/>
 B <a href="#policyXSD">Fragment Policy Schema</a><br/>
@@ -852,20 +852,18 @@
      The wsfrp:Fragment policy assertion is a nested policy container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-Fragment is required to communicate with the
-     subject. In order to indicate that the subject supports WS-Fragment
+     subject and that the subject is a WS-Transfer Resource. 
+    </p><p>
+     In order to indicate that the subject supports WS-Fragment
      but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wsfrp:Fragment assertion. This indicates two policy
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
      alternatives, one which contains the policy assertion, and another
      which does not.
     </p><p>
-     The inclusion of this assertion implies support for the WS-Fragment
-     specification.
-    </p><p>
      The normative outline of this assertion is:
-    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wsfrp:Fragment [wsp:Optional="<em>xs:boolean</em>"]? ...&gt;
+    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wsfrp:Fragment ...&gt;
   &lt;wsfrp:Language ...&gt; <em>xs:anyURI</em> &lt;/wsfrp:Language&gt; * 
   ... 
 &lt;/wsfrp:Fragment&gt;</pre></div></div><p>
@@ -903,7 +901,7 @@
      Yves Lafon (W3C).
    </p></div><div class="div1">
 <h2><a name="refs" id="refs"/>11 References</h2><div class="div2">
-<h3><a name="iddiv2_1_1495" id="iddiv2_1_1495"/>11.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
+<h3><a name="iddiv2_1_1492" id="iddiv2_1_1492"/>11.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
         Key words for use in RFCs to Indicate Requirement Levels
        </cite></a>
        , S. Bradner, Author.
@@ -1028,8 +1026,8 @@
    </p><div class="exampleOuter"><div class="exampleInner"><pre>http://www.w3.org/2009/09/ws-frp/FragmentPolicy.xsd</pre></div></div><p>
     A non-normative copy of the XML schema is listed below for convenience.
    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;xs:schema
-    targetNamespace="http://www.w3.org/2009/09/ws-evp"
-    xmlns:tns="http://www.w3.org/2009/09/ws-evp"
+    targetNamespace="http://www.w3.org/2009/09/ws-frp"
+    xmlns:tns="http://www.w3.org/2009/09/ws-frp"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     blockDefault="#all"&gt;

Index: wst.html
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wst.html,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- wst.html	5 Oct 2009 19:09:17 -0000	1.68
+++ wst.html	6 Oct 2009 12:29:43 -0000	1.69
@@ -59,11 +59,11 @@
 6 <a href="#Security_Considerations">Security Considerations</a><br/>
 7 <a href="#metadata">WS-Transfer Metadata</a><br/>
 &nbsp;&nbsp;&nbsp;7.1 <a href="#iddiv2_1_1379">TransferResource Assertion</a><br/>
-&nbsp;&nbsp;&nbsp;7.2 <a href="#iddiv2_1_1443">TransferResourceFactory Assertion</a><br/>
+&nbsp;&nbsp;&nbsp;7.2 <a href="#iddiv2_1_1440">TransferResourceFactory Assertion</a><br/>
 8 <a href="#acks">Acknowledgements</a><br/>
 9 <a href="#refs">References</a><br/>
-&nbsp;&nbsp;&nbsp;9.1 <a href="#iddiv2_1_1499">Normative References</a><br/>
-&nbsp;&nbsp;&nbsp;9.2 <a href="#iddiv2_1_1672">Informative References</a><br/>
+&nbsp;&nbsp;&nbsp;9.1 <a href="#iddiv2_1_1493">Normative References</a><br/>
+&nbsp;&nbsp;&nbsp;9.2 <a href="#iddiv2_1_1666">Informative References</a><br/>
 </p>
 <h3><a name="appendices" id="appendices"/>Appendices</h3><p class="toc">A <a href="#Appendix_I__E2_80_93_XSD">XML Schema</a><br/>
 B <a href="#Appendix_II__E2_80_93_WSDL">WSDL</a><br/>
@@ -918,20 +918,18 @@
      The wstrp:TransferResource policy assertion is a nested policy container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-Transfer is required to communicate with the
-     subject. In order to indicate that the subject supports WS-Transfer
+     subject and that the subject is a WS-Transfer Resource.
+    </p><p>
+     In order to indicate that the subject supports WS-Transfer
      but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wstrp:TransferResource assertion. This indicates two policy
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
      alternatives, one which contains the policy assertion, and another
      which does not.
     </p><p>
-     The inclusion of this assertion implies support for the WS-Transfer 
-     specification and that the subject is a WS-Transfer resource.
-    </p><p>
      The normative outline of this assertion is:
-    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wstrp:TransferResource [wsp:Optional="<em>xs:boolean</em>"]? ...&gt;
+    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wstrp:TransferResource ...&gt;
   &lt;wstrp:PutOperationSupported .../&gt; ?
   &lt;wstrp:DeleteOperationSupported .../&gt; ?
   &lt;wstrp:FaultOnPutDenied.../&gt; ?
@@ -963,7 +961,7 @@
          When present, this parameter indicates support for the specified 
          Dialect IRI.
         </p></dd></dl></div><div class="div2">
-<h3><a name="iddiv2_1_1443" id="iddiv2_1_1443"/>7.2 TransferResourceFactory Assertion</h3><p>
+<h3><a name="iddiv2_1_1440" id="iddiv2_1_1440"/>7.2 TransferResourceFactory Assertion</h3><p>
      The mechanism for indicating that a binding or endpoint conforms to the
      WS-Transfer specification's definition of a Transfer Resource Factory
      is through the use of the Web Services
@@ -986,20 +984,18 @@
      container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-Transfer is required to communicate with the
-     subject. In order to indicate that the subject supports WS-Transfer
+     subject and that the subject is a WS-Transfer Resource Factory. 
+    </p><p>
+     In order to indicate that the subject supports WS-Transfer
      but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wstrp:TransferResourceFactory assertion. This indicates two 
-     policy alternatives, one which contains the policy assertion, and another
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
+     alternatives, one which contains the policy assertion, and another
      which does not.
     </p><p>
-     The inclusion of this assertion implies support for the WS-Transfer 
-     specification and that the subject is a Resource Factory.
-    </p><p>
      The normative outline of this assertion is:
-    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wstrp:TransferResourceFactory [wsp:Optional="<em>xs:boolean</em>"]? ...&gt;
+    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wstrp:TransferResourceFactory ...&gt;
   &lt;wstrp:Dialect ...&gt; <em>xs :anyURI</em> &lt;/wstrp:Dialect&gt; *
   ...
 &lt;/wstrp:TransferResourceFactory&gt;</pre></div></div><p>
@@ -1037,7 +1033,7 @@
       Yves Lafon (W3C).
    </p></div><div class="div1">
 <h2><a name="refs" id="refs"/>9 References</h2><div class="div2">
-<h3><a name="iddiv2_1_1499" id="iddiv2_1_1499"/>9.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
+<h3><a name="iddiv2_1_1493" id="iddiv2_1_1493"/>9.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
         Key words for use in RFCs to Indicate Requirement Levels
        </cite></a>
        , S. Bradner, Author.
@@ -1105,7 +1101,7 @@
        , P. Biron, A. Malhotra, Editors.
        World Wide Web Consortium (W3C), 28 October 2004.
       Available at <a href="http://www.w3.org/TR/xmlschema-2/">http://www.w3.org/TR/xmlschema-2/</a>.</dd></dl></div><div class="div2">
-<h3><a name="iddiv2_1_1672" id="iddiv2_1_1672"/>9.2 Informative References</h3><dl><dt class="label"><a name="WsFrag" id="WsFrag"/>WS-Fragment</dt><dd><a href="http://www.w3.org/TR/ws-fragment"><cite>
+<h3><a name="iddiv2_1_1666" id="iddiv2_1_1666"/>9.2 Informative References</h3><dl><dt class="label"><a name="WsFrag" id="WsFrag"/>WS-Fragment</dt><dd><a href="http://www.w3.org/TR/ws-fragment"><cite>
        W3C Working Group Draft, "Web Services Fragment (WS-Fragment) 1.0"
       </cite></a>
       , D. Davis, et al., Editors.
@@ -1332,8 +1328,8 @@
    </p><div class="exampleOuter"><div class="exampleInner"><pre>http://www.w3.org/2009/09/ws-tra/TransferPolicy.xsd</pre></div></div><p>
     A non-normative copy of the XML schema is listed below for convenience.
    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;xs:schema
-    targetNamespace="http://www.w3.org/2009/09/ws-evp"
-    xmlns:tns="http://www.w3.org/2009/09/ws-evp"
+    targetNamespace="http://www.w3.org/2009/09/ws-trp"
+    xmlns:tns="http://www.w3.org/2009/09/ws-trp"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     blockDefault="#all"&gt;

Index: wsmex.xml
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsmex.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- wsmex.xml	5 Oct 2009 19:09:17 -0000	1.55
+++ wsmex.xml	6 Oct 2009 12:29:43 -0000	1.56
@@ -1675,28 +1675,25 @@
      The wsmxp:MetadataExchange policy assertion is a nested policy container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-MetadataExchange is required to communicate with 
-     the subject. In order to indicate that the subject supports 
-     WS-MetadataExchange
+     the subject and that the subject supports WS-MetadataExchange. 
+    </p>
+    
+    <p>
+     In order to indicate that the subject supports WS-MetadataExchange
      but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wsmxp:MetadataExchange assertion. This indicates two policy
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
      alternatives, one which contains the policy assertion, and another
      which does not.
     </p>
 
     <p>
-     The inclusion of this assertion implies support for the WS-MetadataExchange
-     specification.
-    </p>
-
-    <p>
      The normative outline of this assertion is:
     </p>
 
     <example>
-     <eg>&lt;wsmxp:MetadataExchange [wsp:Optional="<emph>xs:boolean</emph>"]? ...>
+     <eg>&lt;wsmxp:MetadataExchange ...>
   &lt;wsmxp:MetadataExchangeDialect ...>
     <emph>xs:anyURI</emph>
   &lt;/wsmxp:MetadataExchangeDialect> * 
@@ -2133,8 +2130,8 @@
 
    <example>
     <eg>&lt;xs:schema
-    targetNamespace="http://www.w3.org/2009/09/ws-evp"
-    xmlns:tns="http://www.w3.org/2009/09/ws-evp"
+    targetNamespace="http://www.w3.org/2009/09/ws-mxp"
+    xmlns:tns="http://www.w3.org/2009/09/ws-mxp"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     blockDefault="#all">

Index: wsenum.html
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsenum.html,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- wsenum.html	5 Oct 2009 19:09:16 -0000	1.69
+++ wsenum.html	6 Oct 2009 12:29:42 -0000	1.70
@@ -70,8 +70,8 @@
 &nbsp;&nbsp;&nbsp;6.1 <a href="#iddiv2_1_1895">Enumeration Assertion</a><br/>
 7 <a href="#acks">Acknowledgements</a><br/>
 8 <a href="#refs">References</a><br/>
-&nbsp;&nbsp;&nbsp;8.1 <a href="#iddiv2_1_1987">Normative References</a><br/>
-&nbsp;&nbsp;&nbsp;8.2 <a href="#iddiv2_1_2173">Informative References</a><br/>
+&nbsp;&nbsp;&nbsp;8.1 <a href="#iddiv2_1_1984">Normative References</a><br/>
+&nbsp;&nbsp;&nbsp;8.2 <a href="#iddiv2_1_2170">Informative References</a><br/>
 </p>
 <h3><a name="appendices" id="appendices"/>Appendices</h3><p class="toc">A <a href="#schema">XML Schema</a><br/>
 B <a href="#WSDL">WSDL</a><br/>
@@ -1277,20 +1277,18 @@
      The wsenp:Enumeration policy assertion is a nested policy container 
      assertion. The meaning of this assertion, when present in a policy 
      alternative, is that WS-Enumeration is required to communicate with the 
-     subject. In order to indicate that the subject supports WS-Enumeration 
+     subject and that the subject is a WS-Enumeration Data Source.
+    </p><p>
+     In order to indicate that the subject supports WS-Enumeration 
      but does not require its use, an additional policy alternative should 
-     be provided which does not contain this assertion; the compact 
-     authoring style for an optional policy assertion provided by WS-Policy 
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be 
-     used with the wsenp:Enumeration assertion. This indicates two policy 
+     be provided which does not contain this assertion. The compact 
+     authoring style for an optional policy assertion (the wsp:Optional 
+     attribute) provided by WS-Policy may be used to indicate two policy 
      alternatives, one which contains the policy assertion, and another 
-     which does not.
-    </p><p>
-     The inclusion of this assertion implies support for the WS-Enumeration 
-     specification.
+     which does not. 
     </p><p>
      The normative outline of this assertion is:
-    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wsenp:Enumeration [wsp:Optional="<em>xs:boolean</em>"]? ...&gt;
+    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wsenp:Enumeration ...&gt;
  &lt;wsenp:FilterDialect ...&gt; <em>xs:anyURI</em> &lt;/wsenp:FilterDialect&gt; * 
  &lt;wsenp:MaxExpires ...&gt; <em>xs:duration</em> &lt;/wsenp:MaxExpires&gt; ? 
  &lt;wsenp:MaxTime ...&gt; <em>xs:duration</em> &lt;/wsenp:MaxTime&gt; ? 
@@ -1350,7 +1348,7 @@
       Yves Lafon (W3C).
    </p></div><div class="div1">
 <h2><a name="refs" id="refs"/>8 References</h2><div class="div2">
-<h3><a name="iddiv2_1_1987" id="iddiv2_1_1987"/>8.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
+<h3><a name="iddiv2_1_1984" id="iddiv2_1_1984"/>8.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
         Key words for use in RFCs to Indicate Requirement Levels
        </cite></a>
        , S. Bradner, Author. 
@@ -1422,7 +1420,7 @@
        , J. Clark, S. DeRose, Editors.
        World Wide Web Consortium (W3C), 16 November 1999. 
       Available at <a href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</a>.</dd></dl></div><div class="div2">
-<h3><a name="iddiv2_1_2173" id="iddiv2_1_2173"/>8.2 Informative References</h3><dl><dt class="label"><a name="WSSecureConversation" id="WSSecureConversation"/>WS-SecureConversation</dt><dd><a href="http://docs.oasis-open.org/ws-sx/ws-secureconversation/v1.4/os/ws-secureconversation-1.4-spec-os.doc"><cite>
+<h3><a name="iddiv2_1_2170" id="iddiv2_1_2170"/>8.2 Informative References</h3><dl><dt class="label"><a name="WSSecureConversation" id="WSSecureConversation"/>WS-SecureConversation</dt><dd><a href="http://docs.oasis-open.org/ws-sx/ws-secureconversation/v1.4/os/ws-secureconversation-1.4-spec-os.doc"><cite>
         OASIS Standard, "Web Services Secure Conversation 
           (WS-SecureConversation) 1.4"
        </cite></a>

Index: wsenum.xml
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsenum.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- wsenum.xml	5 Oct 2009 19:09:17 -0000	1.62
+++ wsenum.xml	6 Oct 2009 12:29:42 -0000	1.63
@@ -2336,19 +2336,17 @@
      The wsenp:Enumeration policy assertion is a nested policy container 
      assertion. The meaning of this assertion, when present in a policy 
      alternative, is that WS-Enumeration is required to communicate with the 
-     subject. In order to indicate that the subject supports WS-Enumeration 
-     but does not require its use, an additional policy alternative should 
-     be provided which does not contain this assertion; the compact 
-     authoring style for an optional policy assertion provided by WS-Policy 
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be 
-     used with the wsenp:Enumeration assertion. This indicates two policy 
-     alternatives, one which contains the policy assertion, and another 
-     which does not.
+     subject and that the subject is a WS-Enumeration Data Source.
     </p>
 
     <p>
-     The inclusion of this assertion implies support for the WS-Enumeration 
-     specification.
+     In order to indicate that the subject supports WS-Enumeration 
+     but does not require its use, an additional policy alternative should 
+     be provided which does not contain this assertion. The compact 
+     authoring style for an optional policy assertion (the wsp:Optional 
+     attribute) provided by WS-Policy may be used to indicate two policy 
+     alternatives, one which contains the policy assertion, and another 
+     which does not. 
     </p>
 
     <p>
@@ -2356,7 +2354,7 @@
     </p>
 
     <example>
-     <eg>&lt;wsenp:Enumeration [wsp:Optional="<emph>xs:boolean</emph>"]? ...>
+     <eg>&lt;wsenp:Enumeration ...>
  &lt;wsenp:FilterDialect ...> <emph>xs:anyURI</emph> &lt;/wsenp:FilterDialect> * 
  &lt;wsenp:MaxExpires ...> <emph>xs:duration</emph> &lt;/wsenp:MaxExpires> ? 
  &lt;wsenp:MaxTime ...> <emph>xs:duration</emph> &lt;/wsenp:MaxTime> ? 

Index: wsmex.html
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wsmex.html,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- wsmex.html	5 Oct 2009 19:09:17 -0000	1.65
+++ wsmex.html	6 Oct 2009 12:29:43 -0000	1.66
@@ -63,8 +63,8 @@
 &nbsp;&nbsp;&nbsp;10.1 <a href="#iddiv2_1_1418">MetadataExchange Assertion</a><br/>
 11 <a href="#Acknowledgements">Acknowledgements</a><br/>
 12 <a href="#References">References</a><br/>
-&nbsp;&nbsp;&nbsp;12.1 <a href="#iddiv2_1_1485">Normative References</a><br/>
-&nbsp;&nbsp;&nbsp;12.2 <a href="#iddiv2_1_1658">Informative References</a><br/>
+&nbsp;&nbsp;&nbsp;12.1 <a href="#iddiv2_1_1482">Normative References</a><br/>
+&nbsp;&nbsp;&nbsp;12.2 <a href="#iddiv2_1_1655">Informative References</a><br/>
 </p>
 <h3><a name="appendices" id="appendices"/>Appendices</h3><p class="toc">A <a href="#Appendix-A">XML Schema</a><br/>
 B <a href="#Appendix-B">WSDL</a><br/>
@@ -987,21 +987,18 @@
      The wsmxp:MetadataExchange policy assertion is a nested policy container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-MetadataExchange is required to communicate with 
-     the subject. In order to indicate that the subject supports 
-     WS-MetadataExchange
+     the subject and that the subject supports WS-MetadataExchange. 
+    </p><p>
+     In order to indicate that the subject supports WS-MetadataExchange
      but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wsmxp:MetadataExchange assertion. This indicates two policy
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
      alternatives, one which contains the policy assertion, and another
      which does not.
     </p><p>
-     The inclusion of this assertion implies support for the WS-MetadataExchange
-     specification.
-    </p><p>
      The normative outline of this assertion is:
-    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wsmxp:MetadataExchange [wsp:Optional="<em>xs:boolean</em>"]? ...&gt;
+    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;wsmxp:MetadataExchange ...&gt;
   &lt;wsmxp:MetadataExchangeDialect ...&gt;
     <em>xs:anyURI</em>
   &lt;/wsmxp:MetadataExchangeDialect&gt; * 
@@ -1049,7 +1046,7 @@
       Yves Lafon (W3C).
    </p></div><div class="div1">
 <h2><a name="References" id="References"/>12 References</h2><div class="div2">
-<h3><a name="iddiv2_1_1485" id="iddiv2_1_1485"/>12.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
+<h3><a name="iddiv2_1_1482" id="iddiv2_1_1482"/>12.1 Normative References</h3><dl><dt class="label"><a name="RFC2119" id="RFC2119"/>RFC 2119</dt><dd><a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>
         Key words for use in RFCs to Indicate Requirement Levels
        </cite></a>
        , S. Bradner, Author.
@@ -1116,7 +1113,7 @@
        , P. Biron, A. Malhotra, Editors.
        World Wide Web Consortium (W3C), 28 October 2004.
       Available at <a href="http://www.w3.org/TR/xmlschema-2/">http://www.w3.org/TR/xmlschema-2/</a>.</dd></dl></div><div class="div2">
-<h3><a name="iddiv2_1_1658" id="iddiv2_1_1658"/>12.2 Informative References</h3><dl><dt class="label"><a name="WSSecureConversation" id="WSSecureConversation"/>WS-SecureConversation</dt><dd><a href="http://docs.oasis-open.org/ws-sx/ws-secureconversation/v1.4/os/ws-secureconversation-1.4-spec-os.doc"><cite>
+<h3><a name="iddiv2_1_1655" id="iddiv2_1_1655"/>12.2 Informative References</h3><dl><dt class="label"><a name="WSSecureConversation" id="WSSecureConversation"/>WS-SecureConversation</dt><dd><a href="http://docs.oasis-open.org/ws-sx/ws-secureconversation/v1.4/os/ws-secureconversation-1.4-spec-os.doc"><cite>
         OASIS Standard, "Web Services Secure Conversation
           (WS-SecureConversation) 1.4"
        </cite></a>
@@ -1272,8 +1269,8 @@
    </p><div class="exampleOuter"><div class="exampleInner"><pre>http://www.w3.org/2009/09/ws-mex/MetadataExchangePolicy.xsd</pre></div></div><p>
     A non-normative copy of the XML schema is listed below for convenience.
    </p><div class="exampleOuter"><div class="exampleInner"><pre>&lt;xs:schema
-    targetNamespace="http://www.w3.org/2009/09/ws-evp"
-    xmlns:tns="http://www.w3.org/2009/09/ws-evp"
+    targetNamespace="http://www.w3.org/2009/09/ws-mxp"
+    xmlns:tns="http://www.w3.org/2009/09/ws-mxp"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     blockDefault="#all"&gt;

Index: wseventing.xml
===================================================================
RCS file: /w3ccvs/WWW/2002/ws/ra/edcopies/wseventing.xml,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- wseventing.xml	5 Oct 2009 21:50:18 -0000	1.89
+++ wseventing.xml	6 Oct 2009 12:29:42 -0000	1.90
@@ -2638,19 +2638,17 @@
      The wsevp:EventSource policy assertion is a nested policy container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-Eventing is required to communicate with the
-     subject. In order to indicate that the subject supports WS-Eventing
-     but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wsevp:EventSource assertion. This indicates two policy
-     alternatives, one which contains the policy assertion, and another
-     which does not.
+     subject and that the subject is a WS-Eventing Event Source. 
     </p>
 
     <p>
-     The inclusion of this assertion implies support for the WS-Eventing 
-     specification and that the subject is an Event Source. 
+     In order to indicate that the subject supports WS-Eventing
+     but does not require its use, an additional policy alternative should
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
+     alternatives, one which contains the policy assertion, and another
+     which does not.
     </p>
 
     <p>
@@ -2658,7 +2656,7 @@
     </p>
 
     <example>
-     <eg>&lt;wsevp:EventSource [wsp:Optional="<emph>xs:boolean</emph>"]? ...>
+     <eg>&lt;wsevp:EventSource ...>
   &lt;wsevp:DateTimeSupported .../> ?
   &lt;wsevp:FilterDialect ...> <emph>xs:anyURI</emph> &lt;/wsevp:FilterDialect> * 
   &lt;wsevp:MaxExpires ...> <emph>xs:duration</emph> &lt;/wsevp:MaxExpires> ? 
@@ -2760,19 +2758,17 @@
      The wsevp:SubscriptionManager policy assertion is a nested policy container
      assertion. The meaning of this assertion, when present in a policy
      alternative, is that WS-Eventing is required to communicate with the
-     subject. In order to indicate that the subject supports WS-Eventing
-     but does not require its use, an additional policy alternative should
-     be provided which does not contain this assertion; the compact
-     authoring style for an optional policy assertion provided by WS-Policy
-     may be used. The wsp:Optional attribute, as a syntactic shortcut, can be
-     used with the wsevp:SubscriptionManager assertion. This indicates two 
-     policy alternatives, one which contains the policy assertion, and another
-     which does not.
+     subject and that the subject is a WS-Eventing Subscription Manager.
     </p>
 
     <p>
-     The inclusion of this assertion implies support for the WS-Eventing 
-     specification and that the subject is a Subscription Manager. 
+     In order to indicate that the subject supports WS-Eventing
+     but does not require its use, an additional policy alternative should
+     be provided which does not contain this assertion. The compact
+     authoring style for an optional policy assertion (the wsp:Optional
+     attribute) provided by WS-Policy may be used to indicate two policy
+     alternatives, one which contains the policy assertion, and another
+     which does not.
     </p>
 
     <p>
@@ -2780,7 +2776,7 @@
     </p>
 
     <example>
-     <eg>&lt;wsevp:SubscriptionManager [wsp:Optional="<emph>xs:boolean</emph>"]? ...>
+     <eg>&lt;wsevp:SubscriptionManager ...>
   &lt;wsevp:DateTimeSupported .../> ?
   &lt;wsevp:GetStatusOperationSupported .../> ?
   &lt;wsevp:UnsubscribeOperationSupported .../> ?

Received on Tuesday, 6 October 2009 12:29:51 UTC