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

--- ai05s/ai05-0200-1.txt	2011/03/18 00:11:53	1.5
+++ ai05s/ai05-0200-1.txt	2011/03/25 02:18:11	1.6
@@ -1,5 +1,6 @@
 !standard  12.7(4.1/2)                               11-03-17    AI05-0200-1/03
 !class binding interpretation 10-02-12
+!status Amendment 2012 11-03-24
 !status ARG Approved  8-0-0  11-03-17
 !status work item 10-02-12
 !status received 09-09-24
@@ -73,7 +74,7 @@
 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 a box as well.
+given by <> as well.
 
 AARM note:
 
@@ -93,8 +94,26 @@
 We want the generic in the question to be illegal. It serves no purpose to
 postpone the error until it is instantiated.
 
+!corrigendum 12.7(4.1/2)
 
---!corrigendum 12.7(4.1/2)
+@dinsa
+A @fa<formal_package_actual_part> shall contain at most one
+@fa<formal_package_association> for each formal parameter. If the
+@fa<formal_package_actual_part> does not include "@b<others> => <>", each
+formal parameter without an association shall have a @fa<default_expression>
+or @fa<subprogram_default>.
+@dinss
+The rules for matching between @fa<formal_package_association>s and the generic
+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.>
+
+@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.>
 
 
 !ACATS Test