Mon Oct 13 17:25:22 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>

        * orbsvcs/orbsvcs/Naming/Naming_Server.h:
          Doxygen improvements

        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
          Removed duplicate include

        * orbsvcs/tests/ImplRepo/NameService/test.cpp:
          Zapped empty lines

        * orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl:
        * orbsvcs/tests/ImplRepo/RestartServer/Terminator.h:
          Layout changes

        * tao/ImR_Client/ImR_Client.cpp:
          Unicode logging fixes

        * tao/ImR_Client/ImplRepo.idl:
          Doxygen fixes

8 files changed, 37 insertions, 29 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c5a26f83411..611b3816355 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Mon Oct 13 17:25:22 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Naming/Naming_Server.h:
+          Doxygen improvements
+
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+          Removed duplicate include
+
+        * orbsvcs/tests/ImplRepo/NameService/test.cpp:
+          Zapped empty lines
+
+        * orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl:
+        * orbsvcs/tests/ImplRepo/RestartServer/Terminator.h:
+          Layout changes
+
+        * tao/ImR_Client/ImR_Client.cpp:
+          Unicode logging fixes
+
+        * tao/ImR_Client/ImplRepo.idl:
+          Doxygen fixes
+
 Fri Oct 10 14:27:50 UTC 2014  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/tests/ImplRepo/ReconnectServer/ReconnectServer.mpc:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 42d6fc3a649..b1f46ceb5ac 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "orbsvcs/Log_Macros.h"
-#include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
 // Placing the include of Messanging.h at this point
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
index 4d970da3706..188fbae6936 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h
@@ -15,7 +15,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_NAMING_SERVER_H
 #define TAO_NAMING_SERVER_H
 #include /**/ "ace/pre.h"
@@ -135,7 +134,7 @@ public:
   /// Returns the IOR of the naming service.
   char * naming_service_ior (void);
 
-  /// Returns a <NamingContext_ptr> for the root Naming Context.
+  /// Returns a NamingContext_ptr for the root Naming Context.
   CosNaming::NamingContext_ptr operator-> (void) const;
 
 protected:
@@ -143,11 +142,11 @@ protected:
    * Helper method: create Naming Service locally. Can be specialized to
    * refine how Naming Service components are created and initialized
    * Make the root context of size
-   * <context_size>, register it under the <root_poa>, and make the Naming
-   * Service persistent if <persistence_location> is not 0.
-   * (<persistence_location> specifies name of the file to use for
+   * @a context_size, register it under the @a root_poa, and make the Naming
+   * Service persistent if @a persistence_location is not 0.
+   * (@a persistence_location specifies name of the file to use for
    * persistent storage).
-   * If <enable_multicast> is not zero then the service will respond
+   * If @a enable_multicast is not zero then the service will respond
    * to multicast location queries.
    */
   virtual int init_new_naming (CORBA::ORB_ptr orb,
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index 086e1e39dbc..30bfdb277e5 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -1,9 +1,6 @@
-//
 // $Id$
-//
 
 #include "orbsvcs/CosNamingC.h"
-
 #include "ace/Log_Msg.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl
index 880e7790199..42a6b413857 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl
@@ -1,7 +1,5 @@
 // $Id$
 
-// messenger.idl
-
 interface Messenger
 {
   boolean send_message ( in    string user_name,
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.h b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.h
index 29be200f03e..d34f8981d8b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.h
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.h
@@ -4,10 +4,8 @@
 
 class Terminator : public ACE_Task<ACE_MT_SYNCH>
 {
- public:
-
+public:
   virtual int open(void*);
-
   virtual int svc();
 };
 
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index a1fbeed3272..c62aeb6c9d0 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -238,7 +238,7 @@ namespace TAO
               imr_info = ACE_CString (", IMR IOR=") + ior.in ();
             }
           TAOLIB_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("Notifying ImR of startup%s\n"),
+                      ACE_TEXT ("Notifying ImR of startup%C\n"),
                       imr_info.c_str ()));
         }
 
@@ -304,7 +304,7 @@ namespace TAO
       if (TAO_debug_level > 0)
         {
           TAOLIB_DEBUG((LM_INFO,
-                        "\n\nfull_ior=<%s>\n\nior=<%s>\n\n",
+                        "\n\nfull_ior=<%C>\n\nior=<%C>\n\n",
                         full_ior.in(),
                         ior.in()));
         }
diff --git a/TAO/tao/ImR_Client/ImplRepo.idl b/TAO/tao/ImR_Client/ImplRepo.idl
index 6c5a1af8e57..8c427adbe34 100644
--- a/TAO/tao/ImR_Client/ImplRepo.idl
+++ b/TAO/tao/ImR_Client/ImplRepo.idl
@@ -126,29 +126,29 @@ module ImplementationRepository
   {
     /// Activate server that is named @a server.
     ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.  The <CannotActivate> exception
-    /// is raised when <server> is found in the Repository but could not be
+    /// The @c NotFound exception is raised when @a server is not found
+    /// in the Implementation Repository.  The @c CannotActivate exception
+    /// is raised when @a server is found in the Repository but could not be
     /// activated.
     void activate_server (in string server)
       raises (NotFound, CannotActivate);
 
     /// Add/Update the the @a server.
-    /// The <NotFound> exception is raised when the activator specified
+    /// The @c NotFound exception is raised when the activator specified
     /// in the options is not registered.
     void add_or_update_server (in string server, in StartupOptions options)
       raises(NotFound);
 
     /// Remove @a server from the Implementation Repository.
     ///
-    /// The <NotFound> exception is raised when @a server is not found
+    /// The @c NotFound exception is raised when @a server is not found
     /// in the Implementation Repository.
     void remove_server (in string server)
       raises (NotFound);
 
     /// Tries to shutdown the server, first gracefully, then ungracefully.
     ///
-    /// The <NotFound> exception is raised when @a server is not found
+    /// The @c NotFound exception is raised when @a server is not found
     /// in the Implementation Repository.
     void shutdown_server (in string server)
       raises (NotFound);
@@ -156,7 +156,7 @@ module ImplementationRepository
     /// Used to notify the Implementation Repository that @a server is alive
     /// and well at @a partial_ior.
     ///
-    /// The <NotFound> exception is raised when @a server is not found
+    /// The @c NotFound exception is raised when @a server is not found
     /// in the Implementation Repository.
     void server_is_running (in string server,
                             in string partial_ior,
@@ -166,7 +166,7 @@ module ImplementationRepository
     /// Used to tell the Implementation Repository that @a server is shutting
     /// down.
     ///
-    /// The <NotFound> exception is raised when <server> is not found
+    /// The @c NotFound exception is raised when @a server is not found
     /// in the Implementation Repository.
 
     void server_is_shutting_down (in string server)
@@ -193,9 +193,6 @@ module ImplementationRepository
     oneway void shutdown(in boolean activators, in boolean servers);
   };
 
-
-
-
   /**
     * @brief The Extended Implementation Repository Administration Interface
     *
@@ -211,7 +208,6 @@ module ImplementationRepository
     void kill_server (in string server, in short signum)
       raises(NotFound, CannotComplete);
   };
-
 };
 
 #endif /* TAO_IMRCLIENT_IMPLREPO_PIDL */