CVS difference for ais/conflict.txt

Differences between 1.1 and version 1.2
Log of other versions for file ais/conflict.txt

--- ais/conflict.txt	1999/08/20 03:59:44	1.1
+++ ais/conflict.txt	1999/09/16 20:40:30	1.2
@@ -10,7 +10,7 @@
 !AI-00169
 
 @drepl
-The anonymous objects created by function calls and by @fa<aggregates> are
+The anonymous objects created by function calls and by @fa<aggregate>s are
 finalized no later than the end of the innermost enclosing @fa<declarative_item>
 or @fa<statement>; if that is a @fa<compound_statement>, they are finalized
 before starting the execution of any statement within the
@@ -86,7 +86,7 @@
 
 @dinsa
 An implementation may place restrictions on configuration pragmas, so
-long as it allows them when the environment contains no library_items other
+long as it allows them when the environment contains no @fa<library_item>s other
 than those of the predefined environment.
 @dinss
 @i<@s8<Implementation Advice>>@hr
@@ -96,8 +96,8 @@
 to the instance.
 
 NOTE@hr
-To apply a program unit pragma to an instance, it must be specified
-for the instance. A program unit pragma in the generic unit usually
+To apply a library unit pragma to an instance, it must be specified
+for the instance. A library unit pragma in the generic unit usually
 does not apply to any instances.
 
 !corrigendum A.12.01 (29)
@@ -128,8 +128,8 @@
 @dby
 An access type declared in the visible part of a remote types or remote
 call interface library unit is called a @i<remote access type>. Such a type
-shall be either an access-to-subprogram type or a general access type that
-designates a class-wide limited private type or a class-wide private type
+shall be either an access-to-subprogram type, a general access type that
+designates a class-wide limited private type, or a class-wide private type
 extension whose ancestors are private type extensions and a limited private
 type. A type that is derived from a remote access type is also a remote access
 type.

Questions? Ask the ACAA Technical Agent