*** empty log message ***

4 files changed, 62 insertions, 35 deletions

diff --git a/ACE-INSTALL b/ACE-INSTALL
index 9983a667ebe..e320291ebbb 100644
--- a/ACE-INSTALL
+++ b/ACE-INSTALL
@@ -146,9 +146,8 @@
           appear to be harmless.)
           
           The following ACE tests do not run properly with CXX 6.0:
-          Naming_Test, Mutex_Test, Conn_Test, and Message_Queue_Test. If
-          you have the facilities and time to debug these, please let us
-          know.
+          Naming_Test, Mutex_Test, and Message_Queue_Test. If you have
+          the facilities and time to debug these, please let us know.
           
           GNU gcc 2.7.2.1 compiles without problems. All tests run
           (besides minor problems). Thanks to Thilo Kielmann <[15]
diff --git a/TAO/README b/TAO/README
index ae5188e9fed..2534090f8a8 100644
--- a/TAO/README
+++ b/TAO/README
@@ -1,44 +1,63 @@
 Welcome to the alpha release of The ACE ORB (TAO).  TAO is an
-implementation of a CORBA2-compliant ORB that will support real-time
+implementation of a CORBA2-compliant ORB that supports real-time
 extensions.  Please see http://www.cs.wustl.edu/~schmidt/TAO.html for
 more information on TAO.
 
 The current alpha release of TAO contains the following:
 
-* An ORB Core based on ACE components and an optimized version of
-  the SunSoft IIOP protocol engine;
+     * An ORB Core based on ACE C++ components. This ORB Core provides 3
+       concurrency models: (1) Reactive, (2) Thread-per-Connection,
+       and (3) Thread-per-Rate (which is optimized for certain types
+       of deterministic real-time systems).
 
-* An implementation of a Basic Object Adapter (BOA);
+     * A highly optimized version of the SunSoft IIOP protocol
+       interpreter;
 
-* Various tests illustrating how to use TAO in its current state.
+     * An prototype implementation of the Portable Object Adapter
+       (POA) specification.
+
+     * A prototype IDL compiler, based on the SunSoft IDL compiler. This 
+       IDL compiler generates stubs and skeletons that utilize the
+       SunSoft IIOP protocol interpreter.
+
+     * Various tests illustrating how to use TAO.
+       
+The current version of TAO contains source code and tests that are
+around 0.4 Megabytes when compressed using GNU gzip.
 
 We've gotten TAO to interoperate with other ORBs (e.g., Orbix and
 Visigenic), so we're confident that the implementation of IIOP is
-robust.  However, this alpha release of TAO does not yet contain the
-following:
+robust. We're currently working on the following features for TAO:
+   
+     * A complete POA implementation.
+
+     * An IDL compiler that generates optimized compiled stubs and
+       skeletons. For this, we're planning to use the Flick IDL
+       compiler from University of Utah.
 
-* An IDL compiler;
+     * A highly extensible, highly optimized set of request
+       demultiplexing strategies that provide constant time lookup of
+       servants based on object keys and operation names contained in
+       CORBA requests.
 
-* An real-time version of the new Portable Object Adapter (POA);
+     * A Real-time Scheduling Service that determines the priority at
+       which Client requests are dispatched by the ORB.
 
-* The real-time scheduling service.
+     * A Real-time Event Service that dispatches CORBA events in
+       real-time.
 
-We're currently working on these features and we plan to release them
-throughout the Fall of 1997.  Please note that no amount of proding
-will get them out any faster, unless you are willing to contribute
-time and/or $$$ to the effort.
+     * Implementations of the CORBA COS Naming service and Trader
+       service.
+       
+We plan to release these features throughout the fall of 1997. You can
+keep track of our progress online.
 
 Please feel free to experiment with, dissect, repair, use, etc., TAO.
 We gratefully accept bug reports, appreciate bug fixes/enhancements,
-and will strive to integrate correct bug fixes quickly!  Just remember
-that TAO does not provide all the features of a commercial ORB at the
-moment.
-
-Key components in TAO (e.g., the Object Adapter) will change
-substantially over the Fall.  Thus, any development performed in the
-interim will require additional effort (e.g., writing stubs and
-skeletons by hand), and applications may need to be re-written to work
-with new features in the forthcoming releases.
+and will strive to integrate correct bug fixes quickly!
+
+If you have any questions, please post them to the ACE mailing list
+<ace-users@cs.wustl.edu> until we get a TAO mailing list established.
 
 A quick build note for users who have used ACE with other ORBs:
 linking TAO with a version of ACE that must also be linked against
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index ae01aeb56ec..bd8739a18d7 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -20,6 +20,11 @@ HREF="http://siesta.cs.wustl.edu/~schmidt/ACE-obtain.html">ACE</A>.
 You will likely need the most recent beta version of ACE because TAO
 tends to track changes to ACE rather closely. <P>
 
+A quick build note for users who have used ACE with other ORBs:
+linking TAO with a version of ACE that must also be linked against
+another ORB vendor's library, e.g., liborbix.so, will produce
+undefined and most likely unpredictable and erroneous results. <P>
+
 <HR><P>
 <h3>On UNIX platforms</h3>
 
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index f3cf3082d83..275af001409 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -9,15 +9,19 @@
 
 <H2>Overview</H2>
 
-<P>Certain components in TAO are tuneable by the user by handing the components
-options. These options are commonly specified as a string or on the command
-line and are passed to the components initialization methods for consumption.</P>
-
-<P><EM>Programmer's Note:</EM> the internal structure for these options
-is the traditional <CODE>argc</CODE>/<CODE>argv</CODE> vector of strings
-style popularized by C and Unix. Also, by convention any initialization
-method will consume, <EM>i.e.</EM> remove from the vector, any options which
-it recognizes.</P>
+<P>Certain components in TAO can be tuned by users by passing options
+to components.  
+<!-- Chris, can you please define what is meant by a "component", -->
+<!-- e.g., ORB Core, Object Adapter, etc. --> 
+These options are commonly specified as strings (<EM>e.g.</EM>, passed
+on the command-line) and are passed to component initialization
+methods for consumption.</P>
+
+<P><EM>Programmer's Note:</EM> the internal structure for these
+options is the traditional <CODE>argc</CODE>/<CODE>argv</CODE> vector
+of strings style popularized by C and Unix.  By convention, any
+initialization method will consume, <EM>i.e.</EM> ,remove from the
+vector, any options that it recognizes.</P>
 
 <H2>Types of Options</H2>