Mon Nov 30 09:21:37 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/ComponentServer/CIAO_ServerActivator_Impl.h:
        * ciao/Servants/Port_Activator_T.h:
        * DAnCE/TargetManager/DomainDataManager.h:
        * DAnCE/TargetManager/ResourceCommitmentManager.h:
          Doxygen fixes

5 files changed, 16 insertions, 11 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 6a6e711fd76..2c95bed3649 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Mon Nov 30 09:21:37 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/ComponentServer/CIAO_ServerActivator_Impl.h:
+        * ciao/Servants/Port_Activator_T.h:
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/ResourceCommitmentManager.h:
+          Doxygen fixes
+
 Sun Nov 29 13:06:02 CST 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 	* CIAO version 0.7.5 released.
diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.h b/CIAO/DAnCE/TargetManager/DomainDataManager.h
index de4170f6bbd..32ed5c9b70c 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -63,13 +63,11 @@ namespace DAnCE
      * @brief returns the sequence of node managers
      * object reference
      */
-    ::Deployment::ResourceCommitmentManager_ptr  
+    ::Deployment::ResourceCommitmentManager_ptr
     commitResources (const ::Deployment::ResourceAllocations & resources);
 
     /**
      * @brief The function releases the resources held by a plan
-     * @param plan ::Deployment::DeploymentPlan the plan whose
-     *                resources are to be released
      */
     void releaseResources (const ::Deployment::ResourceCommitmentManager_ptr manager);
 
@@ -109,9 +107,9 @@ namespace DAnCE
     void init (CORBA::ORB_ptr orb,
                ::Deployment::TargetManager_ptr target,
                const ACE_TCHAR *domain_name);
-      
+
   private:
-     
+
     /**
      * @brief   It will read the initial Domain data from
      *          XML files.
diff --git a/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h
index 36065adfa5a..813dcd65bd8 100644
--- a/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h
+++ b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h
@@ -17,7 +17,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-namespace DAnCE 
+namespace DAnCE
 {
 
   class  ResourceCommitmentManager_i
@@ -31,10 +31,9 @@ namespace DAnCE
         virtual ~ResourceCommitmentManager_i (void);
 
         /**
-         * @function commitResources
          * @brief Commits the resources
          *
-         * @description This function makes a call to the DomainDataManager in order
+         * This function makes a call to the DomainDataManager in order
          * to commit the resources mentioned in the ResourceAllocation
          * sequence. If the resource cannot be allocated throws a
          * ResourceCommitmentFailed exception
@@ -48,8 +47,8 @@ namespace DAnCE
               const ::Deployment::ResourceAllocations & resources);
 
       private:
+
         /**
-         * @function add_to_commited_resource
          * @brief This function adds the res to already commited resources.
          *        This is to be called from within commitResources
          */
diff --git a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h
index 2df2f4d7259..23057b2c550 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h
+++ b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h
@@ -110,7 +110,7 @@ namespace CIAO
                                     const ACE_CString &cmd_line);
 
       /// This method is only applicable when our program is configured as
-      /// singled threaded . Internally it uses a <perform_work> blocking
+      /// singled threaded . Internally it uses a @c perform_work blocking
       /// call to wait for NA object to call back
       void single_threaded_wait_for_callback (const Server_Info &si,
                                               ACE_Time_Value &timeout);
diff --git a/CIAO/ciao/Servants/Port_Activator_T.h b/CIAO/ciao/Servants/Port_Activator_T.h
index 4e40d895e8e..4e244d88f94 100644
--- a/CIAO/ciao/Servants/Port_Activator_T.h
+++ b/CIAO/ciao/Servants/Port_Activator_T.h
@@ -63,7 +63,7 @@ namespace CIAO
     /// Context classes
     CONTEXT *context_;
 
-    /// Component servant which created <this>
+    /// Component servant which created @c this
     COMP_SERV *comp_serv_;
   };
 }