summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h5
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h15
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h3
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp2
24 files changed, 39 insertions, 49 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index 14f0a607937..facdd052955 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -50,13 +50,13 @@ class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin
{
public:
/**
- * constructor. If <supplier_set> is nil then it builds one using
+ * Constructor. If <supplier_set> is nil then it builds one using
* the @a event_channel argument.
* In any case it assumes ownership.
*/
TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel* event_channel);
- /// destructor...
+ /// Destructor...
virtual ~TAO_CEC_ConsumerAdmin (void);
/// For each elements call <worker->work()>.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index 20402bb87c6..38855430c0d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -47,11 +47,10 @@ namespace CORBA
class TAO_Event_Serv_Export TAO_CEC_ConsumerControl
{
public:
- /// Constructor. It does not assume ownership of the <event_channel>
- /// parameter.
+ /// Constructor
TAO_CEC_ConsumerControl (void);
- /// destructor...
+ /// Destructor
virtual ~TAO_CEC_ConsumerControl (void);
/// Activate any internal threads or timers used to poll the state of
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
index 10bc975df9d..04e8ba9a68a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
@@ -93,26 +93,22 @@ public:
create_proxy_push_consumer_collection (TAO_CEC_EventChannel*);
virtual void
destroy_proxy_push_consumer_collection (
- TAO_CEC_ProxyPushConsumer_Collection*
- );
+ TAO_CEC_ProxyPushConsumer_Collection*);
virtual TAO_CEC_ProxyPullConsumer_Collection*
create_proxy_pull_consumer_collection (TAO_CEC_EventChannel*);
virtual void
destroy_proxy_pull_consumer_collection (
- TAO_CEC_ProxyPullConsumer_Collection*
- );
+ TAO_CEC_ProxyPullConsumer_Collection*);
virtual TAO_CEC_ProxyPushSupplier_Collection*
create_proxy_push_supplier_collection (TAO_CEC_EventChannel*);
virtual void
destroy_proxy_push_supplier_collection (
- TAO_CEC_ProxyPushSupplier_Collection*
- );
+ TAO_CEC_ProxyPushSupplier_Collection*);
virtual TAO_CEC_ProxyPullSupplier_Collection*
create_proxy_pull_supplier_collection (TAO_CEC_EventChannel*);
virtual void
destroy_proxy_pull_supplier_collection (
- TAO_CEC_ProxyPullSupplier_Collection*
- );
+ TAO_CEC_ProxyPullSupplier_Collection*);
virtual ACE_Lock* create_consumer_lock (void);
virtual void destroy_consumer_lock (ACE_Lock*);
@@ -151,8 +147,7 @@ public:
create_proxy_push_consumer_collection (TAO_CEC_TypedEventChannel*);
virtual void
destroy_proxy_push_consumer_collection (
- TAO_CEC_TypedProxyPushConsumer_Collection*
- );
+ TAO_CEC_TypedProxyPushConsumer_Collection*);
virtual TAO_CEC_ConsumerControl*
create_consumer_control (TAO_CEC_TypedEventChannel*);
virtual TAO_CEC_SupplierControl*
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index 6a5cb720758..2a92dd1fde7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -57,7 +57,7 @@ public:
*/
virtual void shutdown (void) = 0;
- /// The consumer represented by <proxy> should receive <event>.
+ /// The consumer represented by @a proxy should receive @a event.
virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
const CORBA::Any &event) = 0;
virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 1f2030e0866..5a8fc074d54 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -54,7 +54,7 @@ public:
/**
* The basic constructor.
* The attributes listed as arguments are *required* by the EC, and
- * no appropiate defaults are available for them.
+ * no appropriate defaults are available for them.
*/
TAO_CEC_EventChannel_Attributes (PortableServer::POA_ptr supplier_poa,
PortableServer::POA_ptr consumer_poa);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
index 581cb057475..8d8e725998d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -39,7 +39,7 @@ class TAO_Event_Serv_Export TAO_CEC_MT_Dispatching : public TAO_CEC_Dispatching
{
public:
/// Constructor
- /// It will create <nthreads> servicing threads...
+ /// It will create @a nthreads servicing threads...
TAO_CEC_MT_Dispatching (int nthreads,
int thread_creation_flags,
int thread_priority,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 9621fa6a8a7..7114ccb87a5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -75,7 +75,7 @@ public:
/**
* Invoke the _non_existent() pseudo-operation on the supplier. If
* it is disconnected then it returns true and sets the
- * <disconnected> flag.
+ * @a disconnected flag.
*/
CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
@@ -114,7 +114,7 @@ protected:
(CosEventComm::PullSupplier_ptr s);
private:
- /// The supplier admin, used for activation and memory managment.
+ /// The supplier admin, used for activation and memory management.
TAO_CEC_EventChannel* event_channel_;
ACE_Time_Value timeout_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index ba5c870193f..a7bc5e5c17c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -40,7 +40,7 @@ class TAO_CEC_ProxyPullConsumer;
* remember that this class is used to communicate with a
* PullConsumer, so, in effect, this is the ambassador for a
* consumer inside the event channel.
- * = MEMORY MANAGMENT
+ * = MEMORY MANAGEMENT
* It does not assume ownership of the TAO_CEC_Dispatching object.
* It makes a copy of the ConsumerQOS and the consumer object
* reference.
@@ -74,7 +74,7 @@ public:
/**
* Return the consumer object reference. It returns nil() if it has
* not connected yet.
- * NOTE: This method does not return a new reference!!! Doing so
+ * @note This method does not return a new reference!!! Doing so
* will increase the locking overhead on the critical path.
*/
CosEventComm::PullConsumer_ptr consumer (void) const;
@@ -85,7 +85,7 @@ public:
/**
* Invoke the _non_existent() pseudo-operation on the consumer. If
* it is disconnected then it returns true and sets the
- * <disconnected> flag.
+ * @a disconnected flag.
*/
CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index 4b6157f1016..e6bcd1b2178 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -38,7 +38,7 @@ class TAO_CEC_ProxyPushSupplier;
* remember that this class is used to communicate with a
* PushSupplier, so, in effect, this is the ambassador for a
* supplier inside the event channel.
- * = MEMORY MANAGMENT
+ * = MEMORY MANAGEMENT
* The object commits suicide when disconnect_push_consumer() is
* called.
*/
@@ -73,7 +73,7 @@ public:
/**
* Invoke the _non_existent() pseudo-operation on the supplier. If
* it is disconnected then it returns true and sets the
- * <disconnected> flag.
+ * @ disconnected flag.
*/
CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
@@ -116,7 +116,7 @@ protected:
(CosEventComm::PushSupplier_ptr s);
private:
- /// The supplier admin, used for activation and memory managment.
+ /// The supplier admin, used for activation and memory management.
TAO_CEC_EventChannel* event_channel_;
ACE_Time_Value timeout_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index 8a8a0563c64..65d6d40295b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -45,7 +45,7 @@ class TAO_CEC_TypedEventChannel;
* remember that this class is used to communicate with a
* PushConsumer, so, in effect, this is the ambassador for a
* consumer inside the event channel.
- * = MEMORY MANAGMENT
+ * = MEMORY MANAGEMENT
* It does not assume ownership of the TAO_CEC_Dispatching object.
* It makes a copy of the ConsumerQOS and the consumer object
* reference.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index c00fa8365bc..f25c203927c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -80,7 +80,7 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_ConsumerControl
: public TAO_CEC_ConsumerControl
{
public:
- /// Constructor. It does not assume ownership of the <event_channel>
+ /// Constructor. It does not assume ownership of the @a event_channel
/// parameter.
TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate,
const ACE_Time_Value &timeout,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index 5d985ce4a85..3ec717045d1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -78,7 +78,7 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_SupplierControl
: public TAO_CEC_SupplierControl
{
public:
- /// Constructor. It does not assume ownership of the <event_channel>
+ /// Constructor. It does not assume ownership of the @a event_channel
/// parameter.
TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate,
const ACE_Time_Value &timeout,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 71e4d8ea49b..9441c9087ad 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -41,7 +41,7 @@ class TAO_CEC_EventChannel;
* Implement the CosEventChannelAdmin::SupplierAdmin interface.
* This class is an Abstract Factory for the
* TAO_CEC_ProxyPushConsumer.
- * = MEMORY MANAGMENT
+ * = MEMORY MANAGEMENT
* It does not assume ownership of the TAO_CEC_EventChannel object
* = LOCKING
* @@ TODO
@@ -77,13 +77,13 @@ public:
/// this
virtual void shutdown (void);
- // = The CosEventChannelAdmin::SupplierAdmin methods...
+ /// The CosEventChannelAdmin::SupplierAdmin methods...
virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
obtain_push_consumer (void);
virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
obtain_pull_consumer (void);
- // = The PortableServer::ServantBase methods
+ /// The PortableServer::ServantBase methods
virtual PortableServer::POA_ptr _default_POA (void);
private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index e66bc40b5f5..f472b732cfe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -56,8 +56,7 @@ namespace CORBA
class TAO_Event_Serv_Export TAO_CEC_SupplierControl
{
public:
- /// Constructor. It does not assume ownership of the <event_channel>
- /// parameter.
+ /// Constructor
TAO_CEC_SupplierControl (void);
/// destructor...
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index 88aa6cdd3da..fa7a864fef8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -99,9 +99,6 @@ public:
private:
/// The typed event
const TAO_CEC_TypedEvent typed_event_;
-
- /// The typed EC
- // TAO_CEC_TypedEventChannel* typed_event_channel_;
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index 217847c8491..727e1a03872 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -59,7 +59,7 @@ public:
/**
* The basic constructor.
* The attributes listed as arguments are *required* by the EC, and
- * no appropiate defaults are available for them.
+ * no appropriate defaults are available for them.
*/
TAO_CEC_TypedEventChannel_Attributes (PortableServer::POA_ptr typed_supplier_poa,
PortableServer::POA_ptr typed_consumer_poa,
@@ -127,8 +127,8 @@ public:
/**
* Constructor
- * If <own_factory> is not 0 it assumes ownership of the factory.
- * If the factory is <nil> it uses the Service_Configurator to load
+ * If @a own_factory is not 0 it assumes ownership of the factory.
+ * If the @a factory is <nil> it uses the Service_Configurator to load
* the Factory, if not found it uses TAO_CEC_Default_Resource_Factory
*/
TAO_CEC_TypedEventChannel (const TAO_CEC_TypedEventChannel_Attributes& attributes,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index dbe96ca226b..e26f4918e0b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -100,7 +100,7 @@ protected:
(CosEventComm::PushSupplier_ptr pre);
private:
- /// The typed supplier admin, used for activation and memory managment.
+ /// The typed supplier admin, used for activation and memory management.
TAO_CEC_TypedEventChannel* typed_event_channel_;
ACE_Time_Value timeout_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index 2f72fb8b17e..3fd23168cfe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -35,10 +35,10 @@ class TAO_Event_Serv_Export TAO_CEC_TypedSupplierAdmin
: public POA_CosTypedEventChannelAdmin::TypedSupplierAdmin
{
public:
- //Constructor
+ /// Constructor
TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChannel* event_channel);
- //Destructor
+ /// Destructor
virtual ~TAO_CEC_TypedSupplierAdmin (void);
/// For each elements call <worker->work()>.
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index cdbbc1b3df9..3250eee56ad 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -62,7 +62,7 @@ template<class Target> class TAO_ESF_Worker;
* cleanup operations).
*
* The class must also collaborate with other components of the
- * EC to efficiently and safely perform memory managment of the
+ * EC to efficiently and safely perform memory management of the
* members in the collection.
*
* The PROXY object must be reference counted with the following
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 7abaa611148..2ca67d3e4a3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -54,7 +54,7 @@ public:
/**
* The basic constructor.
* The attributes listed as arguments are *required* by the EC, and
- * no appropiate defaults are available for them.
+ * no appropriate defaults are available for them.
*/
TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr supplier_poa,
PortableServer::POA_ptr consumer_poa);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 6655cd7159c..2f8e4fb2afc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -134,7 +134,7 @@ protected:
/// Release the filter and the supplier
void cleanup_i (void);
- /// The supplier admin, used for activation and memory managment.
+ /// The supplier admin, used for activation and memory management.
TAO_EC_Event_Channel_Base* event_channel_;
/// The locking strategy.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
index cb765a69400..7c243fea89c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
@@ -35,7 +35,7 @@ class TAO_Notify_EventChannelFactory;
*
* Defines the interface for the consumer control strategy.
* This strategy handles misbehaving or failing consumers.
- * = MEMORY MANAGMENT
+ * = MEMORY MANAGEMENT
* = LOCKING
* = TODO
*/
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index 5b26d25596a..451189b1a2c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -51,7 +51,7 @@ TAO_UIPMC_Acceptor::create_profile (
// The standard mechanism for adding profiles to object references
// for each pluggable protocol doesn't apply to UIPMC profiles, so
// this function just returns success without doing anything. The
- // appropiate mechanism for getting UIPMC profiles is to call the
+ // appropriate mechanism for getting UIPMC profiles is to call the
// multicast group manager to get a Group reference. Invocations
// sent to this group reference will be dispatched to the servants
// that belong to that group.
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index e14aeb636d7..da9d83b8e5d 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -104,7 +104,7 @@ ACE_Config_Scheduler::get (RtecScheduler::handle_t handle)
{
case BaseSchedImplType::SUCCEEDED:
{
- // IDL memory managment semantics require that we return a copy.
+ // IDL memory management semantics require that we return a copy.
RtecScheduler::RT_Info* copy;
ACE_NEW_RETURN (copy, RtecScheduler::RT_Info (*rt_info), 0);
return copy;