check-help-strings cleanup

This commit was SVN r32496.

orte/mca/errmgr/default_app/errmgr_default_app.c

@@ -9,6 +9,8 @@
  *                         reserved.
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
  *                         All rights reserved.
+ * Copyright (c) 2014      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -118,7 +120,7 @@ static void proc_errors(int fd, short args, void *cbdata)
     if (ORTE_PROC_STATE_UNABLE_TO_SEND_MSG == caddy->proc_state) {
         /* we can't send a message - print a message */
         nodename = orte_get_proc_hostname(&caddy->name);
-        orte_show_help("help-errmgr-base",
+        orte_show_help("help-errmgr-base.txt",
                        "undeliverable-msg",
                        true, ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
                        orte_process_info.nodename,

orte/mca/rtc/freq/rtc_freq.c

@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2014      Intel, Inc. All rights reserved
+ * Copyright (c) 2014      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -280,7 +282,7 @@ static int init(void)
     if (0 == opal_list_get_size(&tracking)) {
         /* nothing to read */
         if (0 < opal_output_get_verbosity(orte_rtc_base_framework.framework_output)) {
-            orte_show_help("help-orcm-sensor-freq.txt", "no-cores-found",
+            orte_show_help("help-rtc-freq.txt", "no-cores-found",
                            true, orte_process_info.nodename);
         }
         OPAL_LIST_DESTRUCT(&tracking);

orte/tools/orte-migrate/help-orte-migrate.txt

@@ -5,6 +5,8 @@
 #                         Corporation.  All rights reserved.
 #
 # Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2014      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,6 +19,16 @@
 ompi-migrate PID_OF_MPIRUN
   Open MPI Process Migration Tool
 
+%s
+#
+[usage-no-cr]
+This build of Open MPI does *not* include Checkpoint/Restart functionality.
+If you require this functionality re-configure Open MPI with the proper
+Checkpoint/Restart options.
+
+ompi-migrate PID_OF_MPIRUN
+  Open MPI Migrage Tool
+
 %s
 #
 [invalid_pid]
@@ -41,6 +53,15 @@ Error: Unable to connect to the Head Node Process to initiate the
         - The application with this PID isn't migratable
         - The application with this PID isn't an Open MPI application.
 #
+[non-ckptable]
+Error: The job with pid %d is not checkpointable.
+       This could be caused by one of the following:
+        - The application is using unsupported components.
+        - Your application did not select to be checkpointable
+To enable checkpointing in an application use the following AMCA parameter
+argument to mpirun:
+       -am ft-enable-cr
+#
 [not_impl]
 The following feature was requested, but is not currently implemented.
      %s