2006/ws/policy glossary-framework.xml,1.9,1.10

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

Modified Files:
	glossary-framework.xml 
Log Message:
change to add "collection" as per AI 276

Index: glossary-framework.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/glossary-framework.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- glossary-framework.xml	22 Mar 2007 03:48:55 -0000	1.9
+++ glossary-framework.xml	29 May 2007 21:48:59 -0000	1.10
@@ -2,13 +2,23 @@
 <glist>
    <gitem>
       <label>
+         <loc href="#collection">collection</loc>
+      </label>
+      <def>
+         <p> The items in a
+                            <term>collection</term> in this specification are unordered and may contain duplicates. 
+                   </p>
+      </def>
+   </gitem>
+   <gitem>
+      <label>
          <loc href="#ignorable_policy_assertion">ignorable policy assertion</loc>
       </label>
       <def>
          <p>An
                             <term>ignorable policy assertion</term> is an assertion that may be
                         ignored for policy intersection (as defined in <xspecref xmlns:xlink="http://www.w3.org/1999/xlink"
-                      href="http://www.w3.org/TR/ws-policy#Policy_Intersection"
+                      href="http://dev.w3.org/cvsweb/~checkout~/2006/ws/policy/ws-policy-framework.html?content-type=text/html;charset=utf-8#Policy_Intersection"
                       xlink:type="simple"
                       xlink:show="new"
                       xlink:actuate="onRequest">4.5 Policy
@@ -41,17 +51,8 @@
       </label>
       <def>
          <p>A <term>policy
-                            alternative</term> is a potentially empty collection of <termref def="policy_assertion">policy assertions</termref>.</p>
-      </def>
-   </gitem>
-   <gitem>
-      <label>
-         <loc href="#policy_alternative_vocabulary">policy alternative vocabulary</loc>
-      </label>
-      <def>
-         <p>A <term>policy alternative vocabulary</term> is the set of all <termref def="policy_assertion_type">policy assertion types</termref> within the
-                            <termref def="policy_alternative">policy
-                    alternative</termref>.</p>
+                            alternative</term> is a potentially empty 
+                            <termref def="collection"> collection </termref> of <termref def="policy_assertion">policy assertions</termref>.</p>
       </def>
    </gitem>
    <gitem>
@@ -123,14 +124,4 @@
                             <termref def="policy">policy</termref> can be associated. </p>
       </def>
    </gitem>
-   <gitem>
-      <label>
-         <loc href="#policy_vocabulary">policy vocabulary</loc>
-      </label>
-      <def>
-         <p>A
-                            <term>policy vocabulary</term> is the set of all <termref def="policy_assertion_type">policy assertion types</termref> used in a
-                        policy.</p>
-      </def>
-   </gitem>
 </glist>
\ No newline at end of file

Received on Tuesday, 29 May 2007 21:49:09 UTC