CVS difference for ais/ai-00418.txt

--- ais/ai-00418.txt	2005/04/13 05:37:24	1.3
+++ ais/ai-00418.txt	2005/06/16 23:47:43	1.4
@@ -1,6 +1,8 @@
-!standard G.3.1(1)                                 05-03-11  AI95-00418-01/02
+!standard G.3.1(1)                                 05-05-05  AI95-00418-01/03
 !standard G.3.2(1)
 !class amendment 05-03-09
+!status Amendment 200Y 05-05-05
+!status ARG Approved 10-0-1  05-04-16
 !status work item 05-03-09
 !status received 05-03-09
 !priority High
@@ -44,7 +46,7 @@
 
 AARM Implementation Note: While the definition is given in terms of
 an inner product, the norm doesn't "involve an inner product" in the
-technical sense. The reason is that is has accuracy requirements
+technical sense. The reason is that it has accuracy requirements
 substantially different from those applicable to inner products; and that
 cancellations cannot occur, because all the terms are positive, so there
 is no possibility of intermediate overflow.
@@ -52,10 +54,9 @@
 Add after G.3.1(81):
 
 For the L2-norm, no accuracy requirements are specified in the relaxed mode. In
-the strict mode the relative error on the norm shall not exceed:
+the strict mode the relative error on the norm shall not exceed
+g / 2.0 + 3.0 * Real'Model_Epsilon where g is defined as above.
 
-    g / 2.0 + 3.0 * Real'Model_Epsilon
-
 AARM Note: This is simply the combination of the error on the inner product
 with the error on Sqrt. A first order computation would lead to 2.0 *
 Real'Model_Epsilon above, but we are adding an extra Real'Model_Epsilon to
@@ -74,7 +75,7 @@
 
 AARM Implementation Note: While the definition is given in terms of
 an inner product, the norm doesn't "involve an inner product" in the
-technical sense. The reason is that is has accuracy requirements
+technical sense. The reason is that it has accuracy requirements
 substantially different from those applicable to inner products; and that
 cancellations cannot occur, because all the terms are positive, so there
 is no possibility of intermediate overflow.
@@ -82,11 +83,8 @@
 Add after G.3.2(150):
 
 For the L2-norm, no accuracy requirements are specified in the relaxed mode. In
-the strict mode the relative error on the norm shall not exceed:
-
-    g / 2.0 + 3.0 * Real'Model_Epsilon
-
-Where g has the definition appropriate for two complex operands.
+the strict mode the relative error on the norm shall not exceed g / 2.0 + 3.0 * Real'Model_Epsilon
+where g has the definition appropriate for two complex operands.
 
 !discussion
 
@@ -94,8 +92,24 @@
 
 !example
 
+
+!corrigendum G.3.1(01)
+!comment A phony force a conflict item.
+
+@dinsc
+
+@i<@s8<Static Semantics>>
+
+Nothing is really here.
+
+!corrigendum G.3.2(01)
+!comment A phony force a conflict item.
+
+@dinsc
+
+@i<@s8<Static Semantics>>
 
---!corrigendum
+Nothing is really here, either.
 
 !ACATS test