Merge pull request #386 from jwillemsen/master

Fixed typos

17 files changed, 17 insertions, 18 deletions

diff --git a/ACE/ACEXML/parser/parser/Parser.cpp b/ACE/ACEXML/parser/parser/Parser.cpp
index 7eaed13df3a..21aae9dbdd2 100644
--- a/ACE/ACEXML/parser/parser/Parser.cpp
+++ b/ACE/ACEXML/parser/parser/Parser.cpp
@@ -1653,7 +1653,7 @@ ACEXML_Parser::parse_element_decl (void)
   count = this->check_for_PE_reference ();
   if (this->skip_whitespace () != '>')
     {
-      this->fatal_error (ACE_TEXT ("Expecting '>' after element defintion"));
+      this->fatal_error (ACE_TEXT ("Expecting '>' after element definition"));
     }
   return 0;
 }
diff --git a/ACE/ACEXML/parser/parser/Parser.h b/ACE/ACEXML/parser/parser/Parser.h
index 1e1bbfc9508..64a330c3273 100644
--- a/ACE/ACEXML/parser/parser/Parser.h
+++ b/ACE/ACEXML/parser/parser/Parser.h
@@ -710,7 +710,7 @@ private:
    * This constant string defines the name of "simple XML parsing"
    * feature.  When this feature is enabled, ACEXML parser is allowed
    * to parse a simple XML stream without mandated XML prolog
-   * and no DTD defintion.
+   * and no DTD definition.
    */
   static const ACEXML_Char simple_parsing_feature_[];
 
diff --git a/ACE/ASNMP/asnmp/sagent.h b/ACE/ASNMP/asnmp/sagent.h
index 142cfaddd34..72be90b95cf 100644
--- a/ACE/ASNMP/asnmp/sagent.h
+++ b/ACE/ASNMP/asnmp/sagent.h
@@ -5,7 +5,7 @@
 /**
  *  @file    sagent.h
  *
- * SNMP agent class defintion. The sagent class provides an object oriented
+ * SNMP agent class definition. The sagent class provides an object oriented
  * approach for creating SNMP Agents. The sagent class is an encapsulation of SNMP
  * sessions, gets, sets, etc.
  *
diff --git a/ACE/ASNMP/asnmp/snmp.h b/ACE/ASNMP/asnmp/snmp.h
index 1c571e71295..14dd2a61d87 100644
--- a/ACE/ASNMP/asnmp/snmp.h
+++ b/ACE/ASNMP/asnmp/snmp.h
@@ -5,7 +5,7 @@
 /**
  *  @file    snmp.h
  *
- * SNMP class defintion. The Snmp class provides an object oriented
+ * SNMP class definition. The Snmp class provides an object oriented
  * approach to SNMP. The SNMP class is an encapsulation of SNMP
  * sessions, gets, sets, etc. The class manages all SNMP
  * resources and provides complete retry and timeout capability.
diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp
index e820b80a362..193e54ab823 100644
--- a/ACE/ace/Service_Config.cpp
+++ b/ACE/ace/Service_Config.cpp
@@ -109,7 +109,7 @@ ACE_Service_Config_Guard::ACE_Service_Config_Guard (ACE_Service_Gestalt * psg)
   if (ACE::debug ())
     ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) - SCG:<ctor=%@>")
-                ACE_TEXT (" - config=%@ repo=%@ superceded by repo=%@\n"),
+                ACE_TEXT (" - config=%@ repo=%@ superseded by repo=%@\n"),
                 this,
                 this->saved_.get (),
                 this->saved_->repo_,
diff --git a/ACE/apps/gperf/src/Options.cpp b/ACE/apps/gperf/src/Options.cpp
index c93e8dc62e4..6bb79148c8d 100644
--- a/ACE/apps/gperf/src/Options.cpp
+++ b/ACE/apps/gperf/src/Options.cpp
@@ -188,7 +188,7 @@ Options::~Options (void)
                        "\nhash function name = %s"
                        "\nkey name = %s"
                        "\njump value = %d"
-                       "\nmax associcated value = %d"
+                       "\nmax associated value = %d"
                        "\ninitial associated value = %d"
                        "\ndelimiters = %s"
                        "\nnumber of switch statements = %d"
diff --git a/ACE/bin/generate_export_file.pl b/ACE/bin/generate_export_file.pl
index 27650e7796f..3fefe816709 100755
--- a/ACE/bin/generate_export_file.pl
+++ b/ACE/bin/generate_export_file.pl
@@ -58,7 +58,6 @@ $ucname = uc $name;
 
 $prologue = '
 // -*- C++ -*-
-// ' . '$' . 'Id' . '$
 // Definition for Win32 Export directives.
 // This file is generated automatically by generate_export_file.pl '."$flags".'
 // ------------------------------'."
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index 38daec698dd..cf4594a4405 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -304,7 +304,7 @@ child (void)
 
 #if defined (ACE_WIN32)
 // On Win9x/Me, a shared address needs to be on the shared arena,
-// betweeen the second and third megabyte in the virtual address space
+// between the second and third megabyte in the virtual address space
 // of the process. Also, a mapped view of a file is shared on the same
 // virtual address on every 32 bit process.  On WinNT/2k, memory above
 // 2Gb is reserved for the system.  So, we need to check at runtime
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 7cce6542bf3..fc1bba18bd5 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -1855,7 +1855,7 @@ int
 be_interface::gen_gperf_things (const char *flat_name)
 {
   // GPERF can give Binary search, Linear search and Perfect Hash
-  // methods. Generate the class defintion according to that.
+  // methods. Generate the class definition according to that.
 
   TAO_OutStream *os = tao_cg->server_skeletons ();
 
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index a9310d3c519..7edeb963495 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -335,7 +335,7 @@ private:
   /// will inherit from the TAO_Binary_Search_OpTable.
   void gen_binary_search_class_definition (const char *flat_name);
 
-  /// Outputs the class defintion for the linear search. This class
+  /// Outputs the class definition for the linear search. This class
   /// will inherit from the TAO_Linear_Search.
   void gen_linear_search_class_definition (const char *flat_name);
 
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index 0e050f36eec..07568e48849 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -26,7 +26,7 @@
  * implementation.
  *
  * A template server definition. This template can be used by
- * single server/client projects for defintion of their
+ * single server/client projects for definition of their
  * server/clients.  See the directories time, bank, echo for
  * further details of implemenatation.
  */
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index 72860949b94..dd10bbfbd3e 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -24,7 +24,7 @@
  * implementation.
  *
  * A template server definition. This template can be used by
- * single server/client projects for defintion of their
+ * single server/client projects for definition of their
  * server/clients.  See the directories time, bank, echo for
  * further details of implemenatation.
  */
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 5a064a6732f..bb85212e63a 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -26,7 +26,7 @@
  * implementation.
  *
  * A template server definition. This template can be used by
- * single server/client projects for defintion of their
+ * single server/client projects for definition of their
  * server/clients.  See the directories time, bank, echo for
  * further details of implemenatation.
  */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index b80036b9164..9dad1c8b29b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -39,7 +39,7 @@ void
 TAO_Container_i::destroy_i (void)
 {
   this->destroy_references_i();
-  this->destroy_defintions_i();
+  this->destroy_definitions_i();
 }
 
 void
@@ -119,7 +119,7 @@ TAO_Container_i::destroy_references_i (void)
 }
 
 void
-TAO_Container_i::destroy_defintions_i (void)
+TAO_Container_i::destroy_definitions_i (void)
 {
   int index = 0;
   int status;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
index 7d442a2bd6f..52bdaaba2be 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
@@ -59,7 +59,7 @@ public:
 
   virtual void destroy_references_i ();
 
-  virtual void destroy_defintions_i ();
+  virtual void destroy_definitions_i ();
 
   virtual CORBA::Contained_ptr lookup (
       const char *search_name);
diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.h b/TAO/tests/Bug_3683_Regression/Simple_util.h
index 4a0061463f6..a890314a03c 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.h
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.h
@@ -25,7 +25,7 @@
  * implementation.
  *
  * A template server definition. This template can be used by
- * single server/client projects for defintion of their
+ * single server/client projects for definition of their
  * server/clients.  See the directories time, bank, echo for
  * further details of implemenatation.
  */
diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h
index ec52e366e19..b5c08b73643 100644
--- a/TAO/tests/OBV/Simple/Simple_util.h
+++ b/TAO/tests/OBV/Simple/Simple_util.h
@@ -23,7 +23,7 @@
  * implementation.
  *
  * A template server definition. This template can be used by
- * single server/client projects for defintion of their
+ * single server/client projects for definition of their
  * server/clients.  See the directories time, bank, echo for
  * further details of implemenatation.
  */