ChangeLogTag:Tue

3 files changed, 28 insertions, 10 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 98fd3a8401f..57e197201e7 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jan 26 03:56:45 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Init_ACE.h: Updated the documentation of ACE::init() and
+          ACE::fini() so it reflects what ACE actually does.  Thanks to
+          Steve Huston, Andrew Kaplan <alexande dot kaplan at tafcorp dot
+          com>, and Alexander Mintz <alexande dot mintz at tafcorp dot
+          com> for motivating this update.
+
 Mon Feb  1 17:35:08 UTC 2010  Chris Cleeland  <cleeland_c@local>
 
         * ace/Obstack_T.h:
diff --git a/ACE/THANKS b/ACE/THANKS
index de780ea4701..07548a8f30e 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -776,7 +776,6 @@ Philipp Slusallek <slusallek at graphics dot stanford dot edu>
 Matthew Davis <matthew dot davis at solers dot com>
 Janusz Stopa <jstopa at bear dot com>
 Rusty Conover <rconover at zootweb dot com>
-Alex Mintz <amintz at bear dot com>
 Phillippe Merle <Philippe dot Merle at lifl dot fr>
 Mark Winrock <mwinrock at nortelnetworks dot com>
 Boris Kaminer <boris_kaminer at mail dot ru>
@@ -2314,6 +2313,9 @@ Sail Zeng <sailzeng at tencent dot com>
 Dirk Bonekaemper <dirk dot bonekaemper at dfs dot de>
 Sreejith <sreejithsmadhavan at gmail dot com>
 Guillaume Lahaye <Guillaume dot Lahaye at nuance dot com>
+Andrew Kaplan <alexande dot kaplan at tafcorp dot com>
+Alexander Mintz <alexande dot mintz at tafcorp dot com>
+Jennifer Kahng <jennifer dot kahng at lmco dot com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ACE/ace/Init_ACE.h b/ACE/ace/Init_ACE.h
index 164f61e1d70..596e2b5f591 100644
--- a/ACE/ace/Init_ACE.h
+++ b/ACE/ace/Init_ACE.h
@@ -6,8 +6,11 @@
  *
  *  $Id$
  *
- *  Initialize ACE library services.  Can be called only once per
- *  program invocation.
+ *  Initialize and finalize the ACE library services.  You can
+ *  generally execute the @a ACE::init() and @a ACE::fini() sequence
+ *  multiple times, but be aware that nothing that ACE controls (e.g.,
+ *  singletons, thread-specific services, loaded services, etc.)  will
+ *  survive the @a ACE::fini().
  */
 //=============================================================================
 
@@ -28,17 +31,22 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE
 {
   /**
-   * This class implements the functions for the initialization and
-   * shutting down ACE.  These functions are called only once per ACE
-   * invokation.
-   * @return Returns 0 on success, -1 on failure, and 1 if it had already been
-   * called.
+   * This method initializes the ACE library services and initializes
+   * ACE's internal resources.  Applications should not instantiate
+   * ACE classes or call methods on objects of these classes until @a
+   * ACE::init() returns successfully.
+
+   * @return Returns 0 on success, -1 on failure, and 1 if it had
+   * already been called.
    */
   extern ACE_Export int init (void);
 
   /**
-   * Shut down ACE library services.  Can be called only once per
-   * program invocation.
+   * Finalize the ACE library services and releases ACE's internal
+   * resources.  In general, do not instantiate ACE classes or call
+   * methods on objects of these classes after @a ACE::fini() has been
+   * called.
+   *
    * @return Returns 0 on success, -1 on failure, and 1 if it had already been
    * called.
    */