CVS difference for ai12s/ai12-0267-1.txt

Differences between 1.6 and version 1.7
Log of other versions for file ai12s/ai12-0267-1.txt

--- ai12s/ai12-0267-1.txt	2018/07/15 00:18:55	1.6
+++ ai12s/ai12-0267-1.txt	2018/07/21 02:24:38	1.7
@@ -1,4 +1,4 @@
-!standard 5.1(1)                                      18-07-08  AI12-0267-1/05
+!standard 5.1(1)                                      18-07-20  AI12-0267-1/06
 !standard 9.5(57/5)
 !standard 9.10(11)
 !standard 9.10(15)
@@ -165,7 +165,7 @@
   units) to which it applies.
 
   If a pragma Conflict_Check_Policy applies to a generic_instantiation,
-  then the pragma Assertion_Policy applies to the entire instance.
+  then the pragma Conflict_Check_Policy applies to the entire instance.
 
   If multiple Conflict_Check_Policy pragmas apply to a given
   construct, the conflict check policy is determined by the one in the
@@ -208,7 +208,7 @@
 
       Implementation Permissions
 
-  When the applicale conflict check policy is Known_Conflict_Checks, the
+  When the applicable conflict check policy is Known_Conflict_Checks, the
   implementation may disallow two concurrent actions if the
   implementation can prove they will at run-time denote the same object
   with uses that potentially conflict.

Questions? Ask the ACAA Technical Agent