Update documentation for fault tolerant tao_imr_locator

3 files changed, 25 insertions, 15 deletions

diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index 66bc094b6df..d8b562fabec 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,13 @@
+Mon Jan 28 22:54:36 UTC 2013  Phillip LaBanca  <labancap@ociweb.com>
+
+        * orbsvcs/ImplRepo_Service/README:
+
+          Update documentation for fault tolerant tao_imr_locator
+
+        * utils/nsgroup/run_test.pl:
+
+          Fix file redirection option check in run_client()
+
 Mon Jan 28 22:20:12 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
 
         * orbsvcs/orbsvcs/Naming/Naming_Loader.h:
diff --git a/TAO/orbsvcs/ImplRepo_Service/README b/TAO/orbsvcs/ImplRepo_Service/README
index 77c52e31dcb..c5465941cc1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/README
+++ b/TAO/orbsvcs/ImplRepo_Service/README
@@ -222,7 +222,7 @@ The ImR_Locator implements a fault tolerant service with the following options:
   file system directory to use as the backing store for the redundant service
   pair.
 
-  The --o <ft_imr_ior_filename> option tells the ImR_Locator to output the
+  The -o <ft_imr_ior_filename> option tells the ImR_Locator to output the
   redundant service pair ImRService ior file, which it can only do after
   successfully starting the primary and backup ImRService instances. The ior
   file contains the combined profiles of the primary and backup ImRLocators. The
@@ -230,8 +230,7 @@ The ImR_Locator implements a fault tolerant service with the following options:
 
 The primary and backup ImRLocator instances should have the same ORBEndPoint
 protocol list so that any client can send a request to either primary or backup
-regardless of protocol (IIOP,UIOP,etc...). The ORBEndPoint port numbers do not
-have to match.
+regardless of protocol (IIOP,UIOP,etc...).
 
 The ImR_Locator primary and backup options cannot be passed on the command
 line along with -ORBObjRefStyle URL, since that style will cause the backup
@@ -252,7 +251,8 @@ same time the Fault Tolerant ImplRepo_Service will always be available.
 <ol>
   <li>
     <em>Start the primary.</em><br>
-    It will write the replication ior to a file in the persistence directory.<br>
+    It will write the replication ior to a file in the shared persistence
+    directory.<br>
     <code>
       tao_imr_locator
         --primary
@@ -262,7 +262,7 @@ same time the Fault Tolerant ImplRepo_Service will always be available.
   </li>
   <li>
     </em>Start the backup.</em><br>
-    Reads the primary replication ior from the persistence directory.<br>
+    Reads the primary replication ior from the shared persistence directory.<br>
     Writes the multi-profile ior to ft_imr_ior_filename<br>.
     <code>
       tao_imr_locator
@@ -291,15 +291,15 @@ same information.
 
 The Commandline parameters that are valid for ImR_Activator are
 
--c:        Run the Service command.
--d:number  Debug Information
--l         lock the database.
--o         Generate the IOR to a file (just in case some one wants to read the
-           IOR)
--r         Enable Win32 regsitry implementation.
--s         Run as a service.
--t         Set a timeout value.
--h         Prints the help.
+-c:          Run the Service command.
+-d:number    Debug Information
+-l           lock the database.
+-o           Generate the IOR to a file (just in case some one wants to read the
+             IOR)
+-r           Enable Win32 regsitry implementation.
+-s           Run as a service.
+-t           Set a timeout value.
+-h           Prints the help.
 
         When Persistence of an ImR_Activator is required, we will save
 the information about the server's that this ImR_Activator is related
diff --git a/TAO/utils/nsgroup/run_test.pl b/TAO/utils/nsgroup/run_test.pl
index a529743fd3f..bd8818e5ffa 100755
--- a/TAO/utils/nsgroup/run_test.pl
+++ b/TAO/utils/nsgroup/run_test.pl
@@ -166,7 +166,7 @@ sub run_client ($$)
     if ($client_status != $expected_test_result) {
         my $time = localtime;
         print STDERR "ERROR: client returned $client_status at $time\n";
-        if ($debug_level == 0) {
+        if ($redirection_enabled) {
             cat_file($client_stderr_file);
             cat_file($client_stdout_file);
         }