W3C home > Mailing lists > Public > public-ws-policy-eds@w3.org > September 2006

2006/ws/policy ws-policy-attachment-diff20060731.html,1.1,1.2 ws-policy-attachment-diff20060731.xml,1.1,1.2 ws-policy-framework-diff20060731.html,1.1,1.2 ws-policy-framework-diff20060731.xml,1.1,1.2

From: Felix Sasaki via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 05 Sep 2006 00:18:50 +0000
To: public-ws-policy-eds@w3.org
Message-Id: <E1GKOeR-00075x-45@lionel-hutz.w3.org>

Update of /sources/public/2006/ws/policy
In directory hutz:/tmp/cvs-serv26822/ws/policy

Modified Files:
	ws-policy-attachment-diff20060731.html 
	ws-policy-attachment-diff20060731.xml 
	ws-policy-framework-diff20060731.html 
	ws-policy-framework-diff20060731.xml 
Log Message:
Updated the diff documents to reflect the changes proposed by dOrchard. See the threads starting at http://lists.w3.org/Archives/Public/public-ws-policy-eds/2006Sep/0000.html and http://lists.w3.org/Archives/Public/public-ws-policy-eds/2006Sep/0002.html

Index: ws-policy-framework-diff20060731.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework-diff20060731.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ws-policy-framework-diff20060731.xml	4 Sep 2006 04:44:50 -0000	1.1
+++ ws-policy-framework-diff20060731.xml	5 Sep 2006 00:18:48 -0000	1.2
@@ -56,13 +56,13 @@
 	<abstract>
 	  <p>The Web Services Policy 1.5 - Framework provides a general
 	  purpose model and corresponding syntax to describe the
-	  policies of <phrase diff="del">entities in </phrase>a Web Service.<phrase diff="del">services-based system.</phrase></p>
+	  policies of <phrase diff="del">entities in </phrase>a Web <phrase diff="add">Service.</phrase><phrase diff="del">services-based system.</phrase></p>
 	  <p>Web Services Policy Framework defines a base set of
 	  constructs that can be used and extended by other Web
 	  services specifications to describe a broad range of service
 	  requirements and capabilities.</p>
 	</abstract>
-	<status diff="chg" xml:base="file:///c:/2006/ws/policy/entitiesedcopy.dtd"><p></p></status>
+	<status xml:base="file:///C:/2006/ws/policy/entitiesedcopy.dtd"><p></p></status>
 	<langusage>
             <language id="en-US">English</language>
         </langusage>
@@ -74,28 +74,28 @@
         <div1 id="tocRange">
             <head>Introduction</head>
 
-            <p>Web Services Policy 1.5 - Framework provides a flexible and extensible
-	    language for expressing the<phrase diff="del">policies that
+            <p>Web Services Policy 1.5 - Framework <phrase diff="chg">provides </phrase>a <phrase diff="chg">flexible </phrase>and <phrase diff="chg">extensible
+	    language </phrase>for expressing <phrase diff="add">the</phrase><phrase diff="del">policies that
             refer to domain-specific </phrase>capabilities, requirements, and
-	    general characteristics of entities in an XML Web
-	    services-based system.
+	    general characteristics of entities in <phrase diff="chg">an XML </phrase><phrase diff="add">Web
+	    </phrase>services-based system.
             
 
-	    <phrase diff="del">A </phrase>Web<phrase diff="del">policy </phrase>Services Policy 1.5 -<phrase diff="del">of 
-	    policy </phrase>Framework<phrase diff="del">alternatives, </phrase>defines
-	    <phrase diff="del">where </phrase>a framework<phrase diff="del">policy </phrase>and<phrase diff="del">alternative 
+	    <phrase diff="del">A </phrase><phrase diff="add">Web</phrase><phrase diff="del">policy </phrase><phrase diff="chg">Services Policy 1.5 </phrase><phrase diff="add">-</phrase><phrase diff="del">of 
+	    policy </phrase><phrase diff="add">Framework</phrase><phrase diff="del">alternatives, </phrase><phrase diff="add">defines
+	    </phrase><phrase diff="del">where </phrase>a <phrase diff="add">framework</phrase><phrase diff="del">policy </phrase><phrase diff="add">and</phrase><phrase diff="del">alternative 
 	    is </phrase>a
-	    model for the<phrase diff="del">policy </phrase>expression<phrase diff="del">assertions.
-		A </phrase>of<phrase diff="del">policy </phrase>these<phrase diff="del">assertion 
-		represents </phrase>properties as
-	    policies.</p>
+	    <phrase diff="chg">model for </phrase><phrase diff="add">the</phrase><phrase diff="del">policy </phrase><phrase diff="add">expression</phrase><phrase diff="del">assertions.
+		A </phrase><phrase diff="add">of</phrase><phrase diff="del">policy </phrase><phrase diff="add">these</phrase><phrase diff="del">assertion 
+		represents </phrase><phrase diff="chg">properties </phrase><phrase diff="add">as
+	    policies.</phrase></p>
 
-	    <p diff="chg">Web<phrase diff="del">individual </phrase>Services Policy 1.5 - Framework defines a <phrase diff="del">behavior.
-	    A </phrase>policy to<phrase diff="del">expression 
-		is an </phrase>be a collection of <phrase diff="del">a </phrase>policy
-	    alternatives,<phrase diff="del">, 
-		either in </phrase>where each policy alternative is a
-	    collection<phrase diff="del">an </phrase>of policy assertions.<phrase diff="del">form. </phrase>Some policy assertions
+	    <p diff="add"><phrase diff="add">Web</phrase><phrase diff="del">individual </phrase><phrase diff="chg">Services Policy 1.5 - Framework defines </phrase>a <phrase diff="del">behavior.
+	    A </phrase>policy <phrase diff="add">to</phrase><phrase diff="del">expression 
+		is an </phrase><phrase diff="chg">be a collection </phrase>of <phrase diff="del">a </phrase>policy
+	    <phrase diff="add">alternatives,</phrase><phrase diff="del">, 
+		either in </phrase><phrase diff="chg">where each policy alternative is </phrase><phrase diff="add">a
+	    collection</phrase><phrase diff="del">an </phrase><phrase diff="chg">of policy </phrase><phrase diff="add">assertions.</phrase><phrase diff="del">form. </phrase>Some policy assertions
 	    specify traditional requirements and capabilities that
 	    will ultimately manifest on the wire (e.g., authentication
 	    scheme, transport protocol selection). Other policy
@@ -105,16 +105,18 @@
 	    language to allow both kinds of assertions to be reasoned
 	    about in a consistent manner.</p>
 
-	    <p>Web Services Policy 1.5 - Framework does not specify how policies are<phrase diff="del">or 
-	    policy </phrase>discovered<phrase diff="del">attachment.
+	    <p>Web Services Policy 1.5 - Framework does not specify <phrase diff="chg">how policies </phrase><phrase diff="add">are</phrase><phrase diff="del">or 
+	    policy </phrase><phrase diff="add">discovered</phrase><phrase diff="del">attachment.
 	    A 
 	    policy attachment is a mechanism for associating 
-	    policy with one </phrase>or attached<phrase diff="del">more policy scopes.
+	    policy with one </phrase>or <phrase diff="add">attached</phrase><phrase diff="del">more policy scopes.
 				A policy scope is a collection of 
 	    policy subjects </phrase>to <phrase diff="del">which a policy may apply.
 				A policy subject is an entity 
 	    (e.g., an endpoint, message, resource, interaction) with which </phrase>a 
-	    <phrase diff="del">policy can </phrase>Web service. Other specifications are
+	    <phrase diff="del">policy </phrase><phrase diff="add">Web</phrase><phrase diff="del">can be </phrase><phrase diff="chg">service. 
+
+	    </phrase>Other specifications are
 	    free to define technology-specific mechanisms for
 	    associating policy with various entities and
 	    resources. Web Services Policy 1.5 - Attachment [<bibref ref="WS-PolicyAttachment"></bibref>]
@@ -124,10 +126,6 @@
 
 	    
 
-	    
-
-	    
-
 
         
             <p diff="del">Example
@@ -160,29 +158,30 @@
 	    one of the algorithm suite assertions (Lines 03-04)
 	    specified.</p>
 
-	    <div2 diff="chg" id="Goals">
-	      <head>Goals</head>
+	    <div2 diff="add" id="Goals">
+	      <head><phrase diff="add">Goals</phrase></head>
 
-	      <p>The goal of Web Services Policy 1.5 - Framework is to provide the mechanisms
+	      <p><phrase diff="add">The goal of Web Services Policy 1.5 - Framework is to provide the mechanisms
 	      needed to enable Web services applications to specify
 	      policy information. Specifically, this specification
-	      defines the following:</p>
+	      defines the following:</phrase></p>
 
 	      <ulist>
 		<item>
-		<p>An XML Infoset called a <emph>policy
-		expression</emph> that contains domain-specific, Web
-		Service policy information.</p></item>
-		<item><p>A core set of constructs to indicate how
+		<p><phrase diff="add">An XML Infoset called a </phrase><emph><phrase diff="add">policy
+		expression</phrase></emph> <phrase diff="add">that contains domain-specific, Web
+		Service policy information.</phrase></p></item>
+		<item><p><phrase diff="add">A core set of constructs to indicate how
 		choices and/or combinations of domain-specific policy
 		assertions apply in a Web services
-		environment.</p></item>
+		environment.</phrase></p></item>
 	      </ulist>
 
-	      <p>Web Services Policy 1.5 - Framework is designed to work with the
+	      <p><phrase diff="add">Web Services Policy 1.5 - Framework is designed to work with the
 	      general Web services framework, including WSDL service
-	      descriptions [<bibref ref="WSDL11"></bibref>, <bibref ref="WSDL20"></bibref>] and UDDI service registrations [<bibref ref="UDDIAPI20"></bibref>, <bibref ref="UDDIDataStructure20"></bibref>, <bibref ref="UDDI30"></bibref>].</p>
-	    </div2>
+	      descriptions [</phrase><bibref ref="WSDL11"></bibref><phrase diff="add">, </phrase><bibref ref="WSDL20"></bibref><phrase diff="add">] and UDDI service registrations [</phrase><bibref ref="UDDIAPI20"></bibref><phrase diff="add">, </phrase><bibref ref="UDDIDataStructure20"></bibref><phrase diff="add">, </phrase><bibref ref="UDDI30"></bibref><phrase diff="add">].</phrase></p>
+	    </div2>        
+        
 	</div1>
 	<div1 id="Notation_Terminilogy">
 	  <head>Notations and Terminology</head>
@@ -230,28 +229,28 @@
 	    Element or Attribute Information Items.
 	    
 	  
-	  <phrase diff="del">Elements and Attributes defined by this </phrase>Information Items
-	    <rfc2119 diff="chg">MAY</rfc2119><phrase diff="del">are </phrase>be added at the indicated<phrase diff="del">text of this document using 
-XPath 1.0 [XPATH 1.0] expressions. Extensibility </phrase>extension
-	    points but<phrase diff="del">are referred to </phrase><rfc2119 diff="add">MUST<phrase diff="del">using </phrase>NOT</rfc2119><phrase diff="del">an </phrase>contradict the
-	    semantics<phrase diff="del">version </phrase>of the<phrase diff="del">this 
+	  <phrase diff="del">Elements and Attributes defined by this </phrase><phrase diff="chg">Information </phrase><phrase diff="add">Items
+	    </phrase><rfc2119 diff="add"><phrase diff="add">MAY</phrase></rfc2119><phrase diff="del">are </phrase><phrase diff="chg">be added at </phrase>the <phrase diff="add">indicated</phrase><phrase diff="del">text of this document using 
+XPath 1.0 [XPATH 1.0] expressions. Extensibility </phrase><phrase diff="add">extension
+	    </phrase>points <phrase diff="add">but</phrase><phrase diff="del">are referred to </phrase><rfc2119 diff="add"><phrase diff="add">MUST</phrase><phrase diff="del">using </phrase><phrase diff="add">NOT</phrase></rfc2119><phrase diff="del">an </phrase><phrase diff="chg">contradict </phrase><phrase diff="add">the
+	    semantics</phrase><phrase diff="del">version </phrase>of <phrase diff="add">the</phrase><phrase diff="del">this 
 syntax:
     
         
-        	An </phrase>element information<phrase diff="del">extensibility point </phrase>item indicated by the
-	    <emph diff="chg" role="infoset-property">parent</emph><phrase diff="del">using </phrase>or <emph diff="chg" role="infoset-property">owner</emph><phrase diff="del">in </phrase>property of the
-	    extension. <phrase diff="del">element name. This 
-indicates that any element </phrase>If a processor does not recognize an Attribute
-	    Information<phrase diff="del">other </phrase>Item, the processor<phrase diff="del">http://www.w3.org/@@@@/@@/policy 
+        	An </phrase>element <phrase diff="add">information</phrase><phrase diff="del">extensibility point </phrase><phrase diff="chg">item indicated by </phrase><phrase diff="add">the
+	    </phrase><emph diff="add" role="infoset-property"><phrase diff="add">parent</phrase></emph><phrase diff="del">using </phrase><phrase diff="chg">or </phrase><emph diff="add" role="infoset-property"><phrase diff="add">owner</phrase></emph><phrase diff="del">in </phrase><phrase diff="chg">property </phrase>of the
+	    <phrase diff="add">extension. </phrase><phrase diff="del">element name. This 
+indicates that any element </phrase><phrase diff="chg">If a processor does not recognize an </phrase><phrase diff="add">Attribute
+	    Information</phrase><phrase diff="del">other </phrase><phrase diff="chg">Item, </phrase>the <phrase diff="add">processor</phrase><phrase diff="del">http://www.w3.org/@@@@/@@/policy 
 namespace. 
 		
 		
-			An </phrase><rfc2119 diff="add">SHOULD</rfc2119>
-	    ignore<phrase diff="del">attribute </phrase>it; if a processor does not recognize an Element
-	    Information<phrase diff="del">place </phrase>Item, the processor<phrase diff="del">attribute name. This 
-indicates that any attribute name can be used, from any namespace </phrase><rfc2119 diff="add">SHOULD</rfc2119>
-	    treat<phrase diff="del">other </phrase>it as an<phrase diff="del">http://www.w3.org/@@@@/@@/policy 
-namespace. </phrase>assertion.</p>
+			An </phrase><rfc2119 diff="add"><phrase diff="add">SHOULD</phrase></rfc2119>
+	    <phrase diff="add">ignore</phrase><phrase diff="del">attribute </phrase><phrase diff="chg">it; if a processor does not recognize an </phrase><phrase diff="add">Element
+	    Information</phrase><phrase diff="del">place </phrase><phrase diff="chg">Item, </phrase>the <phrase diff="add">processor</phrase><phrase diff="del">attribute name. This 
+indicates that any attribute name can be used, </phrase><rfc2119 diff="add"><phrase diff="add">SHOULD</phrase></rfc2119>
+	    <phrase diff="add">treat</phrase><phrase diff="del">from any namespace other </phrase><phrase diff="chg">it as </phrase><phrase diff="add">an</phrase><phrase diff="del">http://www.w3.org/@@@@/@@/policy 
+namespace. </phrase><phrase diff="add">assertion.</phrase></p>
 	    </item>
 	  </ulist>
 
@@ -264,10 +263,6 @@
 	  </div2>
 
 	  
-
-	  
-
-	  
       
 	  
 	    <p diff="del">Extensibility
@@ -369,23 +364,29 @@
 	    </p>
 	    
 <p>We introduce the following terms that are used throughout this document:</p>
-<p><termdef diff="chg" id="policy" term="policy">A <term>policy</term><phrase diff="del">EdNote: </phrase>is a collection of <termref def="policy_alternative">policy alternatives</termref>.</termdef></p>
-<p diff="chg"><termdef id="policy_alternative" term="policy alternative">A <term>policy alternative</term> is a collection of <termref def="policy_assertion">policy assertions</termref>.</termdef></p>
-<p diff="chg"><termdef id="policy_assertion" term="policy assertion">A <term>policy assertion</term> represents an individual requirement, capability, or other property of a behavior.</termdef></p>
-<p diff="chg"><termdef id="policy_assertion_type" term="policy assertion type">A <term>policy assertion type</term> represents a class of <termref def="policy_assertion">policy assertions</termref> and implies a schema for the assertion and assertion-specific semantics.</termdef></p>
-<p diff="chg"><termdef id="policy_assertion_parameter" term="policy assertion parameter">A <term>policy assertion parameter</term> qualifies the behavior indicated by a <termref def="policy_assertion">policy assertion</termref>.</termdef></p>
-<p diff="chg"><termdef id="policy_vocabulary" term="policy vocabulary">A <term>policy<phrase diff="del">will </phrase>vocabulary</term> of a policy is the set of all <termref def="policy_assertion_type">policy assertion types</termref> used in a policy.</termdef></p>
-<p diff="chg"><termdef id="policy_expression" term="policy expression">A <term>policy expression</term> is an XML Infoset representation of a <termref def="policy">policy</termref>, either in a normal form or in an equivalent compact form. </termdef></p>
-<p diff="chg"><termdef id="policy_subject" term="policy subject">A <term>policy subject</term> is an entity (e.g., an endpoint, message, resource, interaction) with which a <termref def="policy">policy</termref> can be associated. </termdef></p>
-<p diff="chg"><termdef id="policy_scope" term="policy scope">A <term>policy scope</term> is a collection of <termref def="policy_subject">policy subjects</termref> to which a policy may apply.</termdef></p>
-<p diff="chg"><termdef id="policy_attachment" term="policy attachment">A <term>policy attachment</term> is a mechanism for associating <termref def="policy">policy</termref> with<phrase diff="del">insert </phrase>one or more <termref def="policy_scope">policy<phrase diff="del">termdefs </phrase>scopes</termref>.</termdef></p><p diff="del">here
-	    </p></div2>
+
+  <p diff="del">policy</p><p><termdef diff="add" id="policy" term="policy">A <term>policy</term> is a collection of <termref def="policy_alternative">policy alternatives</termref><phrase diff="add">.</phrase></termdef><phrase diff="del">, </phrase></p>
+<p diff="del">policy alternative</p><p><termdef diff="add" id="policy_alternative" term="policy alternative"><phrase diff="add">A</phrase><phrase diff="del">a </phrase><term>policy alternative</term> is a collection of <termref def="policy_assertion">policy assertions</termref>.</termdef></p>
+<p diff="del">policy assertion</p><p><termdef diff="add" id="policy_assertion" term="policy assertion">A <term>policy assertion</term> represents an individual requirement, capability, or other property of a behavior.</termdef><phrase diff="del">policy assertion parameterA policy assertion parameter 
+	    qualifies the behavior indicated by a policy assertion.</phrase></p>
+<p diff="del">policy assertion type</p><p><termdef diff="add" id="policy_assertion_type" term="policy assertion type">A <term>policy assertion type</term> represents a class of <termref def="policy_assertion">policy assertions</termref> and implies a schema for the assertion and assertion-specific semantics.</termdef></p>
+<p diff="add"><termdef id="policy_assertion_parameter" term="policy assertion parameter"><phrase diff="add">A </phrase><term>policy <phrase diff="add">assertion parameter</phrase></term> <phrase diff="add">qualifies the behavior indicated by a </phrase><termref def="policy_assertion"><phrase diff="add">policy assertion</phrase></termref><phrase diff="add">.</phrase></termdef></p>
+<p diff="del">attachment</p><p><termdef diff="add" id="policy_vocabulary" term="policy vocabulary">A <term>policy <phrase diff="chg">vocabulary</phrase></term> <phrase diff="chg">of </phrase>a <phrase diff="chg">policy is </phrase><phrase diff="add">the set of all </phrase><termref def="policy_assertion_type"><phrase diff="del">associating 
+	    </phrase>policy <phrase diff="chg">assertion </phrase><phrase diff="add">types</phrase></termref><phrase diff="del">one </phrase><phrase diff="chg">used in </phrase><phrase diff="add">a</phrase><phrase diff="del">policy </phrase><phrase diff="add">policy.</phrase></termdef><phrase diff="del">scopes.</phrase></p>
+<p diff="del">policy expression</p><p><termdef diff="add" id="policy_expression" term="policy expression">A <term>policy expression</term> is an XML Infoset representation of a <termref def="policy">policy</termref>, either in a normal form or in an equivalent compact form.<phrase diff="del">policy </phrase></termdef></p>
+<p diff="del">scope</p><p><termdef diff="add" id="policy_subject" term="policy subject">A <term>policy <phrase diff="chg">subject</phrase></term> is <phrase diff="chg">an entity </phrase><phrase diff="add">(e.g.,</phrase><phrase diff="del">of 
+	    policy </phrase><phrase diff="add">an</phrase><phrase diff="del">subjects </phrase><phrase diff="add">endpoint, message, resource, interaction) with</phrase><phrase diff="del">to </phrase>which a <termref def="policy">policy</termref> <phrase diff="chg">can </phrase><phrase diff="add">be</phrase><phrase diff="del">apply.policy </phrase><phrase diff="add">associated. </phrase></termdef></p>
+<p diff="del">subject</p><p><termdef diff="add" id="policy_scope" term="policy scope">A <term>policy <phrase diff="chg">scope</phrase></term> is <phrase diff="add">a</phrase><phrase diff="del">an entity 
+	    (e.g., an </phrase><phrase diff="chg">collection of </phrase><termref def="policy_subject"><phrase diff="add">policy</phrase><phrase diff="del">resource, </phrase><phrase diff="add">subjects</phrase></termref><phrase diff="del">interaction) </phrase><phrase diff="chg">to </phrase>which a 
+	    <phrase diff="del">policy can </phrase><phrase diff="chg">policy may </phrase><phrase diff="add">apply.</phrase></termdef></p>
+<p diff="del">policy vocabulary</p><p><termdef diff="add" id="policy_attachment" term="policy attachment">A <term>policy <phrase diff="chg">attachment</phrase></term> is <phrase diff="chg">a mechanism for associating </phrase><termref def="policy" diff="chg">policy</termref> <phrase diff="chg">with </phrase><phrase diff="add">one</phrase><phrase diff="del">types </phrase><phrase diff="chg">or more </phrase><termref def="policy_scope"><phrase diff="add">policy</phrase><phrase diff="del">a </phrase><phrase diff="add">scopes</phrase></termref><phrase diff="add">.</phrase></termdef><phrase diff="del">policy.</phrase></p>
+	    </div2>
 	</div1>
 	<div1 id="Policy_Model">
 	  <head>Policy Model</head>
 
 	  <p>This section defines an abstract model for policies and for operations upon policies.</p>
-	  <p>This<phrase diff="del">The descriptions below use XML Infoset terminology for convenience of description. However, this </phrase>abstract model <phrase diff="del">itself </phrase>is independent of how it is represented as an XML Infoset. </p>
+	  <p><phrase diff="add">This</phrase><phrase diff="del">The descriptions below use XML Infoset terminology for convenience of description. However, this </phrase>abstract model <phrase diff="del">itself </phrase>is independent of how it is represented as an XML Infoset. </p>
 	  <div2 id="rPolicy_Assertion">
 	    <head>Policy Assertion</head>
 
@@ -418,8 +419,8 @@
 	    algorithms to qualify the specific behavior of a security
 	    binding assertion. </p>
 
-	    <p>The XML Infoset of an<phrase diff="del">a policy </phrase>assertion <rfc2119>MAY</rfc2119> contain a non-empty
-	    [attributes] <phrase diff="del">attributes </phrase>property and/or a non-empty <emph role="infoset-property">children</emph>
+	    <p>The XML Infoset of <phrase diff="add">an</phrase><phrase diff="del">a policy </phrase>assertion <rfc2119>MAY</rfc2119> contain a non-empty
+	    <phrase diff="add">[attributes] </phrase><phrase diff="del">attributes </phrase>property and/or a non-empty <emph role="infoset-property">children</emph>
 	    property. Such content <rfc2119>MAY</rfc2119> be used to parameterize the
 	    behavior indicated by the assertion.  
 	    <phrase diff="del">A policy assertion parameter 
@@ -436,7 +437,7 @@
 	    expressions. Specifically, domain authors are encouraged
 	    to consider when the identity of the root Element
 	    Information Item alone is enough to convey the requirement
-	    (capability).<phrase diff="del">or capability.</phrase></p>
+	    <phrase diff="add">(capability).</phrase><phrase diff="del">or capability.</phrase></p>
 
 	  </div2>
 	  <div2 id="rPolicy_Alternative">
@@ -453,10 +454,10 @@
 	    <p>The vocabulary of a policy alternative is the set of
 	    all <termref def="policy_assertion_type">policy assertion
 	    types</termref> within the alternative. 
-	    <phrase diff="del">A </phrase>The<phrase diff="del">policy </phrase><termref def="policy_vocabulary" diff="add">vocabulary of
-	    a policy</termref> is the set of all 
-	    <phrase diff="del">policy </phrase>assertion types used in all the<phrase diff="del">policy.
-	    </phrase>policy alternatives in the policy. An assertion whose type
+	    <phrase diff="del">A </phrase><phrase diff="add">The</phrase><phrase diff="del">policy </phrase><termref def="policy_vocabulary" diff="add">vocabulary <phrase diff="add">of
+	    a policy</phrase></termref> is the set of all 
+	    <phrase diff="del">policy </phrase>assertion types used in <phrase diff="chg">all </phrase><phrase diff="add">the</phrase><phrase diff="del">policy.
+	    </phrase><phrase diff="add">policy alternatives in the policy. </phrase>An assertion whose type
 	    is part of the policy's vocabulary but is not included in
 	    an alternative is explicitly prohibited by the
 	    alternative.</p>
@@ -500,8 +501,8 @@
 	    <head>Web services</head>
 
 	    <p>Applied in the Web services model, <termref def="policy">policy</termref> is used to convey conditions
-	    on an interaction between two<phrase diff="del">a Web service requestor and a </phrase>Web service
-	    endpoints. Satisfying assertions in the policy usually
+	    on an interaction between <phrase diff="add">two</phrase><phrase diff="del">a Web service requestor and a </phrase>Web service
+	    <phrase diff="chg">endpoints. </phrase>Satisfying assertions in the policy usually
 	    results in behavior that reflects these
 	    conditions. Typically, the provider of a Web service
 	    exposes a policy to convey conditions under which it
@@ -514,14 +515,14 @@
 	    alternative configuration.</p>
 
 	    <p>A <termref def="policy_assertion">policy
-	    assertion</termref> is <emph diff="chg">supported</emph> by a
+	    assertion</termref> is <emph diff="add">supported</emph> by a
 	    requester if and only if the requester satisfies the
 	    requirement (or accommodates the capability) corresponding
 	    to the assertion. A <termref def="policy_alternative">policy alternative</termref> is
-	    <emph diff="chg">supported</emph> by a requester if and only if the
+	    <emph diff="add">supported</emph> by a requester if and only if the
 	    requester supports all the assertions in the
 	    alternative. And, a <termref def="policy">policy</termref>
-	    is <emph diff="chg">supported</emph> by a requester if and only if
+	    is <emph diff="add">supported</emph> by a requester if and only if
 	    the requester supports at least one of the alternatives in
 	    the policy. Note that although policy alternatives are
 	    meant to be mutually exclusive, it cannot be decided in
@@ -533,7 +534,7 @@
 	    the <termref def="policy_vocabulary">vocabulary of the
 	    policy</termref>; the requester only has to understand the
 	    type of each assertion in the vocabulary of a <termref def="policy_alternative">policy
-	    alternative</termref>. <phrase diff="del">the requester supports. </phrase>This characteristic is crucial to
+	    alternative</termref><phrase diff="add">. </phrase><phrase diff="del">the requester supports. </phrase>This characteristic is crucial to
 	    versioning and incremental deployment of new assertions
 	    because this allows a provider's policy to include new
 	    assertions in new alternatives while allowing requesters
@@ -625,7 +626,7 @@
 (09)   &lt;/wsp:ExactlyOne&gt;
 (10) &lt;/wsp:Policy&gt;</eg>
 
-<p>Lines (02-05) and Lines (06-08) express the two alternatives in the
+<p>Lines <phrase diff="chg">(02-05) </phrase>and Lines (06-08) express the two alternatives in the
 policy. If the first alternative is selected, only the Basic 256 RSA
 15 algorithm suite [<bibref ref="WS-SecurityPolicy"></bibref>] is supported;
 conversely, if the second alternative is selected, only the 3DES RSA
@@ -635,29 +636,29 @@
 <head>Policy Identification</head>
 
 <p>A <termref def="policy_expression">policy expression</termref>
-<rfc2119>MAY</rfc2119> be associated with a URI [<bibref diff="chg" ref="RFC3986"></bibref>]. The schema outline
-for attributes to associate a URI is as follows:</p>
+<rfc2119>MAY</rfc2119> be associated with <phrase diff="chg">a URI </phrase>[<bibref diff="chg" ref="RFC3986"></bibref>]. The schema outline
+for attributes to associate <phrase diff="chg">a URI </phrase>is as follows:</p>
 
-<eg xml:space="preserve">&lt;wsp:Policy ( Name="<emph>xs:anyURI</emph>" )?
-            ( wsu:Id="<emph>xs:ID</emph>" )?
+<eg xml:space="preserve">&lt;wsp:Policy ( Name="<emph>xs:anyURI</emph><phrase diff="add">" )?
+            ( wsu:Id="</phrase><emph>xs:ID</emph>" )?
             … &gt;
   …
 &lt;/wsp:Policy&gt;</eg>
 <p>The following describes the Attribute Information Items listed and defined in the schema outline above:</p>
 <glist><gitem>
 <label><att>/wsp:Policy/@Name</att></label>
-<def><p>The identity of the policy expression as an absolute URI [<bibref diff="chg" ref="RFC3986"></bibref>]. If
-omitted, there is no implied value. This URI <rfc2119>MAY</rfc2119> be
+<def><p>The identity of the policy expression as an absolute <phrase diff="chg">URI </phrase>[<bibref diff="chg" ref="RFC3986"></bibref>]. If
+omitted, there is no implied value. This <phrase diff="chg">URI </phrase><rfc2119>MAY</rfc2119> be
 used to refer to a policy from other XML documents using a <termref def="policy_attachment">policy attachment</termref> mechanism such as
 those defined in WS-PolicyAttachment [<bibref ref="WS-PolicyAttachment"></bibref>]. </p></def>
 </gitem>
 <gitem>
-<label><att>/wsp:Policy/@wsu:Id<phrase diff="del">/wsp:Policy/(@wsu:Id | @xml:id)</phrase></att></label>
+<label><att><phrase diff="add">/wsp:Policy/@wsu:Id</phrase><phrase diff="del">/wsp:Policy/(@wsu:Id | @xml:id)</phrase></att></label>
 <def><p>The identity of the policy expression as an <code>ID</code> within the
 enclosing XML document. If omitted, there is no implied value. To
-refer to this policy expression, a URI-reference
- <rfc2119>MAY</rfc2119> be formed using this value per Section 4.2 of
-WS-Security [<bibref ref="WS-Security"></bibref>].<phrase diff="del">] when @wsu:Id is used.
+refer to this policy expression, <phrase diff="chg">a URI-reference
+</phrase> <rfc2119>MAY</rfc2119> be formed using this value per Section 4.2 of
+WS-Security [<bibref ref="WS-Security"></bibref><phrase diff="add">].</phrase><phrase diff="del">] when @wsu:Id is used.
     The use of xml:id attribute in conjunction with Canonical XML 1.0 is 
     inappropriate as described in Appendix C of xml:id Version 1.0 [] 
     and thus this combination must be avoided (see []). For example, 
@@ -668,15 +669,15 @@
 </glist>
 
 <p>The following example illustrates how to associate a policy
-expression with the absolute URI
-<code>"http://www.example.com/policies/P1"</code>:</p>
+expression with the absolute <phrase diff="chg">URI
+</phrase><code>"http://www.example.com/policies/P1"</code>:</p>
 
 <eg xml:space="preserve">(01) &lt;wsp:Policy
         Name="http://www.example.com/policies/P1"
         xmlns:wsp="http://www.w3.org/@@@@/@@/policy" &gt;
 (02)   &lt;!-- Details omitted for readability --&gt;
 (03) &lt;/wsp:Policy&gt;</eg>
-<p>The following example illustrates how to associate a policy expression with the URI-reference <code>"#P1"</code>:</p>
+<p>The following example illustrates how to associate a policy expression with the <phrase diff="chg">URI-reference </phrase><code>"#P1"</code>:</p>
 <eg xml:space="preserve">(01) &lt;wsp:Policy
         wsu:Id="P1"
         xmlns:wsp="http://www.w3.org/@@@@/@@/policy"
@@ -1110,7 +1111,7 @@
 <div3 id="Policy_Inclusion">
 <head>Policy Inclusion</head>
 <p>In order to share <termref def="policy_assertion">assertions</termref> across <termref def="policy_expression">policy expressions</termref>, the <el>wsp:PolicyReference</el> element <rfc2119>MAY</rfc2119> be present anywhere a policy assertion is allowed inside a policy expression. This element is used to include the content of one policy expression in another policy expression.</p>
-<p>When a <el>wsp:PolicyReference</el> element references a <el>wsp:Policy</el> element, then the semantics of inclusion are simply to replace the <el>wsp:PolicyReference</el> element with a <el>wsp:All</el> element whose <emph role="infoset-property">children</emph> property is the same as the <emph role="infoset-property">children</emph> property of the referenced <el>wsp:Policy</el> element. That is, the contents of the referenced policy <emph diff="chg">conceptually replace</emph> the <el>wsp:PolicyReference</el> element and are wrapped in a <el>wsp:All</el> operator. Using the <el>wsp:PolicyReference</el> element, a policy expression <rfc2119>MUST NOT</rfc2119> reference itself either directly or indirectly. (Note: References that have a <att>@Digest</att> attribute <rfc2119>SHOULD</rfc2119> be validated before being included.)</p>
+<p>When a <el>wsp:PolicyReference</el> element references a <el>wsp:Policy</el> element, then the semantics of inclusion are simply to replace the <el>wsp:PolicyReference</el> element with a <el>wsp:All</el> element whose <emph role="infoset-property">children</emph> property is the same as the <emph role="infoset-property">children</emph> property of the referenced <el>wsp:Policy</el> element. That is, the contents of the referenced policy <emph diff="add">conceptually replace</emph> the <el>wsp:PolicyReference</el> element and are wrapped in a <el>wsp:All</el> operator. Using the <el>wsp:PolicyReference</el> element, a policy expression <rfc2119>MUST NOT</rfc2119> reference itself either directly or indirectly. (Note: References that have a <att>@Digest</att> attribute <rfc2119>SHOULD</rfc2119> be validated before being included.)</p>
 <p>The schema outline for the <el>wsp:PolicyReference</el> element is as follows:</p>
 <eg xml:space="preserve">&lt;wsp:Policy&gt;
   …
@@ -1127,9 +1128,9 @@
 </gitem>
 <gitem>
 <label><att>/wsp:Policy/…/wsp:PolicyReference/@URI</att></label>
-<def><p>This attribute references a policy expression by URI.<phrase diff="del">an IRI. </phrase>For a policy expression within the same XML Document, the reference <rfc2119>SHOULD</rfc2119> be a<phrase diff="del">an 
-IRI-reference </phrase>URI-reference to a policy expression identified by an <code>ID</code>. For an external policy expression, there is no requirement that the URI be resolvable; retrieval mechanisms are beyond the scope of this specification. After retrieval, there is no requirement to check that the retrieved policy expression is associated (Section <specref ref="Policy_Identification"></specref>) with this URI.  The<phrase diff="del"> 
-The </phrase>URI included in the retrieved policy expression, if any, <rfc2119>MAY</rfc2119> be different than the URI used to retrieve the policy expression. </p></def>
+<def><p>This attribute references a policy expression by <phrase diff="add">URI.</phrase><phrase diff="del">an IRI. </phrase>For a policy expression within the same XML Document, the reference <rfc2119>SHOULD</rfc2119> be <phrase diff="add">a</phrase><phrase diff="del">an 
+IRI-reference </phrase><phrase diff="add">URI-reference </phrase>to a policy expression identified by an <code>ID</code>. For an external policy expression, there is no requirement that the <phrase diff="chg">URI </phrase>be resolvable; retrieval mechanisms are beyond the scope of this specification. After retrieval, there is no requirement to check that the retrieved policy expression is associated (Section <specref ref="Policy_Identification"></specref>) with this <phrase diff="chg">URI. </phrase><phrase diff="add"> The</phrase><phrase diff="del"> 
+The </phrase><phrase diff="chg">URI </phrase>included in the retrieved policy expression, if any, <rfc2119>MAY</rfc2119> be different than the <phrase diff="chg">URI </phrase>used to retrieve the policy expression. </p></def>
 </gitem>
 <gitem>
 <label><att>/wsp:Policy/…/wsp:PolicyReference/@Digest</att></label>
@@ -1304,8 +1305,6 @@
 could be secured as part of a SOAP message [<bibref ref="SOAP11"></bibref>, <bibref ref="SOAP12"></bibref>] using WS-Security [<bibref ref="WS-Security"></bibref>] or embedded within other
 objects using object-specific security mechanisms.</p>
 </div1>
-    
-    
 
     <phrase diff="del">Conformance
 
@@ -1324,15 +1323,16 @@
 	    Engineering Task Force, June 1999. Available at
 	    http://www.ietf.org/rfc/rfc2119.txt.
 	  </bibl>
-	  <bibl diff="chg" href="http://www.ietf.org/rfc/rfc3986.txt" id="RFC3986" key="IETF RFC 3986" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink">
-	    <titleref xlink:actuate="onRequest" xlink:show="new" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink">Uniform Resource Identifier (URI): Generic
-	    Syntax<phrase diff="del">(IRIs)
-	      </phrase></titleref>, T. Berners-Lee,<phrase diff="del">M. </phrase>R. Fielding,<phrase diff="del">Duerst </phrase>and
-	    L. Masinter, <phrase diff="del">Suignard, 
+	  <bibl diff="add" href="http://www.ietf.org/rfc/rfc3986.txt" id="RFC3986" key="IETF RFC 3986" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink">
+	    
+	      <titleref xlink:actuate="onRequest" xlink:show="new" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink"><phrase diff="chg">Uniform </phrase>Resource <phrase diff="chg">Identifier </phrase><phrase diff="add">(URI): Generic
+	    Syntax</phrase><phrase diff="del">(IRIs)
+	      </phrase></titleref>, <phrase diff="add">T. Berners-Lee,</phrase><phrase diff="del">M. </phrase><phrase diff="add">R. Fielding,</phrase><phrase diff="del">Duerst </phrase>and
+	    <phrase diff="add">L. </phrase><phrase diff="chg">Masinter, </phrase><phrase diff="del">Suignard, 
 	        </phrase>Authors. Internet Engineering Task Force,
 	    January 2005. Available at
-	    http://www.ietf.org/rfc/rfc3986.txt.
-	  </bibl>
+	    <phrase diff="chg">http://www.ietf.org/rfc/rfc3986.txt.
+	  </phrase></bibl>
 	  <bibl href="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0.pdf" id="WS-Security" key="WS-Security 2004" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink">
 	    <titleref xlink:actuate="onRequest" xlink:show="new" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink">Web Services Security: SOAP Message Security 1.0
 	    (WS-Security 2004)</titleref>, A. Nadalin, C. Kaler,
@@ -1349,8 +1349,6 @@
 	    http://www.w3.org/TR/2004/REC-xml-20040204. The <loc href="http://www.w3.org/TR/REC-xml/" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink">latest version of XML
 	    1.0</loc> is available at http://www.w3.org/TR/REC-xml.
 	  </bibl>
-	  
-	  
 	    
 	        <phrase diff="del">xml:id Version 1.0,
 	        J. Marsh, D. Veillard and N. Walsh, Editors. World Wide Web Consortium,
@@ -1406,8 +1404,6 @@
     <div2 id="Informative-References">
       <head>Other References</head>
       <blist>
-	
-	
       
           <phrase diff="del">Known Issues with Canonical XML 1.0 (C14N/1.0), 
           J. Kahan and K. Lanz, Editors. World Wide Web
@@ -1507,7 +1503,7 @@
 
 </div1>
       
-<inform-div1 diff="chg" id="acknowledgments" xml:base="file:///c:/2006/ws/policy/acknowledgements.xml">
+<inform-div1 id="acknowledgments" xml:base="file:///C:/2006/ws/policy/acknowledgements.xml">
   <head>Acknowledgements</head>
 
   <p>This document is the work of the <loc href="http://www.w3.org/2002/ws/policy/" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink">W3C Web Services Policy
@@ -1532,8 +1528,6 @@
 </inform-div1>
 
         <inform-div1 diff="add" id="changelog">
-            
-            
 
 
   <p diff="del">Changes in this Version of the Document
@@ -1545,25 +1539,10 @@
       Replaced URI with IRI.
   
 
-  GlossarypolicyA policy is a collection of 
-	    policy alternatives, policy alternativea policy alternative 
-	    is a collection of policy assertions.policy assertionA policy assertion 
-		represents an individual requirement, capability, or other property of a behavior.policy assertion parameterA policy assertion parameter 
-	    qualifies the behavior indicated by a policy assertion.policy assertion typeA policy assertion type 
-	    represents a class of policy assertions and implies a 
-	    schema for the assertion and assertion-specific semantics.policy attachmentA 
-	    policy attachment is a mechanism for associating 
-	    policy with one or more policy scopes.policy expressionA policy expression 
-		is an XML Infoset representation of a policy, 
-		either in a normal form or in an equivalent compact form.policy scopeA policy scope is a collection of 
-	    policy subjects to which a policy may apply.policy subjectA policy subject is an entity 
-	    (e.g., an endpoint, message, resource, interaction) with which a 
-	    policy can be associated. policy vocabularyA policy vocabulary is the set of all 
-	    policy assertion types used in a policy.
         
             </p><head>Web Services Policy 1.5 - Framework Change Log</head>
             <table border="1" id="ws-policy-framework-changelog-table">
-                <tbody diff="chg">
+                <tbody diff="del">
                     <tr>
                         <th colspan="1" rowspan="1">Date</th>
                         <th colspan="1" rowspan="1">Author</th>
@@ -1600,11 +1579,9 @@
                         namespace URI versioning policy</loc> adopted by the WG. 
                         </td>
                     </tr>
-                </tbody>
-            
                 
                     
-                       	<phrase diff="del">20060803
+                       	20060803
                        	PY
                        	Completed Issue: 3551 
                        	 Misc updates throughout.                     	
@@ -1727,8 +1704,8 @@
                             Removing Goals section, resulted in moving Policy expression definition to 2nd para of intro.                 	
                         
                                            
-                
-            </phrase></table>
+                </tbody>
+            </table>
         </inform-div1>
     </back>
 </spec>

Index: ws-policy-attachment-diff20060731.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment-diff20060731.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ws-policy-attachment-diff20060731.xml	4 Sep 2006 04:44:50 -0000	1.1
+++ ws-policy-attachment-diff20060731.xml	5 Sep 2006 00:18:48 -0000	1.2
@@ -63,7 +63,7 @@
 	with WSDL and UDDI descriptions.
       </p>
     </abstract>
-    <status xml:base="file:///c:/2006/ws/policy/entitiesedcopy.dtd"><p></p></status>
+    <status xml:base="file:///C:/2006/ws/policy/entitiesedcopy.dtd"><p></p></status>
     <langusage>
       <language id="en-US">English</language>
     </langusage>
@@ -152,8 +152,8 @@
 			An </phrase><rfc2119 diff="add"><phrase diff="add">SHOULD</phrase></rfc2119>
 	      <phrase diff="add">ignore</phrase><phrase diff="del">attribute </phrase><phrase diff="chg">it; if a processor does not recognize an </phrase><phrase diff="add">Element
 	      Information</phrase><phrase diff="del">place </phrase><phrase diff="chg">Item, </phrase>the <phrase diff="add">processor</phrase><phrase diff="del">attribute name. This 
-indicates that any attribute name </phrase><rfc2119 diff="add"><phrase diff="add">SHOULD</phrase></rfc2119>
-	      <phrase diff="add">treat</phrase><phrase diff="del">can be used, from any namespace other </phrase><phrase diff="chg">it as </phrase><phrase diff="add">an</phrase><phrase diff="del">http://www.w3.org/@@@@/@@/policy 
+indicates that any attribute name can be used, from any </phrase><rfc2119 diff="add"><phrase diff="add">SHOULD</phrase></rfc2119>
+	      <phrase diff="add">treat</phrase><phrase diff="del">namespace other </phrase><phrase diff="chg">it as </phrase><phrase diff="add">an</phrase><phrase diff="del">http://www.w3.org/@@@@/@@/policy 
 namespace. </phrase><phrase diff="add">assertion.</phrase></p>
 		
 	  </item>
@@ -284,44 +284,73 @@
 
 
 
-<p diff="del">EdNote: script will insert termdefs here
-</p><p><termdef id="policy" term="policy">A <term>policy</term> is a
+  <p diff="del">effective policythe
+effective policy, for a given policy subject, is the 
+combination of relevant policies. The relevant policies are those
+attached to policy scopes that
+contain the policy subject.element policyThe
+	element policy is the policy attached to the policy subjects associated with
+	the element information item that contains it.mergea merge
+	consists of serializing each policy as a
+	policy expression, replacing their
+	wsp:Policy element with a
+	wsp:All element, and placing each as
+	children of a wrapper wsp:Policy
+	element.policy</p><p><termdef diff="add" id="policy" term="policy">A <term>policy</term> is a
 collection of <termref def="policy_alternative">policy
 alternatives</termref>. </termdef></p>
 
-<p><termdef id="policy_alternative" term="policy alternative">A
+<p diff="del">policy alternative</p><p><termdef diff="add" id="policy_alternative" term="policy alternative">A
 <term>policy alternative</term> is a collection of <termref def="policy_assertion">policy assertions</termref>.</termdef></p>
 
-<p><termdef id="policy_assertion" term="policy assertion">A
+<p diff="del">policy assertion</p><p><termdef diff="add" id="policy_assertion" term="policy assertion">A
 <term>policy assertion</term> represents an individual requirement,
-capability, or other property of a behavior.</termdef></p>
+capability, or other property of a behavior.</termdef><phrase diff="del">policy attachmentA
+policy attachment is a mechanism for associating policy with one or more policy scopes.</phrase></p>
 
-<p><termdef id="policy_expression" term="policy expression">A
+<p diff="del">policy expression</p><p><termdef diff="add" id="policy_expression" term="policy expression">A
 <term>policy expression</term> is an XML Infoset representation of a
 <termref def="policy">policy</termref>, either in a normal form or in
-an equivalent compact form. </termdef></p>
+an equivalent compact form. </termdef><phrase diff="del">policy scopeA policy
+scope is a collection of policy
+subjects to which a policy may apply.</phrase></p>
 
-<p><termdef id="policy_subject" term="policy subject">A <term>policy
+<p diff="del">policy subject</p><p><termdef diff="add" id="policy_subject" term="policy subject">A <term>policy
 subject</term> is an entity (e.g., an endpoint, message, resource,
 interaction) with which a <termref def="policy">policy</termref> can
 be associated. </termdef></p>
 
-<p><termdef id="policy_scope" term="policy scope">A <term>policy
-scope</term> is a collection of <termref def="policy_subject">policy
-subjects</termref> to which a policy may apply.</termdef></p>
 
-<p><termdef id="policy_attachment" term="policy attachment">A
-<term>policy attachment</term> is a mechanism for associating <termref def="policy">policy</termref> with one or more <termref def="policy_scope">policy scopes</termref>.</termdef></p>
+<p><termdef diff="chg" id="policy_scope" term="policy scope">A <term>policy <phrase diff="del">is a
+collection of policy
+alternatives. 
 
-<p diff="add"><termdef id="effective_policy" term="effective policy"><phrase diff="add">An
-</phrase><term><phrase diff="add">effective policy</phrase></term><phrase diff="add">, for a given </phrase><termref def="policy_subject"><phrase diff="add">policy subject</phrase></termref><phrase diff="add">, is the resultant
-combination of relevant policies. The relevant policies are those
-attached to </phrase><termref def="policy_scope"><phrase diff="add">policy scopes</phrase></termref> <phrase diff="add">that
-contain the policy subject.</phrase></termdef></p>
+A
+</phrase><phrase diff="add">scope</phrase><phrase diff="del">policy alternative</phrase></term> is a collection of <termref def="policy_subject" diff="add"><phrase diff="del">policy assertions.
 
-<p diff="add"><termdef id="element_policy" term="element policy"><phrase diff="add">The
-	</phrase><term><phrase diff="add">element policy</phrase></term> <phrase diff="add">is the </phrase><termref def="policy"><phrase diff="add">policy</phrase></termref> <phrase diff="add">attached to the </phrase><termref def="policy_subject"><phrase diff="add">policy subjects</phrase></termref> <phrase diff="add">associated with
-	the element information item that contains it.</phrase></termdef></p>
+A
+</phrase>policy <phrase diff="del">assertion represents an individual requirement,
+</phrase><phrase diff="add">subjects</phrase></termref><phrase diff="del">capability, </phrase><phrase diff="chg">to which a policy may apply.</phrase></termdef></p>
+
+<p><termdef diff="chg" id="policy_attachment" term="policy attachment">A
+<term>policy <phrase diff="chg">attachment</phrase></term> is <phrase diff="add">a</phrase><phrase diff="del">an XML </phrase><phrase diff="chg">mechanism for associating </phrase><phrase diff="del">a
+</phrase><termref def="policy">policy</termref><phrase diff="del">, either in a </phrase><phrase diff="chg">with one </phrase>or <phrase diff="add">more</phrase><phrase diff="del">in
+an equivalent compact </phrase><termref def="policy_scope" diff="add"><phrase diff="add">policy</phrase><phrase diff="del">form. </phrase><phrase diff="add">scopes</phrase></termref><phrase diff="add">.</phrase></termdef></p>
+
+<p><termdef diff="chg" id="effective_policy" term="effective policy"><phrase diff="chg">An
+</phrase><term><phrase diff="add">effective </phrase>policy
+<phrase diff="del">subject</phrase></term><phrase diff="add">, </phrase><phrase diff="chg">for a given </phrase><termref def="policy_subject" diff="add"><phrase diff="add">policy</phrase><phrase diff="del">(e.g., </phrase><phrase diff="add">subject</phrase></termref><phrase diff="add">,</phrase><phrase diff="del">an </phrase><phrase diff="chg">is the resultant
+combination of relevant policies. </phrase><phrase diff="add">The</phrase><phrase diff="del">policy </phrase><phrase diff="add">relevant</phrase><phrase diff="del">can
+be </phrase><phrase diff="chg">policies </phrase><phrase diff="add">are
+
+</phrase><phrase diff="del">A </phrase><phrase diff="add">those</phrase><phrase diff="del">policy
+</phrase><phrase diff="add">attached</phrase><phrase diff="del">scope is a collection </phrase><phrase diff="chg">to </phrase><termref def="policy_scope">policy
+<phrase diff="del">subjects </phrase><phrase diff="add">scopes</phrase></termref><phrase diff="del">to </phrase><phrase diff="add">that
+contain</phrase><phrase diff="del">which </phrase><phrase diff="chg">the </phrase>policy <phrase diff="add">subject.</phrase></termdef><phrase diff="del">may apply.</phrase></p>
+
+<p><termdef diff="chg" id="element_policy" term="element policy"><phrase diff="chg">The
+	</phrase><term><phrase diff="chg">element policy</phrase></term> is <phrase diff="chg">the </phrase><termref def="policy" diff="add"><phrase diff="add">policy</phrase></termref><phrase diff="del">mechanism </phrase><phrase diff="chg">attached to </phrase><phrase diff="add">the </phrase><termref def="policy_subject" diff="add">policy <phrase diff="add">subjects</phrase></termref> <phrase diff="add">associated </phrase>with
+	<phrase diff="add">the </phrase><phrase diff="chg">element information item </phrase><phrase diff="add">that</phrase><phrase diff="del">policy </phrase><phrase diff="add">contains it.</phrase></termdef><phrase diff="del">scopes.</phrase></p>
 
 </div2>
       <div2 id="Example">
@@ -432,11 +461,11 @@
 	<p>When multiple attachments are made, <phrase diff="add">they must be combined
 	to ascertain </phrase>the
 <phrase diff="del">effective </phrase><termref def="effective_policy" diff="add"><phrase diff="add">effective
-	</phrase>policy</termref><phrase diff="del">, </phrase>for a <phrase diff="chg">particular </phrase><termref def="policy_subject">policy subject</termref><phrase diff="add">. This</phrase><phrase diff="del">, </phrase>is <phrase diff="add">done</phrase><phrase diff="del">the 
+	</phrase>policy</termref><phrase diff="del">, </phrase>for a <phrase diff="chg">particular </phrase><termref def="policy_subject">policy subject</termref><phrase diff="chg">. </phrase><phrase diff="add">This </phrase>is <phrase diff="add">done</phrase><phrase diff="del">the 
 combination </phrase><phrase diff="add">by
 	identifying</phrase><phrase diff="del">of </phrase><phrase diff="chg">which </phrase><termref def="policy_scope" diff="add"><phrase diff="add">policy</phrase><phrase diff="del">policies. </phrase><phrase diff="add">scopes</phrase></termref><phrase diff="del">The </phrase><phrase diff="chg">a particular subject </phrase><phrase diff="add">is</phrase><phrase diff="del">those
 attached </phrase><phrase diff="chg">in </phrase><phrase diff="add">and
-	combining the individual policies associated with</phrase><phrase diff="del">policy </phrase><phrase diff="add">those </phrase>scopes
+	combining the individual policies associated with those</phrase><phrase diff="del">policy </phrase>scopes
 	<phrase diff="add">to form</phrase><phrase diff="del">that
 contain </phrase><phrase diff="chg">an </phrase><phrase diff="add">effective</phrase><phrase diff="del">policy </phrase><phrase diff="add">policy.</phrase><phrase diff="del">subject.   
 	</phrase></p>
@@ -1782,7 +1811,7 @@
 </div2>
 </div1>
       
-<inform-div1 id="acknowledgments" xml:base="file:///c:/2006/ws/policy/acknowledgements.xml">
+<inform-div1 id="acknowledgments" xml:base="file:///C:/2006/ws/policy/acknowledgements.xml">
   <head>Acknowledgements</head>
 
   <p>This document is the work of the <loc href="http://www.w3.org/2002/ws/policy/" xlink:actuate="onRequest" xlink:show="replace" xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink">W3C Web Services Policy
@@ -1815,33 +1844,6 @@
       Replaced URI with IRI.
     
   
-  Glossaryeffective policythe
-effective policy, for a given policy subject, is the 
-combination of relevant policies. The relevant policies are those
-attached to policy scopes that
-contain the policy subject.element policyThe
-	element policy is the policy attached to the policy subjects associated with
-	the element information item that contains it.mergea merge
-	consists of serializing each policy as a
-	policy expression, replacing their
-	wsp:Policy element with a
-	wsp:All element, and placing each as
-	children of a wrapper wsp:Policy
-	element.policyA policy is a
-collection of policy
-alternatives. policy alternativeA
-policy alternative is a collection of policy assertions.policy assertionA
-policy assertion represents an individual requirement,
-capability, or other property of a behavior.policy attachmentA
-policy attachment is a mechanism for associating policy with one or more policy scopes.policy expressionA
-policy expression is an XML Infoset representation of a
-policy, either in a normal form or in
-an equivalent compact form. policy scopeA policy
-scope is a collection of policy
-subjects to which a policy may apply.policy subjectA policy
-subject is an entity (e.g., an endpoint, message, resource,
-interaction) with which a policy can
-be associated. 
   
     </p><head>Web Services Policy 1.5 - Attachment Change Log</head>
     <table border="1" id="ws-policy-attachment-changelog-table">

Index: ws-policy-attachment-diff20060731.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-attachment-diff20060731.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ws-policy-attachment-diff20060731.html	4 Sep 2006 04:44:50 -0000	1.1
+++ ws-policy-attachment-diff20060731.html	5 Sep 2006 00:18:47 -0000	1.2
@@ -133,8 +133,8 @@
 			An </span><span class="diff-add"><span class="rfc2119"><span class="diff-add">SHOULD</span></span></span>
 	      <span class="diff-add">ignore</span><span class="diff-del">attribute </span><span class="diff-chg">it; if a processor does not recognize an </span><span class="diff-add">Element
 	      Information</span><span class="diff-del">place </span><span class="diff-chg">Item, </span>the <span class="diff-add">processor</span><span class="diff-del">attribute name. This 
-indicates that any attribute name </span><span class="diff-add"><span class="rfc2119"><span class="diff-add">SHOULD</span></span></span>
-	      <span class="diff-add">treat</span><span class="diff-del">can be used, from any namespace other </span><span class="diff-chg">it as </span><span class="diff-add">an</span><span class="diff-del">http://www.w3.org/@@@@/@@/policy 
+indicates that any attribute name can be used, from any </span><span class="diff-add"><span class="rfc2119"><span class="diff-add">SHOULD</span></span></span>
+	      <span class="diff-add">treat</span><span class="diff-del">namespace other </span><span class="diff-chg">it as </span><span class="diff-add">an</span><span class="diff-del">http://www.w3.org/@@@@/@@/policy 
 namespace. </span><span class="diff-add">assertion.</span></p></li></ul><p>Normative text within this specification takes precedence over
 	normative outlines, which in turn take precedence over the XML Schema
 	[<a href="#XMLSchemaPart1">[XML Schema Structures]</a>] descriptions.</p></div><div class="div2">
@@ -175,28 +175,56 @@
 	      "<span class="rfc2119">MAY</span>", and
 	      "<span class="rfc2119">OPTIONAL</span>" in this document are to be
 	      interpreted as described in RFC 2119 [<a href="#RFC2119">[IETF RFC 2119]</a>].
-	    </p><p>We introduce the following terms that are used throughout this document:</p><div class="diff-del"><p class="diff-del">EdNote: script will insert termdefs here
-</p></div><p>[<a name="policy" title="policy">Definition</a>: A <b>policy</b> is a
+	    </p><p>We introduce the following terms that are used throughout this document:</p><div class="diff-del"><p class="diff-del">effective policythe
+effective policy, for a given policy subject, is the 
+combination of relevant policies. The relevant policies are those
+attached to policy scopes that
+contain the policy subject.element policyThe
+	element policy is the policy attached to the policy subjects associated with
+	the element information item that contains it.mergea merge
+	consists of serializing each policy as a
+	policy expression, replacing their
+	wsp:Policy element with a
+	wsp:All element, and placing each as
+	children of a wrapper wsp:Policy
+	element.policy</p></div><p><span class="diff-add">[<a name="policy" title="policy">Definition</a>: A <b>policy</b> is a
 collection of <a title="policy alternative" href="#policy_alternative">policy
-alternatives</a>. ]</p><p>[<a name="policy_alternative" title="policy alternative">Definition</a>: A
-<b>policy alternative</b> is a collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.]</p><p>[<a name="policy_assertion" title="policy assertion">Definition</a>: A
+alternatives</a>. ]</span></p><div class="diff-del"><p class="diff-del">policy alternative</p></div><p><span class="diff-add">[<a name="policy_alternative" title="policy alternative">Definition</a>: A
+<b>policy alternative</b> is a collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.]</span></p><div class="diff-del"><p class="diff-del">policy assertion</p></div><p><span class="diff-add">[<a name="policy_assertion" title="policy assertion">Definition</a>: A
 <b>policy assertion</b> represents an individual requirement,
-capability, or other property of a behavior.]</p><p>[<a name="policy_expression" title="policy expression">Definition</a>: A
+capability, or other property of a behavior.]</span><span class="diff-del">policy attachmentA
+policy attachment is a mechanism for associating policy with one or more policy scopes.</span></p><div class="diff-del"><p class="diff-del">policy expression</p></div><p><span class="diff-add">[<a name="policy_expression" title="policy expression">Definition</a>: A
 <b>policy expression</b> is an XML Infoset representation of a
 <a title="policy" href="#policy">policy</a>, either in a normal form or in
-an equivalent compact form. ]</p><p>[<a name="policy_subject" title="policy subject">Definition</a>: A <b>policy
+an equivalent compact form. ]</span><span class="diff-del">policy scopeA policy
+scope is a collection of policy
+subjects to which a policy may apply.</span></p><div class="diff-del"><p class="diff-del">policy subject</p></div><p><span class="diff-add">[<a name="policy_subject" title="policy subject">Definition</a>: A <b>policy
 subject</b> is an entity (e.g., an endpoint, message, resource,
 interaction) with which a <a title="policy" href="#policy">policy</a> can
-be associated. ]</p><p>[<a name="policy_scope" title="policy scope">Definition</a>: A <b>policy
-scope</b> is a collection of <a title="policy subject" href="#policy_subject">policy
-subjects</a> to which a policy may apply.]</p><p>[<a name="policy_attachment" title="policy attachment">Definition</a>: A
-<b>policy attachment</b> is a mechanism for associating <a title="policy" href="#policy">policy</a> with one or more <a title="policy scope" href="#policy_scope">policy scopes</a>.]</p><div class="diff-add"><p class="diff-add">[<a name="effective_policy" title="effective policy">Definition</a>: <span class="diff-add">An
-</span><b><span class="diff-add">effective policy</span></b><span class="diff-add">, for a given </span><a title="policy subject" href="#policy_subject"><span class="diff-add">policy subject</span></a><span class="diff-add">, is the resultant
-combination of relevant policies. The relevant policies are those
-attached to </span><a title="policy scope" href="#policy_scope"><span class="diff-add">policy scopes</span></a> <span class="diff-add">that
-contain the policy subject.</span>]</p></div><div class="diff-add"><p class="diff-add">[<a name="element_policy" title="element policy">Definition</a>: <span class="diff-add">The
-	</span><b><span class="diff-add">element policy</span></b> <span class="diff-add">is the </span><a title="policy" href="#policy"><span class="diff-add">policy</span></a> <span class="diff-add">attached to the </span><a title="policy subject" href="#policy_subject"><span class="diff-add">policy subjects</span></a> <span class="diff-add">associated with
-	the element information item that contains it.</span>]</p></div></div><div class="div2">
+be associated. ]</span></p><p><span class="diff-chg">[<a name="policy_scope" title="policy scope">Definition</a>: A <b>policy <span class="diff-del">is a
+collection of policy
+alternatives. 
+
+A
+</span><span class="diff-add">scope</span><span class="diff-del">policy alternative</span></b> is a collection of <span class="diff-add"><a title="policy subject" href="#policy_subject"><span class="diff-del">policy assertions.
+
+A
+</span>policy <span class="diff-del">assertion represents an individual requirement,
+</span><span class="diff-add">subjects</span></a></span><span class="diff-del">capability, </span><span class="diff-chg">to which a policy may apply.</span>]</span></p><p><span class="diff-chg">[<a name="policy_attachment" title="policy attachment">Definition</a>: A
+<b>policy <span class="diff-chg">attachment</span></b> is <span class="diff-add">a</span><span class="diff-del">an XML </span><span class="diff-chg">mechanism for associating </span><span class="diff-del">a
+</span><a title="policy" href="#policy">policy</a><span class="diff-del">, either in a </span><span class="diff-chg">with one </span>or <span class="diff-add">more</span><span class="diff-del">in
+an equivalent compact </span><span class="diff-add"><a title="policy scope" href="#policy_scope"><span class="diff-add">policy</span><span class="diff-del">form. </span><span class="diff-add">scopes</span></a></span><span class="diff-add">.</span>]</span></p><p><span class="diff-chg">[<a name="effective_policy" title="effective policy">Definition</a>: <span class="diff-chg">An
+</span><b><span class="diff-add">effective </span>policy
+<span class="diff-del">subject</span></b><span class="diff-add">, </span><span class="diff-chg">for a given </span><span class="diff-add"><a title="policy subject" href="#policy_subject"><span class="diff-add">policy</span><span class="diff-del">(e.g., </span><span class="diff-add">subject</span></a></span><span class="diff-add">,</span><span class="diff-del">an </span><span class="diff-chg">is the resultant
+combination of relevant policies. </span><span class="diff-add">The</span><span class="diff-del">policy </span><span class="diff-add">relevant</span><span class="diff-del">can
+be </span><span class="diff-chg">policies </span><span class="diff-add">are
+
+</span><span class="diff-del">A </span><span class="diff-add">those</span><span class="diff-del">policy
+</span><span class="diff-add">attached</span><span class="diff-del">scope is a collection </span><span class="diff-chg">to </span><a title="policy scope" href="#policy_scope">policy
+<span class="diff-del">subjects </span><span class="diff-add">scopes</span></a><span class="diff-del">to </span><span class="diff-add">that
+contain</span><span class="diff-del">which </span><span class="diff-chg">the </span>policy <span class="diff-add">subject.</span>]</span><span class="diff-del">may apply.</span></p><p><span class="diff-chg">[<a name="element_policy" title="element policy">Definition</a>: <span class="diff-chg">The
+	</span><b><span class="diff-chg">element policy</span></b> is <span class="diff-chg">the </span><span class="diff-add"><a title="policy" href="#policy"><span class="diff-add">policy</span></a></span><span class="diff-del">mechanism </span><span class="diff-chg">attached to </span><span class="diff-add">the </span><span class="diff-add"><a title="policy subject" href="#policy_subject">policy <span class="diff-add">subjects</span></a></span> <span class="diff-add">associated </span>with
+	<span class="diff-add">the </span><span class="diff-chg">element information item </span><span class="diff-add">that</span><span class="diff-del">policy </span><span class="diff-add">contains it.</span>]</span><span class="diff-del">scopes.</span></p></div><div class="div2">
 <h3><a name="Example"></a>2.4 Example</h3><p>This specification defines several mechanisms for
 	associating policies (Web Services Policy 1.5 - Framework, [<a href="#WS-Policy">[Web Services Policy Framework]</a>]) with various XML Web service entities. For
 	brevity, we define two sample <a title="policy expression" href="#policy_expression">policy expressions</a> that the
@@ -279,11 +307,11 @@
 	mechanisms.</p><p>When multiple attachments are made, <span class="diff-add">they must be combined
 	to ascertain </span>the
 <span class="diff-del">effective </span><span class="diff-add"><a title="effective policy" href="#effective_policy"><span class="diff-add">effective
-	</span>policy</a></span><span class="diff-del">, </span>for a <span class="diff-chg">particular </span><a title="policy subject" href="#policy_subject">policy subject</a><span class="diff-add">. This</span><span class="diff-del">, </span>is <span class="diff-add">done</span><span class="diff-del">the 
+	</span>policy</a></span><span class="diff-del">, </span>for a <span class="diff-chg">particular </span><a title="policy subject" href="#policy_subject">policy subject</a><span class="diff-chg">. </span><span class="diff-add">This </span>is <span class="diff-add">done</span><span class="diff-del">the 
 combination </span><span class="diff-add">by
 	identifying</span><span class="diff-del">of </span><span class="diff-chg">which </span><span class="diff-add"><a title="policy scope" href="#policy_scope"><span class="diff-add">policy</span><span class="diff-del">policies. </span><span class="diff-add">scopes</span></a></span><span class="diff-del">The </span><span class="diff-chg">a particular subject </span><span class="diff-add">is</span><span class="diff-del">those
 attached </span><span class="diff-chg">in </span><span class="diff-add">and
-	combining the individual policies associated with</span><span class="diff-del">policy </span><span class="diff-add">those </span>scopes
+	combining the individual policies associated with those</span><span class="diff-del">policy </span>scopes
 	<span class="diff-add">to form</span><span class="diff-del">that
 contain </span><span class="diff-chg">an </span><span class="diff-add">effective</span><span class="diff-del">policy </span><span class="diff-add">policy.</span><span class="diff-del">subject.   
 	</span></p><p>This combination can be achieved <span class="diff-chg">by </span>a <span class="diff-add"><em>merge</em></span>
@@ -1131,33 +1159,6 @@
       Replaced URI with IRI.
     
   
-  Glossaryeffective policythe
-effective policy, for a given policy subject, is the 
-combination of relevant policies. The relevant policies are those
-attached to policy scopes that
-contain the policy subject.element policyThe
-	element policy is the policy attached to the policy subjects associated with
-	the element information item that contains it.mergea merge
-	consists of serializing each policy as a
-	policy expression, replacing their
-	wsp:Policy element with a
-	wsp:All element, and placing each as
-	children of a wrapper wsp:Policy
-	element.policyA policy is a
-collection of policy
-alternatives. policy alternativeA
-policy alternative is a collection of policy assertions.policy assertionA
-policy assertion represents an individual requirement,
-capability, or other property of a behavior.policy attachmentA
-policy attachment is a mechanism for associating policy with one or more policy scopes.policy expressionA
-policy expression is an XML Infoset representation of a
-policy, either in a normal form or in
-an equivalent compact form. policy scopeA policy
-scope is a collection of policy
-subjects to which a policy may apply.policy subjectA policy
-subject is an entity (e.g., an endpoint, message, resource,
-interaction) with which a policy can
-be associated. 
   
     </p></div>
 <h2><a name="changelog"></a>D. Web Services Policy 1.5 - Attachment Change Log (Non-Normative)</h2><a name="ws-policy-attachment-changelog-table"></a><table border="1"><div class="diff-del"><tbody class="diff-del"><tr><th colspan="1" rowspan="1">Date</th><th colspan="1" rowspan="1">Author</th><th colspan="1" rowspan="1">Description</th></tr><tr><td colspan="1" rowspan="1">20060712</td><td colspan="1" rowspan="1">ASV</td><td colspan="1" rowspan="1">Updated the list of editors. Completed action items 
@@ -1183,7 +1184,7 @@
                        	Completed action items: 15 
                        	    as early as possible in the doc, use the definition that are defined in the doc.
                        	    Issue 3545,
-                       	    use of {any} and {@any} in xpath-like expressions not defined in Notational Conventions section                     	                         	
+                       	    use of {any} and {@any} in xpath-like expressions not defined in Notational Conventions section                     
           20060808
           ASV
           Implemented the 
@@ -1220,7 +1221,8 @@
             3544.                	
           20060827
           TIB
-          Completed action item:     resolution 
+          Completed action item:
+            resolution 
             for adding Conformance section.                  	
           20060827
           TIB

Index: ws-policy-framework-diff20060731.html
===================================================================
RCS file: /sources/public/2006/ws/policy/ws-policy-framework-diff20060731.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ws-policy-framework-diff20060731.html	4 Sep 2006 04:44:50 -0000	1.1
+++ ws-policy-framework-diff20060731.html	5 Sep 2006 00:18:48 -0000	1.2
@@ -74,34 +74,34 @@
         </dd><dt>Latest version:</dt><dd><a href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8">http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8</a></dd><dt>Editors:</dt><dd>Asir S Vedamuthu, Microsoft Corporation</dd><dd>David Orchard, BEA Systems, Inc.</dd><dd>Maryann Hondo, IBM Corporation</dd><dd>Toufic Boubez, Layer 7 Technologies</dd><dd>Prasad Yendluri, webMethods, Inc.</dd></dl><p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>&nbsp;©&nbsp;@@@@&nbsp;<a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/>Keio</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p></div><hr><div>
 <h2><a name="abstract">Abstract</a></h2><p>The Web Services Policy 1.5 - Framework provides a general
 	  purpose model and corresponding syntax to describe the
-	  policies of <span class="diff-del">entities in </span>a Web Service.<span class="diff-del">services-based system.</span></p><p>Web Services Policy Framework defines a base set of
+	  policies of <span class="diff-del">entities in </span>a Web <span class="diff-add">Service.</span><span class="diff-del">services-based system.</span></p><p>Web Services Policy Framework defines a base set of
 	  constructs that can be used and extended by other Web
 	  services specifications to describe a broad range of service
-	  requirements and capabilities.</p></div><div class="diff-chg"><div>
+	  requirements and capabilities.</p></div><div>
 <h2><a name="status">Status of this Document</a></h2><p><strong>This document is an editors' copy that has
-        no official standing.</strong></p><p></p></div></div><hr><div class="toc">
+        no official standing.</strong></p><p></p></div><hr><div class="toc">
 <h2><a name="contents">Table of Contents</a></h2><p class="toc">1. <a href="#tocRange">Introduction</a><br>&nbsp;&nbsp;&nbsp;&nbsp;1.1 <a href="#Goals">Goals</a><br>2. <a href="#Notation_Terminilogy">Notations and Terminology</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.1 <a href="#Notational_Conventions">Notational Conventions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.2 <a href="#XML_Namespaces">XML Namespaces</a><br>&nbsp;&nbsp;&nbsp;&nbsp;2.3 <a href="#Terminology">Terminology</a><br>3. <a href="#Policy_Model">Policy Model</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.1 <a href="#rPolicy_Assertion">Policy Assertion</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.2 <a href="#rPolicy_Alternative">Policy Alternative</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.3 <a href="#rPolicy">Policy</a><br>&nbsp;&nbsp;&nbsp;&nbsp;3.4 <a href="#Web_services">Web services</a><br>4. <a href="#rPolicy_Expression">Policy Expression</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.1 <a href="#Normal_Form_Policy_Expression">Normal Form Policy Expression</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.2 <a href="#Poicy_Identification">Policy Identification</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.3 <a href="#Compact_Policy_Expression">Compact Policy Expression</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.1 <a href="#Optional_Policy_Assertions">Optional Policy Assertions</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.2 <a href="#Policy_Assertion_Nesting">Policy Assertion Nesting</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.3 <a href="#Policy_Operators">Policy Operators</a><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;4.3.4 <a href="#Policy_Inclusion">Policy Inclusion</a><br>&nbsp;&nbsp;&nbsp;&nbsp;4.4 <a href="#Policy_Intersection">Policy Intersection</a><br>5. <a href="#Security_Considerations">Security Considerations</a><br></p>
 <h3><a name="appendix" id="appendix">Appendices</a></h3><p class="toc">A. <a href="#References">References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;A.1 <a href="#Normative-References">Normative References</a><br>&nbsp;&nbsp;&nbsp;&nbsp;A.2 <a href="#Informative-References">Other References</a><br>B. <a href="#acknowledgments">Acknowledgements</a> (Non-Normative)<br>C. <a href="#changelog">Web Services Policy 1.5 - Framework Change Log</a> (Non-Normative)<br></p></div><hr><div class="body"><div class="div1">
-<h2><a name="tocRange"></a>1. Introduction</h2><p>Web Services Policy 1.5 - Framework provides a flexible and extensible
-	    language for expressing the<span class="diff-del">policies that
+<h2><a name="tocRange"></a>1. Introduction</h2><p>Web Services Policy 1.5 - Framework <span class="diff-chg">provides </span>a <span class="diff-chg">flexible </span>and <span class="diff-chg">extensible
+	    language </span>for expressing <span class="diff-add">the</span><span class="diff-del">policies that
             refer to domain-specific </span>capabilities, requirements, and
-	    general characteristics of entities in an XML Web
-	    services-based system.
+	    general characteristics of entities in <span class="diff-chg">an XML </span><span class="diff-add">Web
+	    </span>services-based system.
             
 
-	    <span class="diff-del">A </span>Web<span class="diff-del">policy </span>Services Policy 1.5 -<span class="diff-del">of 
-	    policy </span>Framework<span class="diff-del">alternatives, </span>defines
-	    <span class="diff-del">where </span>a framework<span class="diff-del">policy </span>and<span class="diff-del">alternative 
+	    <span class="diff-del">A </span><span class="diff-add">Web</span><span class="diff-del">policy </span><span class="diff-chg">Services Policy 1.5 </span><span class="diff-add">-</span><span class="diff-del">of 
+	    policy </span><span class="diff-add">Framework</span><span class="diff-del">alternatives, </span><span class="diff-add">defines
+	    </span><span class="diff-del">where </span>a <span class="diff-add">framework</span><span class="diff-del">policy </span><span class="diff-add">and</span><span class="diff-del">alternative 
 	    is </span>a
-	    model for the<span class="diff-del">policy </span>expression<span class="diff-del">assertions.
-		A </span>of<span class="diff-del">policy </span>these<span class="diff-del">assertion 
-		represents </span>properties as
-	    policies.</p><div class="diff-chg"><p class="diff-chg">Web<span class="diff-del">individual </span>Services Policy 1.5 - Framework defines a <span class="diff-del">behavior.
-	    A </span>policy to<span class="diff-del">expression 
-		is an </span>be a collection of <span class="diff-del">a </span>policy
-	    alternatives,<span class="diff-del">, 
-		either in </span>where each policy alternative is a
-	    collection<span class="diff-del">an </span>of policy assertions.<span class="diff-del">form. </span>Some policy assertions
+	    <span class="diff-chg">model for </span><span class="diff-add">the</span><span class="diff-del">policy </span><span class="diff-add">expression</span><span class="diff-del">assertions.
+		A </span><span class="diff-add">of</span><span class="diff-del">policy </span><span class="diff-add">these</span><span class="diff-del">assertion 
+		represents </span><span class="diff-chg">properties </span><span class="diff-add">as
+	    policies.</span></p><div class="diff-add"><p class="diff-add"><span class="diff-add">Web</span><span class="diff-del">individual </span><span class="diff-chg">Services Policy 1.5 - Framework defines </span>a <span class="diff-del">behavior.
+	    A </span>policy <span class="diff-add">to</span><span class="diff-del">expression 
+		is an </span><span class="diff-chg">be a collection </span>of <span class="diff-del">a </span>policy
+	    <span class="diff-add">alternatives,</span><span class="diff-del">, 
+		either in </span><span class="diff-chg">where each policy alternative is </span><span class="diff-add">a
+	    collection</span><span class="diff-del">an </span><span class="diff-chg">of policy </span><span class="diff-add">assertions.</span><span class="diff-del">form. </span>Some policy assertions
 	    specify traditional requirements and capabilities that
 	    will ultimately manifest on the wire (e.g., authentication
 	    scheme, transport protocol selection). Other policy
@@ -109,16 +109,18 @@
 	    proper service selection and usage (e.g., privacy policy,
 	    QoS characteristics). Web Services Policy 1.5 - Framework provides a single policy
 	    language to allow both kinds of assertions to be reasoned
-	    about in a consistent manner.</p></div><p>Web Services Policy 1.5 - Framework does not specify how policies are<span class="diff-del">or 
-	    policy </span>discovered<span class="diff-del">attachment.
+	    about in a consistent manner.</p></div><p>Web Services Policy 1.5 - Framework does not specify <span class="diff-chg">how policies </span><span class="diff-add">are</span><span class="diff-del">or 
+	    policy </span><span class="diff-add">discovered</span><span class="diff-del">attachment.
 	    A 
 	    policy attachment is a mechanism for associating 
-	    policy with one </span>or attached<span class="diff-del">more policy scopes.
+	    policy with one </span>or <span class="diff-add">attached</span><span class="diff-del">more policy scopes.
 				A policy scope is a collection of 
 	    policy subjects </span>to <span class="diff-del">which a policy may apply.
 				A policy subject is an entity 
 	    (e.g., an endpoint, message, resource, interaction) with which </span>a 
-	    <span class="diff-del">policy can </span>Web service. Other specifications are
+	    <span class="diff-del">policy </span><span class="diff-add">Web</span><span class="diff-del">can be </span><span class="diff-chg">service. 
+
+	    </span>Other specifications are
 	    free to define technology-specific mechanisms for
 	    associating policy with various entities and
 	    resources. Web Services Policy 1.5 - Attachment [<a href="#WS-PolicyAttachment">[Web Services Policy Attachment]</a>]
@@ -143,18 +145,18 @@
 	    policy alternatives. A valid interpretation of the policy
 	    above would be that an invocation of a Web service uses
 	    one of the algorithm suite assertions (Lines 03-04)
-	    specified.</p><div class="diff-chg"><div class="div2">
-<h3><a name="Goals"></a>1.1 Goals</h3><p>The goal of Web Services Policy 1.5 - Framework is to provide the mechanisms
+	    specified.</p><div class="diff-add"><div class="div2">
+<h3><a name="Goals"></a>1.1 <span class="diff-add">Goals</span></h3><p><span class="diff-add">The goal of Web Services Policy 1.5 - Framework is to provide the mechanisms
 	      needed to enable Web services applications to specify
 	      policy information. Specifically, this specification
-	      defines the following:</p><ul><li><p>An XML Infoset called a <em>policy
-		expression</em> that contains domain-specific, Web
-		Service policy information.</p></li><li><p>A core set of constructs to indicate how
+	      defines the following:</span></p><ul><li><p><span class="diff-add">An XML Infoset called a </span><em><span class="diff-add">policy
+		expression</span></em> <span class="diff-add">that contains domain-specific, Web
+		Service policy information.</span></p></li><li><p><span class="diff-add">A core set of constructs to indicate how
 		choices and/or combinations of domain-specific policy
 		assertions apply in a Web services
-		environment.</p></li></ul><p>Web Services Policy 1.5 - Framework is designed to work with the
+		environment.</span></p></li></ul><p><span class="diff-add">Web Services Policy 1.5 - Framework is designed to work with the
 	      general Web services framework, including WSDL service
-	      descriptions [<a href="#WSDL11">[WSDL 1.1]</a>, <a href="#WSDL20">[WSDL 2.0 Core Language]</a>] and UDDI service registrations [<a href="#UDDIAPI20">[UDDI API 2.0]</a>, <a href="#UDDIDataStructure20">[UDDI Data Structure 2.0]</a>, <a href="#UDDI30">[UDDI 3.0]</a>].</p></div></div></div><div class="div1">
+	      descriptions [</span><a href="#WSDL11">[WSDL 1.1]</a><span class="diff-add">, </span><a href="#WSDL20">[WSDL 2.0 Core Language]</a><span class="diff-add">] and UDDI service registrations [</span><a href="#UDDIAPI20">[UDDI API 2.0]</a><span class="diff-add">, </span><a href="#UDDIDataStructure20">[UDDI Data Structure 2.0]</a><span class="diff-add">, </span><a href="#UDDI30">[UDDI 3.0]</a><span class="diff-add">].</span></p></div></div></div><div class="div1">
 <h2><a name="Notation_Terminilogy"></a>2. Notations and Terminology</h2><p>This section specifies the notations, namespaces, and terminology used in this specification.</p><div class="div2">
 <h3><a name="Notational_Conventions"></a>2.1 Notational Conventions</h3><p>This specification uses the following syntax within normative outlines: </p><ul><li><p>The syntax appears as an XML instance, but values
 		in <em>italics</em> indicate data types instead of
@@ -170,28 +172,28 @@
 	    Element or Attribute Information Items.
 	    
 	  
-	  <span class="diff-del">Elements and Attributes defined by this </span>Information Items
-	    <span class="diff-chg"><span class="rfc2119">MAY</span></span><span class="diff-del">are </span>be added at the indicated<span class="diff-del">text of this document using 
-XPath 1.0 [XPATH 1.0] expressions. Extensibility </span>extension
-	    points but<span class="diff-del">are referred to </span><span class="diff-add"><span class="rfc2119">MUST<span class="diff-del">using </span>NOT</span></span><span class="diff-del">an </span>contradict the
-	    semantics<span class="diff-del">version </span>of the<span class="diff-del">this 
+	  <span class="diff-del">Elements and Attributes defined by this </span><span class="diff-chg">Information </span><span class="diff-add">Items
+	    </span><span class="diff-add"><span class="rfc2119"><span class="diff-add">MAY</span></span></span><span class="diff-del">are </span><span class="diff-chg">be added at </span>the <span class="diff-add">indicated</span><span class="diff-del">text of this document using 
+XPath 1.0 [XPATH 1.0] expressions. Extensibility </span><span class="diff-add">extension
+	    </span>points <span class="diff-add">but</span><span class="diff-del">are referred to </span><span class="diff-add"><span class="rfc2119"><span class="diff-add">MUST</span><span class="diff-del">using </span><span class="diff-add">NOT</span></span></span><span class="diff-del">an </span><span class="diff-chg">contradict </span><span class="diff-add">the
+	    semantics</span><span class="diff-del">version </span>of <span class="diff-add">the</span><span class="diff-del">this 
 syntax:
     
         
-        	An </span>element information<span class="diff-del">extensibility point </span>item indicated by the
-	    <span class="diff-chg"><em>parent</em></span><span class="diff-del">using </span>or <span class="diff-chg"><em>owner</em></span><span class="diff-del">in </span>property of the
-	    extension. <span class="diff-del">element name. This 
-indicates that any element </span>If a processor does not recognize an Attribute
-	    Information<span class="diff-del">other </span>Item, the processor<span class="diff-del">http://www.w3.org/@@@@/@@/policy 
+        	An </span>element <span class="diff-add">information</span><span class="diff-del">extensibility point </span><span class="diff-chg">item indicated by </span><span class="diff-add">the
+	    </span><span class="diff-add"><em><span class="diff-add">parent</span></em></span><span class="diff-del">using </span><span class="diff-chg">or </span><span class="diff-add"><em><span class="diff-add">owner</span></em></span><span class="diff-del">in </span><span class="diff-chg">property </span>of the
+	    <span class="diff-add">extension. </span><span class="diff-del">element name. This 
+indicates that any element </span><span class="diff-chg">If a processor does not recognize an </span><span class="diff-add">Attribute
+	    Information</span><span class="diff-del">other </span><span class="diff-chg">Item, </span>the <span class="diff-add">processor</span><span class="diff-del">http://www.w3.org/@@@@/@@/policy 
 namespace. 
 		
 		
-			An </span><span class="diff-add"><span class="rfc2119">SHOULD</span></span>
-	    ignore<span class="diff-del">attribute </span>it; if a processor does not recognize an Element
-	    Information<span class="diff-del">place </span>Item, the processor<span class="diff-del">attribute name. This 
-indicates that any attribute name can be used, from any namespace </span><span class="diff-add"><span class="rfc2119">SHOULD</span></span>
-	    treat<span class="diff-del">other </span>it as an<span class="diff-del">http://www.w3.org/@@@@/@@/policy 
-namespace. </span>assertion.</p></li></ul><p>
+			An </span><span class="diff-add"><span class="rfc2119"><span class="diff-add">SHOULD</span></span></span>
+	    <span class="diff-add">ignore</span><span class="diff-del">attribute </span><span class="diff-chg">it; if a processor does not recognize an </span><span class="diff-add">Element
+	    Information</span><span class="diff-del">place </span><span class="diff-chg">Item, </span>the <span class="diff-add">processor</span><span class="diff-del">attribute name. This 
+indicates that any attribute name can be used, </span><span class="diff-add"><span class="rfc2119"><span class="diff-add">SHOULD</span></span></span>
+	    <span class="diff-add">treat</span><span class="diff-del">from any namespace other </span><span class="diff-chg">it as </span><span class="diff-add">an</span><span class="diff-del">http://www.w3.org/@@@@/@@/policy 
+namespace. </span><span class="diff-add">assertion.</span></p></li></ul><p>
 	    Normative text within this specification takes precedence
 	    over normative outlines, which in turn take precedence
 	    over the XML Schema [<a href="#XMLSchemaPart1">[XML Schema Structures]</a>]
@@ -237,9 +239,13 @@
 	      "<span class="rfc2119">MAY</span>", and
 	      "<span class="rfc2119">OPTIONAL</span>" in this document are to be
 	      interpreted as described in RFC 2119 [<a href="#RFC2119">[IETF RFC 2119]</a>].
-	    </p><p>We introduce the following terms that are used throughout this document:</p><p><span class="diff-chg">[<a name="policy" title="policy">Definition</a>: A <b>policy</b><span class="diff-del">EdNote: </span>is a collection of <a title="policy alternative" href="#policy_alternative">policy alternatives</a>.]</span></p><div class="diff-chg"><p class="diff-chg">[<a name="policy_alternative" title="policy alternative">Definition</a>: A <b>policy alternative</b> is a collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.]</p></div><div class="diff-chg"><p class="diff-chg">[<a name="policy_assertion" title="policy assertion">Definition</a>: A <b>policy assertion</b> represents an individual requirement, capability, or other property of a behavior.]</p></div><div class="diff-chg"><p class="diff-chg">[<a name="policy_assertion_type" title="policy assertion type">Definition</a>: A <b>policy assertion type</b> represents a class of <a title="policy assertion" href="#policyassertion">policy assertions</a> and implies a schema for the assertion and assertion-specific semantics.]</p></div><div class="diff-chg"><p class="diff-chg">[<a name="policy_assertion_parameter" title="policy assertion parameter">Definition</a>: A <b>policy assertion parameter</b> qualifies the behavior indicated by a <a title="policy assertion" href="#policy_assertion">policy assertion</a>.]</p></div><div class="diff-chg"><p class="diff-chg">[<a name="policy_vocabulary" title="policy vocabulary">Definition</a>: A <b>policy<span class="diff-del">will </span>vocabulary</b> of a policy is the set of all <a title="policy assertion type" href="#policy_assertion_type">policy assertion types</a> used in a policy.]</p></div><div class="diff-chg"><p class="diff-chg">[<a name="policy_expression" title="policy expression">Definition</a>: A <b>policy expression</b> is an XML Infoset representation of a <a title="policy" href="#policy">policy</a>, either in a normal form or in an equivalent compact form. ]</p></div><dv class="diff-chg"><p class="diff-chg">[<a name="policy_subject" title="policy subject">Definition</a>: A <b>policy subject</b> is an entity (e.g., an endpoint, message, resource, interaction) with which a <a title="policy" href="#policy">policy</a> can be associated. ]</p></div><div class="diff-chg"><p class="diff-chg">[<a name="policy_scope" title="policy scope">Definition</a>: A <b>policy scope</b> is a collection of <a title="policy subject" href="#policy_subject">policy subjects</a> to which a policy may apply.]</p></div><div class="diff-chg"><p class="diff-chg">[<a name="policy_attachment" title="policy attachment">Definition</a>: A <b>policy attachment</b> is a mechanism for associating <a title="policy" href="#policy">policy</a> with<span class="diff-del">insert </span>one or more <a title="policy scope" href="#policy_scope">policy<span class="diff-del">termdefs </span>scopes</a>.]</p></div><div class="diff-del"><p class="diff-del">here
-	    </p></div></div></div><div class="div1">
-<h2><a name="Policy_Model"></a>3. Policy Model</h2><p>This section defines an abstract model for policies and for operations upon policies.</p><p>This<span class="diff-del">The descriptions below use XML Infoset terminology for convenience of description. However, this </span>abstract model <span class="diff-del">itself </span>is independent of how it is represented as an XML Infoset. </p><div class="div2">
+	    </p><p>We introduce the following terms that are used throughout this document:</p><div class="diff-del"><p class="diff-del">policy</p></div><p><span class="diff-add">[<a name="policy" title="policy">Definition</a>: A <b>policy</b> is a collection of <a title="policy alternative" href="#policy_alternative">policy alternatives</a><span class="diff-add">.</span>]</span><span class="diff-del">, </span></p><div class="diff-del"><p class="diff-del">policy alternative</p></div><p><span class="diff-add">[<a name="policy_alternative" title="policy alternative">Definition</a>: <span class="diff-add">A</span><span class="diff-del">a </span><b>policy alternative</b> is a collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>.]</span></p><div class="diff-del"><p class="diff-del">policy assertion</p></div><p><span class="diff-add">[<a name="policy_assertion" title="policy assertion">Definition</a>: A <b>policy assertion</b> represents an individual requirement, capability, or othe property of a behavior.]</span><span class="diff-del">policy assertion parameterA policy assertion parameter 
+	    qualifies the behavior indicated by a policy assertion.</span></p><div class="diff-del"><p class="diff-del">policy assertion type</p></div><p><span class="diff-add">[<a name="policy_assertion_type" title="policy assertion type">Definition</a>: A <b>policy assertion type</b> represents a class of <a title="policy assertion" href="#policy_assertion">policy assertions</a> and implies a schema for the assertion and assertion-specific semantics.]</span></p><div class="diff-add"><p class="diff-add">[<a name="policy_assertion_parameter" title="policy assertion parameter">Definition</a>: <span class="diff-add">A </span><b>policy <span class="diff-add">assertion parameter</span></b> <span class="diff-add">qualifies the behavior indicated by a </span><a title="policy assertion" href="#policy_assertion"><span class="diff-add">policy assertion</span></a><span class="diff-add">.</span>]</p></div><div class="diff-del"><p class="diff-del">attachment</p></div><p><span class="diff-add">[<a name="policy_vocabulary" tite="policy vocabulary">Definition</a>: A <b>policy <span class="diff-chg">vocabulary</span></b> <span class="diff-chg">of </span>a <span class="diff-chg">policy is </span><span class="diff-add">the set of all </span><a title="policy assertion type" href="#policy_assertion_type"><span class="diff-del">associating 
+	    </span>policy <span class="diff-chg">assertion </span><span class="diff-add">types</span></a><span class="diff-del">one </span><span class="diff-chg">used in </span><span class="diff-add">a</span><span class="diff-del">policy </span><span class="diff-add">policy.</span>]</span><span class="diff-del">scopes.</span></p><div class="diff-del"><p class="diff-del">policy expression</p></div><p><span class="diff-add">[<a name="policy_expression" title="policy expression">Definition</a>: A <b>policy expression</b> is an XML Infoset representation of a <a title="policy" href="#policy">policy</a>, either in a normal form or in an equivalent compact form.<span class="diff-del">policy </span>]</span></p><div class="diff-del"><p class="diff-del">scope</p></div><p><span class="diff-add">[<a name="policy_subject" title="policy subject">Definition</a>: A <b>policy <span class="diff-chg">subject</span></b> is <span class="diff-chg">an entity </span><span class="diff-add">(e.g.,</span><span class="diff-del">of 
+	    policy </span><span class="diff-add">an</span><span class="diff-del">subjects </span><span class="diff-add">endpoint, message, resource, interaction) with</span><span class="diff-del">to </span>which a <a title="policy" href="#policy">policy</a> <span class="diff-chg">can </span><span class="diff-add">be</span><span class="diff-del">apply.policy </span><span class="diff-add">associated. </span>]</span></p><div class="diff-del"><p class="diff-del">subject</p></div><p><span class="diff-add">[<a name="policy_scope" title="policy scope">Definition</a>: A <b>policy <span class="diff-chg">scope</span></b> is <span class="diff-add">a</span><span class="diff-del">an entity 
+	    (e.g., an </span><span class="diff-chg">collection of </span><a title="policy subject" href="#policy_subject"><span class="diff-add">policy</span><span class="diff-del">resource, </span><span class="diff-add">subjects</span></a><span class="diff-del">interaction) </span><span class="diff-chg">to </span>which a 
+	    <span class="diff-del">policy can </span><span class="diff-chg">policy may </span><span class="diff-add">apply.</span>]</span></p><div class="diff-del"><p class="diff-del">policy vocabulary</p></div><p><span class="diff-add">[<a name="policy_attachment" title="policy attachment">Definition</a>: A <b>policy <span class="diff-chg">attachment</span></b> is <span class="diff-chg">a mechanism for associating </span><span class="diff-chg"><a title="policy" href="#policy">policy</a></span> <span class="diff-chg">with </span><span class="diff-add">one</span><span class="diff-del">types </span><span class="diff-chg">or more </span><a title="policy scope" href="#policy_scope"><span class="diff-add">policy</span><span class="diff-del">a </span><span class="diff-add">scopes</span></a><span class="diff-add">.</span>]</span><span class="diff-del">policy.</span></p></div></div><div class="div1">
+<h2><a name="Policy_Model"></a>3. Policy Model</h2><p>This section defines an abstract model for policies and for operations upon policies.</p><p><span class="diff-add">This</span><span class="diff-del">The descriptions below use XML Infoset terminology for convenience of description. However, this </span>abstract model <span class="diff-del">itself </span>is independent of how it is represented as an XML Infoset. </p><div class="div2">
 <h3><a name="rPolicy_Assertion"></a>3.1 Policy Assertion</h3><p>A <a title="policy assertion" href="#policy_assertion">policy
 	    assertion</a> identifies a behavior that is a
 	    requirement (or capability) of a <a title="policy subject" href="#policy_subject">policy
@@ -263,8 +269,8 @@
 	    assertion. For example, security policy domain authors may
 	    define an assertion describing a set of security
 	    algorithms to qualify the specific behavior of a security
-	    binding assertion. </p><p>The XML Infoset of an<span class="diff-del">a policy </span>assertion <span class="rfc2119">MAY</span> contain a non-empty
-	    [attributes] <span class="diff-del">attributes </span>property and/or a non-empty <em>children</em>
+	    binding assertion. </p><p>The XML Infoset of <span class="diff-add">an</span><span class="diff-del">a policy </span>assertion <span class="rfc2119">MAY</span> contain a non-empty
+	    <span class="diff-add">[attributes] </span><span class="diff-del">attributes </span>property and/or a non-empty <em>children</em>
 	    property. Such content <span class="rfc2119">MAY</span> be used to parameterize the
 	    behavior indicated by the assertion.  
 	    <span class="diff-del">A policy assertion parameter 
@@ -279,7 +285,7 @@
 	    expressions. Specifically, domain authors are encouraged
 	    to consider when the identity of the root Element
 	    Information Item alone is enough to convey the requirement
-	    (capability).<span class="diff-del">or capability.</span></p></div><div class="div2">
+	    <span class="diff-add">(capability).</span><span class="diff-del">or capability.</span></p></div><div class="div2">
 <h3><a name="rPolicy_Alternative"></a>3.2 Policy Alternative</h3><p>A <a title="policy alternative" href="#policy_alternative">policy
 	    alternative</a> is a logical construct which
 	    represents a potentially empty collection of <a title="policy assertion" href="#policy_assertion">policy assertions</a>. An
@@ -289,10 +295,10 @@
 	    assertions. </p><p>The vocabulary of a policy alternative is the set of
 	    all <a title="policy assertion type" href="#policy_assertion_type">policy assertion
 	    types</a> within the alternative. 
-	    <span class="diff-del">A </span>The<span class="diff-del">policy </span><span class="diff-add"><a title="policy vocabulary" href="#policy_vocabulary">vocabulary of
-	    a policy</a></span> is the set of all 
-	    <span class="diff-del">policy </span>assertion types used in all the<span class="diff-del">policy.
-	    </span>policy alternatives in the policy. An assertion whose type
+	    <span class="diff-del">A </span><span class="diff-add">The</span><span class="diff-del">policy </span><span class="diff-add"><a title="policy vocabulary" href="#policy_vocabulary">vocabulary <span class="diff-add">of
+	    a policy</span></a></span> is the set of all 
+	    <span class="diff-del">policy </span>assertion types used in <span class="diff-chg">all </span><span class="diff-add">the</span><span class="diff-del">policy.
+	    </span><span class="diff-add">policy alternatives in the policy. </span>An assertion whose type
 	    is part of the policy's vocabulary but is not included in
 	    an alternative is explicitly prohibited by the
 	    alternative.</p><p>Assertions within an alternative are not ordered, and
@@ -319,8 +325,8 @@
 	    the alternative and is therefore beyond the scope of this
 	    specification.</p></div><div class="div2">
 <h3><a name="Web_services"></a>3.4 Web services</h3><p>Applied in the Web services model, <a title="policy" href="#policy">policy</a> is used to convey conditions
-	    on an interaction between two<span class="diff-del">a Web service requestor and a </span>Web service
-	    endpoints. Satisfying assertions in the policy usually
+	    on an interaction between <span class="diff-add">two</span><span class="diff-del">a Web service requestor and a </span>Web service
+	    <span class="diff-chg">endpoints. </span>Satisfying assertions in the policy usually
 	    results in behavior that reflects these
 	    conditions. Typically, the provider of a Web service
 	    exposes a policy to convey conditions under which it
@@ -331,14 +337,14 @@
 	    <span class="rfc2119">MUST</span> choose only a single alternative
 	    for an interaction with a service since each represents an
 	    alternative configuration.</p><p>A <a title="policy assertion" href="#policy_assertion">policy
-	    assertion</a> is <span class="diff-chg"><em>supported</em></span> by a
+	    assertion</a> is <span class="diff-add"><em>supported</em></span> by a
 	    requester if and only if the requester satisfies the
 	    requirement (or accommodates the capability) corresponding
 	    to the assertion. A <a title="policy alternative" href="#policy_alternative">policy alternative</a> is
-	    <span class="diff-chg"><em>supported</em></span> by a requester if and only if the
+	    <span class="diff-add"><em>supported</em></span> by a requester if and only if the
 	    requester supports all the assertions in the
 	    alternative. And, a <a title="policy" href="#policy">policy</a>
-	    is <span class="diff-chg"><em>supported</em></span> by a requester if and only if
+	    is <span class="diff-add"><em>supported</em></span> by a requester if and only if
 	    the requester supports at least one of the alternatives in
 	    the policy. Note that although policy alternatives are
 	    meant to be mutually exclusive, it cannot be decided in
@@ -348,7 +354,7 @@
 	    the <a title="policy vocabulary" href="#policy_vocabulary">vocabulary of the
 	    policy</a>; the requester only has to understand the
 	    type of each assertion in the vocabulary of a <a title="policy alternative" href="#policy_alternative">policy
-	    alternative</a>. <span class="diff-del">the requester supports. </span>This characteristic is crucial to
+	    alternative</a><span class="diff-add">. </span><span class="diff-del">the requester supports. </span>This characteristic is crucial to
 	    versioning and incremental deployment of new assertions
 	    because this allows a provider's policy to include new
 	    assertions in new alternatives while allowing requesters
@@ -399,37 +405,37 @@
 (07)&nbsp; &nbsp; &nbsp; &nbsp;&lt;sp:TripleDesRsa15 /&gt;
 (08)&nbsp; &nbsp; &nbsp;&lt;/wsp:All&gt;
 (09)&nbsp; &nbsp;&lt;/wsp:ExactlyOne&gt;
-(10) &lt;/wsp:Policy&gt;</pre></div><p>Lines (02-05) and Lines (06-08) express the two alternatives in the
+(10) &lt;/wsp:Policy&gt;</pre></div><p>Lines <span class="diff-chg">(02-05) </span>and Lines (06-08) express the two alternatives in the
 policy. If the first alternative is selected, only the Basic 256 RSA
 15 algorithm suite [<a href="#WS-SecurityPolicy">[WS-SecurityPolicy]</a>] is supported;
 conversely, if the second alternative is selected, only the 3DES RSA
 15 algorithm suite is supported. </p></div><div class="div2">
 <h3><a name="Policy_Identification"></a>4.2 Policy Identification</h3><p>A <a title="policy expression" href="#policy_expression">policy expression</a>
-<span class="rfc2119">MAY</span> be associated with a URI [<span class="diff-chg"><a href="#RFC3986">[IETF RFC 3986]</a></span>]. The schema outline
-for attributes to associate a URI is as follows:</p><div class="exampleInner"><pre>&lt;wsp:Policy ( Name="<em>xs:anyURI</em>" )?
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; ( wsu:Id="<em>xs:ID</em>" )?
+<span class="rfc2119">MAY</span> be associated with <span class="diff-chg">a URI </span>[<span class="diff-chg"><a href="#RFC3986">[IETF RFC 3986]</a></span>]. The schema outline
+for attributes to associate <span class="diff-chg">a URI </span>is as follows:</p><div class="exampleInner"><pre>&lt;wsp:Policy ( Name="<em>xs:anyURI</em><span class="diff-add">" )?
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; ( wsu:Id="</span><em>xs:ID</em>" )?
 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; … &gt;
 &nbsp; …
-&lt;/wsp:Policy&gt;</pre></div><p>The following describes the Attribute Information Items listed and defined in the schema outline above:</p><dl><dt class="label"><code class="attr">/wsp:Policy/@Name</code> </dt><dd><p>The identity of the policy expression as an absolute URI [<span class="diff-chg"><a href="#RFC3986">[IETF RFC 3986]</a></span>]. If
-omitted, there is no implied value. This URI <span class="rfc2119">MAY</span> be
+&lt;/wsp:Policy&gt;</pre></div><p>The following describes the Attribute Information Items listed and defined in the schema outline above:</p><dl><dt class="label"><code class="attr">/wsp:Policy/@Name</code> </dt><dd><p>The identity of the policy expression as an absolute <span class="diff-chg">URI </span>[<span class="diff-chg"><a href="#RFC3986">[IETF RFC 3986]</a></span>]. If
+omitted, there is no implied value. This <span class="diff-chg">URI </span><span class="rfc2119">MAY</span> be
 used to refer to a policy from other XML documents using a <a title="policy attachment" href="#policy_attachment">policy attachment</a> mechanism such as
-those defined in WS-PolicyAttachment [<a href="#WS-PolicyAttachment">[Web Services Policy Attachment]</a>]. </p></dd><dt class="label"><code class="attr">/wsp:Policy/@wsu:Id<span class="diff-del">/wsp:Policy/(@wsu:Id | @xml:id)</span></code> </dt><dd><p>The identity of the policy expression as an <code>ID</code> within the
+those defined in WS-PolicyAttachment [<a href="#WS-PolicyAttachment">[Web Services Policy Attachment]</a>]. </p></dd><dt class="label"><code class="attr"><span class="diff-add">/wsp:Policy/@wsu:Id</span><span class="diff-del">/wsp:Policy/(@wsu:Id | @xml:id)</span></code> </dt><dd><p>The identity of the policy expression as an <code>ID</code> within the
 enclosing XML document. If omitted, there is no implied value. To
-refer to this policy expression, a URI-reference
-&nbsp;<span class="rfc2119">MAY</span> be formed using this value per Section 4.2 of
-WS-Security [<a href="#WS-Security">[WS-Security 2004]</a>].<span class="diff-del">] when @wsu:Id is used.
+refer to this policy expression, <span class="diff-chg">a URI-reference
+</span>&nbsp;<span class="rfc2119">MAY</span> be formed using this value per Section 4.2 of
+WS-Security [<a href="#WS-Security">[WS-Security 2004]</a><span class="diff-add">].</span><span class="diff-del">] when @wsu:Id is used.
     The use of xml:id attribute in conjunction with Canonical XML 1.0 is 
     inappropriate as described in Appendix C of xml:id Version 1.0 [] 
     and thus this combination must be avoided (see []). For example, 
     a policy expression identified using xml:id attribute should not be signed 
     using XML Digital Signature when Canonical XML 1.0 is being used as 
     the canonicalization method.</span></p></dd></dl><p>The following example illustrates how to associate a policy
-expression with the absolute URI
-<code>"http://www.example.com/policies/P1"</code>:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
+expression with the absolute <span class="diff-chg">URI
+</span><code>"http://www.example.com/policies/P1"</code>:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
 &nbsp; &nbsp; &nbsp;   Name="http://www.example.com/policies/P1"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/@@@@/@@/policy" &gt;
 (02)&nbsp; &nbsp;&lt;!-- Details omitted for readability --&gt;
-(03) &lt;/wsp:Policy&gt;</pre></div><p>The following example illustrates how to associate a policy expression with the URI-reference <code>"#P1"</code>:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
+(03) &lt;/wsp:Policy&gt;</pre></div><p>The following example illustrates how to associate a policy expression with the <span class="diff-chg">URI-reference </span><code>"#P1"</code>:</p><div class="exampleInner"><pre>(01) &lt;wsp:Policy
 &nbsp; &nbsp; &nbsp; &nbsp; wsu:Id="P1"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsp="http://www.w3.org/@@@@/@@/policy"
 &nbsp; &nbsp; &nbsp; &nbsp; xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" &gt;
@@ -713,16 +719,16 @@
 (16)&nbsp; &nbsp; &nbsp;&lt;/wsp:All&gt;
 (17)&nbsp; &nbsp;&lt;/wsp:ExactlyOne&gt;
 (18) &lt;/wsp:Policy&gt;</pre></div><p>Note that the two alternatives listed in Lines (03-06) in the second listing are combined with the two alternatives listed in Lines (09-14) in the second listing to create four alternatives in the normalized policy, Lines (03-06), (07-10), (11-13), and (14-16).</p></div><div class="div3">
-<h4><a name="Policy_Inclusion"></a>4.3.4 Policy Inclusion</h4><p>In order to share <a title="policy assertion" href="#policy_assertion">assertions</a> across <a title="policy expression" href="#policy_expression">policy expressions</a>, the <code class="elt">wsp:PolicyReference</code>  element <span class="rfc2119">MAY</span> be present anywhere a policy assertion is allowed inside a policy expression. This element is used to include the content of one policy expression in another policy expression.</p><p>When a <code class="elt">wsp:PolicyReference</code>  element references a <code class="elt">wsp:Policy</code>  element, then the semantics of inclusion are simply to replace the <code class="elt">wsp:PolicyReference</code>  element with a <code class="elt">wsp:All</code>  element whose <em>children</em> property is the same as the <em>children</em> property of the referenced <code class="elt">wsp:Policy</code>  element. That is, the contents of the referenced policy <span class="diff-chg"><em>conceptuallyreplace</em></span> the <code class="elt">wsp:PolicyReference</code>  element and are wrapped in a <code class="elt">wsp:All</code>  operator. Using the <code class="elt">wsp:PolicyReference</code>  element, a policy expression <span class="rfc2119">MUST NOT</span> reference itself either directly or indirectly. (Note: References that have a <code class="attr">@Digest</code>  attribute <span class="rfc2119">SHOULD</span> be validated before being included.)</p><p>The schema outline for the <code class="elt">wsp:PolicyReference</code>  element is as follows:</p><div class="exampleInner"><pre>&lt;wsp:Policy&gt;
+<h4><a name="Policy_Inclusion"></a>4.3.4 Policy Inclusion</h4><p>In order to share <a title="policy assertion" href="#policy_assertion">assertions</a> across <a title="policy expression" href="#policy_expression">policy expressions</a>, the <code class="elt">wsp:PolicyReference</code>  element <span class="rfc2119">MAY</span> be present anywhere a policy assertion is allowed inside a policy expression. This element is used to include the content of one policy expression in another policy expression.</p><p>When a <code class="elt">wsp:PolicyReference</code>  element references a <code class="elt">wsp:Policy</code>  element, then the semantics of inclusion are simply to replace the <code class="elt">wsp:PolicyReference</code>  element with a <code class="elt">wsp:All</code>  element whose <em>children</em> property is the same as the <em>children</em> property of the referenced <code class="elt">wsp:Policy</code>  element. That is, the contents of the referenced policy <span class="diff-add"><em>conceptuallyreplace</em></span> the <code class="elt">wsp:PolicyReference</code>  element and are wrapped in a <code class="elt">wsp:All</code>  operator. Using the <code class="elt">wsp:PolicyReference</code>  element, a policy expression <span class="rfc2119">MUST NOT</span> reference itself either directly or indirectly. (Note: References that have a <code class="attr">@Digest</code>  attribute <span class="rfc2119">SHOULD</span> be validated before being included.)</p><p>The schema outline for the <code class="elt">wsp:PolicyReference</code>  element is as follows:</p><div class="exampleInner"><pre>&lt;wsp:Policy&gt;
 &nbsp; …
 &nbsp; &lt;wsp:PolicyReference
 &nbsp; &nbsp; &nbsp; URI="<em>xs:anyURI</em>"
 &nbsp; &nbsp; ( Digest="<em>xs:base64Binary</em>" ( DigestAlgorithm="<em>xs:anyURI</em>" )? )?
 &nbsp; &nbsp;   … /&gt;
 &nbsp; …
-&lt;/wsp:Policy&gt;&nbsp;</pre></div><p>The following describes the Attribute and Element Information Items defined in the schema outline above:</p><dl><dt class="label"><code class="elt">/wsp:Policy/…/wsp:PolicyReference</code> </dt><dd><p>This element references a policy expression that is being included.</p></dd><dt class="label"><code class="attr">/wsp:Policy/…/wsp:PolicyReference/@URI</code> </dt><dd><p>This attribute references a policy expression by URI.<span class="diff-del">an IRI. </span>For a policy expression within the same XML Document, the reference <span class="rfc2119">SHOULD</span> be a<span class="diff-del">an 
-IRI-reference </span>URI-reference to a policy expression identified by an <code>ID</code>. For an external policy expression, there is no requirement that the URI be resolvable; retrieval mechanisms are beyond the scope of this specification. After retrieval, there is no requirement to check that the retrieved policy expression is associated (Section <a href="#Policy_Identification"><b>4.2 Policy Identification</b></a>) with this URI. &nbsp;The<span class="diff-del">&nbsp;
-The </span>URI included in the retrieved policy expression, if any, <span class="rfc2119">MAY</span> be different than the URI used to retrieve the policy expression. </p></dd><dt class="label"><code class="attr">/wsp:Policy/…/wsp:PolicyReference/@Digest</code> </dt><dd><p>This optional attribute specifies the digest of the referenced policy expression. This is used to ensure the included policy is the expected policy. &nbsp;If omitted, there is no implied value.</p></dd><dt class="label"><code class="attr">/wsp:Policy/…/wsp:PolicyReference/@DigestAlgorithm</code> </dt><dd><p>This optional URI attribute specifies the digest algorithms being used. This specification predefines the default algorithm below, although additional algorithms can be expressed. </p></dd></dl><table border="1" cellpadding="5" cellspacing="0"><thead><tr><th colspan="1" rowspan="1">URI</th><th colspan="1" rowspan="1">Description</th></tr></thead><tbody><tr><td colspan="1" rowspan="1"><code>http://www.w3.org/@@@@/@@/policy/Sha1Exc<code> (implied)</td><td colspan="1" rowspan="1">The digest is a SHA1 hash over the octet stream resulting from using the Exclusive XML canonicalization defined for XML Signature [<a href="#XML-Signature">[XML-Signature]</a>].</td></tr></tbody></table><br><div class="diff-del"><p class="diff-del">/wsp:Policy/…/wsp:PolicyReference/@{any}
+&lt;/wsp:Policy&gt;&nbsp;</pre></div><p>The following describes the Attribute and Element Information Items defined in the schema outline above:</p><dl><dt class="label"><code class="elt">/wsp:Policy/…/wsp:PolicyReference</code> </dt><dd><p>This element references a policy expression that is being included.</p></dd><dt class="label"><code class="attr">/wsp:Policy/…/wsp:PolicyReference/@URI</code> </dt><dd><p>This attribute references a policy expression by <span class="diff-add">URI.</span><span class="diff-del">an IRI. </span>For a policy expression within the same XML Document, the reference <span class="rfc2119">SHOULD</span> be <span class="diff-add">a</span><span class="diff-del">an 
+IRI-reference </span><span class="diff-add">URI-reference </span>to a policy expression identified by an <code>ID</code>. For an external policy expression, there is no requirement that the <span class="diff-chg">URI </span>be resolvable; retrieval mechanisms are beyond the scope of this specification. After retrieval, there is no requirement to check that the retrieved policy expression is associated (Section <a href="#Policy_Identification"><b>4.2 Policy Identification</b></a>) with this <span class="diff-chg">URI. </span><span class="diff-add">&nbsp;The</span><span class="diff-del">&nbsp;
+The </span><span class="diff-chg">URI </span>included in the retrieved policy expression, if any, <span class="rfc2119">MAY</span> be different than the <span class="diff-chg">URI </span>used to retrieve the policy expression. </p></dd><dt class="label"><code class="attr">/wsp:Policy/…/wsp:PolicyReference/@Digest</code> </dt><dd><p>This optional attribute specifies the digest of the referenced policy expression. This is used to ensure the included policy is the expected policy. &nbsp;If omitted, there is no implied value.</p></dd><dt class="label"><code class="attr">/wsp:Policy/…/wsp:PolicyReference/@DigestAlgorithm</code> </dt><dd><p>This optional URI attribute specifies the digest algorithms being used. This specification predefines the default algorithm below, although additional algorithms can be expressed. </p></dd></dl><table border="1" cellpadding="5" cellspacing="0"><thead><tr><th colspan="1" rowspan="1">URI</th><th colspan="1" rowspan="1">Description</th></tr></thead><tbody><tr><td colspan="1"rowspan="1"><code>http://www.w3.org/@@@@/@@/policy/Sha1Exc</code> (implied)</td><td colspan="1" rowspan="1">The digest is a SHA1 hash over the octet stream resulting from using the Exclusive XML canonicalization defined for XML Signature [<a href="#XML-Signature">[XML-Signature]</a>].</td></tr></tbody></table><br><div class="diff-del"><p class="diff-del">/wsp:Policy/…/wsp:PolicyReference/@{any}
 Additional attributes MAY be specified but
 MUST NOT contradict the semantics of the owner
 element; if an attribute is not recognized, it
@@ -839,15 +845,16 @@
 	    Requirement Levels</cite>, S. Bradner, Author. Internet
 	    Engineering Task Force, June 1999. Available at
 	    http://www.ietf.org/rfc/rfc2119.txt.
-	    (See <a href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a>.)</dd><dt class="label"><span class="diff-chg"><a name="RFC3986"></a>IETF RFC 3986</span></dt><dd><div class="diff-chg">
-	    <cite>Uniform Resource Identifier (URI): Generic
-	    Syntax<span class="diff-del">(IRIs)
-	      </span></cite>, T. Berners-Lee,<span class="diff-del">M. </span>R. Fielding,<span class="diff-del">Duerst </span>and
-	    L. Masinter, <span class="diff-del">Suignard, 
+	    (See <a href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a>.)</dd><dt class="label"><span class="diff-add"><a name="RFC3986"></a>IETF RFC 3986</span></dt><dd><div class="diff-add">
+	    
+	      <cite><span class="diff-chg">Uniform </span>Resource <span class="diff-chg">Identifier </span><span class="diff-add">(URI): Generic
+	    Syntax</span><span class="diff-del">(IRIs)
+	      </span></cite>, <span class="diff-add">T. Berners-Lee,</span><span class="diff-del">M. </span><span class="diff-add">R. Fielding,</span><span class="diff-del">Duerst </span>and
+	    <span class="diff-add">L. </span><span class="diff-chg">Masinter, </span><span class="diff-del">Suignard, 
 	        </span>Authors. Internet Engineering Task Force,
 	    January 2005. Available at
-	    http://www.ietf.org/rfc/rfc3986.txt.
-	    (See http://www.ietf.org/rfc/rfc3986.txt.)</div></dd><dt class="label"><a name="WS-Security"></a>[WS-Security 2004] </dt><dd>
+	    <span class="diff-chg">http://www.ietf.org/rfc/rfc3986.txt.
+	  </span>  (See http://www.ietf.org/rfc/rfc3986.txt.)</div></dd><dt class="label"><a name="WS-Security"></a>[WS-Security 2004] </dt><dd>
 	    <cite>Web Services Security: SOAP Message Security 1.0
 	    (WS-Security 2004)</cite>, A. Nadalin, C. Kaler,
 	    P. Hallam-Baker, and R. Monzillo, Editors.
@@ -990,7 +997,7 @@
 	  <a href="http://www.w3.org/TR/xmldsig-core/">latest
 	  version of XML-Signature Syntax and Processing</a> is
 	  available at http://www.w3.org/TR/xmldsig-core/.
-	  (See <a href="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/">http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/</a>.)</dd></dl></div></div><div class="diff-chg"><div class="div1">
+	  (See <a href="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/">http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/</a>.)</dd></dl></div></div><div class="div1">
 <h2><a name="acknowledgments"></a>B. Acknowledgements (Non-Normative)</h2><p>This document is the work of the <a href="http://www.w3.org/2002/ws/policy/">W3C Web Services Policy
   Working Group</a>.</p><p>
     Members of the Working Group are (at the time of writing, and by
@@ -1000,7 +1007,7 @@
     The people who have contributed to <a href="http://lists.w3.org/Archives/Public/public-ws-policy/">discussions
     on public-ws-policy@w3.org</a> are also gratefully
     acknowledged.
-  </p></div></div><div class="diff-add"><div class="div1"><div class="diff-del"><p class="diff-del">Changes in this Version of the Document
+  </p></div><div class="diff-add"><div class="div1"><div class="diff-del"><p class="diff-del">Changes in this Version of the Document
   A list of substantive changes since the Working Draft dated 31 July 2006
 is below:
   
@@ -1009,24 +1016,9 @@
       Replaced URI with IRI.
   
 
-  GlossarypolicyA policy is a collection of 
-	    policy alternatives, policy alternativea policy alternative 
-	    is a collection of policy assertions.policy assertionA policy assertion 
-		represents an individual requirement, capability, or other property of a behavior.policy assertion parameterA policy assertion parameter 
-	    qualifies the behavior indicated by a policy assertion.policy assertion typeA policy assertion type 
-	    represents a class of policy assertions and implies a 
-	    schema for the assertion and assertion-specific semantics.policy attachmentA 
-	    policy attachment is a mechanism for associating 
-	    policy with one or more policy scopes.policy expressionA policy expression 
-		is an XML Infoset representation of a policy, 
-		either in a normal form or in an equivalent compact form.policy scopeA policy scope is a collection of 
-	    policy subjects to which a policy may apply.policy subjectA policy subject is an entity 
-	    (e.g., an endpoint, message, resource, interaction) with which a 
-	    policy can be associated. policy vocabularyA policy vocabulary is the set of all 
-	    policy assertion types used in a policy.
         
             </p></div>
-<h2><a name="changelog"></a>C. Web Services Policy 1.5 - Framework Change Log (Non-Normative)</h2><a name="ws-policy-framework-changelog-table"></a><table border="1"><div class="diff-chg"><tbody class="diff-chg"><tr><th colspan="1" rowspan="1">Date</th><th colspan="1" rowspan="1">Author</th><th colspan="1" rowspan="1">Description</th></tr><tr><td colspan="1" rowspan="1">20060712</td><td colspan="1" rowspan="1">ASV</td><td colspan="1" rowspan="1">Updated the list of editors. Completed action items
+<h2><a name="changelog"></a>C. Web Services Policy 1.5 - Framework Change Log (Non-Normative)</h2><a name="ws-policy-framework-changelog-table"></a><table border="1"><div class="diff-del"><tbody class="diff-del"><tr><th colspan="1" rowspan="1">Date</th><th colspan="1" rowspan="1">Author</th><th colspan="1" rowspan="1">Description</th></tr><tr><td colspan="1" rowspan="1">20060712</td><td colspan="1" rowspan="1">ASV</td><td colspan="1" rowspan="1">Updated the list of editors. Completed action items
                             <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action12">12</a>,
                             <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action16">16</a> and 
                             <a href="http://www.w3.org/2006/07/12-ws-policy-minutes.html#action20">20</a> 
@@ -1035,27 +1027,19 @@
                        	</td></tr><tr><td colspan="1" rowspan="1">20060726</td><td colspan="1" rowspan="1">ASV</td><td colspan="1" rowspan="1">Incorporated the 
                             <a href="http://lists.w3.org/Archives/Public/public-ws-policy/2006Jul/0107.html">XML 
                         namespace URI versioning policy</a> adopted by the WG. 
-                        </td></tr></tbody></div><span class="diff-del">20060803
+                        </td></tr>
+                       	20060803
                        	PY
                        	Completed Issue: 3551 
                        	 Misc updates throughout.                     	
-                       	
-                    
-                    
                        	20060808
                        	PY
                        	Completed action item: 20 
                        	    to highlight infoset terms uniformly.                     	
-                       	
-                    
-                    
                        	20060808
                        	DBO
                        	Completed action items: 15 
                        	    as early as possible in the doc, use the definition that are defined in the doc.                     	
-                       	
-                    
-                    
                         20060808
                         ASV
                         Implemented the 
@@ -1064,72 +1048,47 @@
                         3543 and
                             the 
                                 resolution for issue 
-                            
                                 'Modify wording in Abstract for Framework'. 
                             Restored Section  (that was accidentally dropped).
                             Completed action item 17 
                             from the Austin F2F.
-                        
-                    
-                    
                         20060809
                         ASV
                         Implemented the 
                             resolution 
                             for issue 
                             3563.
-                        
-                    
-                    
                        	20060811
                        	DBO
                        	Completed action items: 15 
                        	    remove use if emph/ital terms.  Framework: removed emph on conceptually replace and support; attachment: make merge a termdef                     	
-                       	
-                    
-                    
                         20060813
                         ASV
                         Added a new Section  (that provides 
                         a list of substantive chanages since the previous publication).                    	
-                        
-                    
-                    
                         20060818
                         ASV
                         Implemented the 
                             resolution 
                             for issue 
                             3560.                  	
-                        
-                                           
-                    
                         20060822
                         TIB
                         Completed action item:
                             resolution 
                             for issue 
                             3565.                  	
-                        
-                     
-                    
                         20060824
                         PY
                         Completed action item:
                             resolution 
                             for issue 
                             3552.                  	
-                        
-                                           
-                    
                         20060827
                         TIB
                         Completed action item:
                             resolution 
                             for adding Conformance section.                  	
-                        
-                    
-                    
                     	20060828
                     	DBO
                     	Completed action item:
@@ -1137,26 +1096,16 @@
                     	for issue 
                             3590.
                             for adding document attribute extensbility of wsp:Policy/@{any} and wsp:Policy/.../wsp:PolicyReference/@{any}                  	
-                        
-                    
-                    
                         20060829
                         ASV
                         Implemented the 
                             resolution 
                             for issue 
                             3561: replaced URI with IRI.                	
-                        
-                    
-                       
                     	20060830
                     	DBO
                     	Completed action item:
                     	resolution 
                     	for issue 
                             3604.
-                            Removing Goals section, resulted in moving Policy expression definition to 2nd para of intro.                 	
-                        
-                                           
-                
-            </span></table><br></div></div></div></body></html>
\ No newline at end of file
+                            Removing Goals section, resulted in moving Policy expression definition to 2nd para of intro.                 	</tbody></div></table><br></div></div></div></body></html>
\ No newline at end of file
Received on Tuesday, 5 September 2006 00:19:23 UTC

This archive was generated by hypermail 2.3.1 : Tuesday, 6 January 2015 20:27:49 UTC