Fixed documentation issues.

5 files changed, 36 insertions, 21 deletions

diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index d3f9b3336aa..82a3f384b0a 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,18 @@
+Mon Feb  4 22:57:48 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
+
+        * orbsvcs/Naming_Service/FT_Naming_Service.h:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h:
+
+          Updates to doxygen comments.
+
+        * orbsvcs/Naming_Service/README.FT_Naming:
+
+          Added in two missing options to summary description.
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp:
+
+          Filled in incomplete documentation.
+
 Fri Feb  1 21:55:33 UTC 2013  Byron Harris  <harrisb@ociweb.com>
 
         * tests/Storable/run_test.pl:
diff --git a/TAO/orbsvcs/Naming_Service/FT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/FT_Naming_Service.h
index 3b940d8657e..3d77b0e0de5 100644
--- a/TAO/orbsvcs/Naming_Service/FT_Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/FT_Naming_Service.h
@@ -27,10 +27,10 @@ class TAO_Naming_Server;
  * @class TAO_FT_Naming_Service
  *
  * @brief Defines a class that encapsulates the implementation of the
- * COS Naming Service.
+ * Fault Tolerant Naming Service.
  *
  * This class overrides the create_naming_server factory method inherited
- * from <TAO_Naming_Service>
+ * from <TAO_Naming_Service>.
  */
 class TAO_FT_Naming_Service : public TAO_Naming_Service
 {
diff --git a/TAO/orbsvcs/Naming_Service/README.FT_Naming b/TAO/orbsvcs/Naming_Service/README.FT_Naming
index 60a8c014bc9..c499e7198d5 100644
--- a/TAO/orbsvcs/Naming_Service/README.FT_Naming
+++ b/TAO/orbsvcs/Naming_Service/README.FT_Naming
@@ -12,6 +12,8 @@ How to Run the TAO FT Naming Service
 1. Syntax
 
         % tao_ft_naming  [-ORBNameServicePort nsport]
+                         [--primary]
+                         [--backup]
                          [-b base_address]
                          [-d debug_flag]
                          [-m (1=enable multicast responses,0=disable(default)]
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
index f9ba665d386..053db29c525 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
@@ -76,19 +76,17 @@ public:
   virtual int parse_args (int argc,
                           ACE_TCHAR *argv[]);
 
-  /* Factory method to create a naming context factory for use with
-   * the -u and -r options.
-   */
+  /// Factory method to create a naming context factory for use with
+  /// the -u and -r options.
   virtual TAO_Storable_Naming_Context_Factory *
     storable_naming_context_factory (size_t context_size);
 
-  /* Factory method to create a naming context factory for use with
-   * the -f option.
-   */
+  /// Factory method to create a naming context factory for use with
+  /// the -f option.
   virtual TAO_Persistent_Naming_Context_Factory *
     persistent_naming_context_factory (void);
 
-  /// Returns the IOR of the naming manager.
+  /// Returns the IOR of the replication manager.
   char* replication_manager_ior (void);
 
   /// Returns the IOR of the naming manager.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index 2b7236818a3..ede4d544d03 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -151,20 +151,20 @@ void TAO::PG_Property_Set::set_property (
   const PortableGroup::Value * replaced_value = 0;
   int rebind_result = this->values_.rebind (name, value_copy, replaced_value);
   if (1 == rebind_result)
-  { // Existing value was replaced
-    delete replaced_value;
-  }
+    { // Existing value was replaced
+      delete replaced_value;
+    }
   else if (-1 == rebind_result)
-  { // An
-    if (TAO_debug_level > 3)
-    {
-      ACE_ERROR ( (LM_ERROR,
-        "%n\n%T: Property_set: rebind failed.\n"
-        ));
+    { // Value was not rebound.
+      if (TAO_debug_level > 3)
+        {
+          ACE_ERROR ( (LM_ERROR,
+                       "%n\n%T: Property_set: rebind failed.\n"
+                       ));
+        }
+      // @@ should throw something here
+      throw CORBA::NO_MEMORY ();
     }
-    // @@ should throw something here
-    throw CORBA::NO_MEMORY ();
-  }
 }