CVS difference for ais/ai-00421.txt

Differences between 1.3 and version 1.4
Log of other versions for file ais/ai-00421.txt

--- ais/ai-00421.txt	2005/05/06 01:49:49	1.3
+++ ais/ai-00421.txt	2005/05/15 23:35:03	1.4
@@ -1,7 +1,9 @@
-!standard H.06(01)                                    05-04-18  AI95-00421/03
+!standard H.06(01)                                    05-05-05  AI95-00421/04
 !class amendment 05-03-28
-!status work item
-!status received
+!status Amendment 200Y 05-05-05
+!status ARG Approved 10-0-0  05-04-18
+!status work item 05-03-28
+!status received 05-03-28
 !priority High
 !difficulty Easy
 !subject Sequential activation and attachment
@@ -30,28 +32,30 @@
 activation and interrupt attachment are performed in the following sequence
 of steps:
 
-   *  The activation of all library level tasks and the attachment of
+   *  The activation of all library-level tasks and the attachment of
       interrupt handlers are deferred until all library units are elaborated.
 
-   *  The interrupt handlers are then attached by the environment task.
+   *  The interrupt handlers are attached by the environment task.
 
-   *  The environment task is then suspended while the library tasks are
+   *  The environment task is suspended while the library-level tasks are
       activated.
 
-   *  The environment task then executes the main subprogram (if any)
+   *  The environment task executes the main subprogram (if any)
       concurrently with these executing tasks.
 
-If any deferred task activation fails, Tasking_Error is raised in the
-environment task at the beginning of the sequence of statements of the
-body of the environment task prior to calling the
-main subprogram. If several dynamic interrupt handler attachments for
-the same interrrupt are deferred then the most recent call of
+If several dynamic interrupt handler attachments for
+the same interrupt are deferred, then the most recent call of
 Attach_Handler or Exchange_Handler determines which handler is attached.
 
+If any deferred task activation fails, Tasking_Error is raised at the
+beginning of the sequence of statements of the
+body of the environment task prior to calling the
+main subprogram.
+
 Add a new Note:
 
-If any task activation fails, the environment task is unable to handle
-the Tasking_Error exception and completes immediately. By contrast, if
+If any deferred task activation fails, the environment task is unable to
+handle the Tasking_Error exception and completes immediately. By contrast, if
 the partition elaboration policy is Concurrent, then this exception
 could be handled within a library unit.
 
@@ -59,13 +63,19 @@
 
 The essence of AI-265 was OK, just a bit vague. It is now clear that
 the sequential order is: library item elaboration, handler attachments,
-library task activations, call of main subprogram.
+library-level task activations, call of main subprogram.
 
 !example
 
 None (there isn't one in AI-265, either).
+
+!corrigendum H.6(1)
+
+@dinsc
+
+This is dummy content to force a conflict; the real changes are in the conflict
+text.
 
---!corrigendum
 
 !ACATS test
 

Questions? Ask the ACAA Technical Agent