CVS difference for ai05s/ai05-0200-1.txt

--- ai05s/ai05-0200-1.txt	2011/03/25 02:18:11	1.6
+++ ai05s/ai05-0200-1.txt	2011/04/01 02:44:36	1.7
@@ -68,13 +68,13 @@
 formals of the template are as follows:
 
 If all of the formal_package_associations are given by generic associations,
-the generic_actual_parameters of the formal_package_associations shall be legal
-for an instantiation of the template.
+the explicit_generic_actual_parameters of the formal_package_associations shall
+be legal for an instantiation of the template.
 
 If a formal_package_association for a formal type T of the template is given by
-<>, then the formal_package_association for any other generic_formal_parameter
-of the template whose declaration mentions T directly or indirectly must be
-given by <> as well.
+<>, then the formal_package_association for any other
+generic_formal_parameter_declaration of the template that mentions T directly
+or indirectly must be given by <> as well.
 
 AARM note:
 
@@ -107,13 +107,12 @@
 formals of the template are as follows:
 
 @xbullet<If all of the @fa<formal_package_association>s are given by generic associations,
-the @fa<generic_actual_parameter>s of the @fa<formal_package_association>s shall be legal
-for an instantiation of the template.>
+the @fa<explicit_generic_actual_parameter>s of the @fa<formal_package_association>s shall
+be legal for an instantiation of the template.>
 
 @xbullet<If a @fa<formal_package_association> for a formal type @i<T> of the template is given by
-<@>, then the @fa<formal_package_association> for any other @fa<generic_formal_parameter>
-of the template whose declaration mentions @i<T> directly or indirectly must be
-given by <@> as well.>
+<@>, then the @fa<formal_package_association> for any other @fa<generic_formal_parameter_declaration>
+of the template that mentions @i<T> directly or indirectly must be given by <@> as well.>
 
 
 !ACATS Test