ChangeLogTag:Fri Apr 20 18:21:41 2001 Carlos O'Ryan <coryan@uci.edu>

7 files changed, 26 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index b6c14057cfb..25931b26024 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,9 +6,13 @@ Fri Apr 20 18:21:41 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Fri Apr 20 19:37:53 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * ace/TP_Reactor.cpp: Added a workaround for compiling ACE on
-          Linux for the OS/390 OS.  Thanks to James Dorsey
-          <James.Dorsey@acxiom.com> for reporting this.
+	* ace/Get_Opt.h: Updated the documentation to match the constructor
+	  arguments for ACE_Get_Opt.  Thanks to Benot Desmeules
+ 	  <bdesmeules@eurekium.com> for reporting this.	
+  
+	* ace/TP_Reactor.cpp: Added a workaround for compiling ACE on 
+	  Linux for the OS/390 OS.  Thanks to James Dorsey
+ 	  <James.Dorsey@acxiom.com> for reporting this.
 
 Fri Apr 20 00:57:24 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index b6c14057cfb..25931b26024 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -6,9 +6,13 @@ Fri Apr 20 18:21:41 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Fri Apr 20 19:37:53 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * ace/TP_Reactor.cpp: Added a workaround for compiling ACE on
-          Linux for the OS/390 OS.  Thanks to James Dorsey
-          <James.Dorsey@acxiom.com> for reporting this.
+	* ace/Get_Opt.h: Updated the documentation to match the constructor
+	  arguments for ACE_Get_Opt.  Thanks to Benot Desmeules
+ 	  <bdesmeules@eurekium.com> for reporting this.	
+  
+	* ace/TP_Reactor.cpp: Added a workaround for compiling ACE on 
+	  Linux for the OS/390 OS.  Thanks to James Dorsey
+ 	  <James.Dorsey@acxiom.com> for reporting this.
 
 Fri Apr 20 00:57:24 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b6c14057cfb..25931b26024 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -6,9 +6,13 @@ Fri Apr 20 18:21:41 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Fri Apr 20 19:37:53 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * ace/TP_Reactor.cpp: Added a workaround for compiling ACE on
-          Linux for the OS/390 OS.  Thanks to James Dorsey
-          <James.Dorsey@acxiom.com> for reporting this.
+	* ace/Get_Opt.h: Updated the documentation to match the constructor
+	  arguments for ACE_Get_Opt.  Thanks to Benot Desmeules
+ 	  <bdesmeules@eurekium.com> for reporting this.	
+  
+	* ace/TP_Reactor.cpp: Added a workaround for compiling ACE on 
+	  Linux for the OS/390 OS.  Thanks to James Dorsey
+ 	  <James.Dorsey@acxiom.com> for reporting this.
 
 Fri Apr 20 00:57:24 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
diff --git a/TAO/examples/POA/Makefile.bor b/TAO/examples/POA/Makefile.bor
index 5390809779e..3252c787f26 100644
--- a/TAO/examples/POA/Makefile.bor
+++ b/TAO/examples/POA/Makefile.bor
@@ -1,6 +1,4 @@
-#
 # Makefile for building the TAO POA examples
-#
 
 DIRS = \
         Default_Servant \
diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile.bor b/TAO/examples/POA/On_Demand_Loading/Makefile.bor
index 9ea932fa7f3..517c1107c23 100644
--- a/TAO/examples/POA/On_Demand_Loading/Makefile.bor
+++ b/TAO/examples/POA/On_Demand_Loading/Makefile.bor
@@ -1,6 +1,4 @@
-#
 # Makefile for building the POA On_Demand_Loading executable
-#
 
 NAME = server
 
diff --git a/THANKS b/THANKS
index 53fbbaa3182..41a09a9ecfb 100644
--- a/THANKS
+++ b/THANKS
@@ -1216,6 +1216,7 @@ Jean Malenfant <jean.malenfant@locusdialog.com>
 Victor Poznyak <VictorP@Webley.COM>
 Juan Jose Comellas <jcomellas@novamens.com>
 James Dorsey <James.Dorsey@acxiom.com>
+Benot Desmeules <bdesmeules@eurekium.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/Get_Opt.h b/ace/Get_Opt.h
index 013d7cfb4fc..ee1a485268e 100644
--- a/ace/Get_Opt.h
+++ b/ace/Get_Opt.h
@@ -47,14 +47,14 @@ public:
    * following <argv>-element, and returned in <optarg>.
    *
    * If an option character is seen that is not listed in <optstring>,
-   * return '?' after printing an error message.  If you set <opterr>
-   * to zero, the error message is suppressed but we still return '?'.
+   * return '?' after printing an error message.  If you set
+   * <report_errors> to zero, the error message is suppressed but we
+   * still return '?'.
    *
    * If a char in <optstring> is followed by a colon, that means it
    * wants an arg, so the following text in the same <argv>-element,
    * or the text of the following <argv>-element, is returned in
-   * <optarg>.
-   */
+   * <optarg>.  */
   ACE_Get_Opt (int argc,
                ACE_TCHAR **argv,
                const ACE_TCHAR *optstring,