From ada05657da1e8dfefe866b5634484dfa8c9ad0f2 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@pmix.org>
Date: Thu, 14 Sep 2023 11:16:13 -0600
Subject: [PATCH] Update to track master branch

There have been a number of commits that didn't make
the transition to this release branch. This was usually
due to their being things in the commit that would have
provided a positive change here, but also things that
would bring in new material not intended for this release.

Unfortunately, that makes this branch difficult to maintain.
So let's sync the branch up to the HEAD of master and then
"prune" away the pieces we know we don't want here.

Signed-off-by: Ralph Castain <rhc@pmix.org>

Includes (not an exhaustive list):
    (cherry picked from commit 84a55e1aa7)
    (cherry picked from commit 70ed11192b)
    (cherry picked from commit 19eba9ea3a)
    (cherry picked from commit 1e4edb5939)
---
 .gitignore                                    |    8 +-
 LICENSE                                       |    9 +-
 Makefile.am                                   |   23 +-
 Makefile.prte-rules                           |    9 +
 NEWS                                          |  234 +---
 README.md                                     |    2 +-
 VERSION                                       |   10 +-
 autogen.pl                                    |   70 +-
 config/prte_config_files.m4                   |    3 +-
 config/prte_configure_options.m4              |    2 +-
 config/prte_load_platform.m4                  |   19 +-
 config/prte_setup_hwloc.m4                    |   21 +-
 config/prte_setup_pmix.m4                     |   10 +-
 configure.ac                                  |   16 +-
 docs/Makefile.am                              |   37 +-
 docs/conf.py                                  |   26 +-
 docs/configuration.rst                        |  128 +++
 docs/hosts/cli.rst                            |   36 +
 docs/hosts/hostfiles.rst                      |   41 +
 docs/hosts/index.rst                          |   19 +
 docs/hosts/relative-indexing.rst              |  113 ++
 docs/hosts/rm.rst                             |    9 +
 docs/index.rst                                |   23 +-
 docs/man/man1/index.rst                       |    1 +
 docs/man/man1/prte.1.rst                      |   29 +-
 docs/man/man1/prte_info.1.rst                 |   30 +-
 docs/man/man1/prted.1.rst                     |   32 +-
 docs/man/man1/prterun.1.rst                   |   38 +-
 docs/man/man1/prun.1.rst                      |   36 +-
 docs/man/man1/pterm.1.rst                     |   29 +
 docs/notifications.rst                        |   96 ++
 docs/placement/deprecated.rst                 |  141 +++
 docs/placement/diagnostics.rst                |   77 ++
 docs/placement/examples.rst                   |  420 +++++++
 docs/placement/fundamentals.rst               |  142 +++
 docs/placement/index.rst                      |   22 +
 docs/placement/limits.rst                     |  198 ++++
 docs/placement/overview.rst                   |  190 ++++
 docs/placement/rankfiles.rst                  |   71 ++
 docs/prrte-rst-content                        |    1 +
 docs/release-notes.rst                        |    3 +-
 docs/session-directory.rst                    |   54 +
 examples/dmodex.c                             |    4 +-
 src/Makefile.am                               |    6 +-
 src/docs/Makefile.am                          |   15 +
 src/docs/prrte-rst-content/Makefile.am        |   61 +
 src/docs/prrte-rst-content/README.txt         |  132 +++
 .../cli-allow-run-as-root.rst                 |   31 +
 src/docs/prrte-rst-content/cli-bind-to.rst    |   80 ++
 src/docs/prrte-rst-content/cli-dash-host.rst  |   27 +
 .../cli-debug-daemons-file.rst                |   20 +
 .../prrte-rst-content/cli-debug-daemons.rst   |   14 +
 src/docs/prrte-rst-content/cli-display.rst    |   50 +
 .../prrte-rst-content/cli-dvm-hostfile.rst    |   85 ++
 src/docs/prrte-rst-content/cli-dvm.rst        |   56 +
 .../prrte-rst-content/cli-forward-signals.rst |   15 +
 .../cli-launcher-hostfile.rst                 |   49 +
 .../cli-leave-session-attached.rst            |   16 +
 src/docs/prrte-rst-content/cli-map-by.rst     |  136 +++
 src/docs/prrte-rst-content/cli-noprefix.rst   |   16 +
 src/docs/prrte-rst-content/cli-output.rst     |   52 +
 .../prrte-rst-content/cli-personality.rst     |   18 +
 src/docs/prrte-rst-content/cli-pmixmca.rst    |   15 +
 src/docs/prrte-rst-content/cli-prefix.rst     |   17 +
 src/docs/prrte-rst-content/cli-prtemca.rst    |   15 +
 src/docs/prrte-rst-content/cli-rank-by.rst    |   63 +
 .../prrte-rst-content/cli-runtime-options.rst |  164 +++
 .../cli-stream-buffering.rst                  |   16 +
 src/docs/prrte-rst-content/cli-tune.rst       |   25 +
 src/docs/prrte-rst-content/cli-x.rst          |   20 +
 .../deprecated-bind-to-core.rst               |   17 +
 .../deprecated-display-allocation.rst         |   17 +
 .../deprecated-display-devel-allocation.rst   |   18 +
 .../deprecated-display-devel-map.rst          |   18 +
 .../deprecated-display-map.rst                |    6 +
 .../deprecated-display-topo.rst               |   18 +
 .../prrte-rst-content/deprecated-gmca.rst     |   28 +
 src/docs/prrte-rst-content/deprecated-mca.rst |   26 +
 .../deprecated-merge-stderr-to-stdout.rst     |   17 +
 .../deprecated-output-directory.rst           |   23 +
 .../deprecated-output-filename.rst            |   22 +
 .../deprecated-report-bindings.rst            |   17 +
 .../deprecated-tag-output.rst                 |   17 +
 .../deprecated-timestamp-output.rst           |   17 +
 src/docs/prrte-rst-content/deprecated-xml.rst |   17 +
 .../prrte-rst-content/prterun-all-cli.rst     |  125 ++
 .../prterun-all-deprecated.rst                |   85 ++
 src/docs/show-help-files/.gitignore           |    3 +
 src/docs/show-help-files/Makefile.am          |  108 ++
 .../show-help-files/build-dummy-ini-files.py  |   77 ++
 src/docs/show-help-files/conf.py              |    1 +
 .../show-help-files/help-schizo-pinfo.rst     |  126 ++
 src/docs/show-help-files/help-schizo-prte.rst |  336 ++++++
 .../show-help-files/help-schizo-prted.rst     |  180 +++
 .../show-help-files/help-schizo-prterun.rst   |  659 +++++++++++
 src/docs/show-help-files/help-schizo-prun.rst |  532 +++++++++
 .../show-help-files/help-schizo-pterm.rst     |  126 ++
 src/docs/show-help-files/index.rst            |   31 +
 src/docs/show-help-files/prrte-rst-content    |    1 +
 src/docs/show-help-files/requirements.txt     |    1 +
 src/etc/Makefile.am                           |  112 +-
 src/etc/prte.conf                             |   76 ++
 src/event/event-internal.h                    |    4 +-
 src/hwloc/help-prte-hwloc-base.txt            |   69 +-
 src/include/Makefile.am                       |   45 +-
 src/mca/ess/base/Makefile.am                  |    5 +-
 src/mca/ess/base/base.h                       |    5 +-
 src/mca/ess/base/ess_base_bootstrap.c         |  566 +++++++++
 src/mca/ess/base/ess_base_std_prolog.c        |    7 +-
 src/mca/filem/raw/filem_raw_module.c          |    6 +-
 src/mca/grpcomm/base/grpcomm_base_frame.c     |   14 +-
 src/mca/grpcomm/direct/grpcomm_direct.c       |   55 +-
 src/mca/grpcomm/grpcomm.h                     |    5 +
 src/mca/oob/base/base.h                       |    4 +-
 src/mca/oob/tcp/oob_tcp_connection.h          |    4 +-
 src/mca/oob/tcp/oob_tcp_peer.h                |    4 +-
 src/mca/oob/tcp/oob_tcp_sendrecv.h            |   10 +-
 src/mca/plm/base/plm_base_launch_support.c    |   24 +-
 src/mca/plm/base/plm_base_receive.c           |    4 +-
 src/mca/prteinstalldirs/prteinstalldirs.h     |   19 +-
 src/mca/ras/base/help-ras-base.txt            |    9 +
 src/mca/ras/base/ras_base_allocate.c          |  168 ++-
 src/mca/rmaps/base/help-prte-rmaps-base.txt   | 1009 +----------------
 src/mca/rmaps/base/rmaps_base_support_fns.c   |   39 -
 src/mca/rmaps/rank_file/rmaps_rank_file.c     |   21 +-
 src/mca/rmaps/seq/rmaps_seq.c                 |   21 +-
 src/mca/schizo/base/Makefile.am               |    6 +-
 src/mca/schizo/base/help-schizo-base.txt      |   10 +
 src/mca/schizo/base/help-schizo-cli.txt       |  728 ------------
 .../schizo/base/help-schizo-deprecated.txt    |  157 ---
 src/mca/schizo/base/schizo_base_stubs.c       |  176 ++-
 src/mca/schizo/ompi/Makefile.am               |   26 +-
 src/mca/schizo/ompi/help-schizo-ompi.txt      |  183 +--
 src/mca/schizo/ompi/schizo-ompi-cli.rstxt     |  471 ++++++++
 src/mca/schizo/prte/Makefile.am               |   11 +-
 src/mca/schizo/prte/help-schizo-pinfo.txt     |   76 --
 src/mca/schizo/prte/help-schizo-prte.txt      |  191 ----
 src/mca/schizo/prte/help-schizo-prted.txt     |   98 --
 src/mca/schizo/prte/help-schizo-prterun.txt   |  409 -------
 src/mca/schizo/prte/help-schizo-prun.txt      |  327 ------
 src/mca/schizo/prte/help-schizo-pterm.txt     |   75 --
 src/mca/schizo/prte/schizo_prte.c             |    5 +
 src/mca/schizo/schizo.h                       |    2 +-
 src/mca/state/base/state_base_fns.c           |    8 +-
 src/mca/state/dvm/state_dvm.c                 |   26 +-
 src/mca/state/prted/state_prted.c             |   24 +-
 src/prted/pmix/pmix_server.c                  |   80 +-
 src/prted/pmix/pmix_server_dyn.c              |    6 +-
 src/prted/pmix/pmix_server_gen.c              |  171 ++-
 src/prted/pmix/pmix_server_internal.h         |    3 +-
 src/prted/pmix/pmix_server_queries.c          |  321 ++++--
 src/prted/prte_app_parse.c                    |   37 +-
 src/rml/rml_recv.c                            |    6 +-
 src/rml/routed_radix.c                        |   11 +-
 src/runtime/help-prte-runtime.txt             |   64 +-
 src/runtime/prte_globals.c                    |    3 +-
 src/runtime/prte_globals.h                    |    1 +
 src/runtime/prte_init.c                       |   38 +-
 src/runtime/prte_wait.c                       |    4 +-
 src/runtime/runtime_internals.h               |    4 +-
 src/tools/Makefile.am                         |    1 +
 src/tools/prte_info/components.c              |    4 +-
 src/tools/prte_info/prte_info.c               |    2 +-
 src/tools/prted/prted.c                       |   20 +-
 src/util/attr.c                               |    4 +
 src/util/attr.h                               |    3 +-
 src/util/dash_host/dash_host.c                |   15 +-
 src/util/prte_cmd_line.h                      |    3 +
 src/util/string_copy.c                        |   41 -
 src/util/string_copy.h                        |   77 --
 170 files changed, 8137 insertions(+), 4461 deletions(-)
 create mode 100644 docs/configuration.rst
 create mode 100644 docs/hosts/cli.rst
 create mode 100644 docs/hosts/hostfiles.rst
 create mode 100644 docs/hosts/index.rst
 create mode 100644 docs/hosts/relative-indexing.rst
 create mode 100644 docs/hosts/rm.rst
 create mode 100644 docs/man/man1/pterm.1.rst
 create mode 100644 docs/notifications.rst
 create mode 100644 docs/placement/deprecated.rst
 create mode 100644 docs/placement/diagnostics.rst
 create mode 100644 docs/placement/examples.rst
 create mode 100644 docs/placement/fundamentals.rst
 create mode 100644 docs/placement/index.rst
 create mode 100644 docs/placement/limits.rst
 create mode 100644 docs/placement/overview.rst
 create mode 100644 docs/placement/rankfiles.rst
 create mode 120000 docs/prrte-rst-content
 create mode 100644 docs/session-directory.rst
 create mode 100644 src/docs/Makefile.am
 create mode 100644 src/docs/prrte-rst-content/Makefile.am
 create mode 100644 src/docs/prrte-rst-content/README.txt
 create mode 100644 src/docs/prrte-rst-content/cli-allow-run-as-root.rst
 create mode 100644 src/docs/prrte-rst-content/cli-bind-to.rst
 create mode 100644 src/docs/prrte-rst-content/cli-dash-host.rst
 create mode 100644 src/docs/prrte-rst-content/cli-debug-daemons-file.rst
 create mode 100644 src/docs/prrte-rst-content/cli-debug-daemons.rst
 create mode 100644 src/docs/prrte-rst-content/cli-display.rst
 create mode 100644 src/docs/prrte-rst-content/cli-dvm-hostfile.rst
 create mode 100644 src/docs/prrte-rst-content/cli-dvm.rst
 create mode 100644 src/docs/prrte-rst-content/cli-forward-signals.rst
 create mode 100644 src/docs/prrte-rst-content/cli-launcher-hostfile.rst
 create mode 100644 src/docs/prrte-rst-content/cli-leave-session-attached.rst
 create mode 100644 src/docs/prrte-rst-content/cli-map-by.rst
 create mode 100644 src/docs/prrte-rst-content/cli-noprefix.rst
 create mode 100644 src/docs/prrte-rst-content/cli-output.rst
 create mode 100644 src/docs/prrte-rst-content/cli-personality.rst
 create mode 100644 src/docs/prrte-rst-content/cli-pmixmca.rst
 create mode 100644 src/docs/prrte-rst-content/cli-prefix.rst
 create mode 100644 src/docs/prrte-rst-content/cli-prtemca.rst
 create mode 100644 src/docs/prrte-rst-content/cli-rank-by.rst
 create mode 100644 src/docs/prrte-rst-content/cli-runtime-options.rst
 create mode 100644 src/docs/prrte-rst-content/cli-stream-buffering.rst
 create mode 100644 src/docs/prrte-rst-content/cli-tune.rst
 create mode 100644 src/docs/prrte-rst-content/cli-x.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-bind-to-core.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-display-allocation.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-display-devel-allocation.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-display-devel-map.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-display-map.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-display-topo.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-gmca.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-mca.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-merge-stderr-to-stdout.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-output-directory.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-output-filename.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-report-bindings.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-tag-output.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-timestamp-output.rst
 create mode 100644 src/docs/prrte-rst-content/deprecated-xml.rst
 create mode 100644 src/docs/prrte-rst-content/prterun-all-cli.rst
 create mode 100644 src/docs/prrte-rst-content/prterun-all-deprecated.rst
 create mode 100644 src/docs/show-help-files/.gitignore
 create mode 100644 src/docs/show-help-files/Makefile.am
 create mode 100755 src/docs/show-help-files/build-dummy-ini-files.py
 create mode 120000 src/docs/show-help-files/conf.py
 create mode 100644 src/docs/show-help-files/help-schizo-pinfo.rst
 create mode 100644 src/docs/show-help-files/help-schizo-prte.rst
 create mode 100644 src/docs/show-help-files/help-schizo-prted.rst
 create mode 100644 src/docs/show-help-files/help-schizo-prterun.rst
 create mode 100644 src/docs/show-help-files/help-schizo-prun.rst
 create mode 100644 src/docs/show-help-files/help-schizo-pterm.rst
 create mode 100644 src/docs/show-help-files/index.rst
 create mode 120000 src/docs/show-help-files/prrte-rst-content
 create mode 120000 src/docs/show-help-files/requirements.txt
 create mode 100644 src/etc/prte.conf
 create mode 100644 src/mca/ess/base/ess_base_bootstrap.c
 delete mode 100644 src/mca/schizo/base/help-schizo-cli.txt
 delete mode 100644 src/mca/schizo/base/help-schizo-deprecated.txt
 create mode 100644 src/mca/schizo/ompi/schizo-ompi-cli.rstxt
 delete mode 100644 src/mca/schizo/prte/help-schizo-pinfo.txt
 delete mode 100644 src/mca/schizo/prte/help-schizo-prte.txt
 delete mode 100644 src/mca/schizo/prte/help-schizo-prted.txt
 delete mode 100644 src/mca/schizo/prte/help-schizo-prterun.txt
 delete mode 100644 src/mca/schizo/prte/help-schizo-prun.txt
 delete mode 100644 src/mca/schizo/prte/help-schizo-pterm.txt
 delete mode 100644 src/util/string_copy.c
 delete mode 100644 src/util/string_copy.h

diff --git a/.gitignore b/.gitignore
index e89ebd6d28..f53bf4e4b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,7 +71,6 @@ vc70.pdb
 .hgignore_local
 stamp-h?
 AUTHORS
-docs-venv/
 
 ar-lib
 ylwrap
@@ -149,6 +148,7 @@ src/include/prte_config.h.in
 src/include/version.h
 src/include/prte_frameworks.c
 src/include/prte_frameworks.h
+src/include/frameworks.h
 src/include/prte_config.h
 
 src/mca/rmaps/rank_file/rmaps_rank_file_lex.c
@@ -161,6 +161,7 @@ src/tools/prte/prte
 src/tools/pcc/pcc
 src/tools/pcc/pcc-wrapper-data.txt
 src/tools/pterm/pterm
+src/tools/psched/psched
 
 src/util/hostfile/hostfile_lex.c
 src/util/keyval/keyval_lex.c
@@ -188,7 +189,12 @@ docs/_build
 docs/_static
 docs/_static/css/custom.css
 docs/_templates
+src/docs/_build
+src/docs/mca/mca.rst
+src/docs/mca/help*rst
+__pycache__
 
 # Common Python virtual environment directory names
 venv
 py??
+docs-venv
diff --git a/LICENSE b/LICENSE
index 194f207689..51678cd8e6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,14 +1,14 @@
 Most files in this release are marked with the copyrights of the
 organizations who have edited them.  The copyrights below are in no
 particular order and generally reflect members of the PMIx and
-PRRTE core teams who have contributed code to this release.
+Open MPI core teams who have contributed code to this release.
 The copyrights for code used under license from other parties are
 included in the corresponding files.
 
 Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
                         University Research and Technology
                         Corporation.  All rights reserved.
-Copyright (c) 2004-2023 The University of Tennessee and The University
+Copyright (c) 2004-2017 The University of Tennessee and The University
                         of Tennessee Research Foundation.  All rights
                         reserved.
 Copyright (c) 2004-2010 High Performance Computing Center Stuttgart,
@@ -53,13 +53,12 @@ Copyright (c) 2014-2015 Hewlett-Packard Development Company, LP.  All
                         rights reserved.
 Copyright (c) 2013-2017 Research Organization for Information Science (RIST).
                         All rights reserved.
-Copyright (c) 2017-2023 Amazon.com, Inc. or its affiliates.  All Rights
+Copyright (c) 2017-2018 Amazon.com, Inc. or its affiliates.  All Rights
                         reserved.
 Copyright (c) 2018      DataDirect Networks. All rights reserved.
-Copyright (c) 2020-2023 Nanook Consulting. All rights reserved.
-Copyright (c) 2022-2023 Triad National Security, LLC. All rights reserved
 Copyright (c) 2023      Advanced Micro Devices, Inc. All rights reserved.
 
+Copyright (c) 2023      Nanook Consulting.  All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
diff --git a/Makefile.am b/Makefile.am
index 10e2e98bcd..1145e4272d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,9 @@
 # Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2017-2018 Amazon.com, Inc. or its affiliates.
 #                         All Rights reserved.
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
+#
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -27,13 +29,6 @@ EXTRA_DIST = README.md VERSION LICENSE autogen.pl
 
 include examples/Makefile.include
 
-# dist-hook:
-#	env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(PRTE_REPO_REV)"
-#	@if test ! -s $(distdir)/AUTHORS ; then \
-#		echo "AUTHORS file is empty; aborting distribution"; \
-#		exit 1; \
-#	fi
-
 # Check for common symbols.  Use a "-hook" to increase the odds that a
 # developer will see it at the end of their installation process.
 install-exec-hook:
@@ -46,15 +41,3 @@ install-exec-hook:
 	fi
 
 ACLOCAL_AMFLAGS = -I config
-
-# Use EXTRA_DIST and an explicit target (with a FORCE hack so that
-# it's always run) rather than a dist-hook because there's some magic
-# extra logic in Automake that will add AUTHORS to EXTRA_DIST if the
-# file exists when Automake is run.  Once we're explicit (to avoid odd
-# copy behavior), it's easier to always build AUTHORS here, rather
-# than trying to handle the EXTRA_DIST dependency from a clean repo
-# (no AUTHORS file present) and use dist-hook to run every time.
-#AUTHORS: FORCE
-#	$(PERL) "$(top_srcdir)/contrib/dist/make-authors.pl" --skip-ok --quiet --srcdir="$(top_srcdir)"
-
-#FORCE:
diff --git a/Makefile.prte-rules b/Makefile.prte-rules
index 1a39b5956e..0edaaf1c95 100644
--- a/Makefile.prte-rules
+++ b/Makefile.prte-rules
@@ -2,6 +2,7 @@
 # Copyright (c) 2008-2022 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # Copyright (c) 2020      Intel, Inc.  All rights reserved.
+# Copyright (c) 2023      Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -21,3 +22,11 @@ prte__v_SPHINX_HTML_0 = @echo "  GENERATE HTML docs";
 PRTE_V_SPHINX_MAN = $(prte__v_SPHINX_MAN_$V)
 prte__v_SPHINX_MAN_ = $(prte__v_SPHINX_MAN_$AM_DEFAULT_VERBOSITY)
 prte__v_SPHINX_MAN_0 = @echo "  GENERATE man pages";
+
+PRTE_V_TXT = $(prte__v_SPHINX_TXT_$V)
+prte__v_TXT_ = $(prte__v_SPHINX_TXT_$AM_DEFAULT_VERBOSITY)
+prte__v_TXT_0 = @echo "  GENERATE text files";
+
+PRTE_V_LN_S = $(prte__v_LN_S_$V)
+prte__v_LN_S_ = $(prte__v_LN_S_$AM_DEFAULT_VERBOSITY)
+prte__v_LN_S_0 = @echo "  LN_S    " `basename $@`;
diff --git a/NEWS b/NEWS
index 5744089abd..2ed6f7e5eb 100644
--- a/NEWS
+++ b/NEWS
@@ -19,10 +19,10 @@ Copyright (c) 2012      Oak Ridge National Labs.  All rights reserved.
 Copyright (c) 2012      Sandia National Laboratories.  All rights reserved.
 Copyright (c) 2012      University of Houston. All rights reserved.
 Copyright (c) 2013      NVIDIA Corporation.  All rights reserved.
-Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
 Copyright (c) 2018-2001 Amazon.com, Inc. or its affiliates.  All Rights
                         reserved.
-Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
@@ -36,89 +36,7 @@ bug fixes (and other actions) for each version of PRRTE since
 version 1.0.
 
 
-3.0.1 -- TBD
-------------------------------------
-PR #1696: Always set waitpid-fired flag when proc exits
-PR #1694: Fix passing of envars for spawn
-PR #1692: Multiple commits
-  - Plug small memory leaks
-  - Adhere to project's variable declaration convention
-  - Cleanup initial implementation of allocate and session control
-  - Protect one more place for session_control
-  - Fix the routing for non-tree-spawn launch
-  - Cleanup prte_info output
-  - Ensure we exit cleanly when a daemon fails to start
-  - Store prted URI under correct name
-  - Remove duplicate computation of routing tree
-  - Minor cleanup of verbose output
-  - Send direct to HNP if we don't know a route
-  - Cleanup some mangled formatting
-  - Cleanup some debug output
-  - Update the pmix server integration
-PR #1686: Update config/oac submodule
-PR #1682: Multiple commits
-  - Remove wrapper definitions
-  - Extend example to check for sessionID and jobID
-PR #1678: Multiple commits
-  - Add --debug-daemon to prted options
-  - Add the rml and routed types to prte_info array
-PR #1674: Ensure cmd line errors provide error messages
-PR #1672: Multiple commits
-  - Correct default binding for map-by node/slot
-  - Provide better error message for cross-package binding
-  - Add missing command line directives
-  - Fix minor issues found in tests
-  - Silence compiler warning in test/connect
-  - Silence compiler warnings in examples
-  - Use exit macros in example dmodex
-  - Remove antiquated code that can cause problems
-  - Update sphinx requirements
-  - Remove the PMIX_SIZE_ESTIMATE support
-PR #1660: Correct function name when using older hwloc versions
-PR #1658: Multiple commits
-  - Properly handle overload-allowed
-  - Define MIN for environments that lack it
-  - Fix a typo in the README
-  - Fix Sphinx parsing error
-PR #1644: Multiple commits
-  - Add a spawn_multiple test
-  - Provide an estimate of the size of registration data
-  - Provide size estimates for collective operations that return data
-  - Add an option to display the available CPUs
-  - Fix generate_dist type
-  - Protect against missing attribute definition
-  - Set distances array type
-  - Add "parseable" display qualifier
-  - Generate distances by default
-  - Show help message when mapping too low
-  - Fix round-robin by obj with multiple cpus/rank
-  - Fix map-by slot and node for multiple cpus/rank
-PR #1633: First cut of Sphinx/ReadTheDocs docs
-PR #1626: Remove unused variable
-PR #1622: Multiple commits
-  - Don't error out on binding if not required
-  - Check for and track scheduler attachment
-  - Accept local group op upcalls
-  - Add an IOF stress test
-  - Protect against earlier PMIx versions
-  - Pass our event base for use by the PMIx library as an aux base
-  - Update to compatibility with PMIx master branch
-  - Silence warning - add return values
-  - Begin adding support for new server module fn pointer
-  - Designate the framework project as PRTE
-  - Minor touchups of the "fault" example
-  - Include topology in allocated node info
-  - Remove debug
-  - Extend query support to include allocation info
-  - Update version to 3.0.1
-PR #1600: Multiple commits
-  - Minor change to check_os_flavors
-  - Don't emit an error output if not needed
-PR #1597: Fix oac_check_package.m4
-PR #1595: build: fix bashisms in configure
-
-
-3.0.0 -- 13 Nov 2022
+3.0.0: TBD
 ------------------------------------
 **** NOTE: This release represents a major update to the PRRTE
 code base from prior releases. Many of the changes will be
@@ -134,17 +52,11 @@ may (likely) impact users. These include:
     is detected by PRRTE thru the environment.
   * a more extensive "--help" support system.
   * reduction in the "--rank-by" options.
-  * addition of new "--output", "--display", and "--runtime-options"
-    command line directives
+  * addition of new "--output" options
   * removal of the "mindist" mapper due to lack of a maintainer
-  * remove of man pages for PRRTE tools - this has been replaced
-    with a hierarchical help system. Thus, the command "prun --help"
-    will output the former man page for the prun command. Users
-    can then access more detailed help on any command line option
-    by simply adding it to the help command - i.e., "prun --help <option>"
 There are quite a few more changes than listed here, but they mostly
 pertain to code internals. However, these dictate that PRRTE v3.0.0
-require use of PMIx v4.2.2 or above to compile. Note that this doesn't
+require use of PMIx v4.2 or above to compile. Note that this doesn't
 impact the PMIx level associated with any applications executed by
 PRRTE - the only requirement is that applications link against a
 PMIx version that meets the PMIx cross-version requirements (i.e., a
@@ -152,142 +64,6 @@ minimum of PMIx v2.5).
 
 Detailed changes:
 
-PR #1591: Multiple commits
-  - fix conflict
-  - remove unused vars in tools area
-  - adjust prterun to prefix ns: for dvm option
-  - Cleanup the --dvm option a bit
-  - Some more minor cleanups of --dvm
-PR #1586: Multiple commits
-  - Extend PBS allocation detection to cover Cobalt
-  - Broaden ability to require PRRTE to discover slots
-  - Fix default slots count when using --use-hwthread-cpus
-  - Cleanup schizo/prte help files
-  - schizo-ompi: add examples for verbose [dvm] block
-  - schizo:ompi: require arg when specifying dvm
-  - rank_file/LSF: Fix LSB_AFFINITY_HOSTFILE ranking policy
-  - Fix the load-balancing and span round-robin mappers
-  - doc: Fix --rank-by help output
-PR #1575: Ensure we init the available node bit tracker
-PR #1572: Fix some default map/rank policy settings
-PR #1570: Multiple commits
-  - rmaps/base: Fix segv on failed-map
-  - ompi/schizo: Fix deprecated message for rankfile
-  - Rankfile slots fix and LSF support fix for LSB_AFFINITY_HOSTFILE
-PR #1564: Add an example that retrieves node IDs
-PR #1562: Remove check for resilience that caused a segfault
-PR #1557: Update NEWS
-PR #1556: Multiple commits
-  - Support query of pset membership
-  - Cleanup grpcomm cruft
-  - remove some unused vars
-  - squash warnings
-  - unused var
-  - more unused vars
-  - remove unused vars and fix rc/ret typo
-  - misc unused var cleanups
-  - Reduce debugger confusion
-  - Pickup missing changes
-PR #1548: Multiple commits
-  - alps fixes for mca move
-  - schizo/ompi: Fix --report-pid/sid.
-  - Change --stop-in-* to take optional arguments.
-  - Update Open MPI mpirun help text
-  - Fix memory leaks in RML and at job termination.
-  - plm/tm: Fix build breakage
-PR #1539: Multiple commits
-  - Fix a typo and expand debugger example range to cover MPI
-  - ras/lsf: Fix build breakage
-  - Catch some more component updates
-  - Allow prterun to act as prun
-PR #1534: Multiple commits
-  - Fix print statement
-  - Push launch-agent CLI into the env
-  - Fix mapping by pe-list when oversubscribed
-PR #1530: Actually support the output-proctable option
-PR #1528: Add missing commits and new additions
-  - Complete help text on notifications
-  - BuildRequires: gcc
-  - Plug a memory leak
-  - schizo/ompi: Fix --use-hwthead-cpus option
-  - Fix --preload-binary
-PR #1522: Roll version to rc2
-PR #1518: schizo_ompi: use the OMPI_MCA_PREFIXES env var
-PR #1517: Multiple commits
-  - Remove the --with-ft configure option
-  - Replace prte_output with pmix_output
-  - Cleanup code clause identification
-  - Fix a few minor things
-  - Fix setting of runtime options
-  - Update the schizo/ompi component
-  - ompi/schizo: Fix --do-not-launch and --show-progress
-  - schizo/ompi: Fix --display topo
-  - schizo/ompi: Remove --display-devel-allocation
-  - Added specfile BuildRequires
-  - Add action to check commits on pull requests
-  - Restore the PRRTE application-level fault tolerance modes
-  - Update minimum PMIx version to v4.2.2
-PR #1501: Multiple commits
-  - Delete PRRTE MCA infrastructure
-  - Remove stale m4
-  - Handle default MCA params
-  - Rename component libraries and component struct names
-PR #1498: Remove leftover BINDTONONE SET debug code
-PR #1495: Multiple commits
-  - Revise passing of runtime options
-  - Add/modify some spawn-related tests
-  - Update to use PMIx CLI option macro and "check true"
-PR #1491: Multiple commits
-  - stream-buffering is an OMPI option, so make it an MCA
-  - Deprecated the --stream-buffering CLI option
-  - Fix hetero topology operations
-PR #1487: Use correct target path for Flex check
-PR #1485: Fix bug in not updating cached daemon topologies
-PR #1483: Fix oversubscription to not require binding
-PR #1481: Multiple commits
-  - Add support for querying process group attributes
-  - Initial work on --enable-devel-check
-  - Fix free in hostfile
-  - Continue progress on enable-devel-check
-PR #1474: Multiple commits
-  - Upgrade the cmd line option checker
-  - Enable the "show-progress" runtime option
-  - Fix the stack trace handshake
-  - Add more debug to the node list construction procedure
-PR #1469: Multiple commits
-  - Raise the minimum required PMIx level to v4.2.1
-  - Separate out the runtime controls options
-PR #1466: Multiple commits
-  - Ensure tools get string explanation for non-norm term
-  - stop-in-app does not require an argument
-  - Fix compile error with FT enabled
-  - schizo/ompi: Fix --do-not-launch
-  - Fix typo in help message
-  - schizo/ompi: Add translation for --merge-stderr-to-stdout
-  - java: add ease-of-use feature for ompi java apps
-  - Fix second pass on map-by obj
-  - Remove stale references to alloc-dev as display options
-  - Get the "--display topo" option to work
-PR #1456: Multiple commits
-  - Fix synthetic topo support and too early sanity check
-  - Correct the support check logic
-  - Remove the "report" qualifier from "--bind-to"
-  - Fix bind-upward check and cleanup bind output
-PR #1450: Update current state of PRRTE help docs
-PR #1448: Provide upgrade warning for ancient Slurm versions
-PR #1447: Fix app/local rank computation
-PR #1444: Fix keepalive CLI option
-PR #1441: Include the PMIx libdir in the ssh prefix operation
-PR #1440: Do not error out if lib is symlinked to lib64
-PR #1437: Avoid loopback interfaces if not needed
-PR #1433: Update the job object's binding policy
-PR #1431: Fix the tm configure logic
-PR #1429: Update help docs
-PR #1427: Cleanup the PRRTE rpm spec file
-PR #1423: Fix typo in ppr mapper
-PR #1417: Remove stale file reference
-PR #1415: Update release files for rc1
-PR #1414: Remove stale files
 PR #1412: Restrict PRRTE to PMIx v4.2+
 PR #1410: Remove schizo/hydra component
 PR #1409: Add new output options to help string
diff --git a/README.md b/README.md
index 4b6248e4ec..f459bfe117 100644
--- a/README.md
+++ b/README.md
@@ -21,4 +21,4 @@ Developers who clone the PRRTE Git repository will not have the
 HTML documentation and man pages by default; it must be built.
 Instructions for how to build the PRRTE documentation can be found
 here:
-https://docs.prrte.org/en/master/developers/prerequisites.html#sphinx.
+https://docs.prrte.org/en/latest/developers/sphinx.html
diff --git a/VERSION b/VERSION
index 9f4a65db0f..be2ea945d8 100644
--- a/VERSION
+++ b/VERSION
@@ -15,9 +15,9 @@
 # major, minor, and release are generally combined in the form
 # <major>.<minor>.<release>.
 
-major=3
+major=4
 minor=0
-release=1
+release=0
 
 # PRRTE required dependency versions.
 # List in x.y.z format.
@@ -37,7 +37,7 @@ flex_min_version=2.5.4
 # requirement is that it must be entirely printable ASCII characters
 # and have no white space.
 
-greek=rc2
+greek=a1
 
 # If repo_rev is empty, then the repository version number will be
 # obtained during "make dist" via the "git describe --tags --always"
@@ -89,12 +89,12 @@ date="Nov 24, 2018"
 # Version numbers are described in the Libtool current:revision:age
 # format.
 
-libprrte_so_version=3:1:0
+libprrte_so_version=4:0:0
 
 # "Common" components install standalone libraries that are run-time
 # linked by one or more components.  So they need to be versioned as
 # well.  Yuck; this somewhat breaks the
 # components-don't-affect-the-build-system abstraction.
 
-libprrte_common_alps_so_version=3:1:0
+libprrte_common_alps_so_version=4:0:0
 
diff --git a/autogen.pl b/autogen.pl
index 67394820da..8667914dfe 100755
--- a/autogen.pl
+++ b/autogen.pl
@@ -8,8 +8,9 @@
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2015      IBM Corporation.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
 #
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -146,6 +147,13 @@ sub mca_process_component {
         verbose "    Found configure.m4 file\n";
     }
 
+    # Does this directory have a
+    # help-{framework}-{component}.rst file?
+    if (-f "$cdir/help-$framework-$component.rst") {
+        $found_component->{"rst"} = 1;
+        verbose "    Found help-$framework-$component.rst file\n";
+    }
+
     # Push the results onto the $mca_found hash array
     push(@{$mca_found->{$framework}->{"components"}},
          $found_component);
@@ -275,6 +283,7 @@ (\$\@)
     my (@frameworks) = @_;
     my $framework_array_output="";
     my $framework_decl_output="";
+    my $framework_name_output="";
 
     foreach my $framework (@frameworks) {
         # There is no common framework object
@@ -282,11 +291,15 @@ (\$\@)
             my $framework_name = "prte_${framework}_base_framework";
             $framework_array_output .= "    &$framework_name,\n";
             $framework_decl_output .= "extern pmix_mca_base_framework_t $framework_name;\n";
+            $framework_name_output .= "    \"${framework}\",\n";
         }
     }
+    $framework_name_output .= "    \"hwloc\",\n";
+    $framework_name_output .= "    \"if\",\n";
+    $framework_name_output .= "    \"reachable\",\n";
 
     my $ifdef_string = uc "prte_FRAMEWORKS_H";
-    open(FRAMEWORKS_OUT, ">src/include/frameworks.h");
+    open(FRAMEWORKS_OUT, ">src/include/prte_frameworks.h");
     printf FRAMEWORKS_OUT "%s", "/*
  * This file is autogenerated by autogen.pl. Do not edit this file by hand.
  */
@@ -296,11 +309,29 @@ (\$\@)
 #include \"src/mca/base/pmix_mca_base_framework.h\"
 
 $framework_decl_output
-static pmix_mca_base_framework_t *prte_frameworks[] = {
+PRTE_EXPORT extern pmix_mca_base_framework_t *prte_frameworks[];
+PRTE_EXPORT extern char *prte_framework_names[];
+
+#endif /* $ifdef_string */\n\n";
+    close(FRAMEWORKS_OUT);
+
+    open(FRAMEWORKS_OUT, ">src/include/prte_frameworks.c");
+    printf FRAMEWORKS_OUT "%s", "/*
+ * This file is autogenerated by autogen.pl. Do not edit this file by hand.
+ */
+
+#include \"src/include/prte_config.h\"
+#include \"src/include/prte_frameworks.h\"
+
+pmix_mca_base_framework_t *prte_frameworks[] = {
 $framework_array_output    NULL
 };
 
-#endif /* $ifdef_string */\n\n";
+char *prte_framework_names[] = {
+$framework_name_output    NULL
+};
+
+";
     close(FRAMEWORKS_OUT);
 }
 
@@ -896,13 +927,11 @@ sub replace_config_sub_guess {
     open(IN, "git submodule status|")
         || die "Can't run \"git submodule status\"";
     while (<IN>) {
-        chomp;
-        $_ =~ m/^(.)(.{40}) ([^ ]+) *\(*([^\(\)]*)\)*$/;
-        my $status     = $1;
-        my $local_hash = $2;
-        my $path       = $3;
-        my $extra      = $4;
+        $_ =~ m/^(.)[0-9a-f]{40}\s+(\S+)/;
+        my $status = $1;
+        my $path   = $2;
 
+        print("=== Submodule: $path\n");
         # Make sure the submodule is there
         if ($status eq "-") {
             print("    ==> ERROR: Missing
@@ -914,19 +943,14 @@ sub replace_config_sub_guess {
             exit(1);
         }
 
-        # See if the submodule is at the expected git hash
-        # (it may be ok if it's not -- just warn the user)
-        $extra =~ m/-g(.+)/;
-        my $remote_hash = $1;
-        if ($remote_hash) {
-            my $abbrev_local_hash = substr($local_hash, 0, length($remote_hash));
-            if ($remote_hash ne $abbrev_local_hash) {
-                print("    ==> WARNING: Submodule hash is different than upstream.
-         If this is not intentional, you may want to run:
-         \"git submodule update --init --recursive\"\n");
-            } else {
-                print("    Local hash == remote hash (good!)\n");
-            }
+        # See if the commit in the submodule is not the same as the
+        # commit that the git submodule thinks it should be.
+        elsif ($status eq "+") {
+            print("    ==> WARNING: Submodule hash is different than upstream.
+If this is not intentional, you may want to run:
+\"git submodule update --init --recursive\"\n");
+        } else {
+            print("    Local hash is what is expected by the submodule (good!)\n");
         }
     }
 }
diff --git a/config/prte_config_files.m4 b/config/prte_config_files.m4
index 69226df6df..750484975e 100644
--- a/config/prte_config_files.m4
+++ b/config/prte_config_files.m4
@@ -4,7 +4,7 @@
 # Copyright (c) 2016-2020 Intel, Inc.  All rights reserved.
 # Copyright (c) 2019      Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
-# Copyright (c) 2022      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -18,7 +18,6 @@ AC_DEFUN([PRTE_CONFIG_FILES],[
     AC_CONFIG_FILES([
         src/Makefile
         src/etc/Makefile
-        src/include/Makefile
         src/util/Makefile
         src/util/hostfile/Makefile
         src/tools/pcc/Makefile
diff --git a/config/prte_configure_options.m4 b/config/prte_configure_options.m4
index 61ac057b88..8880ff85ad 100644
--- a/config/prte_configure_options.m4
+++ b/config/prte_configure_options.m4
@@ -18,7 +18,7 @@ dnl                         reserved.
 dnl Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
 dnl
 dnl Copyright (c) 2016-2020 Intel, Inc.  All rights reserved.
-dnl Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+dnl Copyright (c) 2021-2023 Nanook Consulting  All rights reserved.
 dnl Copyright (c) 2022      Amazon.com, Inc. or its affiliates.
 dnl                         All Rights reserved.
 dnl $COPYRIGHT$
diff --git a/config/prte_load_platform.m4 b/config/prte_load_platform.m4
index fd31ad252a..bf78c80440 100644
--- a/config/prte_load_platform.m4
+++ b/config/prte_load_platform.m4
@@ -14,7 +14,7 @@ dnl Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
 dnl Copyright (c) 2015      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
 dnl Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
-dnl Copyright (c) 2021      Nanook Consulting.  All rights reserved.
+dnl Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -89,6 +89,9 @@ AC_DEFUN([PRTE_LOAD_PLATFORM], [
         # define an alternate default mca param filename
         platform_alt_mca_file="`basename $platform_loaded`.conf"
 
+        # define an alternate default configuration filename
+        platform_alt_config_file="`basename $platform_loaded`.config"
+
         # look where platform file is located for platform.conf name
         if test -r "${platform_file_dir}/${platform_alt_mca_file}" ; then
             AC_SUBST(PRTE_DEFAULT_MCA_PARAM_CONF, [$platform_file_dir/$platform_alt_mca_file])
@@ -103,6 +106,20 @@ AC_DEFUN([PRTE_LOAD_PLATFORM], [
             AC_SUBST(PRTE_PARAM_FROM_PLATFORM, "no")
         fi
 
+        # look where platform file is located for platform.config name
+        if test -r "${platform_file_dir}/${platform_alt_config_file}" ; then
+            AC_SUBST(PRTE_DEFAULT_CONFIG, [$platform_file_dir/$platform_alt_config_file])
+            AC_SUBST(PRTE_PARAM_FROM_PLATFORM, "yes")
+        # if not, see if a file is there with the default name
+        elif test -r "${platform_file_dir}/prte.config" ; then
+            AC_SUBST(PRTE_DEFAULT_CONFIG, [$platform_file_dir/prte.config])
+            AC_SUBST(PRTE_PARAM_FROM_PLATFORM, "yes")
+        # if not, then just use the default
+        else
+            AC_SUBST(PRTE_DEFAULT_CONFIG, [prte.config])
+            AC_SUBST(PRTE_PARAM_FROM_PLATFORM, "no")
+        fi
+
         patch_dir="${with_prte_platform}.patches"
         if test -n "$with_prte_platform_patches_dir"; then
             if test "$with_prte_platform_patches_dir" = "yes"; then
diff --git a/config/prte_setup_hwloc.m4 b/config/prte_setup_hwloc.m4
index e541529da5..01703ed29d 100644
--- a/config/prte_setup_hwloc.m4
+++ b/config/prte_setup_hwloc.m4
@@ -3,7 +3,7 @@
 # Copyright (c) 2009-2020 Cisco Systems, Inc.  All rights reserved
 # Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
 # Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
 # Copyright (c) 2021-2022 Amazon.com, Inc. or its affiliates.
 #                         All Rights reserved.
 # $COPYRIGHT$
@@ -93,12 +93,12 @@ AC_DEFUN([PRTE_SETUP_HWLOC],[
            prte_have_topology_dup=1],
           [AC_MSG_RESULT([no])])
 
-    AC_MSG_CHECKING([if hwloc version is 2.0 or greater])
+    AC_MSG_CHECKING([if hwloc version is at least 2.0])
     AC_COMPILE_IFELSE(
           [AC_LANG_PROGRAM([#include <hwloc.h>],
           [[
     #if HWLOC_VERSION_MAJOR < 2
-    #error "hwloc version is less than 2.x"
+    #error "hwloc version is less than 2.0"
     #endif
           ]])],
           [AC_MSG_RESULT([yes])
@@ -106,6 +106,21 @@ AC_DEFUN([PRTE_SETUP_HWLOC],[
           [AC_MSG_RESULT([no])
            prte_version_high=0])
 
+    AC_MSG_CHECKING([if hwloc version is greater than 2.x])
+    AC_COMPILE_IFELSE(
+          [AC_LANG_PROGRAM([#include <hwloc.h>],
+          [[
+    #if HWLOC_VERSION_MAJOR > 2
+    #error "hwloc version is greater than 2.x"
+    #endif
+          ]])],
+          [AC_MSG_RESULT([no])],
+          [AC_MSG_RESULT([yes])
+           AC_MSG_WARN([This PRRTE version does not support HWLOC])
+           AC_MSG_WARN([versions 3.x or higher. Please direct us])
+           AC_MSG_WARN([to an HWLOC version in the 1.11-2.x range.])
+           AC_MSG_ERROR([Cannot continue])])
+
     CPPFLAGS=$prte_check_hwloc_save_CPPFLAGS
     LDFLAGS=$prte_check_hwloc_save_LDFLAGS
     LIBS=$prte_check_hwloc_save_LIBS
diff --git a/config/prte_setup_pmix.m4 b/config/prte_setup_pmix.m4
index 76ab8530b6..9a9a635ace 100644
--- a/config/prte_setup_pmix.m4
+++ b/config/prte_setup_pmix.m4
@@ -17,7 +17,7 @@
 # Copyright (c) 2014-2019 Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2016      IBM Corporation.  All rights reserved.
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
 # Copyright (c) 2021-2022 Amazon.com, Inc. or its affiliates.
 #                         All Rights reserved.
 # $COPYRIGHT$
@@ -77,16 +77,16 @@ AC_DEFUN([PRTE_CHECK_PMIX],[
 
     # if the version file exists, then we need to parse it to find
     # the actual release series
-    AC_MSG_CHECKING([version at or above v4.2.2])
+    AC_MSG_CHECKING([version at or above v4.2.4])
     AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
                                         #include <pmix_version.h>
-                                        #if (PMIX_NUMERIC_VERSION < 0x00040202)
-                                        #error "not version 4.2.2 or above"
+                                        #if (PMIX_NUMERIC_VERSION < 0x00040204)
+                                        #error "not version 4.2.4 or above"
                                         #endif
                                        ], [])],
                       [AC_MSG_RESULT([yes])],
                       [AC_MSG_RESULT(no)
-                       AC_MSG_WARN([PRRTE requires PMIx v4.2.2 or above.])
+                       AC_MSG_WARN([PRRTE requires PMIx v4.2.4 or above.])
                        AC_MSG_ERROR([Please select a supported version and configure again])])
 
     AC_CHECK_HEADER([src/util/pmix_argv.h], [],
diff --git a/configure.ac b/configure.ac
index bd1ead40ba..f513641428 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,8 +25,9 @@
 # Copyright (c) 2016-2017 IBM Corporation.  All rights reserved.
 # Copyright (c) 2018-2022 Amazon.com, Inc. or its affiliates.
 #                         All Rights reserved.
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
 # Copyright (c) 2021      FUJITSU LIMITED.  All rights reserved.
+# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -57,6 +58,14 @@ AC_CONFIG_MACRO_DIR(config)
 
 OAC_PUSH_PREFIX([PRTE])
 
+# Get the absolute version of the srcdir.  We don't use "readlink -f",
+# because that unfortunately isn't portable (cough cough macOS cough
+# cough).
+save=$(pwd)
+cd $srcdir
+abs_srcdir=$(pwd)
+cd $save
+
 # autotools expects to perform tests without interference
 # from user-provided CFLAGS, particularly -Werror flags.
 # Search for them here and cache any we find
@@ -705,7 +714,7 @@ AC_INCLUDES_DEFAULT
 #endif])
 
 #
-# Setup HTML and man page processing
+# Setup Sphinx processing
 #
 
 OAC_SETUP_SPHINX([$srcdir/docs/_build/html/index.html], [])
@@ -991,6 +1000,9 @@ AC_CONFIG_FILES([
     include/Makefile
     include/prte_version.h
     docs/Makefile
+    src/docs/Makefile
+    src/docs/show-help-files/Makefile
+    src/docs/prrte-rst-content/Makefile
 ])
 
 PRTE_CONFIG_FILES
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 7a46e36ce6..fc8f9c2d04 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2022-2023 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
 #
+# Copyright (c) 2023      Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -10,38 +12,42 @@
 
 # We need this Makefile to be executed serially.  Below, we list all
 # the man pages as the targets of the rule that invokes Sphinx for
-# dependency/generation reasons.  But a *single* execution of Sphinx
-# will generate *all* of the man pages and HTML files.  Hence, when
-# "make" determines that none of the man page files exist, it should
-# execute the Sphinx-invocation rule once, and then it will realize
-# that all the man pages files exist.  More specifically: if someone
-# invokes "make -j N", we need make to not execute the
+# dependency/generation reasons.  But a *single* execution of the make
+# target will generate *all* of the man pages and HTML files.  Hence,
+# when "make" determines that none of the man page files exist, it
+# should execute the Sphinx-invocation rule once, and then it will
+# realize that all the man pages files exist.  More specifically: if
+# someone invokes "make -j N", we need make to not execute the
 # Sphinx-invocation rule multiple times simultaneously.  Both GNU Make
 # and BSD Make will honor the .NOTPARALLEL target to disable all
 # parallel invocation in this Makefile[.am].
+#
+# Note that even though we explicitly disable make's parallelism,
+# we'll use Sphinx's internal parallelism via "-j auto" -- see
+# SPHINX_OPTS.
 .NOTPARALLEL:
 
 OUTDIR             = _build
 SPHINX_CONFIG      = conf.py
-SPHINX_OPTS       ?= -W --keep-going
+SPHINX_OPTS       ?= -W --keep-going -j auto
 
 # Note: it is significantly more convenient to list all the source
 # files here using wildcards (vs. listing every single .rst file).
 # However, it is necessary to list $(srcdir) when using wildcards.
-TEXT_SOURCE_FILES = # if you have any .txt files, list them here
-IMAGE_SOURCE_FILES = # if you have any, list them here
-RST_SOURCE_FILES   = \
+RST_SOURCE_FILES = \
         $(srcdir)/*.rst \
+        $(srcdir)/prrte-rst-content/*.rst \
+        $(srcdir)/placement/*.rst \
+        $(srcdir)/hosts/*.rst \
         $(srcdir)/developers/*.rst \
         $(srcdir)/man/*.rst \
         $(srcdir)/man/man1/*.rst \
         $(srcdir)/man/man5/*.rst
 
-EXTRA_DIST         = \
+EXTRA_DIST = \
         requirements.txt \
+        _templates/configurator.html \
         $(SPHINX_CONFIG) \
-        $(TEXT_SOURCE_FILES) \
-        $(IMAGE_SOURCE_FILES) \
         $(RST_SOURCE_FILES)
 
 ###########################################################################
@@ -58,7 +64,8 @@ PRTE_MAN1 = \
         prte_info.1 \
         prted.1 \
         prterun.1 \
-        prun.1
+        prun.1 \
+        pterm.1
 
 PRTE_MAN5 = \
         prte.5
@@ -71,6 +78,8 @@ PRTE_MAN1_BUILT = $(PRTE_MAN1:%.1=$(MAN_OUTDIR)/%.1)
 PRTE_MAN5_RST = $(PRTE_MAN5:%.5=man/man5/%.5.rst)
 PRTE_MAN5_BUILT = $(PRTE_MAN5:%.5=$(MAN_OUTDIR)/%.5)
 
+#-------------------
+
 EXTRA_DIST += \
         $(PRTE_MAN1_BUILT) \
         $(PRTE_MAN5_BUILT)
diff --git a/docs/conf.py b/docs/conf.py
index b4fbcc98b4..1a76db467f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -10,12 +10,13 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
+import os
+import sys
 
 # -- Project information -----------------------------------------------------
 
+needs_sphinx = '4.2'
+
 import datetime
 year = datetime.datetime.now().year
 
@@ -25,8 +26,15 @@
 
 # The full version, including alpha/beta/rc tags
 # Read the PRRTE version from the VERSION file
-with open("../VERSION") as fp:
-    prte_lines = fp.readlines()
+# Note: this conf file lives in 2 different directories, so find the
+# VERSION file relative to where we're running right now.
+prte_lines = None
+for dir in ['..', '../../..']:
+    file = f'{dir}/VERSION'
+    if os.path.exists(file):
+        with open(file) as fp:
+            prte_lines = fp.readlines()
+            break
 
 prte_data = dict()
 for prte_line in prte_lines:
@@ -136,6 +144,10 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 #html_static_path = ['_static']
 
+html_additional_pages = {
+    'configurator' : 'configurator.html',
+}
+
 # -- Options for MAN output -------------------------------------------------
 
 import os
@@ -167,6 +179,10 @@
         tuple = (full_filename_without_rst, base_name, '', '', section)
         man_pages.append(tuple)
 
+# -- Options for TEXT output ------------------------------------------------
+
+text_sectionchars = '=-$#@!`'
+
 # -- PRRTE-specific options -----------------------------------------------
 
 # This prolog is included in every file.  Put common stuff here.
diff --git a/docs/configuration.rst b/docs/configuration.rst
new file mode 100644
index 0000000000..f5eb58cdc9
--- /dev/null
+++ b/docs/configuration.rst
@@ -0,0 +1,128 @@
+PRRTE DVM Configuration
+=======================
+
+The PMIx Reference RunTime Environment (PRRTE) can be instantiated
+as a Distributed Virtual Machine (DVM) in two ways. First, the
+``prte`` command can be executed at a shell prompt. This will discover
+the available resources (either from hostfile or as allocated by a
+resource manager) and start a PRRTE shepherd daemon (:ref:`prted(1)
+<man1-prted>`) on each of the indicated nodes.
+
+The other method, however, is to bootstrap the DVM at time of cluster
+startup. Bootstrapping PRRTE allows the DVM to serve as the system-level
+runtime, providing a full-service PMIx environment to sessions under
+its purview. Integration to an appropriately enabled scheduler can
+provide a full workload managed environment for users.
+
+Establishing the DVM using the bootstrap method requires that a PRRTE
+configuration file be created and made available on every node of the
+cluster at node startup. The configuration file provides necessary
+information for establishing the communication infrastructure between
+the DVM controller and the compute node daemons. It also provides a
+means for easily defining DVM behavior for options such as logging,
+system-level prolog and epilog scripts for each session, and other
+PRRTE features.
+
+The configuration file can be manually created or can be created using
+the `PRRTE configuration tool <configurator.html>`_.
+Manual creation can best be done
+by editing the example configuration file (``<source-location>/src/etc/prte.conf``).
+This file contains all the supported configuration options, with all
+entries commented out. Simply uncomment the options of interest and
+set them to appropriate values. The file will be installed into the
+final ``<install-location>/etc`` when ``make install`` is performed.
+
+Configuration Options
+---------------------
+
+The following options are supported by PRRTE |prte_ver|.
+While we make every effort to maintain compatibility with prior versions,
+we recommend that you check options when installing new versions to
+see what may have changed and/or been added. We also recommend that
+you use the `PRRTE DVM configurator <configurator.html>`_ for the
+version you are using to ensure that it is fully compatible.
+
+Bootstrap Options
+^^^^^^^^^^^^^^^^^
+``ClusterName=<string> (default: "cluster")`` is the name of the cluster upon
+which the DVM is executing. This is used by PRRTE to form the namespace
+for the DVM daemons, which is taken as ``<clustername>-prte-dvm``.
+Using different names for each of your clusters is important if you use a single
+database to record information from multiple PRRTE-managed clusters.
+
+``DVMControllerHost=<hostname>`` is the host upon which the DVM controller
+will be executing. The ``prted`` that finds itself booting onto this host
+will declare itself to be the system controller and will initialize itself
+accordingly.
+
+``DVMControllerPort=<number> (default: 7817)`` is the TCP port upon which the
+DVM controller will be listening for connections from its ``prted`` daemons
+on the remaining system nodes.
+
+``PRTEDPort=<number (default: 7818)`` is the TCP port upon which each
+``prted`` daemon will be listening for connections from its peer daemons
+on the other system nodes.
+
+``DVMNodes=<regex of DVM nodes> (default: none)`` provides a regular expression
+identifying the nodes that upon which user applications can run. IP addresses can
+be provided in place of hostnames if desired.The regular expression can consist of
+a simple comma-delimited list of hostnames, or a comma-delimited list of hostname
+ranges (e.g., "linux0,linux[2-10]"), or a PMIx "native" regular expression.
+
+
+Operational Options
+^^^^^^^^^^^^^^^^^^^
+``DVMTempDir=<path> (default: /tmp)`` is the temporary directory that the
+DVM daemons and controller are to use as the base for their session directories.
+Working files/directories for the DVM will be placed under this location.
+
+``SessionTmpDir=<path> (default: DVMTempDir)`` is the temporary directory that
+the DVM daemons are to use as the base for session directories for all
+application sessions. Working files for each session will be placed under
+this location, separated out into a directory for each session.
+
+Logging Options
+^^^^^^^^^^^^^^^
+``ControllerLogJobState=<true|false> (default: false)`` directs the DVM
+controller to log each DVM-launched job state transition. Log entry includes
+the namespace of the job, the state to which it is transitioning, and the
+date/time stamp when the transition was ordered.
+
+``ControllerLogProcState=<true|false> (default: false)`` directs the DVM
+controller to log each process (in a DVM-launched job) state transition.
+Log entry includes the namespace and rank of the process, the state to
+which it is transitioning, and the date/time stamp when the transition was
+ordered.
+
+``ControllerLogPath=<path> (default: DVMTempDir)`` is the path to where the logs are to
+be written. If a relative path is provided,
+then the directory will be created under the ``DVMTempDir`` location. The
+path defaults to the specified SessionTmpDir in the absence of any input
+to this field. The log filename is formatted as ``prtectrlr-<hostname>-log<``.
+
+``PRTEDLogJobState=<true|false> (default: false)`` directs each ``prted``
+in the DVM to log each DVM-launched job state transition. Log entry includes
+the namespace of the job, the state to which it is transitioning, and the
+date/time stamp when the transition was ordered.
+
+``PRTEDLogProcState=<true|false> (default: false)`` directs each ``prted``
+in the DVM to log each process (in a DVM-launched job) state transition.
+Log entry includes the namespace and rank of the process, the state to
+which it is transitioning, and the date/time stamp when the transition was
+ordered.
+
+``PRRTEDLogPath=<path> (default: DVMTempDir)`` is the path to where the logs are to
+be written. If a relative path is provided,
+then the directory will be created under the ``DVMTempDir`` location. The
+path defaults to the specified SessionTmpDir in the absence of any input
+to this field. The log filename is formatted as ``prted-<hostname>-log<``.
+
+
+Configurator Tool
+-----------------
+
+The `PRRTE configuration tool <configurator.html>`_ contains all the supported options in an
+easy-to-use form. Once you have filled out the desired entries, the
+"submit" button will show the resulting configuration file on the
+browser window |mdash| a simple "copy/paste" operation into your target
+configuration file will yield the final result.
diff --git a/docs/hosts/cli.rst b/docs/hosts/cli.rst
new file mode 100644
index 0000000000..e7473440e8
--- /dev/null
+++ b/docs/hosts/cli.rst
@@ -0,0 +1,36 @@
+.. _hosts-cli-label:
+
+Listing Hosts on the Command Line
+=================================
+
+Many PRRTE commands accept the ``--host`` CLI parameter.
+``--host`` accepts a comma-delimited list of tokens of the form:
+
+.. code::
+
+   host[:slots]
+
+The ``host`` token can be either:
+
+* A name that resolves to an IP address, or
+* An IP address
+
+.. note:: The names and/or IP addresses of hosts are *only* used for
+          identifying the target host on which to launch.  They are
+          *not* used for determining which network interfaces are used
+          by applications (e.g., MPI or other network-based
+          applications).
+
+          For network-based applications, consult their documentation
+          for how to specify which network interfaces are used.
+
+The optional integer ``:slots`` parameter tells PRRTE the maximum
+number of slots to use on that host (:ref:`see this section
+<placement-definition-of-slot-label>` for a description of what a
+"slot" is).
+
+For example:
+
+.. code::
+
+   prterun --host node1:10,node2,node3:5 ...
diff --git a/docs/hosts/hostfiles.rst b/docs/hosts/hostfiles.rst
new file mode 100644
index 0000000000..309c73fc0d
--- /dev/null
+++ b/docs/hosts/hostfiles.rst
@@ -0,0 +1,41 @@
+Hostfiles
+=========
+
+Hostfiles (sometimes called "machine files") are a combination of two
+things:
+
+#. A listing of hosts on which to launch processes.
+#. Optionally, limit the number of processes which can be launched on
+   each host.
+
+Syntax
+------
+
+Hostfile syntax consists of one node name on each line, optionally
+including a designated number of "slots":
+
+.. code:: sh
+
+   # This is a comment line, and will be ignored
+   node01  slots=10
+   node13  slots=5
+
+   node15
+   node16
+   node17  slots=3
+   ...
+
+Blank lines and lines beginning with a ``#`` are ignored.
+
+A "slot" is the PRRTE term for an allocatable unit where we can launch
+a process.  :ref:`See this section
+<placement-definition-of-slot-label>` for a longer description of
+slots.
+
+In the absence of the ``slot`` parameter, PRRTE will assign either the
+number of slots to be the number of CPUs detected on the node or the
+resource manager-assigned value if operating in the presence of an
+RM.
+
+.. important:: If using a resource manager, the user-specified number
+               of slots is capped by the RM-assigned value.
diff --git a/docs/hosts/index.rst b/docs/hosts/index.rst
new file mode 100644
index 0000000000..aec4543b8c
--- /dev/null
+++ b/docs/hosts/index.rst
@@ -0,0 +1,19 @@
+Host specification
+==================
+
+PRRTE identifies hosts on which to launch processes by:
+
+#. A Resource Manager (RM) telling PRRTE which hosts to use
+#. The user providing a hostfile (also sometimes called a "machine
+   file")
+#. The user providing a list of hosts on the command line
+
+The sections below describe each of these in more detail.
+
+.. toctree::
+   :maxdepth: 1
+
+   rm
+   hostfiles
+   cli
+   relative-indexing
diff --git a/docs/hosts/relative-indexing.rst b/docs/hosts/relative-indexing.rst
new file mode 100644
index 0000000000..3be6ccf27c
--- /dev/null
+++ b/docs/hosts/relative-indexing.rst
@@ -0,0 +1,113 @@
+Relative host indexing
+======================
+
+Hostfile and ``--host`` specifications can also be made using relative
+indexing. This allows a user to stipulate which hosts are to be used
+for a given app context without specifying the particular host name,
+but rather its relative position in the allocation.
+
+This can probably best be understood through consideration of a few
+examples. Consider the case where a DVM is comprised of a set of nodes
+named ``foo1``, ``foo2``, ``foo3``, ``foo4``. The user wants the first
+app context to have exclusive use of the first two nodes, and a second
+app context to use the last two nodes. Of course, the user could
+printout the allocation to find the names of the nodes allocated to
+them and then use ``--host`` to specify this layout, but this is
+cumbersome and would require hand-manipulation for every invocation.
+
+A simpler method is to utilize PRRTE's relative indexing capability to
+specify the desired layout. In this case, a command line containing:
+
+.. code::
+
+   --host +n1,+n2 ./app1 : --host +n3,+n4 ./app2
+
+would provide the desired pattern. The ``+`` syntax indicates that the
+information is being provided as a relative index into the existing
+allocation. Two methods of relative indexing are supported:
+
+* ``+n#``: A relative index into the allocation referencing the ``#``
+  node. PRRTE will substitute the ``#`` node in the allocation
+
+* ``+e[:#]``: A request for ``#`` empty nodes |mdash| i.e., PRRTE is
+  to substitute this reference with nodes that have not yet been used
+  by any other app_context. If the ``:#`` is not provided, PRRTE will
+  substitute the reference with all empty nodes. Note that PRRTE does
+  track the empty nodes that have been assigned in this manner, so
+  multiple uses of this option will result in assignment of unique
+  nodes up to the limit of the available empty nodes. Requests for
+  more empty nodes than are available will generate an error.
+
+Relative indexing can be combined with absolute naming of hosts in any
+arbitrary manner, and can be used in hostfiles as well as with the
+``--host`` command line option. In addition, any slot specification
+provided in hostfiles will be respected |mdash| thus, a user can
+specify that only a certain number of slots from a relative indexed
+host are to be used for a given app context.
+
+Another example may help illustrate this point. Consider the case
+where the user has a hostfile containing:
+
+.. code::
+
+   dummy1 slots=4
+   dummy2 slots=4
+   dummy3 slots=4
+   dummy4 slots=4
+   dummy5 slots=4
+
+This may, for example, be a hostfile that describes a set of
+commonly-used resources that the user wishes to execute applications
+against. For this particular application, the user plans to map
+byslot, and wants the first two ranks to be on the second node of any
+allocation, the next ranks to land on an empty node, have one rank
+specifically on ``dummy4``, the next rank to be on the second node of the
+allocation again, and finally any remaining ranks to be on whatever
+empty nodes are left. To accomplish this, the user provides a hostfile
+of:
+
+.. code::
+
+   +n2 slots=2
+   +e:1
+   dummy4 slots=1
+   +n2
+   +e
+
+The user can now use this information in combination with PRRTE's
+sequential mapper to obtain their specific layout:
+
+.. code::
+
+   <launcher> --hostfile dummyhosts --hostfile mylayout --prtemca rmaps seq ./my_app
+
+which will result in:
+
+.. code::
+
+   rank0 being mapped to dummy3
+   rank1 to dummy1 as the first empty node
+   rank2 to dummy4
+   rank3 to dummy3
+   rank4 to dummy2 and rank5 to dummy5 as the last remaining unused nodes
+
+Note that the sequential mapper ignores the number of slots arguments
+as it only maps one rank at a time to each node in the list.
+
+If the default round-robin mapper had been used, then the mapping
+would have resulted in:
+
+* ranks 0 and 1 being mapped to dummy3 since two slots were specified
+* ranks 2-5 on dummy1 as the first empty node, which has four slots
+* rank6 on dummy4 since the hostfile specifies only a single slot from
+  that node is to be used
+* ranks 7 and 8 on dummy3 since only two slots remain available
+* ranks 9-12 on dummy2 since it is the next available empty node and
+  has four slots
+* ranks 13-16 on dummy5 since it is the last remaining unused node and
+  has four slots
+
+Thus, the use of relative indexing can allow for complex mappings to
+be ported across allocations, including those obtained from automated
+resource managers, without the need for manual manipulation of scripts
+and/or command lines.
diff --git a/docs/hosts/rm.rst b/docs/hosts/rm.rst
new file mode 100644
index 0000000000..28c97b0d77
--- /dev/null
+++ b/docs/hosts/rm.rst
@@ -0,0 +1,9 @@
+Resource Manager-Provided Hosts
+===============================
+
+When launching under a Resource Manager (RM), the RM usually
+picks which hosts |mdash| and how many processes can be launched on
+each host |mdash| on a per-job basis.
+
+The RM will communicate this information to PRRTE directly; users can
+simply omit specifying hosts or numbers of processes.
diff --git a/docs/index.rst b/docs/index.rst
index f2bbced1d9..7217a6f04a 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -4,10 +4,20 @@ PMIx Reference Runtime Environment (PRRTE) |prte_ver|
 The project is formally referred to in documentation by "PRRTE", and
 the GitHub repository is ``prrte``.
 
-However, we have found that most users do not like typing the two
-consecutive ``r`` letters in the name. Hence, all of the internal API symbols,
-environment variables, MCA frameworks, and CLI executables all use the
-abbreviated ``prte`` (one ``r``, not two) for convenience.
+.. note:: We have found that most users do not like typing the two
+          consecutive ``r`` letters in the name. Hence, all of the
+          internal API symbols, environment variables, MCA frameworks,
+          and CLI executables all use the abbreviated ``prte`` (one
+          ``r``, not two) for convenience.
+
+Documentation locations
+=======================
+
+This documentation can be found in the following locations:
+
+* On the web: https://docs.prrte.org/
+* In the tarball: ``docs/_build/html/index.html``
+* Installed: ``$prefix/share/doc/prrte/html/index.html``
 
 Table of contents
 =================
@@ -20,6 +30,11 @@ Table of contents
    release-notes
    getting-help
    install
+   configuration
+   hosts/index
+   placement/index
+   notifications
+   session-directory
    resilience
    developers/index
    contributing
diff --git a/docs/man/man1/index.rst b/docs/man/man1/index.rst
index fecc6807cc..a1d2e7beb0 100644
--- a/docs/man/man1/index.rst
+++ b/docs/man/man1/index.rst
@@ -9,3 +9,4 @@ Commands (section 1)
    prted.1.rst
    prterun.1.rst
    prun.1.rst
+   pterm.1.rst
diff --git a/docs/man/man1/prte.1.rst b/docs/man/man1/prte.1.rst
index c1e7d92bd1..a00461c735 100644
--- a/docs/man/man1/prte.1.rst
+++ b/docs/man/man1/prte.1.rst
@@ -3,38 +3,27 @@
 prte
 ====
 
-.. one line summary of this command
-
-prte |mdash| do great things
+prte |mdash| instantiate an instance of PRRTE DVM
 
 SYNOPSIS
 --------
 
-.. brief listing of all the CLI options
-
 .. code:: sh
 
-   prte ...options...
+   shell$ prte ...options...
 
 DESCRIPTION
 -----------
 
-Full description of this command.
-
-.. admonition:: PRRTE Docs TODO
-   :class: error
-
-   Need to write this man page.
-
-EXIT STATUS
------------
-
-Description of the various exit statuses of this command.
+``prte`` instantiates an instance of the PMIx Reference Run Time
+Environment (PRRTE) distributed virtual machine (DVM).
 
-EXAMPLES
---------
+Extensive help documentation for this command is provided through
+``prte --help [topic]``.
 
-Examples of using this command.
+At least for now, that content is not available in man page form.
+Pull requests to add all the content (via repeatable infrastructure)
+would be greatly appreciated.
 
 .. seealso::
    :ref:`prterun(1) <man1-prterun>`
diff --git a/docs/man/man1/prte_info.1.rst b/docs/man/man1/prte_info.1.rst
index acce4938d2..9eb027723e 100644
--- a/docs/man/man1/prte_info.1.rst
+++ b/docs/man/man1/prte_info.1.rst
@@ -3,15 +3,11 @@
 prte_info
 =========
 
-.. one line summary of this command
-
-prte_info |mdash| do great things
+prte_info |mdash| Provide detailed information on your PRRTE installation
 
 SYNOPSIS
 --------
 
-.. brief listing of all the CLI options
-
 .. code:: sh
 
    prte_info ...options...
@@ -19,23 +15,15 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-Full description of this command.
-
-.. admonition:: PRRTE Docs TODO
-   :class: error
-
-   Need to write this man page.
-
-EXIT STATUS
------------
-
-Description of the various exit statuses of this command.
+``prte_info`` provide detailed information on your PMIx Reference Run
+Time (PRRTE) installation.
 
-EXAMPLES
---------
+Extensive help documentation for this command is provided through
+``prte_info --help [topic]``.
 
-Examples of using this command.
+At least for now, that content is not available in man page form.
+Pull requests to add all the content (via repeatable infrastructure)
+would be greatly appreciated.
 
 .. seealso::
-   :ref:`prte(1) <man1-prte>`,
-   :ref:`prterun(1) <man1-prterun>`
+   :ref:`prte(1) <man1-prte>`
diff --git a/docs/man/man1/prted.1.rst b/docs/man/man1/prted.1.rst
index 92715e66b2..1fe14f6116 100644
--- a/docs/man/man1/prted.1.rst
+++ b/docs/man/man1/prted.1.rst
@@ -3,39 +3,27 @@
 prted
 =====
 
-.. one line summary of this command
-
-prted |mdash| do great things
+prted |mdash| helper daemon for PRRTE
 
 SYNOPSIS
 --------
 
-.. brief listing of all the CLI options
-
 .. code:: sh
 
-   prted ...options...
+   shell$ prted ...options...
 
 DESCRIPTION
 -----------
 
-Full description of this command.
-
-.. admonition:: PRRTE Docs TODO
-   :class: error
-
-   Need to write this man page.
-
-EXIT STATUS
------------
-
-Description of the various exit statuses of this command.
+``prted`` is the back end helper daemon for PMIx Reference Runtime
+Environment (PRRTE).
 
-EXAMPLES
---------
+Extensive help documentation for this command is provided through
+``prted --help [topic]``.
 
-Examples of using this command.
+At least for now, that content is not available in man page form.
+Pull requests to add all the content (via repeatable infrastructure)
+would be greatly appreciated.
 
 .. seealso::
-   :ref:`prte(1) <man1-prte>`,
-   :ref:`prterun(1) <man1-prterun>`
+   :ref:`prte(1) <man1-prte>`
diff --git a/docs/man/man1/prterun.1.rst b/docs/man/man1/prterun.1.rst
index 29da34ee9a..f56eb57381 100644
--- a/docs/man/man1/prterun.1.rst
+++ b/docs/man/man1/prterun.1.rst
@@ -3,38 +3,52 @@
 prterun
 ========
 
-.. one line summary of this command
-
-prterun |mdash| do great things
+prterun |mdash| launch an application with a default DVM
 
 SYNOPSIS
 --------
 
-.. brief listing of all the CLI options
-
 .. code:: sh
 
-   prterun ...options...
+   shell$ prterun ...options...
 
 DESCRIPTION
 -----------
 
-Full description of this command.
+``prterun`` submits a job to the PMIx Reference Runtime Environment
+(PRRTE).  A default set of distributed virtual
+machine (DVM) options are used; use :ref:`prun(1) <man1-prun>` if you
+wish to utilize specific DVM options.
+
+Much of this same help documentation for this command is also provided
+through ``prun --help [topic]``.
 
 .. admonition:: PRRTE Docs TODO
    :class: error
 
    Need to write this man page.
 
+COMMAND LINE OPTIONS
+--------------------
+
+.. JMS I suspect we don't want to include prterun-all-cli.rst here --
+   I think only a subset of those commands are available for prun.
+
+.. include:: /prrte-rst-content/prterun-all-cli.rst
+
+DEPRECATED COMMAND LINE OPTIONS
+-------------------------------
+
+.. JMS I suspect we don't want to include prterun-all-deprecated.rst
+   here -- I think only a subset of those commands are available for
+   prun.
+
+.. include:: /prrte-rst-content/prterun-all-deprecated.rst
+
 EXIT STATUS
 -----------
 
 Description of the various exit statuses of this command.
 
-EXAMPLES
---------
-
-Examples of using this command.
-
 .. seealso::
    :ref:`prte(1) <man1-prte>`
diff --git a/docs/man/man1/prun.1.rst b/docs/man/man1/prun.1.rst
index a29c24fa00..72695427b2 100644
--- a/docs/man/man1/prun.1.rst
+++ b/docs/man/man1/prun.1.rst
@@ -1,40 +1,46 @@
 .. _man1-prun:
 
 prun
-====
+=====
 
-.. one line summary of this command
-
-prun |mdash| do great things
+prun |mdash| launch an application
 
 SYNOPSIS
 --------
 
-.. brief listing of all the CLI options
-
 .. code:: sh
 
-   prun ...options...
+   shell$ prun ...options...
 
 DESCRIPTION
 -----------
 
-Full description of this command.
+``prun`` submits a job to the PMIx Reference Runtime Environment
+(PRRTE).  The user has control over various distributed virtual
+machine (DVM) options.
+
+Much of this same help documentation for this command is also provided
+through ``prun --help [topic]``.
 
 .. admonition:: PRRTE Docs TODO
    :class: error
 
    Need to write this man page.
 
-EXIT STATUS
------------
+COMMAND LINE OPTIONS
+--------------------
 
-Description of the various exit statuses of this command.
+The following command line options are supported:
 
-EXAMPLES
---------
+.. include:: /prrte-rst-content/prterun-all-cli.rst
+
+DEPRECATED COMMAND LINE OPTIONS
+-------------------------------
+
+The following command line options are deprecated and may disappear in
+a future version of PRRTE:
 
-Examples of using this command.
+.. include:: /prrte-rst-content/prterun-all-deprecated.rst
 
 .. seealso::
-   :ref:`prterun(1) <man1-prterun>`
+   :ref:`prte(1) <man1-prte>`
diff --git a/docs/man/man1/pterm.1.rst b/docs/man/man1/pterm.1.rst
new file mode 100644
index 0000000000..0cb3560c4b
--- /dev/null
+++ b/docs/man/man1/pterm.1.rst
@@ -0,0 +1,29 @@
+.. _man1-pterm:
+
+pterm
+=====
+
+pterm |mdash| terminate an instance of the PRRTE DVM
+
+SYNOPSIS
+--------
+
+.. code:: sh
+
+   shell$ pterm ...options...
+
+DESCRIPTION
+-----------
+
+``pterm`` terminates an instance of the PMIx Reference Runtime
+Environment (PRRTE) distributed virtual machine (DVM).
+
+Extensive help documentation for this command is provided through
+``pterm --help [topic]``.
+
+At least for now, that content is not available in man page form.
+Pull requests to add all the content (via repeatable infrastructure)
+would be greatly appreciated.
+
+.. seealso::
+   :ref:`prte(1) <man1-prte>`
diff --git a/docs/notifications.rst b/docs/notifications.rst
new file mode 100644
index 0000000000..7382b2d986
--- /dev/null
+++ b/docs/notifications.rst
@@ -0,0 +1,96 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Notifications
+=============
+
+PRRTE provides notifications on a variety of process and job
+states. Each notification includes not only the PMIx event code that
+generated it, but also information on the cause of the event to the
+extent to which this is known.
+
+Supported job events include:
+
+* ``PMIX_READY_FOR_DEBUG``: indicates that all processes in the
+  reported nspace have reached the specified debug stopping point.
+
+* ``PMIX_LAUNCH_COMPLETE``: indicates that the reported nspace has
+  been launched |mdash| i.e., the involved PRRTE daemons all report
+  that their respective child processes have completed fork/exec.
+
+* ``PMIX_ERR_JOB_CANCELED``: indicates that the job was cancelled by
+  user command, usually issued via an appropriate PMIx-enabled tool.
+
+* ``PMIX_ERR_JOB_FAILED_TO_LAUNCH``: indicates that the specified job
+  failed to launch.  This can be due to a variety of factors that
+  include inability to find the executable on at least one involved
+  node.
+
+Supported process events include:
+
+* ``PMIX_ERR_PROC_TERM_WO_SYNC``: indicates that at least one process
+  in the job called ``PMIx_Init``, thus indicating some notion of a
+  global existence, and at least one process in the job subsequently
+  exited without calling ``PMIx_Finalize``. This usually indicates a
+  failure somewhere in the application itself that precluded an
+  orderly shutdown of the process. Notification will include the
+  process ID that exited in this manner.
+
+* ``PMIX_EVENT_PROC_TERMINATED``: indicates that the reported process
+  terminated normally.  Notification will include the process ID that
+  exited and its exit status.
+
+* ``PMIX_ERR_PROC_KILLED_BY_CMD``: indicates that the reported process
+  was killed by PRRTE command. This typically occurs in response to a
+  Ctrl-C (or equivalent) being applied to the PRRTE launcher, thereby
+  instructing PRRTE to forcibly terminate its processes. The event
+  currently will only be issued in the case where forcible termination
+  is commanded via a tool that can pass the process IDs that are
+  specifically to be terminated |mdash| otherwise, in the case of the
+  Ctrl-C event previously described, all processes in the job will be
+  terminated, leaving none to be notified. Notification will include
+  the process ID that was terminated.
+
+* ``PMIX_ERR_PROC_SENSOR_BOUND_EXCEEDED``: indicates that the
+  specified process exceeded a previously-set sensor boundary |mdash|
+  e.g., it may have grown beyond a defined memory limit. Such events
+  may or may not automatically trigger termination by command,
+  depending upon the behavior of the sensor. Notification will include
+  the process ID that exceeded the sensor boundary plus whatever
+  information the sensor provides regarding measurements and bounds.
+
+* ``PMIX_ERR_PROC_ABORTED_BY_SIG``: indicates that the specified
+  process was killed by a signal |mdash| e.g., a segmentation
+  fault/violation or an externally applied signal. Notifications will
+  include the process ID that was killed and the corresponding
+  reported signal.
+
+* ``PMIX_ERR_PROC_REQUESTED_ABORT:`` indicates that the specified
+  process has aborted by calling the ``PMIx_Abort``
+  function. Notification will include the process ID that called abort
+  and its exit status.
+
+* ``PMIX_ERR_EXIT_NONZERO_TERM``: indicates that the specified process
+  terminated with a non-zero exit status. This notification is only
+  generated in the case where the runtime option
+  ``ERROR-NONZERO-STATUS`` is set to true, thereby indicating that a
+  process exiting with non-zero status is to be considered an
+  error. As PRRTE can be overwhelmed by a large job where every
+  process exits with a non-zero status, only the *first* process in a
+  given job that exits with a non-zero status will generate a
+  notification unless the ``RECOVERABLE`` runtime option is also
+  provided as otherwise the job will be immediately
+  terminated. Notifications will include the process ID that exited
+  and the status it returned.
+
+* ``PMIX_ERR_PROC_RESTART``: indicates that the specified process has
+  been restarted.  Additional information may include the hostname
+  where the process is now executing.
diff --git a/docs/placement/deprecated.rst b/docs/placement/deprecated.rst
new file mode 100644
index 0000000000..f295641c6e
--- /dev/null
+++ b/docs/placement/deprecated.rst
@@ -0,0 +1,141 @@
+Deprecated options
+==================
+
+These deprecated options will be removed in a future release.
+
+.. list-table::
+   :header-rows: 1
+   :widths: 20 20 30
+
+   * - Deprecated Option
+     - Replacement
+     - Description
+
+   * - ``--bind-to-core``
+     - ``--bind-to core``
+     - Bind processes to cores
+
+
+   * - ``--bind-to-socket``
+     - ``--bind-to package``
+     - Bind processes to processor sockets
+
+   * - ``--bycore``
+     - ``--map-by core``
+     - Map processes by core
+
+   * - ``--bynode``
+     - ``--map-by node``
+     - Launch processes one per node, cycling by node in a round-robin
+       fashion. This spreads processes evenly among nodes and assigns
+       ranks in a round-robin, "by node" manner.
+
+   * - ``--byslot``
+     - ``--map-by slot``
+     - Map and rank processes round-robin by slot
+
+   * - ``--cpus-per-proc <#perproc>``
+     - `--map-by <obj>:PE=<#perproc>``
+     - Bind each process to the specified number of CPUs
+
+   * - ``--cpus-per-rank <#perrank>``
+     - ``--map-by <obj>:PE=<#perrank>``
+     - Alias for ``--cpus-per-proc``
+
+   * - ``--display-allocation``
+     - ``--display ALLOC``
+     - Display the detected resource allocation
+
+   * - ``-display-devel-map``
+     - ``--display MAP-DEVEL``
+     - Display a detailed process map (mostly intended for developers)
+       just before launch.
+
+   * - ``--display-map``
+     - ``--display MAP``
+     - Display a table showing the mapped location of each process
+       prior to launch.
+
+   * - ``--display-topo``
+     - ``--display TOPO``
+     - Display the topology as part of the process map (mostly
+       intended for developers) just before launch.
+
+   * - ``--do-not-launch``
+     - ``--map-by :DONOTLAUNCH``
+     - Perform all necessary operations to prepare to launch the
+       application, but do not actually launch it (usually used to
+       test mapping patterns).
+
+   * - ``--do-not-resolve``
+     - ``--map-by :DONOTRESOLVE``
+     - Do not attempt to resolve interfaces |mdash| usually used to
+       determine proposed process placement/binding prior to obtaining
+       an allocation.
+
+   * - ``-N <num>``
+     - ``--map-by prr:<num>:node``
+     - Launch ``num`` processes per node on all allocated nodes
+
+   * - ``--nolocal``
+     - ``--map-by :NOLOCAL``
+     - Do not run any copies of the launched application on the same
+       node as ``prun`` is running. This option will override listing
+       the ``localhost`` with ``--host`` or any other host-specifying
+       mechanism.
+
+   * - ``--nooversubscribe``
+     - ``--map-by :NOOVERSUBSCRIBE``
+     - Do not oversubscribe any nodes; error (without starting any
+       processes) if the requested number of processes would cause
+       oversubscription. This option implicitly sets "max_slots" equal
+       to the "slots" value for each node. (Enabled by default).
+
+   * - ``--npernode <#pernode>``
+     - ``--map-by ppr:<#pernode>:node``
+     - On each node, launch this many processes
+
+   * - ``--npersocket <#persocket>``
+     - ``--map-by ppr:<#perpackage>:package``
+     - On each node, launch this many processes times the number of
+       processor sockets on the node. The ``--npersocket`` option also
+       turns on the ``--bind-to socket`` option. The term ``socket``
+       has been globally replaced with ``package``.
+
+   * - ``--oversubscribe``
+     - ``--map-by :OVERSUBSCRIBE``
+     - Nodes are allowed to be oversubscribed, even on a managed
+       system, and overloading of processing elements.
+
+   * - ``--pernode``
+     - ``--map-by ppr:1:node``
+     - On each node, launch one process
+
+   * - ``--ppr``
+     - `--map-by ppr:<list>``
+     - Comma-separated list of number of processes on a given resource type
+       [default: ``none``].
+
+   * - ``--rankfile <FILENAME>``
+     - ``--map-by rankfile:FILE=<FILENAME>``
+     - Use a rankfile for mapping/ranking/binding
+
+   * - ``--report-bindings``
+     - ``--display BINDINGS``
+     - Report any bindings for launched processes
+
+   * - ``--tag-output``
+     - ``--output TAG``
+     - Tag all output with ``[job,rank]``
+
+   * - ``--timestamp-output``
+     - ``--output TIMESTAMP``
+     - Timestamp all application process output
+
+   * - ``--use-hwthread-cpus``
+     - ``--map-by :HWTCPUS``
+     - Use hardware threads as independent CPUs
+
+   * - ``--xml``
+     - ``--output XML``
+     - Provide all output in XML format
diff --git a/docs/placement/diagnostics.rst b/docs/placement/diagnostics.rst
new file mode 100644
index 0000000000..215fd85cc8
--- /dev/null
+++ b/docs/placement/diagnostics.rst
@@ -0,0 +1,77 @@
+Diagnostics
+===========
+
+PRRTE provides various diagnostic reports that aid the user in
+verifying and tuning the mapping/ranking/binding for a specific job.
+
+The ``:REPORT`` qualifier to the ``--bind-to`` command line option can
+be used to report process bindings.
+
+As an example, consider a node with:
+
+* 2 processor packages,
+* 4 cores per package, and
+* 8 hardware threads per core.
+
+In each of the examples below the binding is reported in a human readable
+format.
+
+.. code::
+
+   $ prun --np 4 --map-by core --bind-to core:REPORT ./a.out
+   [node01:103137] MCW rank 0 bound to package[0][core:0]
+   [node01:103137] MCW rank 1 bound to package[0][core:1]
+   [node01:103137] MCW rank 2 bound to package[0][core:2]
+   [node01:103137] MCW rank 3 bound to package[0][core:3]
+
+In the example above, processes are bound to successive cores on the
+first package.
+
+.. code::
+
+   $ prun --np 4 --map-by package --bind-to package:REPORT ./a.out
+   [node01:103115] MCW rank 0 bound to package[0][core:0-9]
+   [node01:103115] MCW rank 1 bound to package[1][core:10-19]
+   [node01:103115] MCW rank 2 bound to package[0][core:0-9]
+   [node01:103115] MCW rank 3 bound to package[1][core:10-19]
+
+In the example above, processes are bound to all cores on successive
+packages in a round-robin fashion.
+
+.. code::
+
+   $ prun --np 4 --map-by package:PE=2 --bind-to core:REPORT ./a.out
+   [node01:103328] MCW rank 0 bound to package[0][core:0-1]
+   [node01:103328] MCW rank 1 bound to package[1][core:10-11]
+   [node01:103328] MCW rank 2 bound to package[0][core:2-3]
+   [node01:103328] MCW rank 3 bound to package[1][core:12-13]
+
+The example above shows us that 2 cores have been bound per process.
+The ``:PE=2`` qualifier states that 2 CPUs underneath the package
+(which would be cores in this case) are mapped to each process.
+
+.. code::
+
+   $ prun --np 4 --map-by core:PE=2:HWTCPUS --bind-to :REPORT  hostname
+   [node01:103506] MCW rank 0 bound to package[0][hwt:0-1]
+   [node01:103506] MCW rank 1 bound to package[0][hwt:8-9]
+   [node01:103506] MCW rank 2 bound to package[0][hwt:16-17]
+   [node01:103506] MCW rank 3 bound to package[0][hwt:24-25]
+
+The example above shows us that 2 hardware threads have been bound per
+process.  In this case ``prun`` is directing the DVM to map by
+hardware threads since we used the ``:HWTCPUS`` qualifier. Without
+that qualifier this command would return an error since by default the
+DVM will not map to resources smaller than a core.  The ``:PE=2``
+qualifier states that 2 processing elements underneath the core (which
+would be hardware threads in this case) are mapped to each process.
+
+.. code::
+
+   $ prun --np 4 --bind-to none:REPORT  hostname
+   [node01:107126] MCW rank 0 is not bound (or bound to all available processors)
+   [node01:107126] MCW rank 1 is not bound (or bound to all available processors)
+   [node01:107126] MCW rank 2 is not bound (or bound to all available processors)
+   [node01:107126] MCW rank 3 is not bound (or bound to all available processors)
+
+Binding is turned off in the above example, as reported.
diff --git a/docs/placement/examples.rst b/docs/placement/examples.rst
new file mode 100644
index 0000000000..4a3a293f43
--- /dev/null
+++ b/docs/placement/examples.rst
@@ -0,0 +1,420 @@
+Examples
+========
+
+Listed here are the subset of command line options that will be used
+in the process mapping/ranking/binding examples below.
+
+Specifying Host Nodes
+---------------------
+
+Use one of the following options to specify which hosts (nodes) within
+the PRRTE DVM environment to run on.
+
+.. code::
+
+    --host <host1,host2,...,hostN>
+
+    # or
+
+    --host <host1:X,host2:Y,...,hostN:Z>
+
+* List of hosts on which to invoke processes. After each hostname a
+  colon (``:``) followed by a positive integer can be used to specify
+  the number of slots on that host (``:X``, ``:Y``, and ``:Z``). The
+  default is ``1``.
+
+.. code::
+
+    --hostfile <hostfile>
+
+* Provide a hostfile to use.
+
+Process Mapping / Ranking / Binding Options
+-------------------------------------------
+
+* ``-c #``, ``-n #``, ``--n #``, ``--np <#>``: Run this many copies of
+  the program on the given nodes. This option indicates that the
+  specified file is an executable program and not an application
+  context. If no value is provided for the number of copies to execute
+  (i.e., neither the ``-np`` nor its synonyms are provided on the
+  command line), ``prun`` will automatically execute a copy of the
+  program on each process slot (see below for description of a
+  "process slot"). This feature, however, can only be used in the SPMD
+  model and will return an error (without beginning execution of the
+  application) otherwise.
+
+  .. note:: These options specify the number of processes to launch.
+            None of the options imply a particular binding policy
+            |mdash| e.g., requesting ``N`` processes for each package
+            does not imply that the processes will be bound to the
+            package.
+
+* ``--map-by <object>``: Map to the specified object. Supported
+  objects include:
+
+  * ``slot``
+  * ``hwthread``
+  * ``core`` (default)
+  * ``l1cache``
+  * ``l2cache``
+  * ``l3cache``
+  * ``numa``
+  * ``package``
+  * ``node``
+  * ``seq``
+  * ``ppr``
+  * ``rankfile``
+  * ``pe-list``
+
+  Any object can include qualifiers by adding a colon (``:``) and any
+  colon-delimited combination of one or more of the following to the
+  ``--map-by`` options:
+
+  * ``PE=n`` bind ``n`` processing elements to each process (can not
+    be used in combination with rankfile or pe-list directives)
+
+    .. error:: JMS Several of the options below refer to ``pe-list``.
+               Is this option supposed to be ``PE-LIST=n``, not
+               ``PE=n``?
+
+  * ``SPAN`` load balance the processes across the allocation (cannot
+    be used in combination with ``slot``, ``node``, ``seq``, ``ppr``,
+    ``rankfile``, or ``pe-list`` directives)
+
+  * ``OVERSUBSCRIBE`` allow more processes on a node than processing
+    elements
+
+  * ``NOOVERSUBSCRIBE`` means ``!OVERSUBSCRIBE``
+
+  * ``NOLOCAL`` do not launch processes on the same node as ``prun``
+
+  * ``HWTCPUS`` use hardware threads as CPU slots
+
+  * ``CORECPUS`` use cores as CPU slots (default)
+
+  * ``INHERIT`` indicates that a child job (i.e., one spawned from
+    within an application) shall inherit the placement policies of the
+    parent job that spawned it.
+
+  * ``NOINHERIT`` means ``!INHERIT``
+
+  * ``FILE=<path>`` (path to file containing sequential or rankfile
+    entries).
+
+  * ``ORDERED`` only applies to the PE-LIST option to indicate that
+    procs are to be bound to each of the specified CPUs in the order
+    in which they are assigned (i.e., the first proc on a node shall
+    be bound to the first CPU in the list, the second proc shall be
+    bound to the second CPU, etc.)
+
+  ``ppr`` policy example: ``--map-by ppr:N:<object>`` will launch
+  ``N`` times the number of objects of the specified type on each
+  node.
+
+  .. note:: Directives and qualifiers are case-insensitive and can be
+            shortened to the minimum number of characters to uniquely
+            identify them. Thus, ``L1CACHE`` can be given as
+            ``l1cache`` or simply as ``L1``.
+
+* ``--rank-by <object>``: This assigns ranks in round-robin fashion
+  according to the specified object. The default follows the mapping
+  pattern. Supported rank-by objects include:
+
+  * ``slot``
+  * ``node``
+  * ``fill``
+  * ``span``
+
+  There are no qualifiers for the ``--rank-by`` directive.
+
+* ``--bind-to <object>``: This binds processes to the specified
+  object. See defaults in Quick Summary.  Supported bind-to objects
+  include:
+
+  * ``none``
+  * ``hwthread``
+  * ``core``
+  * ``l1cache``
+  * ``l2cache``
+  * ``l3cache``
+  * ``numa``
+  * ``package``
+
+  Any object can include qualifiers by adding a colon (``:``) and any
+  colon-delimited combination of one or more of the following to the
+  ``--bind-to`` options:
+
+  * ``overload-allowed`` allows for binding more than one process in
+    relation to a CPU
+
+  * ``if-supported`` if binding to that object is supported on this
+    system.
+
+Specifying Host Nodes
+---------------------
+
+Host nodes can be identified on the command line with the ``--host``
+option or in a hostfile.
+
+For example, assuming no other resource manager or scheduler is
+involved:
+
+.. code::
+
+    prun --host aa,aa,bb ./a.out
+
+This launches two processes on node ``aa`` and one on ``bb``.
+
+.. code::
+
+    prun --host aa ./a.out
+
+This launches one process on node ``aa``.
+
+.. code::
+
+    prun --host aa:5 ./a.out
+
+This launches five processes on node ``aa``.
+
+Or, consider the hostfile:
+
+.. code::
+
+    $ cat myhostfile
+    aa slots=2
+    bb slots=2
+    cc slots=2
+
+Here, we list both the host names (``aa``, ``bb``, and ``cc``) but
+also how many "slots" there are for each. Slots indicate how many
+processes can potentially execute on a node. For best performance, the
+number of slots may be chosen to be the number of cores on the node or
+the number of processor sockets.
+
+If the hostfile does not provide slots information, the PRRTE DVM will
+attempt to discover the number of cores (or hwthreads, if the
+``:HWTCPUS`` qualifier to the ``--map-by`` option is set) and set the
+number of slots to that value.
+
+Examples using the hostfile above with and without the ``--host``
+option:
+
+.. code::
+
+    prun --hostfile myhostfile ./a.out
+
+This will launch two processes on each of the three nodes.
+
+.. code::
+
+    prun --hostfile myhostfile --host aa ./a.out
+
+This will launch two processes, both on node ``aa``.
+
+.. code::
+
+    prun --hostfile myhostfile --host dd ./a.out
+
+This will find no hosts to run on and abort with an error. That is, the
+specified host ``dd`` is not in the specified hostfile.
+
+When running under resource managers (e.g., SLURM, Torque, etc.), PRTE
+will obtain both the hostnames and the number of slots directly from
+the resource manger. The behavior of ``--host`` in that environment
+will behave the same as if a hostfile was provided (since it is
+provided by the resource manager).
+
+
+Specifying Number of Processes
+------------------------------
+
+As we have just seen, the number of processes to run can be set using
+the hostfile. Other mechanisms exist.
+
+The number of processes launched can be specified as a multiple of the
+number of nodes or processor sockets available. Consider the hostfile
+below for the examples that follow.
+
+.. code::
+
+   $ cat myhostfile
+   aa
+   bb
+
+For example:
+
+.. code::
+
+   prun --hostfile myhostfile --map-by ppr:2:package ./a.out
+
+This launches processes 0-3 on node ``aa`` and process 4-7 on node
+``bb``, where ``aa`` and ``bb`` are both dual-package nodes. The
+``--map-by ppr:2:package`` option also turns on the ``--bind-to
+package`` option, which is discussed in a later section.
+
+.. code::
+
+   prun --hostfile myhostfile --map-by ppr:2:node ./a.out
+
+This launches processes 0-1 on node ``aa`` and processes 2-3 on node
+``bb``.
+
+.. code::
+
+   prun --hostfile myhostfile --map-by ppr:1:node ./a.out
+
+This launches one process per host node.
+
+Another alternative is to specify the number of processes with the
+``--np`` option. Consider now the hostfile:
+
+.. code::
+
+   $ cat myhostfile
+   aa slots=4
+   bb slots=4
+   cc slots=4
+
+With this hostfile:
+
+.. code::
+
+   prun --hostfile myhostfile --np 6 ./a.out
+
+This will launch processes 0-3 on node ``aa`` and processes 4-5 on
+node ``bb``.  The remaining slots in the hostfile will not be used
+since the ``-np`` option indicated that only 6 processes should be
+launched.
+
+
+Mapping Processes to Nodes Using Policies
+-----------------------------------------
+
+The examples above illustrate the default mapping of process processes
+to nodes. This mapping can also be controlled with various
+``prun`` / ``prterun`` options that describe mapping policies.
+
+.. code::
+
+   $ cat myhostfile
+   aa slots=4
+   bb slots=4
+   cc slots=4
+
+Consider the hostfile above, with ``--np 6``:
+
+.. list-table::
+   :header-rows: 1
+
+   * - Command
+     - Ranks on ``aa``
+     - Ranks on ``bb``
+     - Ranks on ``cc``
+
+   * - ``prun``
+     - 0 1 2 3
+     - 4 5
+     -
+
+   * - ``prun --map-by node``
+     - 0 3
+     - 1 4
+     - 2 5
+
+   * - ``prun --map-by node:NOLOCAL``
+     -
+     - 0 2 4
+     - 1 3 5
+
+The ``--map-by node`` option will load balance the processes across
+the available nodes, numbering each process by node in a round-robin
+fashion.
+
+The ``:NOLOCAL`` qualifier to ``--map-by`` prevents any processes from
+being mapped onto the local host (in this case node ``aa``). While
+``prun`` typically consumes few system resources, the ``:NOLOCAL``
+qualifier can be helpful for launching very large jobs where ``prun``
+may actually need to use noticeable amounts of memory and/or
+processing time.
+
+Just as ``--np`` can specify fewer processes than there are slots, it
+can also oversubscribe the slots. For example, with the same hostfile:
+
+.. code::
+
+   prun --hostfile myhostfile --np 14 ./a.out
+
+This will produce an error since the default ``:NOOVERSUBSCRIBE``
+qualifier to ``--map-by`` prevents oversubscription.
+
+To oversubscribe the nodes you can use the ``:OVERSUBSCRIBE``
+qualifier to ``--map-by``:
+
+.. code::
+
+   prun --hostfile myhostfile --np 14 --map-by :OVERSUBSCRIBE ./a.out
+
+This will launch processes 0-5 on node ``aa``, 6-9 on ``bb``, and
+10-13 on ``cc``.
+
+Limits to oversubscription can also be specified in the hostfile
+itself with the ``max_slots`` field:
+
+.. code::
+
+    $ cat myhostfile
+    aa slots=4 max_slots=4
+    bb         max_slots=8
+    cc slots=4
+
+The ``max_slots`` field specifies such a limit. When it does, the
+``slots`` value defaults to the limit. Now:
+
+.. code::
+
+   prun --hostfile myhostfile --np 14 --map-by :OVERSUBSCRIBE ./a.out
+
+This causes the first 12 processes to be launched as before, but the
+remaining two processes will be forced onto node cc. The other two
+nodes are protected by the hostfile against oversubscription by this
+job.
+
+Using the ``:NOOVERSUBSCRIBE`` qualifier to ``--map-by`` option can be
+helpful since the PRTE DVM currently does not get ``max_slots`` values
+from the resource manager.
+
+Of course, ``--np`` can also be used with the ``--host`` option. For
+example,
+
+.. code::
+
+   prun --host aa,bb --np 8 ./a.out
+
+This will produce an error since the default ``:NOOVERSUBSCRIBE``
+qualifier to ``--map-by`` prevents oversubscription.
+
+.. code::
+
+   prun --host aa,bb --np 8 --map-by :OVERSUBSCRIBE ./a.out
+
+This launches 8 processes. Since only two hosts are specified, after
+the first two processes are mapped, one to ``aa`` and one to ``bb``,
+the remaining processes oversubscribe the specified hosts evenly.
+
+.. code::
+
+   prun --host aa:2,bb:6 --np 8 ./a.out
+
+This launches 8 processes. Processes 0-1 on node ``aa`` since it has 2
+slots and processes 2-7 on node ``bb`` since it has 6 slots.
+
+And here is a MIMD example:
+
+.. code::
+
+   prun --host aa --np 1 hostname : --host bb,cc --np 2 uptime
+
+This will launch process 0 running ``hostname`` on node ``aa`` and
+processes 1 and 2 each running ``uptime`` on nodes ``bb`` and ``cc``,
+respectively.
diff --git a/docs/placement/fundamentals.rst b/docs/placement/fundamentals.rst
new file mode 100644
index 0000000000..b49aaf3bc8
--- /dev/null
+++ b/docs/placement/fundamentals.rst
@@ -0,0 +1,142 @@
+Fundamentals
+============
+
+The mapping of processes to nodes can be defined not just with general
+policies but also, if necessary, using arbitrary mappings that cannot
+be described by a simple policy. Supported directives, given on the
+command line via the ``--map-by`` option, include:
+
+* ``SEQ``: (often accompanied by the ``file=<path>`` qualifier)
+  assigns one process to each node specified in the file. The
+  sequential file is to contain an entry for each desired process, one
+  per line of the file.
+
+* ``RANKFILE``: (often accompanied by the ``file=<path>`` qualifier)
+  assigns one process to the node/resource specified in each entry of
+  the file, one per line of the file.
+
+For example, using the hostfile below:
+
+.. code::
+
+   $ cat myhostfile
+   aa slots=4
+   bb slots=4
+   cc slots=4
+
+The command below will launch three processes, one on each of nodes
+``aa``, ``bb``, and ``cc``, respectively. The slot counts don't
+matter; one process is launched per line on whatever node is listed on
+the line.
+
+.. code::
+
+   $ prun --hostfile myhostfile --map-by seq ./a.out
+
+Impact of the ranking option is best illustrated by considering the
+following hostfile and test cases where each node contains two
+packages (each package with two cores). Using the ``--map-by
+ppr:2:package`` option, we map two processes onto each package and
+utilize the ``--rank-by`` option as show below:
+
+.. code::
+
+   $ cat myhostfile
+   aa
+   bb
+
+.. list-table::
+   :header-rows: 1
+
+   * - Command
+     - Ranks on ``aa``
+     - Ranks on ``bb``
+
+   * - ``--rank-by core``
+     - 0 1 ! 2 3
+     - 4 5 ! 6 7
+
+   * - ``--rank-by package``
+     - 0 2 ! 1 3
+     - 4 6 ! 5 7
+
+   * - ``--rank-by package:SPAN``
+     - 0 4 ! 1 5
+     - 2 6 ! 3 7
+
+Ranking by slot provides the identical result as ranking by core in
+this case |mdash| a simple progression of ranks across each
+node. Ranking by package does a round-robin ranking across packages
+within each node until all processes have been assigned a rank, and
+then progresses to the next node.  Adding the ``:SPAN`` qualifier to
+the ranking directive causes the ranking algorithm to treat the entire
+allocation as a single entity |mdash| thus, the process ranks are
+assigned across all packages before circling back around to the
+beginning.
+
+The binding operation restricts the process to a subset of the CPU
+resources on the node.
+
+The processors to be used for binding can be identified in terms of
+topological groupings |mdash| e.g., binding to an l3cache will bind
+each process to all processors within the scope of a single L3 cache
+within their assigned location. Thus, if a process is assigned by the
+mapper to a certain package, then a ``--bind-to l3cache`` directive
+will cause the process to be bound to the processors that share a
+single L3 cache within that package.
+
+To help balance loads, the binding directive uses a round-robin method,
+binding a process to the first available specified object type within
+the object where the process was mapped. For example, consider the case
+where a job is mapped to the package level, and then bound to core. Each
+package will have multiple cores, so if multiple processes are mapped to
+a given package, the binding algorithm will assign each process located
+to a package to a unique core in a round-robin manner.
+
+Binding can only be done to the mapped object or to a resource located
+within that object.
+
+An object is considered completely consumed when the number of
+processes bound to it equals the number of CPUs within it. Unbound
+processes are not considered in this computation. Additional
+processes cannot be mapped to consumed objects unless the
+OVERLOAD qualifier is provided via the "--bind-to" command
+line option.
+
+Default process mapping/ranking/binding policies can also be set with MCA
+parameters, overridden by the command line options when provided. MCA
+parameters can be set on the ``prte`` command line when starting the
+DVM (or in the ``prterun`` command line for a single-execution job), but
+also in a system or user ``mca-params.conf`` file or as environment
+variables, as described in the MCA section below. Some examples include:
+
+.. list-table::
+   :header-rows: 1
+
+   * - ``prun`` option
+     - MCA parameter key
+     - Value
+
+   * - ``--map-by core``
+     - ``rmaps_default_mapping_policy``
+     - ``core``
+
+   * - ``--map-by package``
+     - ``rmaps_default_mapping_policy``
+     - ``package``
+
+   * - ``--rank-by core``
+     - ``rmaps_default_ranking_policy``
+     - ``core``
+
+   * - ``--bind-to core``
+     - ``hwloc_default_binding_policy``
+     - ``core```
+
+   * - ``--bind-to package``
+     - ``hwloc_default_binding_policy``
+     - ``package``
+
+   * - ``--bind-to none``
+     - ``hwloc_default_binding_policy``
+     - ``none``
diff --git a/docs/placement/index.rst b/docs/placement/index.rst
new file mode 100644
index 0000000000..babe9042de
--- /dev/null
+++ b/docs/placement/index.rst
@@ -0,0 +1,22 @@
+Process placement
+=================
+
+PRRTE provides a set of three controls for assigning process
+locations and ranks:
+
+#. Mapping: Assigns a default location to each process
+#. Ranking: Assigns a unique integer rank value to each process
+#. Binding: Constrains each process to run on specific processors
+
+The sections below describe these controls in more detail.
+
+.. toctree::
+   :maxdepth: 1
+
+   overview
+   examples
+   fundamentals
+   limits
+   diagnostics
+   rankfiles
+   deprecated
diff --git a/docs/placement/limits.rst b/docs/placement/limits.rst
new file mode 100644
index 0000000000..d56d979aa9
--- /dev/null
+++ b/docs/placement/limits.rst
@@ -0,0 +1,198 @@
+Overloading and Oversubscribing
+===============================
+
+This section explores the difference between the terms "overloading"
+and "oversubscribing". Users are often confused by the difference
+between these two scenarios. As such, this section provides a number
+of scenarios to help illustrate the differences.
+
+* ``--map-by :OVERSUBSCRIBE`` allow more processes on a node than
+  allocated :ref:`slots <placement-definition-of-slot-label>`
+
+* ``--bind-to <object>:overload-allowed`` allows for binding more than
+  one process in relation to a CPU
+
+The important thing to remember with *oversubscribing* is that it can
+be defined separately from the actual number of CPUs on a node. This
+allows the mapper to place more or fewer processes per node than
+CPUs. By default, PRRTE uses cores to determine slots in the absence
+of such information provided in the hostfile or by the resource
+manager (except in the case of the ``--host`` as described :ref:`in
+this section <hosts-cli-label>`).
+
+The important thing to remember with *overloading* is that it is
+defined as binding more processes than CPUs. By default, PRRTE uses
+cores as a means of counting the number of CPUs. However, the user can
+adjust this. For example when using the ``:HWTCPUS`` qualifier to the
+``--map-by`` option PRRTE will use hardware threads as a means of
+counting the number of CPUs.
+
+For the following examples consider a node with:
+
+* 2 processor packages,
+* 10 cores per package, and
+* 8 hardware threads per core.
+
+Consider the node from above with the hostfile below:
+
+.. code::
+
+   $ cat myhostfile
+   node01 slots=32
+   node02 slots=32
+
+The ``slots`` token tells PRRTE that it can place up to 32 processes
+before *oversubscribing* the node.
+
+If we run the following:
+
+.. code::
+
+   prun --np 34 --hostfile myhostfile --map-by core --bind-to core hostname
+
+It will return an error at the binding time indicating an
+*overloading* scenario.
+
+The mapping mechanism assigns 32 processes to ``node01`` matching the
+``slots`` specification in the hostfile. The binding mechanism will bind
+the first 20 processes to unique cores leaving it with 12 processes
+that it cannot bind without overloading one of the cores (putting more
+than one process on the core).
+
+Using the ``overload-allowed`` qualifier to the ``--bind-to core``
+option tells PRRTE that it may assign more than one process to a core.
+
+If we run the following:
+
+.. code::
+
+   prun --np 34 --hostfile myhostfile --map-by core --bind-to core:overload-allowed hostname
+
+This will run correctly placing 32 processes on ``node01``, and 2
+processes on ``node02``. On ``node01`` two processes are bound to
+cores 0-11 accounting for the overloading of those cores.
+
+Alternatively, we could use hardware threads to give binding a lower
+level CPU to bind to without overloading.
+
+If we run the following:
+
+.. code::
+
+   prun --np 34 --hostfile myhostfile --map-by core:HWTCPUS --bind-to hwthread hostname
+
+This will run correctly placing 32 processes on ``node01``, and 2
+processes on ``node02``. On ``node01`` two processes are mapped to
+cores 0-11 but bound to different hardware threads on those cores (the
+logical first and second hardware thread). Thus no hardware threads
+are overloaded at binding time.
+
+In both of the examples above the node is not oversubscribed at
+mapping time because the hostfile set the oversubscription limit to
+``slots=32`` for each node. It is only after we exceed that limit that
+PRRTE will throw an oversubscription error.
+
+Consider next if we ran the following:
+
+.. code::
+
+   prun --np 66 --hostfile myhostfile --map-by core:HWTCPUS --bind-to hwthread hostname
+
+This will return an error at mapping time indicating an
+oversubscription scenario. The mapping mechanism will assign all of
+the available slots (64 across 2 nodes) and be left two processes to
+map. The only way to map those processes is to exceed the number of
+available slots putting the job into an oversubscription scenario.
+
+You can force PRRTE to oversubscribe the nodes by using the
+``:OVERSUBSCRIBE`` qualifier to the ``--map-by`` option as seen in the
+example below:
+
+.. code::
+
+   prun --np 66 --hostfile myhostfile \
+       --map-by core:HWTCPUS:OVERSUBSCRIBE --bind-to hwthread hostname
+
+This will run correctly placing 34 processes on ``node01`` and 32 on
+``node02``.  Each process is bound to a unique hardware thread.
+
+Overloading vs. Oversubscription: Package Example
+-------------------------------------------------
+
+Let's extend these examples by considering the package level.
+Consider the same node as before, but with the hostfile below:
+
+.. code::
+
+   $ cat myhostfile
+   node01 slots=22
+   node02 slots=22
+
+The lowest level CPUs are "cores" and we have 20 total (10 per
+package).
+
+If we run:
+
+.. code::
+
+   prun --np 20 --hostfile myhostfile --map-by package \
+       --bind-to package:REPORT hostname
+
+Then 10 processes are mapped to each package, and bound at the package
+level.  This is not overloading since we have 10 CPUs (cores)
+available in the package at the hardware level.
+
+However, if we run:
+
+.. code::
+
+   prun --np 21 --hostfile myhostfile --map-by package \
+       --bind-to package:REPORT hostname
+
+Then 11 processes are mapped to the first package and 10 to the second
+package.  At binding time we have an overloading scenario because
+there are only 10 CPUs (cores) available in the package at the
+hardware level. So the first package is overloaded.
+
+Overloading vs. Oversubscription: Hardware Threads Example
+----------------------------------------------------------
+
+Similarly, if we consider hardware threads.
+
+Consider the same node as before, but with the hostfile below:
+
+.. code::
+
+   $ cat myhostfile
+   node01 slots=165
+   node02 slots=165
+
+The lowest level CPUs are "hwthreads" (because we are going to use the
+``:HWTCPUS`` qualifier) and we have 160 total (80 per package).
+
+If we re-run (from the package example) and add the ``:HWTCPUS``
+qualifier:
+
+.. code::
+
+   prun --np 21 --hostfile myhostfile --map-by package:HWTCPUS \
+       --bind-to package:REPORT hostname
+
+Without the ``:HWTCPUS`` qualifier this would be overloading (as we
+saw previously). The mapper places 11 processes on the first package
+and 10 to the second package. The processes are still bound to the
+package level. However, with the ``:HWTCPUS`` qualifier, it is not
+overloading since we have 80 CPUs (hwthreads) available in the package
+at the hardware level.
+
+Alternatively, if we run:
+
+.. code::
+
+   prun --np 161 --hostfile myhostfile --map-by package:HWTCPUS \
+       --bind-to package:REPORT hostname
+
+Then 81 processes are mapped to the first package and 80 to the second
+package.  At binding time we have an overloading scenario because
+there are only 80 CPUs (hwthreads) available in the package at the
+hardware level.  So the first package is overloaded.
diff --git a/docs/placement/overview.rst b/docs/placement/overview.rst
new file mode 100644
index 0000000000..ebc1521131
--- /dev/null
+++ b/docs/placement/overview.rst
@@ -0,0 +1,190 @@
+Overview
+========
+
+PRRTE provides a set of three controls for assigning process
+locations and ranks:
+
+#. Mapping: Assigns a default location to each process
+#. Ranking: Assigns a unique integer rank value to each process
+#. Binding: Constrains each process to run on specific processors
+
+This section provides an overview of these three controls.  Unless
+otherwise this behavior is shared by ``prun(1)`` (working with a PRRTE
+DVM), and ``prterun(1)``. More detail about PRRTE process placement is
+available in the following sections (using ``--help
+placement-<section>``):
+
+* ``examples``: some examples of the interactions between mapping,
+  ranking, and binding options.
+
+* ``fundamentals``: provides deeper insight into PRRTE's mapping,
+  ranking, and binding options.
+
+* ``limits``: explains the difference between *overloading* and
+  *oversubscribing* resources.
+
+* ``diagnostics``: describes options for obtaining various diagnostic
+  reports that aid the user in verifying and tuning the placement for
+  a specific job.
+
+* ``rankfiles``: explains the format and use of the rankfile mapper
+  for specifying arbitrary process placements.
+
+* ``deprecated``: a list of deprecated options and their new
+  equivalents.
+
+* ``all``: outputs all the placement help except for the
+  ``deprecated`` section.
+
+
+Quick Summary
+-------------
+
+The two binaries that most influence process layout are ``prte(1)``
+and ``prun(1)``.  The ``prte(1)`` process discovers the allocation,
+establishes a Distributed Virtual Machine by starting a ``prted(1)``
+daemon on each node of the allocation, and defines the efault
+mapping/ranking/binding policies for all jobs.  The ``prun(1)`` process
+defines the specific mapping/ranking/binding for a specific job. Most
+of the command line controls are targeted to ``prun(1)`` since each job
+has its own unique requirements.
+
+``prterun(1)`` is just a wrapper around ``prte(1)`` for a single job
+PRRTE DVM. It is doing the job of both ``prte(1)`` and ``prun(1)``,
+and, as such, accepts the sum all of their command line arguments. Any
+example that uses ``prun(1)`` can substitute the use of ``prterun(1)``
+except where otherwise noted.
+
+The ``prte(1)`` process attempts to automatically discover the nodes
+in the allocation by querying supported resource managers. If a
+supported resource manager is not present then ``prte(1)`` relies on a
+hostfile provided by the user.  In the absence of such a hostfile it
+will run all processes on the localhost.
+
+If running under a supported resource manager, the ``prte(1)`` process
+will start the daemon processes (``prted(1)``) on the remote nodes
+using the corresponding resource manager process starter. If no such
+starter is available then ``ssh`` (or ``rsh``) is used.
+
+Minus user direction, PRRTE will automatically map processes in a
+round-robin fashion by CPU, binding each process to its own CPU. The
+type of CPU used (core vs hwthread) is determined by (in priority
+order):
+
+* user directive on the command line via the HWTCPUS qualifier to
+  the ``--map-by`` directive
+
+* setting the ``rmaps_default_mapping_policy`` MCA parameter to
+  include the ``HWTCPUS`` qualifier. This parameter sets the default
+  value for a PRRTE DVM |mdash| qualifiers are carried across to DVM
+  jobs started via ``prun`` unless overridden by the user's command
+  line
+
+* defaulting to ``CORE`` in topologies where core CPUs are defined,
+  and to ``hwthreads`` otherwise.
+
+By default, the ranks are assigned in accordance with the mapping
+directive |mdash| e.g., jobs that are mapped by-node will have the
+process ranks assigned round-robin on a per-node basis.
+
+PRRTE automatically binds processes unless directed not to do so by
+the user. Minus direction, PRRTE will bind individual processes to
+their own CPU within the object to which they were mapped. Should a
+node become oversubscribed during the mapping process, and if
+oversubscription is allowed, all subsequent processes assigned to that
+node will *not* be bound.
+
+.. _placement-definition-of-slot-label:
+
+Definition of 'slot'
+--------------------
+
+The term "slot" is used extensively in the rest of this documentation.
+A slot is an allocation unit for a process.  The number of slots on a
+node indicate how many processes can potentially execute on that node.
+By default, PRRTE will allow one process per slot.
+
+If PRRTE is not explicitly told how many slots are available on a node
+(e.g., if a hostfile is used and the number of slots is not specified
+for a given node), it will determine a maximum number of slots for
+that node in one of two ways:
+
+#. Default behavior: By default, PRRTE will attempt to discover the
+   number of processor cores on the node, and use that as the number
+   of slots available.
+
+#. When ``--use-hwthread-cpus`` is used: If ``--use-hwthread-cpus`` is
+   specified on the command line, then PRRTE will attempt to discover
+   the number of hardware threads on the node, and use that as the
+   number of slots available.
+
+This default behavior also occurs when specifying the ``--host``
+option with a single host.  Thus, the command:
+
+.. code:: sh
+
+   shell$ prun --host node1 ./a.out
+
+launches a number of processes equal to the number of cores on node
+``node1``, whereas:
+
+.. code:: sh
+
+   shell$ prun --host node1 --use-hwthread-cpus ./a.out
+
+launches a number of processes equal to the number of hardware
+threads on ``node1``.
+
+When PRRTE applications are invoked in an environment managed by a
+resource manager (e.g., inside of a Slurm job), and PRRTE was built
+with appropriate support for that resource manager, then PRRTE will
+be informed of the number of slots for each node by the resource
+manager.  For example:
+
+.. code:: sh
+
+   shell$ prun ./a.out
+
+launches one process for every slot (on every node) as dictated by
+the resource manager job specification.
+
+Also note that the one-process-per-slot restriction can be overridden
+in unmanaged environments (e.g., when using hostfiles without a
+resource manager) if oversubscription is enabled (by default, it is
+disabled).  Most parallel applications and HPC environments do not
+oversubscribe; for simplicity, the majority of this documentation
+assumes that oversubscription is not enabled.
+
+Slots are not hardware resources
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Slots are frequently incorrectly conflated with hardware resources.
+It is important to realize that slots are an entirely different metric
+than the number (and type) of hardware resources available.
+
+Here are some examples that may help illustrate the difference:
+
+#. More processor cores than slots: Consider a resource manager job
+   environment that tells PRRTE that there is a single node with 20
+   processor cores and 2 slots available.  By default, PRRTE will
+   only let you run up to 2 processes.
+
+   Meaning: you run out of slots long before you run out of processor
+   cores.
+
+#. More slots than processor cores: Consider a hostfile with a single
+   node listed with a ``slots=50`` qualification.  The node has 20
+   processor cores.  By default, PRRTE will let you run up to 50
+   processes.
+
+   Meaning: you can run many more processes than you have processor
+   cores.
+
+.. _placement-definition-of-processor-element-label:
+
+Definition of "processor element"
+---------------------------------
+
+By default, PRRTE defines that a "processing element" is a processor
+core.  However, if ``--use-hwthread-cpus`` is specified on the command
+line, then a "processing element" is a hardware thread.
diff --git a/docs/placement/rankfiles.rst b/docs/placement/rankfiles.rst
new file mode 100644
index 0000000000..16f2eb772d
--- /dev/null
+++ b/docs/placement/rankfiles.rst
@@ -0,0 +1,71 @@
+Rankfiles
+=========
+
+Another way to specify arbitrary mappings is with a rankfile, which
+gives you detailed control over process binding as well.
+
+Rankfiles are text files that specify detailed information about how
+individual processes should be mapped to nodes, and to which
+processor(s) they should be bound. Each line of a rankfile specifies
+the location of one process. The general form of each line in the
+rankfile is:
+
+.. code::
+
+   rank <N>=<hostname> slot=<slot list>
+
+For example:
+
+.. code::
+
+   $ cat myrankfile
+   rank 0=aa slot=10-12
+   rank 1=bb slot=0,1,4
+   rank 2=cc slot=1-2
+   $ prun --host aa,bb,cc,dd --map-by rankfile:FILE=myrankfile ./a.out
+
+Means that:
+
+* Rank 0 runs on node aa, bound to logical cores 10-12.
+* Rank 1 runs on node bb, bound to logical cores 0, 1, and 4.
+* Rank 2 runs on node cc, bound to logical cores 1 and 2.
+
+Similarly:
+
+.. code::
+
+   $ cat myrankfile
+   rank 0=aa slot=1:0-2
+   rank 1=bb slot=0:0,1,4
+   rank 2=cc slot=1-2
+   $ prun --host aa,bb,cc,dd --map-by rankfile:FILE=myrankfile ./a.out
+
+Means that:
+
+* Rank 0 runs on node aa, bound to logical package 1, cores 10-12 (the
+  0th through 2nd cores on that package).
+* Rank 1 runs on node bb, bound to logical package 0, cores 0, 1,
+  and 4.
+* Rank 2 runs on node cc, bound to logical cores 1 and 2.
+
+The hostnames listed above are "absolute," meaning that actual
+resolvable hostnames are specified. However, hostnames can also be
+specified as "relative," meaning that they are specified in relation
+to an externally-specified list of hostnames (e.g., by ``prun``'s
+``--host`` argument, a hostfile, or a job scheduler).
+
+The "relative" specification is of the form "``+n<X>``", where ``X``
+is an integer specifying the Xth hostname in the set of all available
+hostnames, indexed from 0. For example:
+
+.. code::
+
+   $ cat myrankfile
+   rank 0=+n0 slot=10-12
+   rank 1=+n1 slot=0,1,4
+   rank 2=+n2 slot=1-2
+   $ prun --host aa,bb,cc,dd --map-by rankfile:FILE=myrankfile ./a.out
+
+All package/core slot locations are be specified as *logical*
+indexes. You can use tools such as HWLOC's ``lstopo`` to find the
+logical indexes of packages and cores.
diff --git a/docs/prrte-rst-content b/docs/prrte-rst-content
new file mode 120000
index 0000000000..e2e90e10c8
--- /dev/null
+++ b/docs/prrte-rst-content
@@ -0,0 +1 @@
+../src/docs/prrte-rst-content
\ No newline at end of file
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index e9f717bbf6..29b2bbe36e 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -3,9 +3,10 @@ Release Notes
 
 - Systems that have been tested are:
 
+  - Linux (various flavors/distros), 32 bit, with gcc
   - Linux (various flavors/distros), 64 bit (x86), with gcc, Intel,
     and Portland (*)
-  - OS X (10.7 and above), 64 bit (x86_64), with gcc and clang (*)
+  - OS X (10.7 and above), 32 and 64 bit (x86_64), with gcc (*)
 
 - PRRTE has taken some steps towards Reproducible Builds
   (https://reproducible-builds.org/).  Specifically, PRRTE's
diff --git a/docs/session-directory.rst b/docs/session-directory.rst
new file mode 100644
index 0000000000..34dbbb5c7d
--- /dev/null
+++ b/docs/session-directory.rst
@@ -0,0 +1,54 @@
+Session directory
+=================
+
+PRRTE establishes a "session directory" on the filesystem to serve as
+a top-level location for temporary files used by both the local PRRTE
+daemon and its child processes.
+
+This is done to enable quick and easy cleanup in the event that PRRTE
+is unable to fully cleanup after itself.
+
+Directory location
+------------------
+
+PRRTE decides where to located the root of the session directory by
+examining the following (in precedence order):
+
+#. If the value of the ``prte_top_session_dir`` MCA parameter is not
+   empty, use that (it defaults to empty).
+
+   .. note:: MCA parameters can be set via environment variables, on
+             the command line, or in a parameter file.
+
+#. If the environment variable ``TMPDIR`` is not empty, use that.
+#. If the environment variable ``TEMP`` is not empty, use that.
+#. If the environment variable ``TMP`` is not empty, use that.
+#. Use ``/tmp``
+
+Directory name
+--------------
+
+By default, the session directory name is set to
+
+.. code::
+
+   prte.<nodename>.<uid>
+
+The session directory name can further be altered to include the PID
+of the daemon process, if desired:
+
+.. code::
+
+   prte.<nodename>.<pid>.<uid>
+
+by setting the ``prte_add_pid_to_session_dirname`` MCA parameter to a
+"true" value (e.g., 1).
+
+Tools
+-----
+
+In the case of tools, the rendezvous files containing connection
+information for a target server are located in the session directory
+tree. Thus, it may be necessary to point the tool at the location
+where those files can be found if that location is other than the
+expected default.
diff --git a/examples/dmodex.c b/examples/dmodex.c
index 1bc16559bb..286b6c3e6e 100644
--- a/examples/dmodex.c
+++ b/examples/dmodex.c
@@ -16,7 +16,7 @@
  * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015      Mellanox Technologies, Inc.  All rights reserved.
  * Copyright (c) 2019-2022 IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * Copyright (c) 2023      Triad National Security, LLC. All rights reserved.
  * $COPYRIGHT$
  *
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
     pmix_rank_t *locals = NULL;
     uint8_t j;
     pmix_info_t timeout;
-    int tlimit = 10;
+    int tlimit = 240;
 
     EXAMPLES_HIDE_UNUSED_PARAMS(argc, argv);
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0690b86166..a6231009bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@
 #
 
 SUBDIRS = \
-	include \
+	docs \
 	etc \
 	util \
 	$(MCA_prte_FRAMEWORKS_SUBDIRS) \
@@ -36,7 +36,7 @@ SUBDIRS = \
 	$(MCA_prte_FRAMEWORK_COMPONENT_DSO_SUBDIRS)
 
 DIST_SUBDIRS = \
-	include \
+	docs \
 	etc \
 	util \
 	$(MCA_prte_FRAMEWORKS_SUBDIRS) \
@@ -58,6 +58,7 @@ libprrte_la_CPPFLAGS =
 
 # included subdirectory Makefile.am's and appended-to variables
 headers =
+nodist_headers =
 noinst_LTLIBRARIES =
 dist_prtedata_DATA =
 libprrte_la_SOURCES += $(headers)
@@ -69,6 +70,7 @@ prtedir = $(prteincludedir)/$(subdir)
 nobase_prte_HEADERS = $(headers)
 endif
 
+include include/Makefile.am
 include runtime/Makefile.am
 include tools/Makefile.am
 include prted/Makefile.am
diff --git a/src/docs/Makefile.am b/src/docs/Makefile.am
new file mode 100644
index 0000000000..1826b6e290
--- /dev/null
+++ b/src/docs/Makefile.am
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2022-2023 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
+# Copyright (c) 2023      Nanook Consulting.  All rights reserved.
+#
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+SUBDIRS = \
+        prrte-rst-content \
+        show-help-files
diff --git a/src/docs/prrte-rst-content/Makefile.am b/src/docs/prrte-rst-content/Makefile.am
new file mode 100644
index 0000000000..822b60c537
--- /dev/null
+++ b/src/docs/prrte-rst-content/Makefile.am
@@ -0,0 +1,61 @@
+#
+# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
+# Copyright (c) 2023      Nanook Consulting.  All rights reserved.
+#
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# Install the prterun RST "source" files so that other projects can
+# include them in their documentation, even if they do not have access
+# to the PRTE source tree.
+#
+# Note that we install these files into the "data" directory (vs. the
+# "doc" directory) so that packagers won't split these files into a
+# "docs" sub-package that may not be installed when we build other
+# packages that want to use these RST files.
+rstdir = $(prtedatadir)/rst/prrte-rst-content
+dist_rst_DATA = \
+    cli-allow-run-as-root.rst \
+    cli-bind-to.rst \
+    cli-dash-host.rst \
+    cli-debug-daemons-file.rst \
+    cli-debug-daemons.rst \
+    cli-display.rst \
+    cli-dvm-hostfile.rst \
+    cli-dvm.rst \
+    cli-forward-signals.rst \
+    cli-launcher-hostfile.rst \
+    cli-leave-session-attached.rst \
+    cli-map-by.rst \
+    cli-noprefix.rst \
+    cli-output.rst \
+    cli-personality.rst \
+    cli-pmixmca.rst \
+    cli-prefix.rst \
+    cli-prtemca.rst \
+    cli-rank-by.rst \
+    cli-runtime-options.rst \
+    cli-stream-buffering.rst \
+    cli-tune.rst \
+    cli-x.rst \
+    deprecated-bind-to-core.rst \
+    deprecated-display-allocation.rst \
+    deprecated-display-devel-allocation.rst \
+    deprecated-display-devel-map.rst \
+    deprecated-display-map.rst \
+    deprecated-display-topo.rst \
+    deprecated-gmca.rst \
+    deprecated-mca.rst \
+    deprecated-merge-stderr-to-stdout.rst \
+    deprecated-output-directory.rst \
+    deprecated-output-filename.rst \
+    deprecated-report-bindings.rst \
+    deprecated-tag-output.rst \
+    deprecated-timestamp-output.rst \
+    deprecated-xml.rst \
+    prterun-all-cli.rst \
+    prterun-all-deprecated.rst
diff --git a/src/docs/prrte-rst-content/README.txt b/src/docs/prrte-rst-content/README.txt
new file mode 100644
index 0000000000..e4ab269d01
--- /dev/null
+++ b/src/docs/prrte-rst-content/README.txt
@@ -0,0 +1,132 @@
+This file covers two main topics:
+
+1. How downstream projects should use PRRTE's RST files
+2. How PRRTE developers should maintain these RST files
+
+
+How downstream projects should use PRRTE's RST files
+====================================================
+
+The intent is that PRRTE will install some of its RST files in the
+install tree so that downstream projects can use the RST
+".. include::" directive to include them directly in their own RST
+documentation.
+
+Overall scheme
+--------------
+
+The overall scheme is relatively straightfoward:
+
+1. Downstream projects should sym link or copy the PRRTE install
+   directory $datadir/rst/prrte-rst-content (typically
+   $prefix/share/prte/rst/prrte-rst-content) to the top directory of
+   their RST doc tree.
+
+2. Where relevant, use the RST include directive using the absolute
+   path form:
+
+   .. include:: /prrte-rst-content/prterun-all-cli.rst
+   .. include:: /prrte-rst-content/prterun-all-deprecated.rst
+
+   The absolute path represents the root of the RST tree (not the root
+   of the overall filesystem).
+
+   The RST files shown above are the public interface for the RST
+   docs: they will include multiple other RST files.  The specific
+   list of files that are included by the above files may (will)
+   change over time; downstream projects are encouraged to limit
+   themselves to including only the above-listed files to protect
+   themselves from changes like this.
+
+   The RST files use the following RST block indicators in this order:
+
+   Chapter: ===
+   Section: ---
+   Subsection: ^^^
+   Subsubsection: +++
+
+   It is advisable to start a new RST block immediately after
+   including the public PRRTE RST files in order to precisely control
+   the document section level after the PRRTE content.
+
+3. Specific components may also install RST files in the same
+   $datadir/rst tree (e.g., schizo components).  These RST files are
+   suitable for inclusion in downstream project documentation; consult
+   their guidance for usage.
+
+   Note that PRRTE component RST filenames are not standardized by
+   PRRTE, but they follow the same "use the absolute path form"
+   convention as the public PRRTE RST files.
+
+
+Sphinx pickyness
+----------------
+
+Sphinx is notably picky about two things:
+
+1. How include paths propagate through files (and included files, and
+   files that are included from included files, ... etc.).
+
+   This is why it is recommended that downstream projects have
+   "prrte-rst-content" at the top of their doc tree and then include
+   with the absolute path form.  Attempting to use relative paths
+   *might* be able to work, but is not advisable.
+
+2. That every *.rst file in the doc tree is used.
+
+   The "prrte-rst-content" directory contains a bunch of individual
+   *.rst files.  If downstream project documentation ends up only
+   using *some* of those files, Sphinx will complain about the *.rst
+   files that are not used.
+
+   In such cases, downstream projects can either remove unneeded files
+   (which may not be entirely safe across multiple different versions
+   of PRRTE), or use the RST ".. toctree::" directive with the
+   ":hidden:" parameter to include those RST files so that Sphinx will
+   not complain, but not have them linked anywhere in the rendered
+   output tree.
+
+
+How PRRTE developers should maintain these RST files
+====================================================
+
+There are two types of files in this directory:
+
+1. Files that are intended to be directly included by downstream
+   project documentation.
+
+   As described in the "How downstream projects should use PRRTE's RST
+   files" section in this file, there are a small number of "public"
+   RST files that are intended to be included by downstream projects.
+
+   a. PRRTE developers should attempt to a) make this list as short as
+      possible, and b) keep the list the same between PRRTE versions
+      as much as possible.  This helps downstream projects include the
+      PRRTE docs in their own docs over time.
+
+   b. These files should include other PRRTE RST files using the
+      absolute path form, and assume that /prrte-rst-content is a
+      top-level directory in the RST doc tree.
+
+      The absolute path represents the root of the RST tree (not the
+      root of the overall filesystem).
+
+2. Files that are included (directly or indirectly) by the files from
+   #1.
+
+   They are meant to be self-contained chunks of information that can
+   be included like building blocks in higher-level RST documentation
+   files.
+
+   a. Be wary of defining sections / subsections, especially for the
+      "lowest" level files (that may be included multiple times in
+      multiple places).  When creating new RST blocks, follow the RST
+      block indicator sequence listed earlier in this file.
+
+   b. Be ware of creating RST labels, especially for the "lowest"
+      level files (that may be included multiple times in multiple
+      places).
+
+   c. When using the ".. include::" RST directive, use the absolute
+      path form, and assume that /prrte-rst-content is a top-level
+      directory in the RST doc tree.
diff --git a/src/docs/prrte-rst-content/cli-allow-run-as-root.rst b/src/docs/prrte-rst-content/cli-allow-run-as-root.rst
new file mode 100644
index 0000000000..6669174e57
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-allow-run-as-root.rst
@@ -0,0 +1,31 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Allow execution as root **(STRONGLY DISCOURAGED)**.
+
+Running as root exposes the user to potentially catastrophic file
+system corruption and damage |mdash| e.g., if the user accidentally
+points the root of the session directory to a system required point,
+this directory and all underlying elements will be deleted upon job
+completion, thereby rendering the system inoperable.
+
+It is recognized that some environments (e.g., containers) may require
+operation as root, and that the user accepts the risks in those
+scenarios. Accordingly, one can override PRRTE's run-as-root
+protection by providing one of the following:
+
+* The ``--allow-run-as-root`` command line directive
+* Adding **BOTH** of the following environmental parameters:
+
+    * ``PRTE_ALLOW_RUN_AS_ROOT=1``
+    * ``PRTE_ALLOW_RUN_AS_ROOT_CONFIRM=1``
+
+Again, we recommend this only be done if absolutely necessary.
diff --git a/src/docs/prrte-rst-content/cli-bind-to.rst b/src/docs/prrte-rst-content/cli-bind-to.rst
new file mode 100644
index 0000000000..3707f1a212
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-bind-to.rst
@@ -0,0 +1,80 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+By default, processes are bound to individual CPUs (either COREs or
+HWTHREADs, as defined by default or by user specification for the
+job). On nodes that are OVERSUBSCRIBEd (i.e., where the number of
+procs exceeds the number of assigned slots), the default is to not
+bind the processes.
+
+.. note:: Processes from prior jobs that are already executing on a
+          node are not "unbound" when a new job mapping results in the
+          node becoming oversubscribed.
+
+Binding is performed to the first available specified object type
+within the object where the process was mapped. In other words,
+binding can only be done to the mapped object or to a resource
+located beneath that object.
+
+An object is considered completely consumed when the number of
+processes bound to it equals the number of CPUs within it. Unbound
+processes are not considered in this computation. Additional
+processes cannot be mapped to consumed objects unless the
+``OVERLOAD`` qualifier is provided via the ``--bind-to`` command
+line option.
+
+Note that directives and qualifiers are case-insensitive
+and can be shortened to the minimum number of characters
+to uniquely identify them. Thus, ``L1CACHE`` can be given
+as ``l1cache`` or simply as ``L1``.
+
+Supported binding directives include:
+
+* ``NONE`` does not bind the processes
+
+* ``HWTHREAD`` binds each process to a single hardware
+  thread/ This requires that hwthreads be treated
+  as independent CPUs (i.e., that either the ``HWTCPUS``
+  qualifier be provided to the ``map-by`` option or
+  that ``hwthreads`` be designated as CPUs by default).
+
+* ``CORE`` binds each process to a single core. This
+  can be done whether ``hwthreads`` or ``cores`` are being
+  treated as independent CPUs provided that mapping
+  is performed at the core or higher level.
+
+* ``L1CACHE`` binds each process to all the CPUs in
+  an ``L1`` cache.
+
+* ``L2CACHE`` binds each process to all the CPUs in
+  an ``L2`` cache
+
+* ``L3CACHE`` binds each process to all the CPUs in
+  an ``L3`` cache
+
+* ``NUMA`` binds each process to all the CPUs in a ``NUMA``
+  region
+
+* ``PACKAGE`` binds each process to all the CPUs in a ``PACKAGE``
+
+Any directive can include qualifiers by adding a colon (:) and any
+combination of one or more of the following to the ``--bind-to``
+option:
+
+* ``OVERLOAD`` indicates that objects can have more
+  processes bound to them than CPUs within them
+
+* ``IF-SUPPORTED`` indicates that the job should continue to
+  be launched and executed even if binding cannot be
+  performed as requested.
+
+.. note:: Directives and qualifiers are case-insensitive.
+          ``OVERLOAD`` is the same as ``overload``.
diff --git a/src/docs/prrte-rst-content/cli-dash-host.rst b/src/docs/prrte-rst-content/cli-dash-host.rst
new file mode 100644
index 0000000000..25e8372830
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-dash-host.rst
@@ -0,0 +1,27 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Host syntax consists of a comma-delimited list of node names, each
+entry optionally containing a ``:N`` extension indicating the number
+of slots to assign to that entry:
+
+.. code::
+
+   --host node01:5,node02
+
+In the absence of the slot extension, one slot will be assigned to the
+node. Duplicate entries are aggregated and the number of slots
+assigned to that node are summed together.
+
+.. note:: A "slot" is the PRRTE term for an allocatable unit where we
+   can launch a process. Thus, the number of slots equates to the
+   maximum number of processes PRRTE may start on that node without
+   oversubscribing it.
diff --git a/src/docs/prrte-rst-content/cli-debug-daemons-file.rst b/src/docs/prrte-rst-content/cli-debug-daemons-file.rst
new file mode 100644
index 0000000000..8588ef8af4
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-debug-daemons-file.rst
@@ -0,0 +1,20 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Debug daemon output is enabled and all output from the daemons is
+redirected into files with names of the form:
+
+.. code::
+
+   output-prted-<daemon-nspace>-<nodename>.log
+
+These names avoid conflict on shared file systems. The files are
+located in the top-level session directory assigned to the DVM.
diff --git a/src/docs/prrte-rst-content/cli-debug-daemons.rst b/src/docs/prrte-rst-content/cli-debug-daemons.rst
new file mode 100644
index 0000000000..cf574e8bcd
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-debug-daemons.rst
@@ -0,0 +1,14 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Debug daemon output enabled. This is a somewhat limited stream of
+information normally used to simply confirm that the daemons
+started. Includes leaving the output streams open.
diff --git a/src/docs/prrte-rst-content/cli-display.rst b/src/docs/prrte-rst-content/cli-display.rst
new file mode 100644
index 0000000000..c07ee0a000
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-display.rst
@@ -0,0 +1,50 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+The ``display`` command line directive must be accompanied by a
+comma-delimited list of case-insensitive options indicating what
+information about the job and/or allocation is to be displayed. The
+full directive need not be provided |mdash| only enough characters are
+required to uniquely identify the directive. For example, ``ALL`` is
+sufficient to represent the ``ALLOCATION`` directive |mdash| while ``MAP``
+can not be used to represent ``MAP-DEVEL`` (though ``MAP-D`` would
+suffice).
+
+Supported values include:
+
+* ``ALLOCATION`` displays the detected hosts and slot assignments for
+  this job
+
+* ``BINDINGS`` displays the resulting bindings applied to processes in
+  this job
+
+* ``MAP`` displays the resulting locations assigned to processes in
+  this job
+
+* ``MAP-DEVEL`` displays a more detailed report on the locations
+  assigned to processes in this job that includes local and node
+  ranks, assigned bindings, and other data
+
+* ``TOPO=LIST`` displays the topology of each node in the
+  semicolon-delimited list that is allocated to the job
+
+* ``CPUS[=LIST]`` displays the available CPUs on the provided
+  semicolon-delimited list of nodes (defaults to all nodes)
+
+The display command line directive can include qualifiers by adding a
+colon (``:``) and any combination of one or more of the following
+(delimited by colons):
+
+* ``PARSEABLE`` directs that the output be provided in a format that
+  is easily parsed by machines. Note that ``PARSABLE`` is also accepted as
+  a typical spelling for the qualifier.
+
+Provided qualifiers will apply to *all* of the display directives.
diff --git a/src/docs/prrte-rst-content/cli-dvm-hostfile.rst b/src/docs/prrte-rst-content/cli-dvm-hostfile.rst
new file mode 100644
index 0000000000..a4ee088196
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-dvm-hostfile.rst
@@ -0,0 +1,85 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+PRRTE supports several levels of user-specified host lists based on an
+established precedence order. Users can specify a default hostfile
+that contains a list of nodes to be used by the DVM. Only one default
+hostfile can be provided for a given DVM. In addition, users can
+specify a hostfile that contains a list of nodes to be used for a DVM,
+or can provide a comma-delimited list of nodes to be used for that DVM
+via the ``--host`` command line option.
+
+The precedence order applied to these various options depends to some
+extent on the local environment. The following table illustrates how
+host and hostfile directives work together to define the set of hosts
+upon which a DVM will execute in the absence of a resource manager
+(RM):
+
+.. list-table::
+   :header-rows: 1
+   :widths: 10 7 10 32
+
+   * - Default hostfile
+     - host
+     - hostfile
+     - Result
+
+   * - unset
+     - unset
+     - unset
+     - | The DVN will consist solely of the
+       | local host where the DVM
+       | was started.
+
+   * - unset
+     - set
+     - unset
+     - | Host option defines resource list for the DVM.
+
+   * - unset
+     - unset
+     - set
+     - | Hostfile option defines resource list for the DVM.
+
+   * - unset
+     - set
+     - set
+     - | Hostfile option defines resource list for the DVM,
+       | then host filters the list to define the final
+       | set of nodes to be used by the DVM
+
+   * - set
+     - unset
+     - unset
+     - | Default hostfile defines resource list for the DVM
+
+   * - set
+     - set
+     - unset
+     - | Default hostfile defines resource list for the DVM,
+       | then host filters the list to define the final
+       | set of nodes to be used by the DVM
+
+   * - set
+     - set
+     - set
+     - | Default hostfile defines resource list for the DVM,
+       | then hostfile filters the list, and then host filters
+       | the list to define the final set of nodes to be
+       | used by the DVM
+
+This changes somewhat in the presence of an RM as that entity
+specifies the initial allocation of nodes. In this case, the default
+hostfile, hostfile and host directives are all used to filter the RM's
+specification so that a user can utilize different portions of the
+allocation for different DVMs. This is done according to the same
+precedence order as in the prior table, with the RM providing the
+initial pool of nodes.
diff --git a/src/docs/prrte-rst-content/cli-dvm.rst b/src/docs/prrte-rst-content/cli-dvm.rst
new file mode 100644
index 0000000000..394706890d
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-dvm.rst
@@ -0,0 +1,56 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+A required argument is passed to the ``--dvm`` directive to specify
+the location of the DVM controller (e.g., ``--dvm pid:12345``) or by
+passing the string ``search`` to instead search for an existing
+controller.
+
+Supported options include:
+
+* ``search``: directs the tool to search for available DVM controllers
+  it is authorized to use, connecting to the first such candidate it
+  finds.
+
+* ``pid:<arg>``: provides the PID of the target DVM controller. This
+  can be given as either the PID itself (arg = int) or the path to a
+  file that contains the PID (arg = ``file:<path>``)
+
+* ``file:<path>``: provides the path to a PMIx rendezvous file that is
+  output by PMIx servers |mdash| the file contains all the required
+  information for completing the connection
+
+* ``uri:<arg>``: specifies the URI of the DVM controller, or the name of
+  the file (specified as ``file:filename``) that contains that info
+
+* ``ns:<arg>``: specifies the namespace of the DVM controller
+
+* ``system``: exclusively find and use the system-level DVM controller
+
+* ``system-first``: look for a system-level DVM controller, fall back
+  to searching for an available DVM controller the command is
+  authorized to use if a system-level controller is not found
+
+Examples:
+
+.. code::
+
+   prterun --dvm file:dvm_uri.txt --np 4 ./a.out
+
+   prterun --dvm pid:12345 --np 4 ./a.out
+
+   prterun --dvm uri:file:dvm_uri.txt --np 4 ./a.out
+
+   prterun --dvm ns:prte-node1-2095 --np 4 ./a.out
+
+   prterun --dvm pid:file:prte_pid.txt --np 4 ./a.out
+
+   prterun --dvm search --np 4 ./a.out
diff --git a/src/docs/prrte-rst-content/cli-forward-signals.rst b/src/docs/prrte-rst-content/cli-forward-signals.rst
new file mode 100644
index 0000000000..e7dc3a7ea3
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-forward-signals.rst
@@ -0,0 +1,15 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Comma-delimited list of additional signals (names or integers) to
+forward to application processes (``none`` = forward
+nothing). Signals provided by default include SIGTSTP, SIGUSR1,
+SIGUSR2, SIGABRT, SIGALRM, and SIGCONT.
diff --git a/src/docs/prrte-rst-content/cli-launcher-hostfile.rst b/src/docs/prrte-rst-content/cli-launcher-hostfile.rst
new file mode 100644
index 0000000000..421e37d524
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-launcher-hostfile.rst
@@ -0,0 +1,49 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+PRRTE supports several levels of user-specified hostfiles based on an
+established precedence order. Users can specify a hostfile that
+contains a list of nodes to be used for the job, or can provide a
+comma-delimited list of nodes to be used for that job via the
+``--host`` command line option.
+
+The precedence order applied to these various options depends to some
+extent on the local environment. The following table illustrates how
+host and hostfile directives work together to define the set of hosts
+upon which a DVM will execute the job in the absence of a resource
+manager (RM):
+
+.. list-table::
+   :header-rows: 1
+   :widths: 7 10 45
+
+   * - host
+     - hostfile
+     - Result
+
+   * - unset
+     - unset
+     - | The DVM will utilize all its available resources
+       | when mapping the job.
+
+   * - set
+     - unset
+     - | Host option defines resource list for the job
+
+   * - unset
+     - set
+     - | Hostfile defines resource list for the job
+
+   * - set
+     - set
+     - | Hostfile defines resource list for the job,
+       | then host filters the list to define the final
+       | set of nodes to be used for the job
diff --git a/src/docs/prrte-rst-content/cli-leave-session-attached.rst b/src/docs/prrte-rst-content/cli-leave-session-attached.rst
new file mode 100644
index 0000000000..1e6e984d58
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-leave-session-attached.rst
@@ -0,0 +1,16 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Do not discard stdout/stderr of remote PRRTE daemons. The primary use
+for this option is to ensure that the daemon output streams (i.e.,
+stdout and stderr) remain open after launch, thus allowing the user to
+see any daemon-generated error messages. Otherwise, the daemon will
+"daemonize" itself upon launch, thereby closing its output streams.
diff --git a/src/docs/prrte-rst-content/cli-map-by.rst b/src/docs/prrte-rst-content/cli-map-by.rst
new file mode 100644
index 0000000000..eef475dd66
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-map-by.rst
@@ -0,0 +1,136 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Processes are mapped based on one of the following directives as
+applied at the job level:
+
+* ``SLOT`` assigns procs to each node up to the number of available
+  slots on that node before moving to the next node in the
+  allocation
+
+* ``HWTHREAD`` assigns a proc to each hardware thread on a node in a
+  round-robin manner up to the number of available slots on that
+  node before moving to the next node in the allocation
+
+* ``CORE`` (default) assigns a proc to each core on a node in a
+  round-robin manner up to the number of available slots on that
+  node before moving to the next node in the allocation
+
+* ``L1CACHE`` assigns a proc to each L1 cache on a node in a
+  round-robin manner up to the number of available slots on that
+  node before moving to the next node in the allocation
+
+* ``L2CACHE`` assigns a proc to each L2 cache on a node in a
+  round-robin manner up to the number of available slots on that
+  node before moving to the next node in the allocation
+
+* ``L3CACHE`` assigns a proc to each L3 cache on a node in a
+  round-robin manner up to the number of available slots on that
+  node before moving to the next node in the allocation
+
+* ``NUMA`` assigns a proc to each NUMA region on a node in a
+  round-robin manner up to the number of available slots on that
+  node before moving to the next node in the allocation
+
+* ``PACKAGE`` assigns a proc to each package on a node in a
+  round-robin manner up to the number of available slots on that
+  node before moving to the next node in the allocation
+
+* ``NODE`` assigns processes in a round-robin fashion to all nodes
+  in the allocation, with the number assigned to each node capped
+  by the number of available slots on that node
+
+* ``SEQ`` (often accompanied by the file=<path> qualifier) assigns
+  one process to each node specified in the file. The sequential
+  file is to contain an entry for each desired process, one per
+  line of the file.
+
+* ``PPR:N``:resource maps N procs to each instance of the specified
+  resource type in the allocation
+
+* ``RANKFILE`` (often accompanied by the file=<path> qualifier) assigns
+  one process to the node/resource specified in each entry of the
+  file, one per line of the file.
+
+* ``PE-LIST=a,b`` assigns procs to each node in the allocation based on
+  the ORDERED qualifier. The list is comprised of comma-delimited
+  ranges of CPUs to use for this job. If the ORDERED qualifier is not
+  provided, then each node will be assigned procs up to the number of
+  available slots, capped by the availability of the specified CPUs.
+  If ORDERED is given, then one proc will be assigned to each of the
+  specified CPUs, if available, capped by the number of slots on each
+  node and the total number of specified processes. Providing the
+  OVERLOAD qualifier to the "bind-to" option removes the check on
+  availability of the CPU in both cases.
+
+Any directive can include qualifiers by adding a colon (``:``) and any
+combination of one or more of the following (delimited by colons) to
+the ``--map-by`` option (except where noted):
+
+* ``PE=n`` bind n CPUs to each process (can not be used in combination
+  with rankfile or pe-list directives)
+
+* ``SPAN`` load balance the processes across the allocation by treating
+  the allocation as a single "super-node" (can not be used in
+  combination with ``slot``, ``node``, ``seq``, ``ppr``, ``rankfile``, or
+  ``pe-list`` directives)
+
+* ``OVERSUBSCRIBE`` allow more processes on a node than processing elements
+
+* ``NOOVERSUBSCRIBE`` means ``!OVERSUBSCRIBE``
+
+* ``NOLOCAL`` do not launch processes on the same node as ``prun``
+
+* ``HWTCPUS`` use hardware threads as CPU slots
+
+* ``CORECPUS`` use cores as CPU slots (default)
+
+* ``INHERIT`` indicates that a child job (i.e., one spawned from within
+  an application) shall inherit the placement policies of the parent job
+  that spawned it.
+
+* ``NOINHERIT`` means ```!INHERIT``
+
+* ``FILE=<path>`` (path to file containing sequential or rankfile entries).
+
+* ``ORDERED`` only applies to the ``PE-LIST`` option to indicate that
+  procs are to be bound to each of the specified CPUs in the order in
+  which they are assigned (i.e., the first proc on a node shall be
+  bound to the first CPU in the list, the second proc shall be bound
+  to the second CPU, etc.)
+
+.. note:: Directives and qualifiers are case-insensitive and can be
+          shortened to the minimum number of characters to uniquely
+          identify them. Thus, ``L1CACHE`` can be given as ``l1cache`` or
+          simply as ``L1``.
+
+The type of CPU (core vs hwthread) used in the mapping algorithm
+is determined as follows:
+
+* by user directive on the command line via the HWTCPUS qualifier to
+  the ``--map-by`` directive
+
+* by setting the ``rmaps_default_mapping_policy`` MCA parameter to
+  include the ``HWTCPUS`` qualifier. This parameter sets the default
+  value for a PRRTE DVM |mdash| qualifiers are carried across to DVM jobs
+  started via ``prun`` unless overridden by the user's command line
+
+* defaults to CORE in topologies where core CPUs are defined, and to
+  hwthreads otherwise.
+
+If your application uses threads, then you probably want to ensure that
+you are either not bound at all (by specifying ``--bind-to none``), or
+bound to multiple cores using an appropriate binding level or specific
+number of processing elements per application process via the ``PE=#``
+qualifier to the ``--map-by`` command line directive.
+
+A more detailed description of the mapping, ranking, and binding
+procedure can be obtained via the ``--help placement`` option.
diff --git a/src/docs/prrte-rst-content/cli-noprefix.rst b/src/docs/prrte-rst-content/cli-noprefix.rst
new file mode 100644
index 0000000000..96bf282184
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-noprefix.rst
@@ -0,0 +1,16 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Disable automatic ``--prefix`` behavior. PRRTE automatically sets the
+prefix for remote daemons if it was either configured with the
+``--enable-prte-prefix-by-default`` option OR prte itself was executed
+with an absolute path to the ``prte`` command. This option disables
+that behavior.
diff --git a/src/docs/prrte-rst-content/cli-output.rst b/src/docs/prrte-rst-content/cli-output.rst
new file mode 100644
index 0000000000..6dff3b1085
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-output.rst
@@ -0,0 +1,52 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+The ``output`` command line directive must be accompanied by a
+comma-delimited list of case-insensitive options that control how
+output is generated. The full directive need not be provided |mdash| only
+enough characters are required to uniquely identify the directive. For
+example, ``MERGE`` is sufficient to represent the
+``MERGE-STDERR-TO-STDOUT`` directive |mdash| while ``TAG`` can not be
+used to represent ``TAG-DETAILED`` (though ``TAG-D`` would suffice).
+
+Supported values include:
+
+* ``TAG`` marks each output line with the ``[job,rank]<stream>:`` of
+  the process that generated it
+
+* ``TAG-DETAILED`` marks each output line with a detailed annotation
+  containing ``[namespace,rank][hostname:pid]<stream>:`` of the
+  process that generated it
+
+* ``TAG-FULLNAME`` marks each output line with the
+  ``[namespace,rank]<stream>:`` of the process that generated it
+
+* ``TAG-FULLNAME`` marks each output line with the
+  ``[namespace,rank]<stream>:`` of the process that generated it
+
+* ``TIMESTAMP`` prefixes each output line with a ``[datetime]<stream>:``
+  stamp. Note that the timestamp will be the time when the line is
+  output by the DVM and not the time when the source output it
+
+* ``XML`` provides all output in a pseudo-XML format
+  ``MERGE-STDERR-TO-STDOUT`` merges stderr into stdout
+
+* ``DIR=DIRNAME`` redirects output from application processes into
+  ``DIRNAME/job/rank/std[out,err,diag]``. The provided name will be
+  converted to an absolute path
+
+* ``FILE=FILENAME`` redirects output from application processes into
+  ``filename.rank.`` The provided name will be converted to an absolute
+  path
+
+Supported qualifiers include ``NOCOPY`` (do not copy the output to the
+stdout/err streams), and ``RAW`` (do not buffer the output into complete
+lines, but instead output it as it is received).
diff --git a/src/docs/prrte-rst-content/cli-personality.rst b/src/docs/prrte-rst-content/cli-personality.rst
new file mode 100644
index 0000000000..cb667248da
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-personality.rst
@@ -0,0 +1,18 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Specify the personality to be used. This governs selection of the
+plugin responsible for defining and parsing the command line,
+harvesting and forwarding environmental variables, and providing
+library-dependent support to the launched processes. Examples include
+``ompi`` for an application compiled with Open MPI, ``mpich`` for one
+built against the MPICH library, or ``oshmem`` for an OpenSHMEM
+application compiled against SUNY's reference library.
diff --git a/src/docs/prrte-rst-content/cli-pmixmca.rst b/src/docs/prrte-rst-content/cli-pmixmca.rst
new file mode 100644
index 0000000000..03697f0e2a
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-pmixmca.rst
@@ -0,0 +1,15 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Pass a PMIx MCA parameter
+
+Syntax: ``--pmixmca <key> <value>``, where ``key`` is the parameter
+name and ``value`` is the parameter value.
diff --git a/src/docs/prrte-rst-content/cli-prefix.rst b/src/docs/prrte-rst-content/cli-prefix.rst
new file mode 100644
index 0000000000..67f68fd75c
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-prefix.rst
@@ -0,0 +1,17 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Prefix to be used to look for PRRTE executables. PRRTE automatically
+sets the prefix for remote daemons if it was either configured with
+the ``--enable-prte-prefix-by-default`` option OR prte itself was
+executed with an absolute path to the prte command. This option
+overrides those settings, if present, and forces use of the provided
+path.
diff --git a/src/docs/prrte-rst-content/cli-prtemca.rst b/src/docs/prrte-rst-content/cli-prtemca.rst
new file mode 100644
index 0000000000..4d2c4d25da
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-prtemca.rst
@@ -0,0 +1,15 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Pass a PRRTE MCA parameter.
+
+Syntax: ``--prtemca <key> <value>``, where ``key`` is the parameter
+name and ``value`` is the parameter value.
diff --git a/src/docs/prrte-rst-content/cli-rank-by.rst b/src/docs/prrte-rst-content/cli-rank-by.rst
new file mode 100644
index 0000000000..dfc997fd94
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-rank-by.rst
@@ -0,0 +1,63 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+PRRTE automatically ranks processes for each job starting from zero.
+Regardless of the algorithm used, rank assignments span applications
+in the same job |mdash| i.e., a command line of
+
+.. code::
+
+  -n 3 app1 : -n 2 app2
+
+will result in ``app1`` having three processes ranked 0-2 and ``app2``
+having two processes ranked 3-4.
+
+By default, process ranks are assigned in accordance with the mapping
+directive |mdash| e.g., jobs that are mapped by-node will have the process
+ranks assigned round-robin on a per-node basis. However, users can override
+the default by specifying any of the following directives using the
+``--rank-by`` command line option:
+
+* ``SLOT`` assigns ranks to each process on a node in the order in
+  which the mapper assigned them. This is the default behavior,
+  but is provided as an explicit option to allow users to override
+  any alternative default specified in the environment. When mapping
+  to a specific resource type, procs assigned to a given instance
+  of that resource on a node will be ranked on a per-resource basis
+  on that node before moving to the next node.
+
+* ``NODE`` assigns ranks round-robin on a per-node basis
+
+* ``FILL`` assigns ranks to procs mapped to a particular resource type
+  on each node, filling all ranks on that resource before moving to
+  the next resource on that node. For example, procs mapped by
+  ``L1cache`` would have all procs on the first ``L1cache`` ranked
+  sequentially before moving to the second ``L1cache`` on the
+  node. Once all procs on the node have been ranked, ranking would
+  continue on the next node.
+
+* ``SPAN`` assigns ranks round-robin to procs mapped to a particular
+  resource type, treating the collection of resource instances
+  spanning the entire allocation as a single "super node" before
+  looping around for the next pass. Thus, ranking would begin with the
+  first proc on the first ``L1cache`` on the first node, then the next
+  rank would be assigned to the first proc on the second ``L1cache``
+  on that node, proceeding across until the first proc had been ranked
+  on all ``L1cache`` used by the job before circling around to rank
+  the second proc on each object.
+
+The ``rank-by`` command line option has no qualifiers.
+
+.. note:: Directives are case-insensitive.  ``SPAN`` is the same as
+          ``span``.
+
+A more detailed description of the mapping, ranking, and binding
+procedure can be obtained via the ``--help placement`` option.
diff --git a/src/docs/prrte-rst-content/cli-runtime-options.rst b/src/docs/prrte-rst-content/cli-runtime-options.rst
new file mode 100644
index 0000000000..2a2c0a4f93
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-runtime-options.rst
@@ -0,0 +1,164 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+The ``--runtime-options`` command line directive must be accompanied
+by a comma-delimited list of case-insensitive options that control the
+runtime behavior of the job. The full directive need not be provided
+|mdash| only enough characters are required to uniquely identify the
+directive.
+
+Runtime options are typically ``true`` or ``false``, though this is
+not a requirement on developers. Since the value of each option may
+need to be set (e.g., to override a default set by MCA parameter), the
+syntax of the command line directive includes the use of an ``=``
+character to allow inclusion of a value for the option. For example,
+one can set the ``ABORT-NONZERO-STATUS`` option to ``true`` by
+specifying it as ``ABORT-NONZERO-STATUS=1``. Note that boolean options
+can be set to ``true`` using a non-zero integer or a case-insensitive
+string of the word ``true``.  For the latter representation, the user
+need only provide at least the ``T`` character. The same policy
+applies to setting a boolean option to ``false``.
+
+Note that a boolean option will default to ``true`` if provided
+without a value. Thus, ``--runtime-options abort-nonzero`` is
+sufficient to set the ``ABORT-NONZERO-STATUS`` option to ``true``.
+
+Supported values include:
+
+* ``ERROR-NONZERO-STATUS[=(bool)]``: if set to false, this directs the
+  runtime to treat a process that exits with non-zero status as a
+  normal termination.  If set to true, the runtime will consider such
+  an occurrence as an error termination and take appropriate action
+  |mdash| i.e., the job will be terminated unless a runtime option
+  directs otherwise. This option defaults to a true value if the
+  option is given without a value.
+
+* ``DONOTLAUNCH``: directs the runtime to map but not launch the
+  specified job. This is provided to help explore possible process
+  placement patterns before actually starting execution. No value need
+  be passed as this is not an option that can be set by default in
+  PRRTE.
+
+* ``SHOW-PROGRESS[=(bool)]``: requests that the runtime provide
+  progress reports on its startup procedure |mdash| i.e., the launch
+  of its daemons in support of a job. This is typically used to debug
+  DVM startup on large systems.  This option defaults to a true value
+  if the option is given without a value.
+
+* ``NOTIFYERRORS[=(bool)]``: if set to true, requests that the runtime
+  provide a PMIx event whenever a job encounters an error |mdash|
+  e.g., a process fails.  The event is to be delivered to each
+  remaining process in the job. This option defaults to a true value
+  if the option is given without a value.  See ``--help
+  notifications`` for more detail as to the PMIx event codes available
+  for capturing failure events.
+
+* ``RECOVERABLE[=(bool)]``: if set to true, this indicates that the
+  application wishes to consider the job as recoverable |mdash| i.e.,
+  the application is assuming responsibility for recovering from any
+  process failure. This could include application-driven spawn of a
+  substitute process or internal compensation for the missing
+  process. This option defaults to a true value if the option is given
+  without a value.
+
+* ``AUTORESTART[=(bool)]``: if set to true, this requests that the
+  runtime automatically restart failed processes up to "max restarts"
+  number of times. This option defaults to a true value if the option
+  is given without a value.
+
+* ``CONTINUOUS[=(bool)]``: if set to true, this informs the runtime
+  that the processes in this job are to run until explicitly
+  terminated. Processes that fail are to be automatically restarted up
+  to "max restarts" number of times. Notification of process failure
+  is to be delivered to all processes in the application. This is the
+  equivalent of specifying ``RECOVERABLE``, ``NOTIFYERRORS``, and
+  ``AUTORESTART`` options except that the runtime, not the
+  application, assumes responsibility for process recovery. This
+  option defaults to a true value if the option is given without a
+  value.
+
+* ``MAX-RESTARTS=<int>``: indicates the maximum number of times a
+  given process is to be restarted. This can be set at the application
+  or job level (which will then apply to all applications in that
+  job).
+
+* ``EXEC-AGENT=<path>`` indicates the executable that shall be used to
+  start an application process. The resulting command for starting an
+  application process will be ``<path> app <app-argv>``. The path may
+  contain its own command line arguments.
+
+* ``DEFAULT-EXEC-AGENT``: directs the runtime to use the system
+  default exec agent to start an application process. No value need be
+  passed as this is not an option that can be set by default in PRRTE.
+
+* ``OUTPUT-PROCTABLE[(=channel)]``: directs the runtime to report the
+  convential debugger process table (includes PID and host location of
+  each process in the application). Output is directed to stdout if
+  the channel is ``-``, stderr if ``+``, or into the specified file
+  otherwise. If no channel is specified, output will be directed to
+  stdout.
+
+* ``STOP-ON-EXEC``: directs the runtime to stop the application
+  process(es) immediately upon exec'ing them. The directive will apply
+  to all processes in the job.
+
+* ``STOP-IN-INIT``: indicates that the runtime should direct the
+  application process(es) to stop in ``PMIx_Init()``. The directive
+  will apply to all processes in the job.
+
+* ``STOP-IN-APP``: indicates that the runtime should direct
+  application processes to stop at some application-defined place and
+  notify they are ready-to-debug. The directive will apply to all
+  processes in the job.
+
+* ``TIMEOUT=<string>``: directs the runtime to terminate the job after
+  it has executed for the specified time. Time is specified in
+  colon-delimited format |mdash| e.g., ``01:20:13:05`` to indicate 1
+  day, 20 hours, 13 minutes and 5 seconds. Time specified without
+  colons will be assumed to have been given in seconds.
+
+* ``SPAWN-TIMEOUT=<string>``: directs the runtime to terminate the job
+  if job launch is not completed within the specified time. Time is
+  specified in colon-delimited format |mdash| e.g., ``01:20:13:05`` to
+  indicate 1 day, 20 hours, 13 minutes and 5 seconds.  Time specified
+  without colons will be assumed to have been given in seconds.
+
+* ``REPORT-STATE-ON-TIMEOUT[(=bool)]``: directs the runtime to provide
+  a detailed report on job and application process state upon job
+  timeout. This option defaults to a true value if the option is given
+  without a value.
+
+* ``GET-STACK-TRACES[(=bool)]``: requests that the runtime provide
+  stack traces on all application processes still executing upon
+  timeout. This option defaults to a true value if the option is given
+  without a value.
+
+* ``REPORT-CHILD-JOBS-SEPARATELY[(=bool)]``: directs the runtime to
+  report the exit status of any child jobs spawned by the primary job
+  separately. If false, then the final exit status reported will be
+  zero if the primary job and all spawned jobs exit normally, or the
+  first non-zero status returned by either primary or child jobs.
+  This option defaults to a true value if the option is given without
+  a value.
+
+* ``AGGREGATE-HELP-MESSAGES[(=bool)]``: directs the runtime to
+  aggregate help messages, reporting each unique help message once
+  accompanied by the number of processes that reported it. This option
+  defaults to a true value if the option is given without a value.
+
+* ``FWD-ENVIRONMENT[(=bool)]``: directs the runtime to forward the
+  entire local environment in support of the application. This option
+  defaults to a true value if the option is given without a value.
+
+The ``--runtime-options`` command line option has no qualifiers.
+
+.. note:: Directives are case-insensitive.  ``FWD-ENVIRONMENT`` is the
+          same as ``fwd-environment``.
diff --git a/src/docs/prrte-rst-content/cli-stream-buffering.rst b/src/docs/prrte-rst-content/cli-stream-buffering.rst
new file mode 100644
index 0000000000..05ad554dd5
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-stream-buffering.rst
@@ -0,0 +1,16 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Adjust buffering for stdout/stderr.  Allowable values:
+
+* 0: unbuffered
+* 1: line buffered
+* 2: fully buffered
diff --git a/src/docs/prrte-rst-content/cli-tune.rst b/src/docs/prrte-rst-content/cli-tune.rst
new file mode 100644
index 0000000000..c37deeeed4
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-tune.rst
@@ -0,0 +1,25 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Comma-delimited list of one or more files containing PRRTE and PMIx
+MCA params for tuning DVM and/or application operations. Parameters in
+the file will be treated as *generic* parameters and subject to the
+translation rules/uncertainties.  See ``--help mca`` for more
+information.
+
+Syntax in the file is:
+
+.. code::
+
+   param = value
+
+with one parameter and its associated value per line. Empty lines and
+lines beginning with the ``#`` character are ignored.
diff --git a/src/docs/prrte-rst-content/cli-x.rst b/src/docs/prrte-rst-content/cli-x.rst
new file mode 100644
index 0000000000..bf3f2d721f
--- /dev/null
+++ b/src/docs/prrte-rst-content/cli-x.rst
@@ -0,0 +1,20 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Export an environment variable, optionally specifying a value. For
+example:
+
+* ``-x foo`` exports the environment variable ``foo`` and takes its
+  value from the current environment.
+* ``-x foo=bar`` exports the environment variable name ``foo`` and
+  sets its value to ``bar`` in the started processes.
+* ``-x foo*`` exports all current environmental variables starting
+  with ``foo``.
diff --git a/src/docs/prrte-rst-content/deprecated-bind-to-core.rst b/src/docs/prrte-rst-content/deprecated-bind-to-core.rst
new file mode 100644
index 0000000000..8a76f231ca
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-bind-to-core.rst
@@ -0,0 +1,17 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Bind each process to its own core.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--bind-to core``.
diff --git a/src/docs/prrte-rst-content/deprecated-display-allocation.rst b/src/docs/prrte-rst-content/deprecated-display-allocation.rst
new file mode 100644
index 0000000000..ba4b41928c
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-display-allocation.rst
@@ -0,0 +1,17 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Display the allocation being used by this job.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--display alloc``.
diff --git a/src/docs/prrte-rst-content/deprecated-display-devel-allocation.rst b/src/docs/prrte-rst-content/deprecated-display-devel-allocation.rst
new file mode 100644
index 0000000000..a4a506593e
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-display-devel-allocation.rst
@@ -0,0 +1,18 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Display a detailed list (mostly intended for developers) of the
+allocation being used by this job.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--display alloc-devel``.
diff --git a/src/docs/prrte-rst-content/deprecated-display-devel-map.rst b/src/docs/prrte-rst-content/deprecated-display-devel-map.rst
new file mode 100644
index 0000000000..5942fb4983
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-display-devel-map.rst
@@ -0,0 +1,18 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Display a detailed process map (mostly intended for developers)
+just before launch.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--display map-devel``.
diff --git a/src/docs/prrte-rst-content/deprecated-display-map.rst b/src/docs/prrte-rst-content/deprecated-display-map.rst
new file mode 100644
index 0000000000..69adbd8f58
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-display-map.rst
@@ -0,0 +1,6 @@
+Display the process map just before launch.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--display map``.
diff --git a/src/docs/prrte-rst-content/deprecated-display-topo.rst b/src/docs/prrte-rst-content/deprecated-display-topo.rst
new file mode 100644
index 0000000000..0ba505d7f6
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-display-topo.rst
@@ -0,0 +1,18 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Display the topology as part of the process map (mostly intended
+for developers) just before launch.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--display topo``.
diff --git a/src/docs/prrte-rst-content/deprecated-gmca.rst b/src/docs/prrte-rst-content/deprecated-gmca.rst
new file mode 100644
index 0000000000..9e5dbfc3b9
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-gmca.rst
@@ -0,0 +1,28 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Syntax: ``--gmca <key> <value>``, where ``key`` is the parameter name
+and ``value`` is the parameter value. The ``g`` prefix indicates that
+this parameter is "global", and to be applied to *all* application
+contexts |mdash| not just the one in which the directive appears.
+
+Pass generic MCA parameters |mdash| i.e., parameters whose project
+affiliation must be determined by PRRTE based on matching the name of
+the parameter with defined values from various projects that PRRTE
+knows about.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This translation can be incomplete (e.g., if known project adds or
+   changes parameters) |mdash| thus, it is strongly recommended that
+   users use project-specific parameters such as ``--gprtemca`` or
+   ``--gpmixmca``.
diff --git a/src/docs/prrte-rst-content/deprecated-mca.rst b/src/docs/prrte-rst-content/deprecated-mca.rst
new file mode 100644
index 0000000000..dd76dafa4b
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-mca.rst
@@ -0,0 +1,26 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Syntax: ``--mca <key> <value>``, where ``key`` is the parameter name
+and ``value`` is the parameter value.
+
+Pass generic MCA parameters |mdash| i.e., parameters whose project
+affiliation must be determined by PRRTE based on matching the name of
+the parameter with defined values from various projects that PRRTE
+knows about.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This translation can be incomplete (e.g., if a project adds or
+   changes parameters) |mdash| thus, it is strongly recommended that
+   users use project-specific parameters such as ``--prtemca`` or
+   ``--pmixmca``.
diff --git a/src/docs/prrte-rst-content/deprecated-merge-stderr-to-stdout.rst b/src/docs/prrte-rst-content/deprecated-merge-stderr-to-stdout.rst
new file mode 100644
index 0000000000..67708ea49a
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-merge-stderr-to-stdout.rst
@@ -0,0 +1,17 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Merge stderr to stdout for each process.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--output merge``
diff --git a/src/docs/prrte-rst-content/deprecated-output-directory.rst b/src/docs/prrte-rst-content/deprecated-output-directory.rst
new file mode 100644
index 0000000000..4e009067c5
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-output-directory.rst
@@ -0,0 +1,23 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Redirect output from application processes into
+``filename/job/rank/std[out,err,diag]``. A relative path value will be
+converted to an absolute path. The directory name may include a colon
+followed by a comma-delimited list of optional case-insensitive
+directives. Supported directives currently include ``NOJOBID`` (do not
+include a job-id directory level) and ``NOCOPY`` (do not copy the
+output to the stdout/err streams).
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--output dir=<path>``.
diff --git a/src/docs/prrte-rst-content/deprecated-output-filename.rst b/src/docs/prrte-rst-content/deprecated-output-filename.rst
new file mode 100644
index 0000000000..19c3d79673
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-output-filename.rst
@@ -0,0 +1,22 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Redirect output from application processes into ``filename.rank``. A
+relative path value will be converted to an absolute path. The
+directory name may include a colon followed by a comma-delimited list
+of optional case-insensitive directives. Supported directives
+currently include ``NOCOPY`` (do not copy the output to the stdout/err
+streams).
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--output file=<path>``
diff --git a/src/docs/prrte-rst-content/deprecated-report-bindings.rst b/src/docs/prrte-rst-content/deprecated-report-bindings.rst
new file mode 100644
index 0000000000..9fcc4bbd1e
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-report-bindings.rst
@@ -0,0 +1,17 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Display process bindings to stderr.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--display bindings``.
diff --git a/src/docs/prrte-rst-content/deprecated-tag-output.rst b/src/docs/prrte-rst-content/deprecated-tag-output.rst
new file mode 100644
index 0000000000..fe7f4791cc
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-tag-output.rst
@@ -0,0 +1,17 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Tag all output with ``[job,rank]``.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--output``.
diff --git a/src/docs/prrte-rst-content/deprecated-timestamp-output.rst b/src/docs/prrte-rst-content/deprecated-timestamp-output.rst
new file mode 100644
index 0000000000..204eec71e7
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-timestamp-output.rst
@@ -0,0 +1,17 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Timestamp all application process output.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--output timestamp``.
diff --git a/src/docs/prrte-rst-content/deprecated-xml.rst b/src/docs/prrte-rst-content/deprecated-xml.rst
new file mode 100644
index 0000000000..8478155b89
--- /dev/null
+++ b/src/docs/prrte-rst-content/deprecated-xml.rst
@@ -0,0 +1,17 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+Provide all output in XML format.
+
+.. admonition:: Deprecated
+   :class: warning
+
+   This option is deprecated.  Please use ``--output``.
diff --git a/src/docs/prrte-rst-content/prterun-all-cli.rst b/src/docs/prrte-rst-content/prterun-all-cli.rst
new file mode 100644
index 0000000000..9795301c0a
--- /dev/null
+++ b/src/docs/prrte-rst-content/prterun-all-cli.rst
@@ -0,0 +1,125 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+The ``--allow-run-as-root`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-allow-run-as-root.rst
+
+The ``--bind-to`` option
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-bind-to.rst
+
+The ``--debug-daemons`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-debug-daemons.rst
+
+The ``--debug-daemons-file`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-debug-daemons-file.rst
+
+The ``--display`` option
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-display.rst
+
+The ``--dvm`` option
+^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-dvm.rst
+
+The ``--dvm-hostfile`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-dvm-hostfile.rst
+
+The ``--forward-signals`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-forward-signals.rst
+
+The ``--host`` option
+^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-dash-host.rst
+
+The ``--launcher-hostfile`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-launcher-hostfile.rst
+
+The ``--leave-session-attached`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-leave-session-attached.rst
+
+The ``--map-by`` option
+^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-map-by.rst
+
+The ``--output`` option
+^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-output.rst
+
+The ``--personality`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-personality.rst
+
+The ``--pmixmca`` option
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-pmixmca.rst
+
+The ``--prefix`` option
+^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-prefix.rst
+
+The ``--prtemca`` option
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-prtemca.rst
+
+The ``--noprefix`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-noprefix.rst
+
+The ``--rank-by`` option
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-rank-by.rst
+
+The ``--runtime-options`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-runtime-options.rst
+
+The ``--stream-buffering`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-stream-buffering.rst
+
+The ``--tune`` option
+^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-tune.rst
+
+The ``-x`` option
+^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/cli-x.rst
diff --git a/src/docs/prrte-rst-content/prterun-all-deprecated.rst b/src/docs/prrte-rst-content/prterun-all-deprecated.rst
new file mode 100644
index 0000000000..cc04ffcdf6
--- /dev/null
+++ b/src/docs/prrte-rst-content/prterun-all-deprecated.rst
@@ -0,0 +1,85 @@
+.. -*- rst -*-
+
+   Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+The ``--bind-to-core`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-bind-to-core.rst
+
+The ``--display-allocation`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-display-allocation.rst
+
+The ``--display-devel-allocation`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-display-devel-allocation.rst
+
+The ``--display-devel-map`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-display-devel-map.rst
+
+The ``--display-map`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-display-map.rst
+
+The ``--display-topo`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-display-topo.rst
+
+The ``--gmca`` option
+^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-gmca.rst
+
+The ``--mca`` option
+^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-mca.rst
+
+The ``--merge-stderr-to-stdout`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-merge-stderr-to-stdout.rst
+
+The ``--output-directory`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-output-directory.rst
+
+The ``--output-filename`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-output-filename.rst
+
+The ``--report-bindings`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-report-bindings.rst
+
+The ``--tag-output`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-tag-output.rst
+
+The ``--timestamp-output`` option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-timestamp-output.rst
+
+The ``--xml`` option
+^^^^^^^^^^^^^^^^^^^^
+
+.. include:: /prrte-rst-content/deprecated-xml.rst
diff --git a/src/docs/show-help-files/.gitignore b/src/docs/show-help-files/.gitignore
new file mode 100644
index 0000000000..a786516d7e
--- /dev/null
+++ b/src/docs/show-help-files/.gitignore
@@ -0,0 +1,3 @@
+_build
+cli-*.rst
+deprecated-*.rst
diff --git a/src/docs/show-help-files/Makefile.am b/src/docs/show-help-files/Makefile.am
new file mode 100644
index 0000000000..e9bb40a523
--- /dev/null
+++ b/src/docs/show-help-files/Makefile.am
@@ -0,0 +1,108 @@
+#
+# Copyright (c) 2022-2023 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
+# Copyright (c) 2023      Nanook Consulting.  All rights reserved.
+#
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# We need this Makefile to be executed serially.  Below, we list all
+# the man pages as the targets of the rule that invokes Sphinx for
+# dependency/generation reasons.  But a *single* execution of the make
+# target will generate *all* of the man pages and HTML files.  Hence,
+# when "make" determines that none of the man page files exist, it
+# should execute the Sphinx-invocation rule once, and then it will
+# realize that all the man pages files exist.  More specifically: if
+# someone invokes "make -j N", we need make to not execute the
+# Sphinx-invocation rule multiple times simultaneously.  Both GNU Make
+# and BSD Make will honor the .NOTPARALLEL target to disable all
+# parallel invocation in this Makefile[.am].
+#
+# Note that even though we explicitly disable make's parallelism,
+# we'll use Sphinx's internal parallelism via "-j auto" -- see
+# SPHINX_OPTS.
+.NOTPARALLEL:
+
+OUTDIR         = _build
+SPHINX_CONFIG  = conf.py
+#SPHINX_OPTS   ?= -W --keep-going -j auto
+SPHINX_OPTS   ?= --keep-going -j auto
+
+# All RST source files, including those that are not installed
+RST_SOURCE_FILES = \
+        $(srcdir)/prrte-rst-content/*.rst \
+        $(srcdir)/index.rst \
+        $(srcdir)/help-schizo-pinfo.rst \
+        $(srcdir)/help-schizo-prte.rst \
+        $(srcdir)/help-schizo-prted.rst \
+        $(srcdir)/help-schizo-prterun.rst \
+        $(srcdir)/help-schizo-prun.rst \
+        $(srcdir)/help-schizo-pterm.rst
+
+TXT_OUTDIR = $(OUTDIR)/text
+
+# These files are the ones that are built that we care about (Sphinx
+# will emit lots of files in the TXT_OUTDIR; these are the only ones
+# that we care about).
+ALL_TXT_BUILT = \
+        $(TXT_OUTDIR)/help-schizo-pinfo.txt \
+        $(TXT_OUTDIR)/help-schizo-prte.txt \
+        $(TXT_OUTDIR)/help-schizo-prted.txt \
+        $(TXT_OUTDIR)/help-schizo-prterun.txt \
+        $(TXT_OUTDIR)/help-schizo-prun.txt \
+        $(TXT_OUTDIR)/help-schizo-pterm.txt
+
+#-------------------
+
+EXTRA_DIST = \
+        requirements.txt \
+        $(SPHINX_CONFIG) \
+        $(RST_SOURCE_FILES) \
+        $(TXT_OUTDIR)
+
+###########################################################################
+
+include $(top_srcdir)/Makefile.prte-rules
+
+# We do not specifically compute or list the RST file dependencies.
+# Instead, because Sphinx will do this computation by itself, we just
+# say "all Sphinx output is dependent upon all RST input files" here
+# in the Makefile.  If any of the input RST files are edited, this
+# will cause "make" to invoke Sphinx and let it re-generate whatever
+# output files need to be re-generated.
+#
+# Hence, we use a single sentinel file here in the Makefile to
+# represent all Sphinx output files.
+TXT_SENTINEL_OUTPUT = $(TXT_OUTDIR)/index.txt
+$(ALL_TXT_BUILT): $(TXT_SENTINEL_OUTPUT)
+
+$(TXT_SENTINEL_OUTPUT): $(RST_SOURCE_FILES)
+$(TXT_SENTINEL_OUTPUT): $(SPHINX_CONFIG)
+
+# Technically, we always build the docs files if they're missing
+# (e.g., in a git clone).  The "PRTE_BUILD_DOCS" conditional really
+# refers to whether we have Sphinx or not.
+#
+# If we have Sphinx, use it to build.
+#
+# If we do not have Sphinx, then build dummy help files that say "you
+# don't have Sphinx, so you didn't get proper help files" files, just
+# so that it's obvious as to why you don't have proper help files.
+$(TXT_SENTINEL_OUTPUT):
+if PRTE_BUILD_DOCS
+	$(PRTE_V_TXT) $(SPHINX_BUILD) -M text "$(srcdir)" "$(OUTDIR)" $(SPHINX_OPTS)
+else !PRTE_BUILD_DOCS
+	$(PRTE_V_TXT) $(srcdir)/build-dummy-ini-files.py $(TXT_OUTDIR) $(ALL_TXT_BUILT)
+endif !PRTE_BUILD_DOCS
+
+maintainer-clean-local:
+	$(SPHINX_BUILD) -M clean "$(srcdir)" "$(OUTDIR)" $(SPHINX_OPTS)
+
+###########################################################################
+
+# Install the generated text files
+dist_prtedata_DATA = $(ALL_TXT_BUILT)
diff --git a/src/docs/show-help-files/build-dummy-ini-files.py b/src/docs/show-help-files/build-dummy-ini-files.py
new file mode 100755
index 0000000000..fb505db91f
--- /dev/null
+++ b/src/docs/show-help-files/build-dummy-ini-files.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+#
+# Copyright 2023 Jeffrey M. Squyres.  All rights reserved.
+#
+# Copyright (c) 2023      Nanook Consulting.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+
+# Trivial script to scrape section names from source .rst files and
+# generate dummy show_help-style text files.  We only use this script
+# a) if the show_help files are not availabale (i.e., in a git clone),
+# and b) if Sphinx is not available.
+#
+# We generate these show_help files (as opposed to generating a run
+# time error when the show_help file is unavailable) just so that it's
+# 100% obvious that you're not getting proper help files because you
+# did not have Sphinx available.
+
+# Intentially use a minimal set of Python modules (to decrease any
+# needed dependencies).
+
+import re
+import os
+import sys
+
+# Pop the executable name
+exe = sys.argv.pop(0)
+abs_srcdir = os.path.abspath(os.path.dirname(exe))
+
+# First argument is the text outdir (in the build tree).
+outdir = sys.argv.pop(0)
+outdir_len = len(outdir) + 1
+
+# The rest of the arguments are the text filenames to build.
+for outfile in sys.argv:
+
+    # The filenames all have the outdir prefix.  We find the
+    # correspoding source .rst file by stripping that prefix off and
+    # adding the srcdir prefix to it.
+    #
+    # We do this instead of using os.path.basename() because some
+    # files have subdirectory names in them (e.g.,
+    # "mca/help-something.txt").
+    txt_filename = outfile[outdir_len:]
+
+    # Replace the .txt with .rst, and add the srcdir prefix.
+    rst_filename = txt_filename.replace(".txt", ".rst")
+    srcfile = os.path.join(abs_srcdir, rst_filename)
+
+    # Read in the source file
+    with open(srcfile) as fp:
+        src_rst = fp.readlines()
+
+    # Find all the "[section]" lines.
+    sections = list()
+    for line in src_rst:
+        match = re.search('\s*\[(.+)\]\s*$', line)
+        if match:
+            sections.append(match.group(1))
+
+    # Ensure the out directory exists
+    full_outdir = os.path.abspath(os.path.dirname(outfile))
+    # Use older form of os.mkdirs (without the exist_ok param) to make
+    # this script runnable in as many environments as possible.
+    try:
+        os.makedirs(full_outdir)
+    except FileExistsError:
+        pass
+
+    # Write the output file
+    with open(outfile, 'w') as fp:
+        for section in sections:
+            fp.write(f"""[{section}]
+This help section is empty because PRRTE was built without Sphinx.\n""")
diff --git a/src/docs/show-help-files/conf.py b/src/docs/show-help-files/conf.py
new file mode 120000
index 0000000000..cb9acdea07
--- /dev/null
+++ b/src/docs/show-help-files/conf.py
@@ -0,0 +1 @@
+../../../docs/conf.py
\ No newline at end of file
diff --git a/src/docs/show-help-files/help-schizo-pinfo.rst b/src/docs/show-help-files/help-schizo-pinfo.rst
new file mode 100644
index 0000000000..5b2ce24011
--- /dev/null
+++ b/src/docs/show-help-files/help-schizo-pinfo.rst
@@ -0,0 +1,126 @@
+.. -*- rst -*-
+
+   Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+[bogus section]
+
+This section is not used by PRTE code.  But we have to put a RST
+section title in this file somewhere, or Sphinx gets unhappy.  So we
+put it in a section that is ignored by PRTE code.
+
+Hello, world
+------------
+
+[usage]
+
+%s (%s) %s
+
+Usage: ``%s [OPTION]...``
+
+Provide detailed information on your PRRTE installation.
+
+The following list of command line options are available. Note that
+more detailed help for any option can be obtained by adding that
+option to the help request as ``--help <option>``.
+
+.. list-table::
+   :header-rows: 1
+   :widths: 20 45
+
+   * - Option
+     - Description
+
+   * - ``-a`` | ``--all``
+     - Show all configuration options and MCA parameters
+
+   * - ``--arch``
+     - Show architecture on which PRRTE was compiled
+
+   * - ``-c`` | ``--config``
+     - Show configuration options
+
+   * - ``-h`` | ``--help``
+     - This help message
+
+   * - ``--hostname``
+     - Show the hostname on which PRRTE was configured and built
+
+   * - ``--internal``
+     - Show internal MCA parameters (not meant to be modified by users)
+
+   * - ``--param <framework>:<component1>,<component2>``
+     - Show MCA parameters.  The first parameter is the framework (or
+       the keyword ``all``); the second parameter is a comma-delimited
+       list of specific component names (if only ``<framework>`` is
+       given, then all components will be reported).
+
+   * - ``--path <type>``
+     - Show paths with which PRRTE was configured.  Accepts the
+       following parameters: ``prefix``, ``bindir``, ``libdir``,
+       ``incdir``, ``mandir``, ``pkglibdir``, ``sysconfdir``.
+
+   * - ``--show-version <type>:<part>``
+     - Show version of PRRTE or a component.  The first parameter can
+       be the keywords ``prte``, ``all``, or a framework name
+       (indicating all components in a framework), or a
+       ``framework:component`` string (indicating a specific
+       component).  The second parameter can be one of: ``full``,
+       ``major``, ``minor``, ``release``, ``greek``, ``git``.
+
+   * - ``-V`` | ``--version``
+     - Print version and exit
+
+Report bugs to %s
+
+[param]
+
+Syntax: ``--param <arg0> <arg1>``
+
+Show MCA parameters.  The first parameter is the framework (or the
+keyword ``all``); the second parameter is the specific component name
+(or the keyword ``all``).
+
+[internal]
+
+Syntax: ``--internal``
+
+Show internal MCA parameters (i.e., parameters not meant to be
+modified by users)
+
+[path]
+
+Syntax: ``--path <arg0>``
+
+Show the paths with which PRRTE was configured.  Accepts the following
+parameters: ``prefix``, ``bindir``, ``libdir``, ``incdir``,
+``mandir``, ``pkglibdir``, ``sysconfdir``.
+
+[arch]
+
+Syntax: ``--arch``
+Show architecture on which PRRTE was compiled
+
+[config]
+
+Syntax: ``-c`` or ``--config``
+
+Show configuration options used to configure PRRTE
+
+[hostname]
+
+Syntax: ``--hostname``
+
+Show the hostname upon which PRRTE was configured and built
+
+[all]
+
+Syntax: ``-a`` or ``--all``
+
+Show all configuration options and MCA parameters
diff --git a/src/docs/show-help-files/help-schizo-prte.rst b/src/docs/show-help-files/help-schizo-prte.rst
new file mode 100644
index 0000000000..8b3471d6ff
--- /dev/null
+++ b/src/docs/show-help-files/help-schizo-prte.rst
@@ -0,0 +1,336 @@
+.. -*- rst -*-
+
+   Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+[bogus section]
+
+This section is not used by PRTE code.  But we have to put a RST
+section title in this file somewhere, or Sphinx gets unhappy.  So we
+put it in a section that is ignored by PRTE code.
+
+Hello, world
+------------
+
+[version]
+
+%s (%s) %s
+
+%s
+
+[usage]
+
+%s (%s) %s
+
+Usage: %s [OPTION]...
+
+Initiate an instance of the PMIx Reference RTE (PRRTE) DVM
+
+The following list of command line options are available. Note that
+more detailed help for any option can be obtained by adding that
+option to the help request as ``--help <option>``.
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - General Options
+
+   * - Option
+     - Description
+
+   * - ``-h`` | ``--help``
+     - This help message
+
+   * - ``-h`` | ``--help <arg0>``
+     - Help for the specified option
+
+   * - ``-v`` | ``--verbose``
+     - Enable typical debug options
+
+   * - ``-V`` | ``--version``
+     - Print version and exit
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Debug Options
+
+   * - Option
+     - Description
+
+   * - ``--debug-daemons``
+     - Debug daemons - if not set, any "verbose" settings will be
+       limited to the DVM controller to reduce clutter
+
+   * - ``--debug-daemons-file``
+     - Enable debugging of any PRRTE daemons used by this application,
+       storing their verbose output in files
+
+   * - ``--leave-session-attached``
+     - Do not discard stdout/stderr of remote PRRTE daemons
+
+   * - ``--test-suicide <arg0>``
+     - Direct that the specified daemon suicide after delay
+
+   * - ``--display <arg0>``
+     - Comma-delimited list of options for displaying information
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - DVM Options
+
+   * - Option
+     - Description
+
+   * - ``--runtime-options <options>``
+     - Comma-delimited list of runtime directives for the job (e.g.,
+       show progress reports on DVM startup for large systems)
+
+   * - ``--default-hostfile <filename>``
+     - Provide a default hostfile
+
+   * - ``-H|--host <hostname>``
+     - List of hosts to use for the DVM
+
+   * - ``--hostfile <filename>``
+     - Provide a hostfile
+
+   * - ``--machinefile <filename>``
+     - Provide a hostfile (synonym for ``--hostfile``)
+
+   * - ``--pmixmca <key> <value>``
+     - Pass PMIx MCA parameters
+
+   * - ``--prtemca <key> <value>``
+     - Pass PRTE MCA parameters to the DVM
+
+   * - ``--show-progress``
+     - Output a brief periodic report on DVM startup progress
+
+   * - ``-x <var_name>[=value]``
+     - Export an environment variable, optionally specifying a value
+
+   * - ``--allow-run-as-root``
+     - Allow execution as root (**STRONGLY DISCOURAGED**)
+
+   * - ``--daemonize``
+     - Daemonize the DVM daemons into the background
+
+   * - ``--forward-signals <signals>``
+     - Comma-delimited list of additional signals (names or integers)
+       to forward
+
+   * - ``--keepalive <arg0>``
+     - Pipe to monitor - DVM will terminate upon closure
+
+   * - ``--launch-agent <executable>``
+     - Name of daemon executable used to start processes on remote
+       nodes (default: ``prted``)
+
+   * - ``--max-vm-size <size>``
+     - Max number of daemons to start
+
+   * - ``--no-ready-msg``
+     - Do not print a "DVM ready" message
+
+   * - ``--noprefix``
+     - Disable automatic ``--prefix`` behavior
+
+   * - ``--prefix <dir>``
+     - Prefix to be used to look for RTE executables
+
+   * - ``--report-pid <arg>``
+     - Print out PID on stdout (``-``), stderr (``+``), or a file
+       (anything else)
+
+   * - ``--report-uri <arg>``
+     - Print out URI on stdout (``-``), stderr (``+``), or a file
+       (anything else)
+
+   * - ``--set-sid``
+     - Direct the DVM daemons to separate from the current session
+
+   * - ``--singleton <id>``
+     - ID of the singleton process that started us
+
+   * - ``--system-server``
+     - Start the DVM as the system server
+
+   * - ``--tmpdir <dir>``
+     - Set the filesystem root for the session directory tree
+
+   * - ``--tune <arg0>``
+     - File(s) containing MCA params for tuning DVM operations
+
+   * - ``--timeout <seconds>``
+     - Timeout DVM startup if time exceeds the specified number of
+       seconds
+
+Report bugs to %s
+
+[prtemca]
+
+.. include:: /prrte-rst-content/cli-prtemca.rst
+
+[pmixmca]
+
+.. include:: /prrte-rst-content/cli-pmixmca.rst
+
+[tune]
+
+.. include:: /prrte-rst-content/cli-tune.rst
+
+[no-ready-msg]
+
+Do not print a DVM ready message
+
+[daemonize]
+
+Daemonize the DVM daemons and controller into the background
+
+[system-server]
+
+Start the DVM controller and its daemons as the system server on their
+nodes
+
+[set-sid]
+
+Direct the DVM (controller and daemons) to separate from the current
+session
+
+[report-pid]
+
+Printout DVM controller's PID on stdout [-], stderr [+], or a file
+[anything else]
+
+[report-uri]
+
+Printout DVM controller's URI on stdout [-], stderr [+], or a file
+[anything else]
+
+[test-suicide]
+
+Test DVM cleanup upon daemon failure by having one daemon suicide
+after delay
+
+[default-hostfile]
+
+Specify a default hostfile.
+
+Also see ``--help hostfile``.
+
+[singleton]
+
+DVM is being started by a singleton process (i.e., one not started by
+a DVM) - the argument must be the PMIx ID of the singleton process
+that started us
+
+[keepalive]
+
+Pipe for DVM controller to monitor - DVM will terminate upon closure
+
+[launch-agent]
+
+Name of daemon executable used to start processes on remote nodes
+(default: prted).  This is the executable the DVM controller shall
+start on each remote node when establishing the DVM.
+
+[max-vm-size]
+
+Maximum number of daemons to start - sets the maximum size of the DVM.
+
+[debug-daemons]
+
+Debug daemon output enabled. This is a somewhat limited stream of
+information normally used to simply confirm that the daemons
+started. Includes leaving the output streams open.
+
+[debug-daemons-file]
+
+.. include:: /prrte-rst-content/cli-debug-daemons-file.rst
+
+See the "Session directory" HTML documentation for additional details
+about the PRRTE session directory.
+
+[leave-session-attached]
+
+.. include:: /prrte-rst-content/cli-leave-session-attached.rst
+
+[tmpdir]
+
+Define the root location for the PRRTE session directory tree
+
+See the "Session directory" HTML documentation for additional details
+about the PRRTE session directory.
+
+[prefix]
+
+.. include:: /prrte-rst-content/cli-prefix.rst
+
+[noprefix]
+
+.. include:: /prrte-rst-content/cli-noprefix.rst
+
+[forward-signals]
+
+.. include:: /prrte-rst-content/cli-forward-signals.rst
+
+[allow-run-as-root]
+
+.. include:: /prrte-rst-content/cli-allow-run-as-root.rst
+
+[no-aggregate-help]
+
+Do not aggregate help output from multiple processes. PRRTE defaults
+to aggregating messages generated by its "help" subsystem so that
+only one is printed out per topic (along with the number of processes
+that reported the same issue). This is done to avoid users receiving a
+flood of one-per-process error messages, all containing the identical
+error report.  Setting this option turns off the aggregation, thereby
+allowing the user to see duplicate reports from multiple processes.
+
+[timeout]
+
+Timeout DVM startup if time exceeds the specified number of
+seconds. The DVM startup will abort after the specified interval.
+
+[x]
+
+.. include:: /prrte-rst-content/cli-x.rst
+
+[show-progress]
+
+Output a brief periodic report on DVM startup progress
+
+[hostfile]
+
+.. include:: /prrte-rst-content/cli-dvm-hostfile.rst
+
+See the "Host specification" HTML documentation for details about the
+format and content of hostfiles.
+
+[machinefile]
+
+Provide a hostfile.  This option is a synonym for ``--hostfile``; see
+that option for more information.
+
+[host]
+
+.. include:: /prrte-rst-content/cli-dash-host.rst
+
+[display]
+
+.. include:: /prrte-rst-content/cli-display.rst
diff --git a/src/docs/show-help-files/help-schizo-prted.rst b/src/docs/show-help-files/help-schizo-prted.rst
new file mode 100644
index 0000000000..ed535b6c22
--- /dev/null
+++ b/src/docs/show-help-files/help-schizo-prted.rst
@@ -0,0 +1,180 @@
+.. -*- rst -*-
+
+   Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+[bogus section]
+
+This section is not used by PRTE code.  But we have to put a RST
+section title in this file somewhere, or Sphinx gets unhappy.  So we
+put it in a section that is ignored by PRTE code.
+
+Hello, world
+------------
+
+[usage]
+
+%s (%s) %s
+
+Usage: %s [OPTION]...
+
+The following list of command line options are available. Note that
+more detailed help for any option can be obtained by adding that
+option to the help request as "--help <option>".
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - General Options
+
+   * - Option
+     - Description
+
+   * - ``-h`` | ``--help``
+     - This help message
+
+   * - ``-h`` | ``--help <arg0>``
+     - Help for the specified option
+
+   * - ``-v`` | ``--verbose``
+     - Enable typical debug options
+
+   * - ``-V`` | ``--version``
+     - Print version and exit
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Debug Options
+
+   * - Option
+     - Description
+
+   * - ``--debug``
+     - Top-level PRTE debug switch (default: false). This option will
+       be deprecated, use ``--debug-devel`` instead.
+
+   * - ``--debug-daemons-file``
+     - Enable debugging of any PRTE daemons used by this application,
+       storing output in files
+
+   * - ``--leave-session-attached``
+     - Do not daemonize the ``prted``
+
+   * - ``--test-suicide <arg0>``
+     - Suicide instead of clean abort after specified delay
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - DVM Options
+
+   * - Option
+     - Description
+
+   * - ``--pmixmca <key> <value>``
+     - Pass context-specific PMIx MCA parameters (``key`` is the
+       parameter name; ``value`` is the parameter value)
+
+   * - ``--prtemca <key> <value>``
+     - Pass context-specific PRTE MCA parameters; they are considered
+       global if ``--gmca`` is not used and only one context is
+       specified (``key`` is the parameter name; ``value`` is the
+       parameter value)
+
+   * - ``--dvm-master-uri <uri>``
+     - Specify the URI of the DVM master, or the name of the file
+       (specified as ``file:filename``) that contains that info
+
+   * - ``--parent-uri <uri>``
+     - Specify the URI of the prted acting as the parent of this prted
+       in a tree-based spawn operation
+
+   * - ``--tree-spawn``
+     - A tree-based spawn operation is in progress
+
+   * - ``--bootstrap``
+     - Self-construct the DVM based on a configuration file
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Specific Options
+
+   * - Option
+     - Description
+
+   * - ``--set-sid``
+     - Direct the DVM daemons to separate from the current session
+
+   * - ``--system-server``
+     - Start the DVM as the system server
+
+   * - ``--pubsub-server <uri>``
+     - Contact information for external PRRTE publish/lookup data
+       server
+
+Report bugs to %s
+
+[version]
+
+%s (%s) %s
+
+Report bugs to %s
+
+[dvm-master-uri]
+
+Specify the URI of the DVM master, or the name of the file (specified
+as ``file:filename``) that contains that info
+
+[test-suicide]
+
+Test DVM cleanup upon daemon failure by having one daemon suicide
+after delay
+
+[system-server]
+
+Start the daemon as the system server on its node
+
+[set-sid]
+
+Direct the daemon to separate from the current session
+
+[prtemca]
+
+.. include:: /prrte-rst-content/cli-prtemca.rst
+
+[pmixmca]
+
+.. include:: /prrte-rst-content/cli-pmixmca.rst
+
+[leave-session-attached]
+
+.. include:: /prrte-rst-content/cli-leave-session-attached.rst
+
+[parent-uri]
+
+Specify the URI of the prted acting as the parent of this prted in a
+tree-based spawn operation
+
+[tree-spawn]
+
+A tree-based spawn operation is in progress
+
+[pubsub-server]
+
+Contact information for external PRRTE publish/lookup data server
diff --git a/src/docs/show-help-files/help-schizo-prterun.rst b/src/docs/show-help-files/help-schizo-prterun.rst
new file mode 100644
index 0000000000..df0d001efd
--- /dev/null
+++ b/src/docs/show-help-files/help-schizo-prterun.rst
@@ -0,0 +1,659 @@
+.. -*- rst -*-
+
+   Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+[bogus section]
+
+This section is not used by PRTE code.  But we have to put a RST
+section title in this file somewhere, or Sphinx gets unhappy.  So we
+put it in a section that is ignored by PRTE code.
+
+Hello, world
+------------
+
+[version]
+
+%s (%s) %s
+
+%s
+
+[usage]
+
+%s (%s) %s
+
+Usage: %s [OPTION]...
+
+Initiate an instance of the PMIx Reference RTE (PRRTE) DVM
+
+The following list of command line options are available. Note that
+more detailed help for any option can be obtained by adding that
+option to the help request as ``--help <option>``.
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - General Options
+
+   * - Option
+     - Description
+
+   * - ``-h`` | ``--help``
+     - This help message
+
+   * - ``-h`` | ``--help <arg0>``
+     - Help for the specified option
+
+   * - ``-v`` | ``--verbose``
+     - Enable typical debug options
+
+   * - ``-V`` | ``--version``
+     - Print version and exit
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Debug Options
+
+   * - Option
+     - Description
+
+   * - ``--debug-daemons``
+     - Debug daemons |mdash| if not set, any "verbose" settings will
+       be limited to the prterun itself to reduce clutter
+
+   * - ``--debug-daemons-file``
+     - Enable debugging of any PRRTE daemons used by this application,
+       storing their verbose output in files
+
+   * - ``--display <arg0>``
+     - Options for displaying information about the allocation and
+       job.
+
+   * - ``--spawn-timeout <seconds>``
+     - Timeout the job if spawn takes more than the specified number
+       of seconds
+
+   * - ``--timeout <seconds>``
+     - Timeout the job if execution is not complete after the
+       specified number of seconds
+
+   * - ``--get-stack-traces``
+     - Get stack traces of all application procs on timeout
+
+   * - ``--leave-session-attached``
+     - Do not discard stdout/stderr of remote PRRTE daemons
+
+   * - ``--report-state-on-timeout``
+     - Report all job and process states upon timeout
+
+   * - ``--stop-on-exec``
+     - If supported, stop each specified process at start of execution
+
+   * - ``--stop-in-init``
+     - Direct the specified processes to stop in ``PMIx_Init``
+
+   * - ``--stop-in-app``
+     - Direct the specified processes to stop at an
+       application-controlled location
+
+   * - ``--test-suicide <arg0>``
+     - Direct that the specified daemon suicide after delay
+
+   * - ``--do-not-launch``
+     - Perform all necessary operations to prepare to launch the
+       application, but do not actually launch it (usually used to
+       test mapping patterns)
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Output Options
+
+   * - Option
+     - Description
+
+   * - ``--output <arg0>``
+     - Comma-delimited list of options that control how output is
+       generated.
+
+   * - ``--report-child-jobs-separately``
+     - Return the exit status of the primary job only
+
+   * - ``--xterm <ranks>``
+     - Create a new xterm window for each of the comma-delimited
+       ranges of application process ranks
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Input Options
+
+   * - Option
+     - Description
+
+   * - ``--stdin <ranks>``
+     - Specify application rank(s) to receive stdin [integer ranks,
+       ``rank``, ``all``, ``none``] (default: ``0``, indicating
+       rank 0)
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Placement Options
+
+   * - Option
+     - Description
+
+   * - ``--map-by <type>``
+     - Mapping Policy for job
+
+   * - ``--rank-by <type>``
+     - Ranking Policy for job
+
+   * - ``--bind-to <type>``
+     - Binding policy for job.
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Launch Options
+
+   * - Option
+     - Description
+
+   * - ``--runtime-options <arg0>``
+     - Comma-delimited list of runtime directives for the job (e.g.,
+       do not abort if a process exits on non-zero status)
+
+   * - ``-c`` | ``--np <num>``
+     - Number of processes to run
+
+   * - ``-n`` | ``--n <num>``
+     - Number of processes to run
+
+   * - ``-N`` | ``--npernode <num>``
+     - Run designated number of processes on each node
+
+   * - ``--personality <name>``
+     - Specify the personality to be used
+
+   * - ``-H`` | ``--host <hosts>``
+     - List of hosts to invoke processes on
+
+   * - ``--hostfile <file>``
+     - Provide a hostfile
+
+   * - ``--machinefile <file>``
+     - Provide a hostfile (synonym for ``--hostfile``)
+
+   * - ``--pmixmca <key> <value>``
+     - Pass context-specific PMIx MCA parameters; they are considered
+       global if only one context is specified (``key`` is the
+       parameter name; ``value`` is the parameter value)
+
+   * - ``--gpmixmca <key> <value>``
+     - Pass global PMIx MCA parameters that are applicable to all
+       contexts (``key`` is the parameter name; ``value`` is the
+       parameter value)
+
+   * - ``--preload-files <files>``
+     - Preload the comma separated list of files to the remote
+       machines current working directory before starting the remote
+       process.
+
+   * - ``--prtemca <key> <value>``
+     - Pass context-specific PRRTE MCA parameters to the DVM
+
+   * - ``--pset <name>``
+     - User-specified name assigned to the processes in their given
+       application
+
+   * - ``-s`` | ``--preload-binary``
+     - Preload the binary on the remote machine before starting the
+       remote process.
+
+   * - ``--set-cwd-to-session-dir``
+     - Set the working directory of the started processes to their
+       session directory
+
+   * - ``--show-progress``
+     - Output a brief periodic report on launch progress
+
+   * - ``--wd <dir>``
+     - Synonym for ``--wdir``
+
+   * - ``--wdir <dir>``
+     - Set the working directory of the started processes
+
+   * - ``-x <name>``
+     - Export an environment variable, optionally specifying a value
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Specific Options
+
+   * - Option
+     - Description
+
+   * - ``--allow-run-as-root``
+     - Allow execution as root (**STRONGLY DISCOURAGED**)
+
+   * - ``--daemonize``
+     - Daemonize the prterun and its daemons into the background
+
+   * - ``--forward-signals <signals>``
+     - Comma-delimited list of additional signals (names or integers) to forward
+       to application processes [``none`` => forward nothing].
+
+   * - ``--keepalive <arg0>``
+     - Pipe to monitor |mdash| DVM will terminate upon closure
+
+   * - ``--launch-agent <exe>``
+     - Name of daemon executable used to start processes on remote
+       nodes (default: ``prted``)
+
+   * - ``--max-vm-size <num>``
+     - Number of daemons to start
+
+   * - ``--no-ready-msg``
+     - Do not print a DVM ready message
+
+   * - ``--noprefix``
+     - Disable automatic ``--prefix`` behavior
+
+   * - ``--prefix <dir>``
+     - Prefix to be used to look for RTE executables
+
+   * - ``--report-pid <arg0>``
+     - Print out PID on stdout (``-``), stderr (``+``), or a file
+       [anything else]
+
+   * - ``--report-uri <arg0>``
+     - Print out URI on stdout (``-``), stderr (``+``), or a file
+       [anything else]
+
+   * - ``--set-sid``
+     - Direct the DVM daemons to separate from the current session
+
+   * - ``--singleton <id>``
+     - ID of the singleton process that started us
+
+   * - ``--tmpdir <dir>``
+     - Set the root for the session directory tree
+
+   * - ``--tune <files>``
+     - File(s) containing MCA params for tuning DVM operations
+
+   * - ``--dvm <arg>``
+     - Use a persistent DVM instead of instantiating independent runtime
+       infrastructure. The argument indicates the PID, URI,
+       file containing the URI, or namespace of the DVM.
+
+Report bugs to %s
+
+[dvm]
+
+Utilize an existing persistent DVM instead of instantiating an
+independent runtime infrastructure. This mimics the ``prun`` command,
+but is provided as a convenience option for those wanting to embed the
+``prterun`` command in a script that can be optionally used to run
+either independently or under a persistent DVM.
+
+.. include:: /prrte-rst-content/cli-dvm.rst
+
+[prtemca]
+
+.. include:: /prrte-rst-content/cli-prtemca.rst
+
+[pmixmca]
+
+.. include:: /prrte-rst-content/cli-pmixmca.rst
+
+[gpmixmca]
+
+Syntax: ``--gpmixmca <key> <value>``
+
+where ``key`` is the parameter name and ``value`` is the parameter
+value. The ``g`` prefix indicates that this PMIx parameter is to be
+applied to _all_ application contexts and not just the one in which
+the directive appears.
+
+[tune]
+
+.. include:: /prrte-rst-content/cli-tune.rst
+
+[stream]
+
+.. include:: /prrte-rst-content/cli-stream-buffering.rst
+
+[daemonize]
+
+Daemonize the prterun and the DVM daemons into the background
+
+[system-server]
+
+Start prterun and its daemons as the system server on their nodes
+
+[set-sid]
+
+Direct the DVM (controller and daemons) to separate from the current session
+
+[report-pid]
+
+Printout prterun's PID on stdout (``-``), stderr (``+``), or a file
+(anything else).
+
+[report-uri]
+
+Printout prterun's URI on stdout (``-``), stderr (``+``), or a file
+(anything else).
+
+[test-suicide]
+
+Test DVM cleanup upon daemon failure by having one daemon suicide
+after delay
+
+[singleton]
+
+``prterun`` is being started by a singleton process (i.e., one not
+started by prterun) |mdash| the argument must be the PMIx ID of the
+singleton process that started us
+
+[keepalive]
+
+Pipe for prterun to monitor |mdash| job will terminate upon closure
+
+[launch-agent]
+
+Name of daemon executable used to start processes on remote nodes
+(default: ``prted``).
+
+This is the executable prterun shall start on each remote node when
+establishing the DVM.
+
+[max-vm-size]
+
+Maximum number of daemons to start
+
+[debug-daemons]
+
+.. include:: /prrte-rst-content/cli-debug-daemons.rst
+
+[debug-daemons-file]
+
+.. include:: /prrte-rst-content/cli-debug-daemons-file.rst
+
+See the "Session directory" HTML documentation for additional details
+about the PRRTE session directory.
+
+[leave-session-attached]
+
+.. include:: /prrte-rst-content/cli-leave-session-attached.rst
+
+[tmpdir]
+
+Define the root location for the PRRTE session directory tree
+
+See the "Session directory" HTML documentation for additional details
+about the PRRTE session directory.
+
+[prefix]
+
+.. include:: /prrte-rst-content/cli-prefix.rst
+
+[noprefix]
+
+.. include:: /prrte-rst-content/cli-noprefix.rst
+
+[forward-signals]
+
+.. include:: /prrte-rst-content/cli-forward-signals.rst
+
+[allow-run-as-root]
+
+.. include:: /prrte-rst-content/cli-allow-run-as-root.rst
+
+[report-child-jobs-separately]
+
+Return the exit status of the primary job only
+
+[timeout]
+
+Timeout the job if execution time exceeds the specified number of
+seconds
+
+[report-state-on-timeout]
+
+Report all job and process states upon timeout
+
+[get-stack-traces]
+
+Get stack traces of all application procs on timeout
+
+[spawn-timeout]
+
+Timeout the job if spawn takes more than the specified number of seconds
+
+[np]
+
+Specify number of application processes to be started
+
+[n]
+Specify number of application processes to be started
+
+[N]
+
+Specify number of application processes per node to be started
+
+[app]
+
+Provide an appfile; ignore all other command line options
+
+[xterm]
+
+Create a new xterm window and display output from the specified ranks
+there.  Ranks are specified as a comma-delimited list of ranges
+|mdash| e.g., ``1,3-6,9``, or as ``all``.
+
+[stop-on-exec]
+
+If supported, stop each process at start of execution
+
+[stop-in-init]
+
+Include the ``PMIX_DEBUG_STOP_IN_INIT`` attribute in the application's
+job info directing that the specified ranks stop in PMIx_Init pending
+release. Ranks are specified as a comma-delimited list of ranges
+|mdash| e.g., ``1,3-6,9``, or as ``all``.
+
+[stop-in-app]
+
+Include the ``PMIX_DEBUG_STOP_IN_APP`` attribute in the application's
+job info directing that the specified ranks stop at an application-determined
+point pending release. Ranks are specified as a comma-delimited list of
+ranges |mdash| e.g., ``1,3-6,9``, or as ``all``.
+
+[x]
+
+.. include:: /prrte-rst-content/cli-x.rst
+
+[wdir]
+
+Set the working directory of the started processes
+
+[wd]
+
+Synonym for --wdir
+
+[set-cwd-to-session-dir]
+
+Set the working directory of the started processes to their session
+directory
+
+[path]
+
+Path to be used to look for executables to start processes
+
+[show-progress]
+
+Output a brief periodic report on launch progress
+
+[pset]
+
+User-specified name assigned to the processes in their given application
+
+[hostfile]
+
+.. include:: /prrte-rst-content/cli-launcher-hostfile.rst
+
+See the "Host specification" HTML documentation for details about the
+format and content of hostfiles.
+
+[machinefile]
+
+Provide a hostfile.  This option is a synonym for ``--hostfile``; see
+that option for more information.
+
+[host]
+
+.. include:: /prrte-rst-content/cli-dash-host.rst
+
+See the "Host specification" HTML documentation for details about the
+format and content of hostfiles.
+
+[personality]
+
+.. include:: /prrte-rst-content/cli-personality.rst
+
+[preload-files]
+
+Syntax: ``--preload-files <files>``
+
+Preload the comma separated list of files to the remote machines current
+working directory before starting the remote process.
+
+[preload-binary]
+
+Syntax: ``--preload-binary``
+
+Preload the binary on the remote machine before starting the
+remote process.
+
+[output]
+
+.. include:: /prrte-rst-content/cli-output.rst
+
+[stdin]
+
+Specify procs to receive stdin [integer ranks, ``all``, ``none``]
+(default: ``0``, indicating rank 0)
+
+[map-by]
+
+.. include:: /prrte-rst-content/cli-map-by.rst
+
+[rank-by]
+
+.. include:: /prrte-rst-content/cli-rank-by.rst
+
+[bind-to]
+
+.. include:: /prrte-rst-content/cli-bind-to.rst
+
+[runtime-options]
+
+.. include:: /prrte-rst-content/cli-runtime-options.rst
+
+[rankfile]
+
+Name of file to specify explicit task mapping
+[display]
+
+.. include:: /prrte-rst-content/cli-display.rst
+
+[do-not-launch]
+
+Perform all necessary operations to prepare to launch the application,
+but do not actually launch it (usually used to test mapping patterns)
+
+[mca]
+
+.. include:: /prrte-rst-content/deprecated-mca.rst
+
+[gmca]
+
+.. include:: /prrte-rst-content/deprecated-gmca.rst
+
+[xml]
+
+.. include:: /prrte-rst-content/deprecated-xml.rst
+
+[bind-to-core]
+
+.. include:: /prrte-rst-content/deprecated-bind-to-core.rst
+
+[tag-output]
+
+.. include:: /prrte-rst-content/deprecated-tag-output.rst
+
+[timestamp-output]
+
+.. include:: /prrte-rst-content/deprecated-timestamp-output.rst
+
+[output-directory]
+
+.. include:: /prrte-rst-content/deprecated-output-directory.rst
+
+[output-filename]
+
+.. include:: /prrte-rst-content/deprecated-output-filename.rst
+
+[merge-stderr-to-stdout]
+
+.. include:: /prrte-rst-content/deprecated-merge-stderr-to-stdout.rst
+
+[display-devel-map]
+
+.. include:: /prrte-rst-content/deprecated-display-devel-map.rst
+
+[display-topo]
+
+.. include:: /prrte-rst-content/deprecated-display-topo.rst
+
+[report-bindings]
+
+.. include:: /prrte-rst-content/deprecated-report-bindings.rst
+
+[display-devel-allocation]
+
+.. include:: /prrte-rst-content/deprecated-display-devel-allocation.rst
+
+[display-map]
+
+.. include:: /prrte-rst-content/deprecated-display-map.rst
+
+[display-allocation]
+
+.. include:: /prrte-rst-content/deprecated-display-allocation.rst
diff --git a/src/docs/show-help-files/help-schizo-prun.rst b/src/docs/show-help-files/help-schizo-prun.rst
new file mode 100644
index 0000000000..ee3b332229
--- /dev/null
+++ b/src/docs/show-help-files/help-schizo-prun.rst
@@ -0,0 +1,532 @@
+.. -*- rst -*-
+
+   Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+[bogus section]
+
+This section is not used by PRTE code.  But we have to put a RST
+section title in this file somewhere, or Sphinx gets unhappy.  So we
+put it in a section that is ignored by PRTE code.
+
+Hello, world
+------------
+
+[version]
+
+%s (%s) %s
+
+%s
+
+[usage]
+
+%s (%s) %s
+
+Usage: %s [OPTION]...
+
+Submit job to the PMIx Reference RTE
+
+The following list of command line options are available. Note that
+more detailed help for any option can be obtained by adding that
+option to the help request as ``--help <option>``.
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - General Options
+
+   * - Option
+     - Description
+
+   * - ``-h`` | ``--help``
+     - This help message
+
+   * - ``-h`` | ``--help <arg0>``
+     - Help for the specified option
+
+   * - ``-v`` | ``--verbose``
+     - Enable typical debug options
+
+   * - ``-V`` | ``--version``
+     - Print version and exit
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Debug Options
+
+   * - Option
+     - Description
+
+   * - ``--display <arg0>``
+     - Comma-delimited list of options for displaying information
+       about the allocation and job. Allowed values: ``allocation``,
+       ``bind``, ``map``, ``map-devel``, ``topo``.
+
+   * - ``--timeout <seconds>``
+     - Timeout the job after the specified number of seconds
+
+   * - ``--spawn-timeout <seconds>``
+     - Timeout the job if spawn takes more than the specified number
+       of seconds
+
+   * - ``--get-stack-traces``
+     - Get stack traces of all application procs on timeout
+
+   * - ``--report-state-on-timeout``
+     - Report all job and process states upon timeout
+
+   * - ``--stop-on-exec``
+     - If supported, stop each specified process at start of execution
+
+   * - ``--stop-in-init``
+     - Direct the specified processes to stop in ``PMIx_Init``
+
+   * - ``--stop-in-app``
+     - Direct the specified processes to stop at an
+       application-controlled location
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Output Options
+
+   * - Option
+     - Description
+
+   * - ``--output <args>``
+     - Comma-delimited list of options that control how output is
+       generated. Allowed values: ``tag``, ``tag-detailed``,
+       ``tag-fullname``, ``timestamp``, ``xml``,
+       ``merge-stderr-to-stdout``, ``dir=DIRNAME``,
+       ``file=filename``. The ``dir`` option redirects output from
+       application processes into
+       ``DIRNAME/job/rank/std[out,err,diag]``. The file option
+       redirects output from application processes into
+       ``filename.rank``. In both cases, the provided name will be
+       converted to an absolute path.  Supported qualifiers include
+       ``NOCOPY`` (do not copy the output to the stdout/stderr
+       streams).
+
+   * - ``--report-child-jobs-separately``
+     - Return the exit status of the primary job only
+
+   * - ``--xterm <ranks>``
+     - Create a new xterm window and display output from the specified
+       ranks there
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Input Options
+
+   * - Option
+     - Description
+
+   * - ``--stdin <ranks>``
+     - Specify procs to receive stdin [``rank``, ``all``, ``none`, or
+       comma-delimited list of integers] (default: ``0``, indicating
+       rank 0)
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Placement Options
+
+   * - Option
+     - Description
+
+   * - ``--map-by <type>``
+     - Mapping Policy for job
+
+   * - ``--rank-by <type>``
+     - Ranking Policy for job
+
+   * - ``--bind-to <type>``
+     - Binding policy for job
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Launch Options
+
+   * - Option
+     - Description
+
+   * - ``--runtime-options <arg0>``
+     - Comma-delimited list of runtime directives for the job (e.g.,
+       do not abort if a process exits on non-zero status)
+
+   * - ``-c`` | ``--np <num_procs>``
+     - Number of processes to run
+
+   * - ``-n`` | ``--n <num_procs>``
+     - Number of processes to run
+
+   * - ``-N <num_procs>``
+     - Number of processes to run per node
+
+   * - ``--app <filename>``
+     - Provide an appfile; ignore all other command line options
+
+   * - ``-H`` | ``--host <hosts>``
+     - List of hosts to invoke processes on
+
+   * - ``--hostfile <filename>``
+     - Provide a hostfile
+
+   * - ``--machinefile <filename>``
+     - Provide a hostfile (synonym for ``--hostfile``)
+
+   * - ``--path <path>``
+     - PATH to be used to look for executables to start processes
+
+   * - ``--pmixmca <key> <value>``
+     - Pass context-specific PMIx MCA parameters; they are considered
+       global if only one context is specified (``key`` is the
+       parameter name; ``value`` is the parameter value)
+
+   * - ``--gpmixmca <key> <value>``
+     - Pass global PMIx MCA parameters that are applicable to all
+       contexts (``key`` is the parameter name; ``value`` is the
+       parameter value)
+
+   * - ``--tune <filename>``
+     - File(s) containing MCA params for tuning operations
+
+   * - ``--preload-files <filenames>``
+     - Preload the comma separated list of files to the remote
+       machines current working directory before starting the remote
+       process.
+
+   * - ``--pset <name>``
+     - User-specified name assigned to the processes in their given
+       application
+
+   * - ``--rankfile <filename>``
+     - Name of file to specify explicit task mapping
+
+   * - ``-s`` | ``--preload-binary``
+     - Preload the binary on the remote machine before starting the
+       remote process.
+
+   * - ``--set-cwd-to-session-dir``
+     - Set the working directory of the started processes to their
+       session directory
+
+   * - ``--show-progress``
+     - Output a brief periodic report on launch progress
+
+   * - ``--wd <dir>``
+     - Synonym for ``--wdir``
+
+   * - ``--wdir <dir>``
+     - Set the working directory of the started processes
+
+   * - ``-x <name>``
+     - Export an environment variable, optionally specifying a value
+       (e.g., ``-x foo`` exports the environment variable foo and takes
+       its value from the current environment; ``-x foo=bar`` exports
+       the environment variable name foo and sets its value to ``bar``
+       in the started processes; ``-x foo*`` exports all current
+       environmental variables starting with ``foo``)
+
+.. list-table::
+   :header-rows: 2
+   :widths: 20 45
+
+   * -
+     - Specific Options
+
+   * - Option
+     - Description
+
+   * - ``--do-not-connect``
+     - Do not connect to a server
+
+   * - ``--dvm-uri <uri>``
+     - Specify the URI of the DVM master, or the name of the file
+       (specified as ``file:filename``) that contains that info
+
+   * - ``--namespace <name>``
+     - Namespace of the daemon to which we should connect
+
+   * - ``--pid <pid>``
+     - PID of the daemon to which we should connect (integer PID or
+       ``file:<filename>`` for file containing the PID
+
+   * - ``--system-server-first``
+     - First look for a system server and connect to it if found
+
+   * - ``--system-server-only``
+     - Connect only to a system-level server
+
+   * - ``--tmpdir <dir>``
+     - Set the root for the session directory tree
+
+   * - ``--wait-to-connect <seconds>```
+     - Delay specified number of seconds before trying to connect
+
+   * - ``--num-connect-retries <num>```
+     - Max number of times to try to connect
+
+   * - ``--personality <name>``
+     - Specify the personality to be used
+
+   * - ``--allow-run-as-root``
+     - Allow execution as root (**STRONGLY DISCOURAGED**)
+
+   * - ``--forward-signals <signals>``
+     - Comma-delimited list of additional signals (names or integers)
+       to forward to application processes [``none`` => forward
+       nothing]. Signals provided by default include ``SIGTSTP``,
+       ``SIGUSR1``, ``SIGUSR2``, ``SIGABRT``, ``SIGALRM``, and
+       ``SIGCONT``
+
+Report bugs to %s
+
+[dvm-uri]
+
+Specify the URI of the DVM master, or the name of the file (specified as
+``file:filename``) that contains that info
+
+[num-connect-retries]
+
+Max number of times to try to connect to the specified server (int)
+
+[pid]
+
+PID of the daemon to which we should connect (integer PID or
+``file:<filename>`` for file containing the PID
+
+[namespace]
+
+Namespace of the daemon we are to connect to (char*)
+
+[system-server-first]
+
+First look for a system server and connect to it if found
+
+[system-server-only]
+
+Connect only to a system-level server - abort if one is not found
+
+[tmpdir]
+
+Define the root location for the PRRTE session directory tree
+
+See the "Session directory" HTML documentation for additional details
+about the PRRTE session directory.
+
+[wait-to-connect]
+
+Delay specified number of seconds before trying to connect
+
+[hostfile]
+
+.. include:: /prrte-rst-content/cli-launcher-hostfile.rst
+
+See the "Host specification" HTML documentation for details about the
+format and content of hostfiles.
+
+[machinefile]
+
+Provide a hostfile.  This option is a synonym for ``--hostfile``; see
+that option for more information.
+
+[host]
+
+.. include:: /prrte-rst-content/cli-dash-host.rst
+
+[parseable]
+
+Output information (e.g., help messages) in machine-parseable
+friendly format
+
+[parsable]
+
+Output information (e.g., help messages) in machine-parseable
+friendly format
+
+[np]
+
+Specify number of application processes to be started
+
+[no-ready-msg]
+
+Do not print a DVM ready message
+
+[daemonize]
+
+Daemonize the DVM daemons into the background
+
+[system-server]
+
+Start the DVM as the system server
+
+[set-sid]
+
+Direct the DVM daemons to separate from the current session
+
+[report-pid]
+
+Printout PID on stdout [-], stderr [+], or a file [anything else]
+
+[report-uri]
+
+Printout URI on stdout [-], stderr [+], or a file [anything else]
+
+[test-suicide]
+
+Suicide instead of clean abort after delay
+
+[singleton]
+
+ID of the singleton process that started us
+
+[keepalive]
+
+Pipe to monitor - DVM will terminate upon closure
+
+[map-by]
+
+.. include:: /prrte-rst-content/cli-map-by.rst
+
+[rank-by]
+
+.. include:: /prrte-rst-content/cli-rank-by.rst
+
+[bind-to]
+
+.. include:: /prrte-rst-content/cli-bind-to.rst
+
+[runtime-options]
+
+.. include:: /prrte-rst-content/cli-runtime-options.rst
+
+[display]
+
+.. include:: /prrte-rst-content/cli-display.rst
+
+[output]
+
+.. include:: /prrte-rst-content/cli-output.rst
+
+[rankfile]
+
+Name of file to specify explicit task mapping
+
+[do-not-launch]
+
+Perform all necessary operations to prepare to launch the
+application, but do not actually launch it (usually used
+to test mapping patterns)
+
+[display-devel-map]
+
+Display a detailed process map (mostly intended for developers)
+just before launch
+
+[display-topo]
+
+Display the topology as part of the process map (mostly intended
+for developers) just before launch
+
+[report-bindings]
+
+Display process bindings to stderr
+
+[display-devel-allocation]
+
+Display a detailed list (mostly intended for developers) of the
+allocation being used by this job
+
+[display-map]
+
+Display the process map just before launch
+
+[display-allocation]
+
+Display the allocation being used by this job
+
+[enable-recovery]
+
+Enable recovery from process failure [Default = disabled]
+
+[max-restarts]
+
+Max number of times to restart a failed process
+
+[disable-recovery]
+
+Disable recovery (resets all recovery options to off)
+
+[continuous]
+
+Job is to run until explicitly terminated
+
+[personality]
+
+Specify the personality to be used
+
+[prte-server]
+
+Specify the URI of the publish/lookup server, or the name of the file
+(specified as ``file:<filename>`` that contains that info
+
+[dvm-master-uri]
+
+URI for the DVM master
+
+[parent-uri]
+
+URI for the parent if tree launch is enabled
+
+[tree-spawn]
+
+Tree-based spawn in progress
+
+[daemonize]
+
+Daemonize the DVM daemons into the background
+
+[set-sid]
+
+Direct the DVM daemons to separate from the current session
+
+[prtemca]
+
+.. include:: /prrte-rst-content/cli-prtemca.rst
+
+[pmixmca]
+
+.. include:: /prrte-rst-content/cli-pmixmca.rst
+
+[debug-daemons-file]
+
+.. include:: /prrte-rst-content/cli-debug-daemons-file.rst
+
+See the "Session directory" HTML documentation for additional details
+about the PRRTE session directory.
+
+[leave-session-attached]
+
+.. include:: /prrte-rst-content/cli-leave-session-attached.rst
diff --git a/src/docs/show-help-files/help-schizo-pterm.rst b/src/docs/show-help-files/help-schizo-pterm.rst
new file mode 100644
index 0000000000..f9dcf06a2f
--- /dev/null
+++ b/src/docs/show-help-files/help-schizo-pterm.rst
@@ -0,0 +1,126 @@
+.. -*- rst -*-
+
+   Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2023 Jeffrey M. Squyres.  All rights reserved.
+
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+[bogus section]
+
+This section is not used by PRTE code.  But we have to put a RST
+section title in this file somewhere, or Sphinx gets unhappy.  So we
+put it in a section that is ignored by PRTE code.
+
+Hello, world
+------------
+
+[usage]
+
+%s (%s) %s
+
+Usage: %s [OPTION]...
+
+Terminate an instance of the PMIx Reference RTE (PRRTE) DVM
+
+* General Options
+
+.. list-table::
+   :header-rows: 1
+   :widths: 20 45
+
+   * - Option
+     - Description
+
+   * - ``-h`` | ``--help``
+     - This help message
+
+   * - ``-h`` | ``--help <arg0>``
+     - Help for the specified option
+
+   * - ``-v`` | ``--verbose``
+     - Enable typical debug options
+
+   * - ``-V`` | ``--version``
+     - Print version and exit
+
+* Specific Options
+
+.. list-table::
+   :header-rows: 1
+   :widths: 20 45
+
+   * - Option
+     - Description
+
+   * - ``--pmixmca <key> <value>``
+     - Pass context-specific PMIx MCA parameters (``key`` is the
+       parameter name; ``value`` is the parameter value)
+
+   * - ``--dvm-uri <uri>``
+     - Specify the URI of the DVM master, or the name of the file
+       (specified as ``file:filename``) that contains that info
+
+   * - ``--num-connect-retries <num>``
+     - Max number of times to try to connect (int)
+
+   * - ``--pid <pid>```
+     - PID of the daemon to which we should connect (integer PID or
+       ``file:<filename>`` for file containing the PID
+
+   * - ``--namespace <name>``
+     - Namespace of the daemon we are to connect to
+
+   * - ``--system-server-first``
+     - First look for a system server and connect to it if found
+
+   * - ``--system-server-only``
+     - Connect only to a system-level server
+
+   * - ``--wait-to-connect <seconds>``
+     - Delay specified number of seconds before trying to connect
+
+Report bugs to %s
+
+[version]
+
+%s (%s) %s
+
+Report bugs to %s
+
+[dvm-uri]
+
+Specify the URI of the DVM master, or the name of the file (specified
+as ``file:<filename>``) that contains that info
+
+[num-connect-retries]
+
+Max number of times to try to connect to the specified server (int)
+
+[pid]
+
+PID of the daemon to which we should connect (integer PID or
+``file:<filename>`` for file containing the PID
+
+[namespace]
+
+Namespace of the daemon we are to connect to (char*)
+
+[system-server-first]
+
+First look for a system server and connect to it if found
+
+[system-server-only]
+
+Connect only to a system-level server - abort if one is not found
+
+[wait-to-connect]
+
+Delay specified number of seconds before trying to connect
+
+[pmixmca]
+
+.. include:: /prrte-rst-content/cli-pmixmca.rst
diff --git a/src/docs/show-help-files/index.rst b/src/docs/show-help-files/index.rst
new file mode 100644
index 0000000000..7ca1357713
--- /dev/null
+++ b/src/docs/show-help-files/index.rst
@@ -0,0 +1,31 @@
+The only purpose of this file is for Sphinx to have a top-level source
+RST file that includes all the others.
+
+This file -- and the ``index.txt`` file that it generates -- is not
+used by PRTE code.  **PRTE code only uses the individually
+``help-*.txt`` files that Sphinx generates.**  The additional output
+files that Sphinx generates in the ``_build/text`` tree are just
+harmelss by-products; we ignore them.
+
+.. toctree::
+
+   Pinfo <help-schizo-pinfo>
+
+   Prte <help-schizo-prte>
+
+   Prted <help-schizo-prted>
+
+   Prterun <help-schizo-prterun>
+
+   Prun <help-schizo-prun>
+
+   Prun <help-schizo-pterm>
+
+Have to also include these additional files so that Sphinx doesn't
+complain that there are RST files in the doc tree that aren't used.
+
+.. toctree::
+   :hidden:
+
+   prrte-rst-content/prterun-all-cli
+   prrte-rst-content/prterun-all-deprecated
diff --git a/src/docs/show-help-files/prrte-rst-content b/src/docs/show-help-files/prrte-rst-content
new file mode 120000
index 0000000000..46266ad03b
--- /dev/null
+++ b/src/docs/show-help-files/prrte-rst-content
@@ -0,0 +1 @@
+../prrte-rst-content
\ No newline at end of file
diff --git a/src/docs/show-help-files/requirements.txt b/src/docs/show-help-files/requirements.txt
new file mode 120000
index 0000000000..eef0a92a42
--- /dev/null
+++ b/src/docs/show-help-files/requirements.txt
@@ -0,0 +1 @@
+../../../docs/requirements.txt
\ No newline at end of file
diff --git a/src/etc/Makefile.am b/src/etc/Makefile.am
index 9208aab094..0052725dab 100644
--- a/src/etc/Makefile.am
+++ b/src/etc/Makefile.am
@@ -9,9 +9,9 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2008-2020 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008-2023 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
-# Copyright (c) 2021      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -19,10 +19,15 @@
 # $HEADER$
 #
 
-prte_config_files = @PRTE_DEFAULT_MCA_PARAM_CONF@
 prte_file_from_platform = @PRTE_PARAM_FROM_PLATFORM@
+prte_mca_param_file = @PRTE_DEFAULT_MCA_PARAM_CONF@
+prte_config_file = @PRTE_DEFAULT_CONFIG@
 
-EXTRA_DIST = $(prte_config_files) prte-default-hostfile
+EXTRA_DIST = prte-mca-params.conf prte-default-hostfile prte.conf
+
+# Note that prte-mca-params.conf and prte.conf are
+# "special" -- we do not list them here.
+prte_install_hook_files = prte-default-hostfile
 
 # Steal a little trickery from a generated Makefile to only install
 # files if they do not already exist at the target.  Be sure to read
@@ -31,43 +36,49 @@ EXTRA_DIST = $(prte_config_files) prte-default-hostfile
 # details why the mkdir is in install-data-local.
 
 install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
-	@ p="$(prte_config_files)"; \
-        if test "$(prte_file_from_platform)" = "yes"; then \
-	    	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-            echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/prte-mca-params.conf"; \
-		    $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/prte-mca-params.conf; \
-        else \
-            for file in $$p; do \
-                if test -f $(DESTDIR)$(sysconfdir)/prte-mca-params.conf; then \
-		            echo "******************************* WARNING ************************************"; \
-		            echo "*** Not installing new $$file over existing file in:"; \
-		            echo "***   $(DESTDIR)$(sysconfdir)/$$file"; \
-		            echo "******************************* WARNING ************************************"; \
-		        else \
-		            if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
-		            f="`echo $$file | sed -e 's|^.*/||'`"; \
-		            echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f"; \
-		            $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f; \
-		        fi; \
-		    done \
+	@ $(MKDIR_P) $(DESTDIR)$(sysconfdir); \
+	if test "$(prte_file_from_platform)" = "yes"; then \
+	    $(INSTALL_DATA) $(prte_mca_param_file) $(DESTDIR)$(sysconfdir)/prte-mca-params.conf; \
+	    $(INSTALL_DATA) $(prte_config_file) $(DESTDIR)$(sysconfdir)/prte.conf; \
+	else \
+	    if test -f $(DESTDIR)$(sysconfdir)/prte-mca-params.conf; then \
+		echo "******************************* WARNING ************************************"; \
+		echo "*** Not installing new prte-mca-params.conf over existing file in:"; \
+		echo "***   $(DESTDIR)$(sysconfdir)/prte-mca-params.conf"; \
+		echo "******************************* WARNING ************************************"; \
+	    else \
+		echo installing prte-mca-params.conf to $(DESTDIR)$(sysconfdir)/; \
+		$(INSTALL_DATA) $(srcdir)/prte-mca-params.conf $(DESTDIR)$(sysconfdir)/; \
+	    fi; \
+	    if test -f $(DESTDIR)$(sysconfdir)/prte.conf; then \
+		echo "******************************* WARNING ************************************"; \
+		echo "*** Not installing new prte.conf over existing file in:"; \
+		echo "***   $(DESTDIR)$(sysconfdir)/prte.conf"; \
+		echo "******************************* WARNING ************************************"; \
+	    else \
+		echo installing prte.conf to $(DESTDIR)$(sysconfdir)/; \
+		$(INSTALL_DATA) $(srcdir)/prte.conf $(DESTDIR)$(sysconfdir)/; \
+	    fi; \
+	fi
+	@ for file in $(prte_install_hook_files); do \
+	    if test -f $(DESTDIR)$(sysconfdir)/$$file; then \
+		echo "******************************* WARNING ************************************"; \
+		echo "*** Not installing new $$file over existing file in:"; \
+		echo "***   $(DESTDIR)$(sysconfdir)/$$file"; \
+		echo "******************************* WARNING ************************************"; \
+	    else \
+		echo installing $$file to $(DESTDIR)$(sysconfdir)/; \
+		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(sysconfdir)/; \
 	    fi; \
-		if test -f $(DESTDIR)$(sysconfdir)/prte-default-hostfile; then \
-            echo "******************************* WARNING ************************************"; \
-            echo "*** Not installing new prte-default-hostfile over existing file in:"; \
-            echo "***   $(DESTDIR)$(sysconfdir)/$$file"; \
-            echo "******************************* WARNING ************************************"; \
-        else \
-            $(INSTALL_DATA) $(srcdir)/prte-default-hostfile $(DESTDIR)$(sysconfdir)/; \
-        fi;
+	done
 
 
 # Only remove if exactly the same as what in our tree
 # NOTE TO READER: Bourne shell if ... fi evaluates the body if
-#    the return of the evaluted command is 0 (as opposed to non-zero
+#    the return of the evaluated command is 0 (as opposed to non-zero
 #    as used by everyone else)
 uninstall-local:
-	@ p="$(prte_config_files)"; \
+	@ p="$(prte_install_hook_files)"; \
 	for file in $$p; do \
 	  if test -f "$(DESTDIR)$(sysconfdir)/$$file"; then \
 	  	if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
@@ -76,10 +87,31 @@ uninstall-local:
 	      rm -f "$(DESTDIR)$(sysconfdir)/$$file" ; \
 	    fi ; \
 	  fi ; \
-	done
-	@ if test -f "$(DESTDIR)$(sysconfdir)/prte-default-hostfile"; then \
-		if diff "$(DESTDIR)$(sysconfdir)/prte-default-hostfile" "$(srcdir)/prte-default-hostfile" > /dev/null 2>&1 ; then \
-	      echo "rm -f $(DESTDIR)$(sysconfdir)/prte-default-hostfile" ; \
-	      rm -f "$(DESTDIR)$(sysconfdir)/prte-default-hostfile" ; \
-	    fi ; \
+	done ; \
+	if test "$(prte_file_from_platform)" = "yes"; then \
+	    if test -f $(DESTDIR)$(sysconfdir)/prte-mca-params.conf; then \
+		    if diff "$(DESTDIR)$(sysconfdir)/prte-mca-params.conf" "$(prte_mca_param_file)" > /dev/null 2>&1 ; then \
+		      echo "rm -f $(DESTDIR)$(sysconfdir)/prte-mca-params.conf" ; \
+		      rm -f "$(DESTDIR)$(sysconfdir)/prte-mca-params.conf" ; \
+		    fi ; \
+		fi ; \
+	    if test -f $(DESTDIR)$(sysconfdir)/prte.conf; then \
+		    if diff "$(DESTDIR)$(sysconfdir)/prte.conf" "$(prte_config_file)" > /dev/null 2>&1 ; then \
+		      echo "rm -f $(DESTDIR)$(sysconfdir)/prte.conf" ; \
+		      rm -f "$(DESTDIR)$(sysconfdir)/prte.conf" ; \
+		    fi ; \
+		fi ; \
+	else \
+	    if test -f $(DESTDIR)$(sysconfdir)/prte-mca-params.conf; then \
+		    if diff "$(DESTDIR)$(sysconfdir)/prte-mca-params.conf" "$(srcdir)/prte-mca-params.conf"> /dev/null 2>&1 ; then \
+		      echo "rm -f $(DESTDIR)$(sysconfdir)/prte-mca-params.conf" ; \
+		      rm -f "$(DESTDIR)$(sysconfdir)/prte-mca-params.conf" ; \
+		    fi ; \
+		fi ; \
+	    if test -f $(DESTDIR)$(sysconfdir)/prte.conf; then \
+		    if diff "$(DESTDIR)$(sysconfdir)/prte.conf" "$(srcdir)/prte.conf"> /dev/null 2>&1 ; then \
+		      echo "rm -f $(DESTDIR)$(sysconfdir)/prte.conf" ; \
+		      rm -f "$(DESTDIR)$(sysconfdir)/prte.conf" ; \
+		    fi ; \
+		fi ; \
 	fi ;
diff --git a/src/etc/prte.conf b/src/etc/prte.conf
new file mode 100644
index 0000000000..4d2a48c409
--- /dev/null
+++ b/src/etc/prte.conf
@@ -0,0 +1,76 @@
+#
+# Copyright (c) 2023      Nanook Consulting.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+# The PMIx Reference RunTime Environment (PRRTE) can be instantiated
+# as a Distributed Virtual Machine (DVM) in two ways. First, the
+# `prte` command can be executed at a shell prompt. This will discover
+# the available resources (either from hostfile or as allocated by a
+# resource manager) and start a PRRTE shepherd daemon (`prted`) on each
+# of the indicated nodes.
+#
+# The other method, however, is to bootstrap the DVM at time of cluster
+# startup. Bootstrapping PRRTE allows the DVM to serve as the system-level
+# runtime, providing a full-service PMIx environment to sessions under
+# its purview. Integration to an appropriately enabled scheduler can
+# provide a full workload managed environment for users.
+#
+# Establishing the DVM using the bootstrap method requires that a PRRTE
+# configuration file be created and made available on every node of the
+# cluster at node startup. The configuration file provides necessary
+# information for establishing the communication infrastructure between
+# the DVM controller and the compute node daemons. It also provides a
+# means for easily defining DVM behavior for options such as logging,
+# system-level prolog and epilog scripts for each session, and other
+# PRRTE features.
+#
+# The configuration file can be manually created or can be created using
+# the PRRTE configuration tool ``<install-location>/etc/prte-configurator.html``
+# running in the browser of your choice. Manual creation can best be done
+# by editing the example configuration file (``<source-location>/src/etc/prte.conf``).
+# This file contains all the supported configuration options, with all
+# entries commented out. Simply uncomment the options of interest and
+# set them to appropriate values. The file will be installed into the
+# final ``<install-location>/etc`` when ``make install`` is performed.
+#
+# The configuration tool also contains all the supported options in an
+# easy-to-use form. Once you have filled out the desired entries, the
+# "submit" button will show the resulting configuration file on the
+# browser window - a simple "copy/paste" operation into your target
+# configuration file will yield the final result.
+#
+# Configuration Options
+# ---------------------
+#
+# The following options are supported by this version of PRRTE.
+# While we make every effort to maintain compatibility with prior versions,
+# we recommend that you check options when installing new versions to
+# see what may have changed and/or been added. We also recommend that
+# you use the prte-configurator.html for the version you are using to
+# ensure that it is fully compatible.
+#
+# Bootstrap Options
+# -----------------
+#ClusterName=cluster
+#DVMControllerHost=host0
+#DVMControllerPort=7817
+#PRTEDPort=7818
+#DVMNodes=
+#
+# Operational Options
+# -------------------
+#DVMTempDir=/tmp
+#SessionTmpDir=/tmp
+#
+# Logging Options
+# ---------------
+#ControllerLogJobState=undefined
+#ControllerLogProcState=undefined
+#ControllerLogPath=
+#PRTEDLogJobState=undefined
+#PRTEDLogProcState=undefined
+#PRTEDLogPath=
diff --git a/src/event/event-internal.h b/src/event/event-internal.h
index 94f50815ae..07cecd9c3b 100644
--- a/src/event/event-internal.h
+++ b/src/event/event-internal.h
@@ -8,7 +8,7 @@
  * Copyright (c) 2019      Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
  *
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -164,7 +164,7 @@ typedef struct {
 PRTE_EXPORT PMIX_CLASS_DECLARATION(prte_event_list_item_t);
 
 /* define a threadshift macro */
-#define PMIX_THREADSHIFT(x, eb, f, p)                                  \
+#define PRTE_PMIX_THREADSHIFT(x, eb, f, p)                                  \
     do {                                                               \
         prte_event_set((eb), &((x)->ev), -1, PRTE_EV_WRITE, (f), (x)); \
         prte_event_set_priority(&((x)->ev), (p));                      \
diff --git a/src/hwloc/help-prte-hwloc-base.txt b/src/hwloc/help-prte-hwloc-base.txt
index aa6bf49d95..5c8739dd9f 100644
--- a/src/hwloc/help-prte-hwloc-base.txt
+++ b/src/hwloc/help-prte-hwloc-base.txt
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2011-2020 Cisco Systems, Inc.  All rights reserved
 # Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
-# Copyright (c) 2022      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -87,73 +87,6 @@ The binding request contains an unrecognized modifier:
 
 Please check your request and try again.
 #
-[bind-to-option]
-By default, processes are bound to individual CPUs (either COREs
-or HWTHREADs, as defined by default or by user specification for
-the job). On nodes that are OVERSUBSCRIBEd (i.e., where the number
-of procs exceeds the number of assigned slots), the default is to
-not bind the processes.
-
-NOTE: processes from prior jobs that are already executing on a node
-are not "unbound" when a new job mapping results in the node
-becoming oversubscribed.
-
-Binding is performed to the first available specified object type
-within the object where the process was mapped. In other words,
-binding can only be done to the mapped object or to a resource
-located beneath that object.
-
-An object is considered completely consumed when the number of
-processes bound to it equals the number of CPUs within it. Unbound
-processes are not considered in this computation. Additional
-processes cannot be mapped to consumed objects unless the
-OVERLOAD qualifier is provided via the "--bind-to" command
-line option.
-
-Note that directives and qualifiers are case-insensitive
-and can be shortened to the minimum number of characters
-to uniquely identify them. Thus, "L1CACHE" can be given
-as "l1cache" or simply as "L1".
-
-Supported binding directives include:
-
--   NONE does not bind the processes
-
--   HWTHREAD binds each process to a single hardware
-    thread/ This requires that hwthreads be treated
-    as independent CPUs (i.e., that either the HWTCPUS
-    qualifier be provided to the "map-by" option or
-    that hwthreads be designated as CPUs by default).
-
--   CORE binds each process to a single core. This
-    can be done whether hwthreads or cores are being
-    treated as independent CPUs provided that mapping
-    is performed at the core or higher level.
-
--   L1CACHE binds each process to all the CPUs in
-    an L1 cache.
-
--   L2CACHE binds each process to all the CPUs in
-    an L2 cache
-
--   L3CACHE binds each process to all the CPUs in
-    an L3 cache
-
--   NUMA binds each process to all the CPUs in a NUMA
-    region
-
--   PACKAGE binds each process to all the CPUs in a PACKAGE
-
-Any directive can include qualifiers by adding a colon (:) and any
-combination of one or more of the following to the --bind-to option:
-
--   OVERLOAD indicates that objects can have more
-    processes bound to them than CPUs within them
-
--   IF-SUPPORTED indicates that the job should continue to
-    be launched and executed even if binding cannot be
-    performed as requested.
-#
 [bind-upwards]
 Binding is performed to the first available specified object type
 within the object where the process was mapped. In other words,
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index fc06585d5c..5500238df2 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -12,7 +12,7 @@
 #                         All rights reserved.
 # Copyright (c) 2010-2020 Cisco Systems, Inc.  All rights reserved
 # Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
-# Copyright (c) 2021      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -20,28 +20,27 @@
 # $HEADER$
 #
 
-headers = constants.h \
-		  types.h \
-		  frameworks.h \
-		  hash_string.h \
-		  prefetch.h \
-		  prte_config_top.h \
-		  prte_config_bottom.h \
-		  prte_portable_platform.h \
-		  prte_portable_platform_real.h \
-		  prte_stdint.h \
-		  prte_stdatomic.h \
-		  prte_socket_errno.h \
-		  align.h
+# This makefile.am does not stand on its own - it is included from src/Makefile.am
 
-nodist_headers = \
-		  prte_config.h \
-		  version.h
+headers += \
+        include/constants.h \
+        include/types.h \
+        include/prte_frameworks.h \
+        include/hash_string.h \
+        include/prefetch.h \
+        include/prte_config_top.h \
+        include/prte_config_bottom.h \
+        include/prte_portable_platform.h \
+        include/prte_portable_platform_real.h \
+        include/prte_stdint.h \
+        include/prte_stdatomic.h \
+        include/prte_socket_errno.h \
+        include/align.h
 
-EXTRA_DIST = $(headers)
+nodist_headers += \
+        include/prte_config.h \
+        include/version.h
 
-if WANT_INSTALL_HEADERS
-prtedir = $(prteincludedir)
-nobase_dist_prte_HEADERS = $(headers)
-nobase_nodist_prte_HEADERS = $(nodist_headers)
-endif
+libprrte_la_SOURCES += \
+        $(headers) \
+        include/prte_frameworks.c
diff --git a/src/mca/ess/base/Makefile.am b/src/mca/ess/base/Makefile.am
index 0b64951735..c807afa21b 100644
--- a/src/mca/ess/base/Makefile.am
+++ b/src/mca/ess/base/Makefile.am
@@ -14,7 +14,7 @@
 # Copyright (c) 2019      Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2022      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -31,4 +31,5 @@ libprtemca_ess_la_SOURCES += \
         base/ess_base_frame.c \
         base/ess_base_select.c \
 		base/ess_base_std_prted.c \
-        base/ess_base_std_prolog.c
+        base/ess_base_std_prolog.c \
+        base/ess_base_bootstrap.c
diff --git a/src/mca/ess/base/base.h b/src/mca/ess/base/base.h
index 21b4c5f68d..c6f3268068 100644
--- a/src/mca/ess/base/base.h
+++ b/src/mca/ess/base/base.h
@@ -15,7 +15,7 @@
  * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2019      Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -80,6 +80,9 @@ PRTE_EXPORT int prte_ess_base_proc_binding(void);
  */
 PRTE_EXPORT int prte_ess_env_put(int32_t num_procs, int32_t num_local_procs, char ***env);
 
+/* read a bootstrap configuration file */
+PRTE_EXPORT int prte_ess_base_bootstrap(void);
+
 typedef struct {
     pmix_list_item_t super;
     char *signame;
diff --git a/src/mca/ess/base/ess_base_bootstrap.c b/src/mca/ess/base/ess_base_bootstrap.c
new file mode 100644
index 0000000000..f73dcea2e6
--- /dev/null
+++ b/src/mca/ess/base/ess_base_bootstrap.c
@@ -0,0 +1,566 @@
+/*
+ * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2021 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2009      Institut National de Recherche en Informatique
+ *                         et Automatique. All rights reserved.
+ * Copyright (c) 2011-2020 Cisco Systems, Inc.  All rights reserved
+ * Copyright (c) 2011-2013 Los Alamos National Security, LLC.  All rights
+ *                         reserved.
+ * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2017      IBM Corporation. All rights reserved.
+ * Copyright (c) 2019      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2023      Triad National Security, LLC. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "prte_config.h"
+#include "constants.h"
+
+#include <stdio.h>
+#include <sys/types.h>
+#ifdef HAVE_FCNTL_H
+#    include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#    include <unistd.h>
+#endif
+
+#include "src/util/proc_info.h"
+
+#include "src/event/event-internal.h"
+#include "src/hwloc/hwloc-internal.h"
+#include "src/pmix/pmix-internal.h"
+#include "src/util/pmix_os_path.h"
+#include "src/util/pmix_environ.h"
+#include "src/util/pmix_string_copy.h"
+
+#include "src/mca/prteinstalldirs/base/base.h"
+#include "src/rml/rml.h"
+#include "src/rml/rml_contact.h"
+
+#include "src/runtime/prte_globals.h"
+#include "src/util/name_fns.h"
+#include "src/util/session_dir.h"
+#include "src/util/pmix_show_help.h"
+
+#include "src/mca/ess/base/base.h"
+
+static pmix_status_t regex_extract_nodes(char *regexp, char ***names);
+static pmix_status_t regex_parse_value_ranges(char *base, char *ranges,
+                                              int num_digits, char *suffix,
+                                              char ***names);
+static pmix_status_t regex_parse_value_range(char *base, char *range,
+                                             int num_digits, char *suffix,
+                                             char ***names);
+static pmix_status_t read_file(char *regexp, char ***names);
+
+int prte_ess_base_bootstrap(void)
+{
+    char *path, *line, *ptr;
+    FILE *fp;
+    int n;
+    char *cluster = NULL;
+    char *ctrlhost = NULL;
+    uint32_t ctrlport = UINT32_MAX;
+    uint32_t prtedport = UINT32_MAX;
+    char *dvmnodes = NULL;
+    char *dvmtmpdir = NULL;
+    char *sessiontmpdir = NULL;
+    bool ctrllogjobstate = false;
+    bool ctrllogprocstate = false;
+    char *ctrllogpath = NULL;
+    bool prtedlogjobstate = false;
+    bool prtedlogprocstate = false;
+    char *prtedlogpath = NULL;
+    char **nodes = NULL;
+    int rc = PRTE_ERR_SILENT;
+
+    /* see if we can open a configuration file */
+    path = pmix_os_path(false, prte_install_dirs.sysconfdir, "prte.conf", NULL);
+    fp = fopen(path, "r");
+    if (NULL == fp) {
+        pmix_show_help("help-prte-runtime.txt", "bootstrap-not-found", true,
+                       prte_process_info.nodename, path);
+        free(path);
+        return PRTE_ERR_SILENT;
+    }
+
+    while (NULL != (line = pmix_getline(fp))) {
+        /* ignore if line is empty or comment */
+        if (0 == strlen(line) || '#' == line[0]) {
+            free(line);
+            continue;
+        }
+        /* split on the '=' sign */
+        if (NULL == (ptr = strchr(line, '='))) {
+            /* bad file */
+            pmix_show_help("help-prte-runtime.txt", "bootstrap-bad-entry", true,
+                           prte_process_info.nodename, path, line);
+            free(path);
+            fclose(fp);
+            return PRTE_ERR_SILENT;
+        }
+        *ptr = '\0';
+        if (0 == strlen(line)) {   // missing the field name
+            /* restore the '=' sign */
+            *ptr = '=';
+            pmix_show_help("help-prte-runtime.txt", "bootstrap-missing-field-name", true,
+                           prte_process_info.nodename, path, ptr);
+            free(path);
+            fclose(fp);
+            return PRTE_ERR_SILENT;
+        }
+        ++ptr;
+        if (NULL == ptr) {    // missing the value
+            pmix_show_help("help-prte-runtime.txt", "bootstrap-missing-value", true,
+                           prte_process_info.nodename, path, line);
+            free(path);
+            fclose(fp);
+            return PRTE_ERR_SILENT;
+        }
+        /* identify and cache the option */
+        if (0 == strcmp(line, "ClusterName")) {
+            cluster = strdup(ptr);
+        } else if (0 == strcmp(line, "DVMControllerHost")) {
+            ctrlhost = strdup(ptr);
+        } else if (0 == strcmp(line, "DVMControllerPort")) {
+            ctrlport = strtoul(ptr, NULL, 10);
+        } else if (0 == strcmp(line, "PRTEDPort")) {
+            prtedport = strtoul(ptr, NULL, 10);
+        } else if (0 == strcmp(line, "DVMNodes")) {
+            dvmnodes = strdup(ptr);
+        } else if (0 == strcmp(line, "DVMTempDir")) {
+            dvmtmpdir = strdup(ptr);
+        } else if (0 == strcmp(line, "SessionTmpDir")) {
+            sessiontmpdir = strdup(ptr);
+        } else if (0 == strcmp(line, "ControllerLogJobState")) {
+            if (0 == strcasecmp(ptr, "on") ||
+                0 == strncasecmp(ptr, "true", 1)) {
+                ctrllogjobstate = true;
+            }
+        } else if (0 == strcmp(line, "ControllerLogProcState")) {
+            if (0 == strcasecmp(ptr, "on") ||
+                0 == strncasecmp(ptr, "true", 1)) {
+                ctrllogprocstate = true;
+            }
+        } else if (0 == strcmp(line, "ControllerLogPath")) {
+            ctrllogpath = strdup(ptr);
+        } else if (0 == strcmp(line, "PRTEDLogJobState")) {
+            if (0 == strcasecmp(ptr, "on") ||
+                0 == strncasecmp(ptr, "true", 1)) {
+                prtedlogjobstate = true;
+            }
+        } else if (0 == strcmp(line, "PRTEDLogProcState")) {
+            if (0 == strcasecmp(ptr, "on") ||
+                0 == strncasecmp(ptr, "true", 1)) {
+                prtedlogprocstate = true;
+            }
+        } else if (0 == strcmp(line, "PRTEDLogPath")) {
+            prtedlogpath = strdup(ptr);
+        }
+        free(line);
+    }
+    fclose(fp);
+
+    /* we require the node list */
+    if (NULL == dvmnodes) {
+        pmix_show_help("help-prte-runtime.txt", "bootstrap-missing-entry", true,
+                       prte_process_info.nodename, path, "DVMNodes");
+        goto cleanup;
+    }
+    /* we must be able to parse that list */
+    rc = regex_extract_nodes(dvmnodes, &nodes);
+    if (PMIX_SUCCESS != rc) {
+        pmix_show_help("help-prte-runtime.txt", "bootstrap-bad-nodelist", true,
+                       prte_process_info.nodename, path, dvmnodes,
+                       PMIx_Error_string(rc));
+        goto cleanup;
+    }
+    /* we must have the controller host so we can find it */
+    if (NULL == ctrlhost) {
+        pmix_show_help("help-prte-runtime.txt", "bootstrap-missing-entry", true,
+                       prte_process_info.nodename, path, "DVMControllerHost");
+        goto cleanup;
+    }
+    /* we must have a prted port so we can contact our parent */
+    if (UINT32_MAX == prtedport) {
+        pmix_show_help("help-prte-runtime.txt", "bootstrap-missing-entry", true,
+                       prte_process_info.nodename, path, "DVMControllerPort");
+        goto cleanup;
+    }
+    /* if we aren't given a controller port, default to the prted port */
+    if (UINT32_MAX == ctrlport) {
+        ctrlport = prtedport;
+    }
+
+    /* report the nodes */
+    for (n=0; NULL != nodes[n]; n++) {
+        pmix_output(0, "NODE[%d]: %s", n, nodes[n]);
+    }
+
+    rc = PRTE_SUCCESS;
+
+cleanup:
+    if (NULL != cluster) {
+        free(cluster);
+    }
+    if (NULL != dvmnodes) {
+        free(dvmnodes);
+    }
+    if (NULL != nodes) {
+        PMIX_ARGV_FREE_COMPAT(nodes);
+    }
+    if (NULL != dvmtmpdir) {
+        free(dvmtmpdir);
+    }
+    if (NULL != sessiontmpdir) {
+        free(sessiontmpdir);
+    }
+    if (NULL != ctrllogpath) {
+        free(ctrllogpath);
+    }
+    if (NULL != prtedlogpath) {
+        free(prtedlogpath);
+    }
+    return rc;
+}
+
+static pmix_status_t regex_extract_nodes(char *regexp, char ***names)
+{
+    int i, j, k, len;
+    pmix_status_t ret;
+    char *base;
+    char *orig, *suffix;
+    bool found_range = false;
+    bool more_to_come = false;
+    int num_digits;
+
+    /* set the default */
+    *names = NULL;
+
+    if (NULL == regexp) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+
+    /* see what regex we were given. Supported options:
+     *
+     * file:<path> - file of names, one per line
+     * <regex> - PMIx native regex, which is a comma-delimited
+     *                list of ranges or names
+     */
+    if (0 == strncasecmp(regexp, "file:", 5)) {
+        /* skip over the "file:" portion */
+        ret = read_file(&regexp[5], names);
+        return ret;
+    }
+
+    orig = base = strdup(regexp);
+    if (NULL == base) {
+        PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
+    pmix_output_verbose(1, prte_ess_base_framework.framework_output,
+                         "bootstrap:extract:nodes: checking list: %s",
+                         regexp);
+
+    do {
+        /* Find the base */
+        len = strlen(base);
+        for (i = 0; i <= len; ++i) {
+            if (base[i] == '[') {
+                /* we found a range. this gets dealt with below */
+                base[i] = '\0';
+                found_range = true;
+                break;
+            }
+            if (base[i] == ',') {
+                /* we found a singleton value, and there are more to come */
+                base[i] = '\0';
+                found_range = false;
+                more_to_come = true;
+                break;
+            }
+            if (base[i] == '\0') {
+                /* we found a singleton value */
+                found_range = false;
+                more_to_come = false;
+                break;
+            }
+        }
+        if (i == 0 && !found_range) {
+            /* we found a special character at the beginning of the string */
+            free(orig);
+            return PMIX_ERR_BAD_PARAM;
+        }
+
+        if (found_range) {
+            /* If we found a range, get the number of digits in the numbers */
+            i++; /* step over the [ */
+            for (j = i; j < len; j++) {
+                if (base[j] == ':') {
+                    base[j] = '\0';
+                    break;
+                }
+            }
+            if (j >= len) {
+                /* we didn't find the number of digits */
+                free(orig);
+                return PMIX_ERR_BAD_PARAM;
+            }
+            num_digits = strtol(&base[i], NULL, 10);
+            i = j + 1; /* step over the : */
+            /* now find the end of the range */
+            for (j = i; j < len; ++j) {
+                if (base[j] == ']') {
+                    base[j] = '\0';
+                    break;
+                }
+            }
+            if (j >= len) {
+                /* we didn't find the end of the range */
+                free(orig);
+                return PMIX_ERR_BAD_PARAM;
+            }
+            /* check for a suffix */
+            if (j + 1 < len && base[j + 1] != ',') {
+                /* find the next comma, if present */
+                for (k = j + 1; k < len && base[k] != ','; k++)
+                    ;
+                if (k < len) {
+                    base[k] = '\0';
+                }
+                suffix = strdup(&base[j + 1]);
+                if (k < len) {
+                    base[k] = ',';
+                }
+                j = k - 1;
+            } else {
+                suffix = NULL;
+            }
+            pmix_output_verbose(1, prte_ess_base_framework.framework_output,
+                                 "bootstrap:extract:nodes: parsing range %s %s %s",
+                                 base, base + i, suffix);
+
+            ret = regex_parse_value_ranges(base, base + i, num_digits, suffix, names);
+            if (NULL != suffix) {
+                free(suffix);
+            }
+            if (PMIX_SUCCESS != ret) {
+                free(orig);
+                return ret;
+            }
+            if (j + 1 < len && base[j + 1] == ',') {
+                more_to_come = true;
+                base = &base[j + 2];
+            } else {
+                more_to_come = false;
+            }
+        } else {
+            /* If we didn't find a range, just add the value */
+            PMIX_ARGV_APPEND_NOSIZE_COMPAT(names, base);
+            /* step over the comma */
+            i++;
+            /* set base equal to the (possible) next base to look at */
+            base = &base[i];
+        }
+    } while (more_to_come);
+
+    free(orig);
+
+    /* All done */
+    return ret;
+}
+
+/*
+ * Parse one or more ranges in a set
+ *
+ * @param base     The base text of the value name
+ * @param *ranges  A pointer to a range. This can contain multiple ranges
+ *                 (i.e. "1-3,10" or "5" or "9,0100-0130,250")
+ * @param ***names An argv array to add the newly discovered values to
+ */
+static pmix_status_t regex_parse_value_ranges(char *base, char *ranges, int num_digits,
+                                              char *suffix, char ***names)
+{
+    int i, len;
+    pmix_status_t ret;
+    char *start, *orig;
+
+    /* Look for commas, the separator between ranges */
+
+    len = strlen(ranges);
+    for (orig = start = ranges, i = 0; i < len; ++i) {
+        if (',' == ranges[i]) {
+            ranges[i] = '\0';
+            ret = regex_parse_value_range(base, start, num_digits, suffix, names);
+            if (PMIX_SUCCESS != ret) {
+                PMIX_ERROR_LOG(ret);
+                return ret;
+            }
+            start = ranges + i + 1;
+        }
+    }
+
+    /* Pick up the last range, if it exists */
+
+    if (start < orig + len) {
+
+        pmix_output_verbose(1, prte_ess_base_framework.framework_output,
+                             "bootstrap:parse:ranges: parse range %s (2)",
+                             start);
+
+        ret = regex_parse_value_range(base, start, num_digits, suffix, names);
+        if (PMIX_SUCCESS != ret) {
+            PMIX_ERROR_LOG(ret);
+            return ret;
+        }
+    }
+
+    /* All done */
+    return PMIX_SUCCESS;
+}
+
+/*
+ * Parse a single range in a set and add the full names of the values
+ * found to the names argv
+ *
+ * @param base     The base text of the value name
+ * @param *ranges  A pointer to a single range. (i.e. "1-3" or "5")
+ * @param ***names An argv array to add the newly discovered values to
+ */
+static pmix_status_t regex_parse_value_range(char *base, char *range, int num_digits, char *suffix,
+                                             char ***names)
+{
+    char *str, tmp[132];
+    size_t i, k, start, end;
+    size_t base_len, len;
+    bool found;
+    pmix_status_t ret;
+
+    if (NULL == base || NULL == range) {
+        return PMIX_ERROR;
+    }
+
+    len = strlen(range);
+    base_len = strlen(base);
+    /* Silence compiler warnings; start and end are always assigned
+     properly, below */
+    start = end = 0;
+
+    /* Look for the beginning of the first number */
+
+    for (found = false, i = 0; i < len; ++i) {
+        if (isdigit((int) range[i])) {
+            if (!found) {
+                start = strtol(range + i, NULL, 10);
+                found = true;
+                break;
+            }
+        }
+    }
+    if (!found) {
+        PMIX_ERROR_LOG(PMIX_ERR_NOT_FOUND);
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    /* Look for the end of the first number */
+
+    for (found = false; i < len; ++i) {
+        if (!isdigit(range[i])) {
+            break;
+        }
+    }
+
+    /* Was there no range, just a single number? */
+
+    if (i >= len) {
+        end = start;
+        found = true;
+    } else {
+        /* Nope, there was a range.  Look for the beginning of the second
+         * number
+         */
+        for (; i < len; ++i) {
+            if (isdigit(range[i])) {
+                end = strtol(range + i, NULL, 10);
+                found = true;
+                break;
+            }
+        }
+    }
+    if (!found) {
+        PMIX_ERROR_LOG(PMIX_ERR_NOT_FOUND);
+        return PMIX_ERR_NOT_FOUND;
+    }
+
+    /* Make strings for all values in the range */
+
+    len = base_len + num_digits + 32;
+    if (NULL != suffix) {
+        len += strlen(suffix);
+    }
+    str = (char *) malloc(len);
+    if (NULL == str) {
+        PMIX_ERROR_LOG(PMIX_ERR_OUT_OF_RESOURCE);
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+    for (i = start; i <= end; ++i) {
+        memset(str, 0, len);
+        strcpy(str, base);
+        /* we need to zero-pad the digits */
+        for (k = 0; k < (size_t) num_digits; k++) {
+            str[k + base_len] = '0';
+        }
+        memset(tmp, 0, 132);
+        pmix_snprintf(tmp, 132, "%lu", (unsigned long) i);
+        for (k = 0; k < strlen(tmp); k++) {
+            str[base_len + num_digits - k - 1] = tmp[strlen(tmp) - k - 1];
+        }
+        /* if there is a suffix, add it */
+        if (NULL != suffix) {
+            strcat(str, suffix);
+        }
+        PMIX_ARGV_APPEND_NOSIZE_COMPAT(names, str);
+    }
+    free(str);
+
+    /* All done */
+    return PMIX_SUCCESS;
+}
+
+static pmix_status_t read_file(char *regexp, char ***names)
+{
+    char *line;
+    FILE *fp;
+
+    fp = fopen(regexp, "r");
+    if (NULL == fp) {
+        return PMIX_ERR_BAD_PARAM;
+    }
+    while (NULL != (line = pmix_getline(fp))) {
+        /* ignore if line is empty or comment */
+        if (0 == strlen(line) || '#' == line[0]) {
+            free(line);
+            continue;
+        }
+        PMIX_ARGV_APPEND_NOSIZE_COMPAT(names, line);
+        free(line);
+    }
+    fclose(fp);
+    return PMIX_SUCCESS;
+}
diff --git a/src/mca/ess/base/ess_base_std_prolog.c b/src/mca/ess/base/ess_base_std_prolog.c
index c63d78df2f..c475fd9e58 100644
--- a/src/mca/ess/base/ess_base_std_prolog.c
+++ b/src/mca/ess/base/ess_base_std_prolog.c
@@ -11,7 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2019      Intel, Inc.  All rights reserved.
  * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -60,8 +60,9 @@ int prte_ess_base_std_prolog(void)
     return PRTE_SUCCESS;
 
 error:
-    pmix_show_help("help-prte-runtime", "prte_init:startup:internal-failure", true, error,
-                   PRTE_ERROR_NAME(ret), ret);
+    pmix_show_help("help-prte-runtime",
+                   "prte_init:startup:internal-failure", true,
+                   error, PRTE_ERROR_NAME(ret), ret);
 
     return ret;
 }
diff --git a/src/mca/filem/raw/filem_raw_module.c b/src/mca/filem/raw/filem_raw_module.c
index fd64229acd..9a3d3d7fa7 100644
--- a/src/mca/filem/raw/filem_raw_module.c
+++ b/src/mca/filem/raw/filem_raw_module.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015-2019 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -524,7 +524,7 @@ static int raw_preposition_files(prte_job_t *jdata,
         xfer->app_idx = fs->app_idx;
         xfer->outbound = outbound;
         pmix_list_append(&outbound->xfers, &xfer->super);
-        PMIX_THREADSHIFT(xfer, prte_event_base, send_chunk, PRTE_MSG_PRI);
+        PRTE_PMIX_THREADSHIFT(xfer, prte_event_base, send_chunk, PRTE_MSG_PRI);
         PMIX_RELEASE(item);
     }
     PMIX_DESTRUCT(&fsets);
@@ -1054,7 +1054,7 @@ static void recv_files(int status, pmix_proc_t *sender, pmix_data_buffer_t *buff
         }
         free(tmp);
         incoming->pending = true;
-        PMIX_THREADSHIFT(incoming, prte_event_base, write_handler, PRTE_MSG_PRI);
+        PRTE_PMIX_THREADSHIFT(incoming, prte_event_base, write_handler, PRTE_MSG_PRI);
     }
     /* create an output object for this data */
     output = PMIX_NEW(prte_filem_raw_output_t);
diff --git a/src/mca/grpcomm/base/grpcomm_base_frame.c b/src/mca/grpcomm/base/grpcomm_base_frame.c
index 75378eee63..bb112c06a2 100644
--- a/src/mca/grpcomm/base/grpcomm_base_frame.c
+++ b/src/mca/grpcomm/base/grpcomm_base_frame.c
@@ -120,7 +120,9 @@ PMIX_MCA_BASE_FRAMEWORK_DECLARE(prte, grpcomm, "GRPCOMM", base_register, prte_gr
                                 prte_grpcomm_base_close, prte_grpcomm_base_static_components,
                                 PMIX_MCA_BASE_FRAMEWORK_FLAG_DEFAULT);
 
-PMIX_CLASS_INSTANCE(prte_grpcomm_base_active_t, pmix_list_item_t, NULL, NULL);
+PMIX_CLASS_INSTANCE(prte_grpcomm_base_active_t,
+                    pmix_list_item_t,
+                    NULL, NULL);
 
 static void scon(prte_grpcomm_signature_t *p)
 {
@@ -133,7 +135,9 @@ static void sdes(prte_grpcomm_signature_t *p)
         free(p->signature);
     }
 }
-PMIX_CLASS_INSTANCE(prte_grpcomm_signature_t, pmix_object_t, scon, sdes);
+PMIX_CLASS_INSTANCE(prte_grpcomm_signature_t,
+                    pmix_object_t,
+                    scon, sdes);
 
 static void ccon(prte_grpcomm_coll_t *p)
 {
@@ -147,6 +151,7 @@ static void ccon(prte_grpcomm_coll_t *p)
     p->assignID = false;
     p->timeout = 0;
     p->memsize = 0;
+    PMIX_CONSTRUCT(&p->addmembers, pmix_list_t);
     p->cbfunc = NULL;
     p->cbdata = NULL;
     p->buffers = NULL;
@@ -157,7 +162,10 @@ static void cdes(prte_grpcomm_coll_t *p)
         PMIX_RELEASE(p->sig);
     }
     PMIX_DATA_BUFFER_DESTRUCT(&p->bucket);
+    PMIX_LIST_DESTRUCT(&p->addmembers);
     free(p->dmns);
     free(p->buffers);
 }
-PMIX_CLASS_INSTANCE(prte_grpcomm_coll_t, pmix_list_item_t, ccon, cdes);
+PMIX_CLASS_INSTANCE(prte_grpcomm_coll_t,
+                    pmix_list_item_t,
+                    ccon, cdes);
diff --git a/src/mca/grpcomm/direct/grpcomm_direct.c b/src/mca/grpcomm/direct/grpcomm_direct.c
index dbe575da3f..327d49ce07 100644
--- a/src/mca/grpcomm/direct/grpcomm_direct.c
+++ b/src/mca/grpcomm/direct/grpcomm_direct.c
@@ -167,8 +167,12 @@ static void allgather_recv(int status, pmix_proc_t *sender,
 {
     int32_t cnt;
     int rc, timeout;
-    size_t n, ninfo, memsize;
+    size_t n, ninfo, memsize, m;
     bool assignID = false;
+    pmix_proc_t *addmembers = NULL;
+    size_t num_members = 0;
+    prte_namelist_t *nm;
+    pmix_data_array_t darray;
     pmix_status_t st;
     pmix_info_t *info, infostat;
     prte_grpcomm_signature_t sig;
@@ -282,6 +286,14 @@ static void allgather_recv(int status, pmix_proc_t *sender,
             /* update the info with the collected value */
             info[n].value.type = PMIX_BOOL;
             info[n].value.data.flag = coll->assignID;
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_GROUP_ADD_MEMBERS)) {
+            addmembers = (pmix_proc_t*)info[n].value.data.darray->array;
+            num_members = info[n].value.data.darray->size;
+            for (m=0; m < num_members; m++) {
+                nm = PMIX_NEW(prte_namelist_t);
+                PMIX_XFER_PROCID(&nm->name, &addmembers[m]);
+                pmix_list_append(&coll->addmembers, &nm->super);
+            }
         }
     }
 
@@ -331,22 +343,59 @@ static void allgather_recv(int status, pmix_proc_t *sender,
                 return;
             }
             /* add some values to the payload in the bucket */
+            PMIX_DATA_BUFFER_CONSTRUCT(&ctrlbuf);
 
             /* if we were asked to provide a context id, do so */
             if (assignID) {
                 size_t sz;
                 sz = prte_grpcomm_base.context_id;
                 --prte_grpcomm_base.context_id;
-                PMIX_INFO_LOAD(&infostat, PMIX_GROUP_CONTEXT_ID, &sz, PMIX_UINT32);
-                rc = PMIx_Data_pack(NULL, reply, &infostat, 1, PMIX_INFO);
+                PMIX_INFO_LOAD(&infostat, PMIX_GROUP_CONTEXT_ID, &sz, PMIX_SIZE);
+                rc = PMIx_Data_pack(NULL, &ctrlbuf, &infostat, 1, PMIX_INFO);
+                PMIX_INFO_DESTRUCT(&infostat);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    PMIX_DATA_BUFFER_RELEASE(reply);
+                    PMIX_DATA_BUFFER_DESTRUCT(&ctrlbuf);
+                    PMIX_PROC_FREE(sig.signature, sig.sz);
+                    return;
+                }
+            }
+            /* if we added members, add them here */
+            if (0 < pmix_list_get_size(&coll->addmembers)) {
+                num_members = pmix_list_get_size(&coll->addmembers);
+                PMIX_PROC_CREATE(addmembers, num_members);
+                n=0;
+                PMIX_LIST_FOREACH(nm, &coll->addmembers, prte_namelist_t) {
+                    memcpy(&addmembers[n], &nm->name, sizeof(pmix_proc_t));
+                    ++n;
+                }
+                darray.type = PMIX_PROC;
+                darray.array = addmembers;
+                darray.size = num_members;
+                PMIX_INFO_LOAD(&infostat, PMIX_GROUP_ADD_MEMBERS, &darray, PMIX_DATA_ARRAY);
+                PMIX_PROC_FREE(addmembers, num_members);
+                rc = PMIx_Data_pack(NULL, &ctrlbuf, &infostat, 1, PMIX_INFO);
                 PMIX_INFO_DESTRUCT(&infostat);
                 if (PMIX_SUCCESS != rc) {
                     PMIX_ERROR_LOG(rc);
                     PMIX_DATA_BUFFER_RELEASE(reply);
+                    PMIX_DATA_BUFFER_DESTRUCT(&ctrlbuf);
                     PMIX_PROC_FREE(sig.signature, sig.sz);
                     return;
                 }
             }
+            PMIX_DATA_BUFFER_UNLOAD(&ctrlbuf, ctrlsbo.bytes, ctrlsbo.size);
+            PMIX_DATA_BUFFER_DESTRUCT(&ctrlbuf);
+            rc = PMIx_Data_pack(NULL, reply, &ctrlsbo, 1, PMIX_BYTE_OBJECT);
+            PMIX_BYTE_OBJECT_DESTRUCT(&ctrlsbo);
+            if (PMIX_SUCCESS != rc) {
+                PMIX_ERROR_LOG(rc);
+                PMIX_DATA_BUFFER_RELEASE(reply);
+                PMIX_PROC_FREE(sig.signature, sig.sz);
+                return;
+            }
+
             /* transfer the collected bucket */
             rc = PMIx_Data_copy_payload(reply, &coll->bucket);
             if (PMIX_SUCCESS != rc) {
diff --git a/src/mca/grpcomm/grpcomm.h b/src/mca/grpcomm/grpcomm.h
index 76b35485fb..49fb364c3b 100644
--- a/src/mca/grpcomm/grpcomm.h
+++ b/src/mca/grpcomm/grpcomm.h
@@ -91,6 +91,7 @@ typedef struct {
     bool assignID;
     int timeout;
     size_t memsize;
+    pmix_list_t addmembers;
     /* distance masks for receive */
     pmix_bitmap_t distance_mask_recv;
     /* received buckets */
@@ -106,8 +107,12 @@ typedef struct {
     pmix_object_t super;
     prte_event_t ev;
     prte_grpcomm_signature_t *sig;
+    pmix_group_operation_t op;
+    char *grpid;
     pmix_data_buffer_t *buf;
     pmix_byte_object_t ctrls;
+    pmix_proc_t *procs;
+    size_t nprocs;
     pmix_info_t *info;
     size_t ninfo;
     prte_grpcomm_cbfunc_t grpcbfunc;
diff --git a/src/mca/oob/base/base.h b/src/mca/oob/base/base.h
index 52fe7fd1bf..01a32dcd33 100644
--- a/src/mca/oob/base/base.h
+++ b/src/mca/oob/base/base.h
@@ -15,7 +15,7 @@
  * Copyright (c) 2019      Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -116,7 +116,7 @@ PRTE_EXPORT void prte_oob_base_send_nb(int fd, short args, void *cbdata);
                             PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), __FILE__, __LINE__);              \
         prte_oob_send_cd = PMIX_NEW(prte_oob_send_t);                                             \
         prte_oob_send_cd->msg = (m);                                                              \
-        PMIX_THREADSHIFT(prte_oob_send_cd, prte_event_base, prte_oob_base_send_nb, PRTE_MSG_PRI); \
+        PRTE_PMIX_THREADSHIFT(prte_oob_send_cd, prte_event_base, prte_oob_base_send_nb, PRTE_MSG_PRI); \
     } while (0)
 
 PRTE_EXPORT prte_oob_base_peer_t *prte_oob_base_get_peer(const pmix_proc_t *pr);
diff --git a/src/mca/oob/tcp/oob_tcp_connection.h b/src/mca/oob/tcp/oob_tcp_connection.h
index 8bddb873f7..42ae81c012 100644
--- a/src/mca/oob/tcp/oob_tcp_connection.h
+++ b/src/mca/oob/tcp/oob_tcp_connection.h
@@ -15,7 +15,7 @@
  * Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
  * Copyright (c) 2019      Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -61,7 +61,7 @@ PMIX_CLASS_DECLARATION(prte_oob_tcp_conn_op_t);
                             __FILE__, __LINE__, PRTE_NAME_PRINT((&(p)->name)));             \
         cop = PMIX_NEW(prte_oob_tcp_conn_op_t);                                             \
         cop->peer = (p);                                                                    \
-        PMIX_THREADSHIFT(cop, prte_event_base, (cbfunc), PRTE_MSG_PRI);                     \
+        PRTE_PMIX_THREADSHIFT(cop, prte_event_base, (cbfunc), PRTE_MSG_PRI);                     \
     } while (0);
 
 #define PRTE_ACTIVATE_TCP_ACCEPT_STATE(s, a, cbfunc)                               \
diff --git a/src/mca/oob/tcp/oob_tcp_peer.h b/src/mca/oob/tcp/oob_tcp_peer.h
index b91cb84f5e..c6c71c53dc 100644
--- a/src/mca/oob/tcp/oob_tcp_peer.h
+++ b/src/mca/oob/tcp/oob_tcp_peer.h
@@ -17,7 +17,7 @@
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2020      Amazon.com, Inc. or its affiliates.  All Rights
  *                         reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -86,7 +86,7 @@ PMIX_CLASS_DECLARATION(prte_oob_tcp_peer_op_t);
         prte_oob_tcp_peer_op_t *pop;                                    \
         pop = PMIX_NEW(prte_oob_tcp_peer_op_t);                         \
         PMIX_XFER_PROCID(&pop->peer, &(p)->name);                       \
-        PMIX_THREADSHIFT(pop, prte_event_base, (cbfunc), PRTE_MSG_PRI); \
+        PRTE_PMIX_THREADSHIFT(pop, prte_event_base, (cbfunc), PRTE_MSG_PRI); \
     } while (0);
 
 #endif /* _MCA_OOB_TCP_PEER_H_ */
diff --git a/src/mca/oob/tcp/oob_tcp_sendrecv.h b/src/mca/oob/tcp/oob_tcp_sendrecv.h
index a64d7ca3c3..2c6496493d 100644
--- a/src/mca/oob/tcp/oob_tcp_sendrecv.h
+++ b/src/mca/oob/tcp/oob_tcp_sendrecv.h
@@ -15,7 +15,7 @@
  * Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
  * Copyright (c) 2019      Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -86,7 +86,7 @@ PMIX_CLASS_DECLARATION(prte_oob_tcp_recv_t);
     do {                                                                              \
         (s)->peer = (struct prte_oob_tcp_peer_t *) (p);                               \
         (s)->activate = (f);                                                          \
-        PMIX_THREADSHIFT((s), prte_event_base, prte_oob_tcp_queue_msg, PRTE_MSG_PRI); \
+        PRTE_PMIX_THREADSHIFT((s), prte_event_base, prte_oob_tcp_queue_msg, PRTE_MSG_PRI); \
     } while (0)
 
 /* queue a message to be sent by one of our modules - must
@@ -201,7 +201,7 @@ PMIX_CLASS_DECLARATION(prte_oob_tcp_msg_op_t);
                             __FILE__, __LINE__, PRTE_NAME_PRINT(&((ms)->dst)));               \
         mop = PMIX_NEW(prte_oob_tcp_msg_op_t);                                                \
         mop->msg = (ms);                                                                      \
-        PMIX_THREADSHIFT(mop, prte_event_base, (cbfunc), PRTE_MSG_PRI);                       \
+        PRTE_PMIX_THREADSHIFT(mop, prte_event_base, (cbfunc), PRTE_MSG_PRI);                       \
     } while (0);
 
 typedef struct {
@@ -243,7 +243,7 @@ PMIX_CLASS_DECLARATION(prte_oob_tcp_msg_error_t);
         }                                                                                          \
         PMIX_XFER_PROCID(&mop->hop, (h));                                                          \
         /* this goes to the OOB framework, so use that event base */                               \
-        PMIX_THREADSHIFT(mop, prte_event_base, (cbfunc), PRTE_MSG_PRI);                            \
+        PRTE_PMIX_THREADSHIFT(mop, prte_event_base, (cbfunc), PRTE_MSG_PRI);                            \
     } while (0)
 
 #define PRTE_ACTIVATE_TCP_NO_ROUTE(r, h, c)                                                       \
@@ -257,7 +257,7 @@ PMIX_CLASS_DECLARATION(prte_oob_tcp_msg_error_t);
         PMIX_XFER_PROCID(&mop->hop, (h));                                                         \
         /* this goes to the component, so use the framework                                       \
          * event base */                                                                          \
-        PMIX_THREADSHIFT(mop, prte_event_base, (c), PRTE_MSG_PRI);                                \
+        PRTE_PMIX_THREADSHIFT(mop, prte_event_base, (c), PRTE_MSG_PRI);                                \
     } while (0)
 
 #endif /* _MCA_OOB_TCP_SENDRECV_H_ */
diff --git a/src/mca/plm/base/plm_base_launch_support.c b/src/mca/plm/base/plm_base_launch_support.c
index 2b303cbc90..8bb6c2a340 100644
--- a/src/mca/plm/base/plm_base_launch_support.c
+++ b/src/mca/plm/base/plm_base_launch_support.c
@@ -84,14 +84,14 @@ void prte_plm_base_set_slots(prte_node_t *node)
 {
     if (0 == strncmp(prte_set_slots, "cores", strlen(prte_set_slots))) {
         if (NULL != node->topology && NULL != node->topology->topo) {
-            node->slots = prte_hwloc_base_get_nbobjs_by_type(node->topology->topo, HWLOC_OBJ_CORE,
-                                                             0);
+            node->slots = prte_hwloc_base_get_nbobjs_by_type(node->topology->topo,
+                                                             HWLOC_OBJ_CORE, 0);
         }
     } else if (0 == strncmp(prte_set_slots, "sockets", strlen(prte_set_slots))) {
         if (NULL != node->topology && NULL != node->topology->topo) {
-            if (0
-                == (node->slots = prte_hwloc_base_get_nbobjs_by_type(node->topology->topo,
-                                                                     HWLOC_OBJ_SOCKET, 0))) {
+            node->slots = prte_hwloc_base_get_nbobjs_by_type(node->topology->topo,
+                                                             HWLOC_OBJ_SOCKET, 0);
+            if (0 == node->slots) {
                 /* some systems don't report sockets - in this case,
                  * use numanodes */
                 node->slots = prte_hwloc_base_get_nbobjs_by_type(node->topology->topo,
@@ -2129,6 +2129,14 @@ int prte_plm_base_setup_virtual_machine(prte_job_t *jdata)
         return PRTE_SUCCESS;
     }
 
+    PMIX_CONSTRUCT(&nodes, pmix_list_t);
+
+    if (prte_get_attribute(&jdata->attributes, PRTE_JOB_EXTEND_DVM, NULL, PMIX_BOOL)) {
+        // nodes have been added, so extend the DVM
+        prte_remove_attribute(&jdata->attributes, PRTE_JOB_EXTEND_DVM);
+        goto construct;
+    }
+
     /* if this is a dynamic spawn, then we don't make any changes to
      * the virtual machine unless specifically requested to do so
      */
@@ -2154,7 +2162,6 @@ int prte_plm_base_setup_virtual_machine(prte_job_t *jdata)
             /* mark that this is from a singleton */
             singleton = true;
         }
-        PMIX_CONSTRUCT(&nodes, pmix_list_t);
         for (i = 1; i < prte_node_pool->size; i++) {
             if (NULL == (node = (prte_node_t *) pmix_pointer_array_get_item(prte_node_pool, i))) {
                 continue;
@@ -2201,7 +2208,6 @@ int prte_plm_base_setup_virtual_machine(prte_job_t *jdata)
      */
     multi_sim = prte_get_attribute(&jdata->attributes, PRTE_JOB_MULTI_DAEMON_SIM, NULL, PMIX_BOOL);
     if (prte_get_attribute(&daemons->attributes, PRTE_JOB_NO_VM, NULL, PMIX_BOOL) || multi_sim) {
-        PMIX_CONSTRUCT(&nodes, pmix_list_t);
         /* loop across all nodes and include those that have
          * num_procs > 0 && no daemon already on them
          */
@@ -2291,9 +2297,6 @@ int prte_plm_base_setup_virtual_machine(prte_job_t *jdata)
      */
     map->num_new_daemons = 0;
 
-    /* setup the list of nodes */
-    PMIX_CONSTRUCT(&nodes, pmix_list_t);
-
     /* if this is an unmanaged allocation, then we use
      * the nodes that were specified for the union of
      * all apps - there is no need to collect all
@@ -2434,6 +2437,7 @@ int prte_plm_base_setup_virtual_machine(prte_job_t *jdata)
         goto process;
     }
 
+construct:
     /* construct a list of available nodes */
     for (i = 1; i < prte_node_pool->size; i++) {
         if (NULL != (node = (prte_node_t *) pmix_pointer_array_get_item(prte_node_pool, i))) {
diff --git a/src/mca/plm/base/plm_base_receive.c b/src/mca/plm/base/plm_base_receive.c
index 5c7e00b2eb..5fce679cbc 100644
--- a/src/mca/plm/base/plm_base_receive.c
+++ b/src/mca/plm/base/plm_base_receive.c
@@ -128,7 +128,7 @@ void prte_plm_base_recv(int status, pmix_proc_t *sender, pmix_data_buffer_t *buf
     pmix_proc_t name, *nptr;
     pid_t pid;
     bool debugging, found;
-    int i, room;
+    int i, room, *rmptr = &room;
     char **env;
     char *prefix_dir, *tmp;
     pmix_rank_t tgt, *tptr;
@@ -346,7 +346,7 @@ void prte_plm_base_recv(int status, pmix_proc_t *sender, pmix_data_buffer_t *buf
         }
 
         /* pack the room number of the request */
-        if (prte_get_attribute(&jdata->attributes, PRTE_JOB_ROOM_NUM, (void **) &room, PMIX_INT)) {
+        if (prte_get_attribute(&jdata->attributes, PRTE_JOB_ROOM_NUM, (void **) &rmptr, PMIX_INT)) {
             rc = PMIx_Data_pack(NULL, answer, &room, 1, PMIX_INT);
             if (PMIX_SUCCESS != rc) {
                 PMIX_ERROR_LOG(rc);
diff --git a/src/mca/prteinstalldirs/prteinstalldirs.h b/src/mca/prteinstalldirs/prteinstalldirs.h
index 7c5feca8eb..7f2f1b41fe 100644
--- a/src/mca/prteinstalldirs/prteinstalldirs.h
+++ b/src/mca/prteinstalldirs/prteinstalldirs.h
@@ -4,7 +4,7 @@
  *                         reserved.
  * Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -42,23 +42,6 @@ struct prte_install_dirs_t {
     char *includedir;
     char *infodir;
     char *mandir;
-
-    /* Note that the following fields intentionally have an "ompi"
-       prefix, even though they're down in the PRTE layer.  This is
-       not abstraction break because the "ompi" they're referring to
-       is for the build system of the overall software tree -- not an
-       individual project within that overall tree.
-
-       Rather than using pkg{data,lib,includedir}, use our own
-       ompi{data,lib,includedir}, which is always set to
-       {datadir,libdir,includedir}/openmpi. This will keep us from
-       having help files in prefix/share/open-rte when building
-       without PRTE, but in prefix/share/openmpi when building
-       with PRTE.
-
-       Note that these field names match macros set by configure that
-       are used in Makefile.am files.  E.g., project help files are
-       installed into $(prtedatadir). */
     char *prtedatadir;
     char *prtelibdir;
     char *prteincludedir;
diff --git a/src/mca/ras/base/help-ras-base.txt b/src/mca/ras/base/help-ras-base.txt
index fc8731ca9e..7c32c7956a 100644
--- a/src/mca/ras/base/help-ras-base.txt
+++ b/src/mca/ras/base/help-ras-base.txt
@@ -12,6 +12,7 @@
 #                         All rights reserved.
 # Copyright (c) 2019      Intel, Inc.  All rights reserved.
 # Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
+# Copyright (c) 2023      Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -38,3 +39,11 @@ Cmd line: -mca prte_allocation_required 1
 The number of topology files and the list of number of nodes
 must match - i.e., a number of nodes must be given for each
 topology.
+#
+[ras-base:addhost-not-found]
+A request was made to add hosts from a hostfile, but the
+file could not be opened for reading:
+
+  File: %s
+
+Please check the filename and try again.
diff --git a/src/mca/ras/base/ras_base_allocate.c b/src/mca/ras/base/ras_base_allocate.c
index 70ae3b4573..2c0afe64fb 100644
--- a/src/mca/ras/base/ras_base_allocate.c
+++ b/src/mca/ras/base/ras_base_allocate.c
@@ -37,6 +37,7 @@
 #include "src/pmix/pmix-internal.h"
 
 #include "src/mca/errmgr/errmgr.h"
+#include "src/mca/iof/base/base.h"
 #include "src/mca/rmaps/base/base.h"
 #include "src/mca/state/state.h"
 #include "src/runtime/prte_globals.h"
@@ -52,6 +53,7 @@
 #include "src/util/pmix_output.h"
 #include "src/util/pmix_printf.h"
 #include "src/util/pmix_show_help.h"
+#include "src/util/pmix_string_copy.h"
 #include "src/util/proc_info.h"
 #include "src/util/prte_cmd_line.h"
 
@@ -103,8 +105,10 @@ void prte_ras_base_display_alloc(prte_job_t *jdata)
     prte_node_t *alloc;
     char *flgs, *aliases;
     bool parsable;
+    pmix_proc_t source;
 
     parsable = prte_get_attribute(&jdata->attributes, PRTE_JOB_DISPLAY_PARSEABLE_OUTPUT, NULL, PMIX_BOOL);
+    PMIX_LOAD_PROCID(&source, jdata->nspace, PMIX_RANK_WILDCARD);
 
     if (parsable) {
         pmix_asprintf(&tmp, "<allocation>\n");
@@ -156,12 +160,13 @@ void prte_ras_base_display_alloc(prte_job_t *jdata)
         }
     }
     if (parsable) {
-        pmix_output(prte_clean_output, "%s</allocation>\n", tmp);
+        pmix_asprintf(&tmp2, "%s</allocation>\n", tmp);
     } else {
-        pmix_output(prte_clean_output,
+        pmix_asprintf(&tmp2,
                     "%s=================================================================\n", tmp);
     }
     free(tmp);
+    prte_iof_base_output(&source, PMIX_FWD_STDOUT_CHANNEL, tmp2);
 }
 
 static void display_cpus(prte_topology_t *t,
@@ -747,12 +752,14 @@ int prte_ras_base_add_hosts(prte_job_t *jdata)
 {
     int rc;
     pmix_list_t nodes;
-    int i, n;
+    int i, k, n, slots;
     prte_app_context_t *app;
     prte_node_t *node, *next, *nptr;
-    char *hosts;
+    char *hosts, *line, *cptr, *ptr, **hostfiles;
+    FILE *fp;
+    bool addslots, found;
+    bool extend = false;
 
-    /* construct a list to hold the results */
     PMIX_CONSTRUCT(&nodes, pmix_list_t);
 
     /* Individual add-hostfile names, if given, are included
@@ -772,25 +779,129 @@ int prte_ras_base_add_hosts(prte_job_t *jdata)
         if (NULL == (app = (prte_app_context_t *) pmix_pointer_array_get_item(jdata->apps, i))) {
             continue;
         }
-        if (prte_get_attribute(&app->attributes, PRTE_APP_ADD_HOSTFILE, (void **) &hosts,
-                               PMIX_STRING)) {
+        if (prte_get_attribute(&app->attributes, PRTE_APP_ADD_HOSTFILE,
+                               (void **) &hosts, PMIX_STRING)) {
             PMIX_OUTPUT_VERBOSE((5, prte_ras_base_framework.framework_output,
                                  "%s ras:base:add_hosts checking add-hostfile %s",
                                  PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), hosts));
 
-            /* hostfile was specified - parse it and add it to the list */
-            if (PRTE_SUCCESS != (rc = prte_util_add_hostfile_nodes(&nodes, hosts))) {
-                PRTE_ERROR_LOG(rc);
-                PMIX_DESTRUCT(&nodes);
-                free(hosts);
-                return rc;
-            }
-            /* now indicate that this app is to run across it */
-            prte_set_attribute(&app->attributes, PRTE_APP_HOSTFILE, PRTE_ATTR_LOCAL,
-                               (void **) hosts, PMIX_STRING);
             prte_remove_attribute(&app->attributes, PRTE_APP_ADD_HOSTFILE);
+
+            hostfiles = PMIX_ARGV_SPLIT_COMPAT(hosts, ',');
             free(hosts);
+
+            for (k=0; NULL != hostfiles[k]; k++) {
+                /* hostfile was specified - parse it and add it to the list. We
+                 * don't use the hostfile parsing code in src/util because it
+                 * uses flex and that has problems handling the range of allowed
+                 * syntax here */
+                fp = fopen(hostfiles[k], "r");
+                if (NULL == fp) {
+                    pmix_show_help("help-ras-base.txt", "ras-base:addhost-not-found", true, hostfiles[k]);
+                    PMIX_ARGV_FREE_COMPAT(hostfiles);
+                    PMIX_LIST_DESTRUCT(&nodes);
+                    return PRTE_ERR_SILENT;
+                }
+
+                while (NULL != (line = pmix_getline(fp))) {
+                    // ignore comments and blank lines
+                    if (0 == strlen(line)) {
+                        free(line);
+                        continue;
+                    }
+                    // remove leading whitespace
+                    cptr = line;
+                    while (isspace(*cptr)) {
+                        ++cptr;
+                    }
+                    if ('#' == *cptr) {
+                        free(line);
+                        continue;
+                    }
+
+                    // because there can be arbitrary whitespace around keywords,
+                    // we manually parse the line to get the directives
+                    ptr = cptr;
+                    while (NULL != ptr && !isspace(*ptr)) {
+                        ++ptr;
+                    }
+                    *ptr = '\0';
+                    // find the '=' sign
+                    ++ptr;
+                    ptr = strchr(ptr, '=');
+                    if (NULL == ptr) {
+                        // didn't specify slots - autodetect them
+                        slots = -1;
+                        goto process;
+                    }
+                    // find the value
+                    ++ptr;
+                    while (NULL != ptr && '\0' != *ptr && isspace(*ptr)) {
+                        ++ptr;
+                    }
+                    if (NULL == ptr || '\0' == *ptr) {
+                        // bad syntax
+                        PRTE_ERROR_LOG(PRTE_ERR_BAD_PARAM);
+                        fclose(fp);
+                        free(line);
+                        PMIX_ARGV_FREE_COMPAT(hostfiles);
+                        PMIX_LIST_DESTRUCT(&nodes);
+                        return PRTE_ERR_SILENT;
+                    }
+                    // if it is a '+' or '-', then we are adjusting
+                    // the #slots
+                    addslots = false;
+                    if ('+' == *ptr || '-' == *ptr) {
+                        addslots = true;
+                    }
+                    slots = strtol(ptr, NULL, 10);
+
+            process:
+                    // see if we have this node
+                    found = false;
+                    for (n = 0; n < prte_node_pool->size; n++) {
+                        nptr = (prte_node_t *) pmix_pointer_array_get_item(prte_node_pool, n);
+                        if (NULL == nptr) {
+                            continue;
+                        }
+                        if (0 == strcmp(cptr, nptr->name)) {
+                            // we have the node
+                            if (addslots) {
+                                nptr->slots += slots;
+                                if (0 > nptr->slots) {
+                                    nptr->slots = 0;
+                                }
+                            } else {
+                                nptr->slots = slots;
+                            }
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        // this is a new node - add it
+                        node = PMIX_NEW(prte_node_t);
+                        node->name = strdup(cptr);
+                        node->slots = slots;
+                        pmix_list_append(&nodes, &node->super);
+                    }
+                    free(line);
+                }
+                fclose(fp);
+            }
+            PMIX_ARGV_FREE_COMPAT(hostfiles);
+        }
+    }
+    if (!pmix_list_is_empty(&nodes)) {
+        /* store the results in the global resource pool - this removes the
+         * list items
+         */
+        if (PRTE_SUCCESS != (rc = prte_ras_base_node_insert(&nodes, jdata))) {
+            PRTE_ERROR_LOG(rc);
         }
+        /* mark that an updated nidmap must be communicated to existing daemons */
+        prte_nidmap_communicated = false;
+        extend = true;
     }
 
     /* We next check for and add any add-host options. Note this is
@@ -806,8 +917,8 @@ int prte_ras_base_add_hosts(prte_job_t *jdata)
         if (NULL == (app = (prte_app_context_t *) pmix_pointer_array_get_item(jdata->apps, i))) {
             continue;
         }
-        if (prte_get_attribute(&app->attributes, PRTE_APP_ADD_HOST, (void **) &hosts,
-                               PMIX_STRING)) {
+        if (prte_get_attribute(&app->attributes, PRTE_APP_ADD_HOST,
+                               (void **) &hosts, PMIX_STRING)) {
             pmix_output_verbose(5, prte_ras_base_framework.framework_output,
                                 "%s ras:base:add_hosts checking add-host %s",
                                 PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), hosts);
@@ -817,9 +928,6 @@ int prte_ras_base_add_hosts(prte_job_t *jdata)
                 free(hosts);
                 return rc;
             }
-            /* now indicate that this app is to run across them */
-            prte_set_attribute(&app->attributes, PRTE_APP_DASH_HOST, PRTE_ATTR_LOCAL, hosts,
-                               PMIX_STRING);
             prte_remove_attribute(&app->attributes, PRTE_APP_ADD_HOST);
             free(hosts);
         }
@@ -834,11 +942,17 @@ int prte_ras_base_add_hosts(prte_job_t *jdata)
         {
             node->state = PRTE_NODE_STATE_ADDED;
             for (n = 0; n < prte_node_pool->size; n++) {
-                if (NULL
-                    == (nptr = (prte_node_t *) pmix_pointer_array_get_item(prte_node_pool, n))) {
+                nptr = (prte_node_t *) pmix_pointer_array_get_item(prte_node_pool, n);
+                if (NULL == nptr) {
                     continue;
                 }
                 if (0 == strcmp(node->name, nptr->name)) {
+                    if (prte_get_attribute(&node->attributes, PRTE_NODE_ADD_SLOTS, NULL, PMIX_BOOL)) {
+                        nptr->slots += node->slots;
+                        prte_remove_attribute(&node->attributes, PRTE_NODE_ADD_SLOTS);
+                    } else {
+                        nptr->slots = node->slots;
+                    }
                     pmix_list_remove_item(&nodes, &node->super);
                     PMIX_RELEASE(node);
                     break;
@@ -854,11 +968,17 @@ int prte_ras_base_add_hosts(prte_job_t *jdata)
             }
             /* mark that an updated nidmap must be communicated to existing daemons */
             prte_nidmap_communicated = false;
+            extend = true;
         }
     }
     /* cleanup */
     PMIX_LIST_DESTRUCT(&nodes);
 
+    if (extend) {
+        // mark that we need to extend the DVM
+        prte_set_attribute(&jdata->attributes, PRTE_JOB_EXTEND_DVM, PRTE_ATTR_LOCAL, NULL, PMIX_BOOL);
+    }
+
     /* shall we display the results? */
     if (0 < pmix_output_get_verbosity(prte_ras_base_framework.framework_output)) {
         prte_ras_base_display_alloc(jdata);
diff --git a/src/mca/rmaps/base/help-prte-rmaps-base.txt b/src/mca/rmaps/base/help-prte-rmaps-base.txt
index 156ba19150..6fc089c538 100644
--- a/src/mca/rmaps/base/help-prte-rmaps-base.txt
+++ b/src/mca/rmaps/base/help-prte-rmaps-base.txt
@@ -622,183 +622,6 @@ When specifying the CPUs to be used for the job, the mapper can
 only look at those CPUs. It is therefore not possible to map
 the job according to some other target object. Please either
 remove the mapping policy or change it to "slot" and try again.
-#
-#  MAP-BY-OPTION
-#
-[map-by-option]
-Processes are mapped in a round-robin fashion based on
-one of the following directives as applied at the job level:
-
--   SLOT assigns procs to each node up to the number of available
-    slots on that node before moving to the next node in the
-    allocation
-
--   HWTHREAD assigns a proc to each hardware thread on a node in a
-    round-robin manner up to the number of available slots on that
-    node before moving to the next node in the allocation
-
--   CORE (default) assigns a proc to each core on a node in a
-    round-robin manner up to the number of available slots on that
-    node before moving to the next node in the allocation
-
--   L1CACHE assigns a proc to each L1 cache on a node in a
-    round-robin manner up to the number of available slots on that
-    node before moving to the next node in the allocation
-
--   L2CACHE assigns a proc to each L2 cache on a node in a
-    round-robin manner up to the number of available slots on that
-    node before moving to the next node in the allocation
-
--   L3CACHE assigns a proc to each L3 cache on a node in a
-    round-robin manner up to the number of available slots on that
-    node before moving to the next node in the allocation
-
--   NUMA assigns a proc to each NUMA region on a node in a
-    round-robin manner up to the number of available slots on that
-    node before moving to the next node in the allocation
-
--   PACKAGE assigns a proc to each package on a node in a
-    round-robin manner up to the number of available slots on that
-    node before moving to the next node in the allocation
-
--   NODE assigns processes in a round-robin fashion to all nodes
-    in the allocation, with the number assigned to each node capped
-    by the number of available slots on that node
-
--   SEQ (often accompanied by the file=<path> qualifier) assigns
-    one process to each node specified in the file. The sequential
-    file is to contain an entry for each desired process, one per
-    line of the file.
-
--   PPR:N:resource maps N procs to each instance of the specified
-    resource type in the allocation
-
--   RANKFILE (often accompanied by the file=<path> qualifier) assigns
-    one process to the node/resource specified in each entry of the
-    file, one per line of the file.
-
--   PE-LIST=a,b assigns procs to each node in the allocation based on
-    the ORDERED qualifier. The list is comprised of comma-delimited
-    ranges of CPUs to use for this job. If the ORDERED qualifier is not
-    provided, then each node will be assigned procs up to the number of
-    available slots, capped by the availability of the specified CPUs.
-    If ORDERED is given, then one proc will be assigned to each of the
-    specified CPUs, if available, capped by the number of slots on each
-    node and the total number of specified processes. Providing the
-    OVERLOAD qualifier to the "bind-to" option removes the check on
-    availability of the CPU in both cases.
-
-Any directive can include qualifiers by adding a colon (:) and any
-combination of one or more of the following (delimited by colons)
-to the --map-by option (except where noted):
-
--   PE=n bind n CPUs to each process (can not be used in combination
-    with rankfile or pe-list directives)
-
--   SPAN load balance the processes across the allocation by treating
-    the allocation as a single "super-node" (can not be used in
-    combination with slot, node, seq, ppr, rankfile, or
-    pe-list directives)
-
--   OVERSUBSCRIBE allow more processes on a node than processing elements
--   NOOVERSUBSCRIBE means !OVERSUBSCRIBE
-
--   NOLOCAL do not launch processes on the same node as prun
-
--   HWTCPUS use hardware threads as CPU slots
-
--   CORECPUS use cores as CPU slots (default)
-
--   INHERIT
--   NOINHERIT means !INHERIT
-
--   FILE=<path> (path to file containing sequential or rankfile entries).
-
--   ORDERED only applies to the PE-LIST option to indicate that procs
-    are to be bound to each of the specified CPUs in the order
-    in which they are assigned (i.e., the first proc on a node shall
-    be bound to the first CPU in the list, the second proc shall be
-    bound to the second CPU, etc.)
-
-Note that directives and qualifiers are case-insensitive
-and can be shortened to the minimum number of characters
-to uniquely identify them. Thus, "L1CACHE" can be given
-as "l1cache" or simply as "L1".
-
-The type of CPU (core vs hwthread) used in the mapping algorithm
-is determined as follows:
-
-* by user directive on the command line via the HWTCPUS qualifier to
-  the "--map-by" directive
-
-* by setting the "rmaps_default_mapping_policy" MCA parameter to
-  include the "HWTCPUS" qualifier. This parameter sets the default
-  value for a PRRTE DVM - qualifiers are carried across to DVM jobs
-  started via "prun" unless overridden by the user's cmd line
-
-* defaults to CORE in topologies where core CPUs are defined, and to
-  hwthreads otherwise.
-
-If your application uses threads, then you probably want to ensure that
-you are either not bound at all (by specifying `--bind-to none`), or
-bound to multiple cores using an appropriate binding level or specific
-number of processing elements per application process via the "PE=#"
-qualifier to the "--map-by" cmd line directive.
-
-A more detailed description of the mapping, ranking, and binding procedure
-can be obtained via the "--help placement" option.
-#
-#  RANK-BY-OPTION
-#
-[rank-by-option]
-PRRTE automatically ranks processes for each job starting from zero.
-Regardless of the algorithm used, rank assignments span applications
-in the same job - i.e., a cmd line of
-
-  -n 3 app1 : -n 2 app2
-
-will result in app1 having three processes ranked 0-2 and app2 having
-two processes ranked 3-4.
-
-By default, process ranks are assigned in accordance with the mapping
-directive - e.g., jobs that are mapped by-node will have the process
-ranks assigned round-robin on a per-node basis. However, users can override
-the default by specifying any of the following directives using the
---rank-by command line option:
-
--   SLOT assigns ranks to each process on a node in the order in
-    which the mapper assigned them. This is the default behavior,
-    but is provided as an explicit option to allow users to override
-    any alternative default specified in the environment. When mapping
-    to a specific resource type, procs assigned to a given instance
-    of that resource on a node will be ranked on a per-resource basis
-    on that node before moving to the next node.
-
--   NODE assigns ranks round-robin on a per-node basis
-
--   FILL assigns ranks to procs mapped to a particular resource type
-    on each node, filling all ranks on that resource before moving to
-    the next resource on that node. For example, procs mapped by-L1cache
-    would have all procs on the first L1cache ranked sequentially before
-    moving to the second L1cache on the node. Once all procs on the
-    node have been ranked, ranking would continue on the next node.
-
--   SPAN assigns ranks round-robin to procs mapped to a particular
-    resource type, treating the collection of resource instances
-    spanning the entire allocation as a single "super node" before
-    looping around for the next pass. Thus, ranking would begin with
-    the first proc on the first L1cache on the first node, then the
-    next rank would be assiged to the first proc on the second L1cache
-    on that node, proceeding across until the first proc had been
-    ranked on all L1caches used by the job before circling around to
-    rank the second proc on each object.
-
-The rank-by command line option has no qualifiers. Note that directives
-are case-insensitive.
-
-A more detailed description of the mapping, ranking, and binding procedure
-can be obtained via the "--help placement" option.
-#
 [must-map-by-obj]
 When ranking by FILL or by SPAN, you must map by an object
 type (e.g., HWTHREAD, NUMA, or cache level):
@@ -842,826 +665,6 @@ number of available slots when deciding the number of processes to
 launch. Similarly, you can use the --bind-to :OVERLOAD option to bind
 more than one process to a CPU, if desired, or --bind-to NONE to avoid
 binding altogether.
-#
-#  PLACEMENT
-#
-[placement]
-PRRTE provides a set of three controls for assigning process
-locations and ranks:
-
-  1. mapping:   Assigns a default location to each process
-  2. ranking:   Assigns a unique rank value to each process
-  3. binding:   Constrains each process to run on specific processors
-
-This help entry provides an overview of these three controls. Unless
-otherwise noted, this behavior is shared by prun (working with a PRRTE
-DVM), and prterun. More detail about PRRTE process placement is available
-in the following sections (using `--help placement-<section>`):
-
-* examples - some examples of the interactions between mapping, ranking,
-             and binding options
-* fundamentals - provides deeper insight into PRRTE's mapping, ranking,
-                 and binding options
-* limits - explains the difference between _overloading_ and _oversubscribing_
-           resources
-* diagnostics - describes options for obtaining various diagnostic reports
-                that aid the user in verifying and tuning the placement
-                for a specific job
-* rankfiles - explains the format and use of the rankfile mapper for
-              specifying arbitrary process placements
-* deprecated - a list of deprecated options and their new equivalents
-* all - outputs all the placement help except for the "deprecated" section
-
-
--- Quick Summary --
-The two binaries that most influence process layout are `prte` and `prun`.
-The `prte` process discovers the allocation, establishes a Distributed
-Virtual Machine by starting a `prted` daemon on each node of the allocation,
-and defines the efault mapping/ranking/binding policies for all jobs.
-The `prun` process defines the specific mapping/ranking/binding for a specific
-job. Most of the command line controls are targeted to `prun` since each job has
-its own unique requirements.
-
-`prterun` is just a wrapper around `prte` for a single job PRRTE DVM. It is
-doing the job of both `prte` and `prun`, and, as such, accepts the sum all of
-their command line arguments. Any example that uses `prun` can substitute the
-use of `prterun` except where otherwise noted.
-
-The `prte` process attempts to automatically discover the nodes in the
-allocation by querying supported resource managers. If a supported resource
-manager is not present then `prte` relies on a hostfile provided by the user.
-In the absence of such a hostfile it will run all processes on the localhost.
-
-If running under a supported resource manager, the `prte` process will start the
-daemon processes (`prted`) on the remote nodes using the corresponding resource
-manager process starter. If no such starter is available then `rsh` or `ssh`
-is used.
-
-Minus user direction, PRRTE will automatically map processes in a
-round-robin fashion by CPU, binding each process to its own CPU. The
-type of CPU used (core vs hwthread) is determined by (in priority order):
-
-* user directive on the command line via the HWTCPUS qualifier to
-  the "--map-by" directive
-
-* setting the "rmaps_default_mapping_policy" MCA parameter to
-  include the "HWTCPUS" qualifier. This parameter sets the default
-  value for a PRRTE DVM - qualifiers are carried across to DVM jobs
-  started via "prun" unless overridden by the user's cmd line
-
-* defaulting to CORE in topologies where core CPUs are defined, and to
-  hwthreads otherwise.
-
-By default, the ranking algorithm will follow the mapping pattern. Thus,
-mapping by-node will default to ranking by-node.
-
-PRRTE automatically binds processes unless directed not to do so by the
-user. Minus direction, PRRTE will bind individual processes to their
-own core within the object to which they were mapped. Should a node become
-oversubscribed during the mapping process, and if oversubscription is
-allowed, all subsequent processes assigned to that node will _not_ be bound.
-#
-#  EXAMPLES
-#
-[placement-examples]
--------------------------------- Examples ----------------------------------
-
-Listed here are the subset of command line options that will be used in the
-process mapping/ranking/binding examples below.
-
-** Specifying Host Nodes
-
-Use one of the following options to specify which hosts (nodes) within
-the PRRTE DVM environment to run on.
-
-`--host <host1,host2,...,hostN>` or `--host <host1:X,host2:Y,...,hostN:Z>`
-
-:   List of hosts on which to invoke processes. After each hostname a
-    colon (`:`) followed by a positive integer can be used to specify the
-    number of slots on that host (`:X`, `:Y`, and `:Z`). The default is `1`.
-
-`--hostfile <hostfile>`
-
-:   Provide a hostfile to use.
-
-** Process Mapping / Ranking / Binding Options
-
-The following options specify the number of processes to launch. Note
-that none of the options imply a particular binding policy - e.g.,
-requesting `N` processes for each socket does not imply that the processes
-will be bound to the socket.
-
-`-c, -n, --n, --np <#>`
-
-:   Run this many copies of the program on the given nodes. This option
-    indicates that the specified file is an executable program and not
-    an application context. If no value is provided for the number of
-    copies to execute (i.e., neither the `-np` nor its synonyms are
-    provided on the command line), `prun` will automatically execute a
-    copy of the program on each process slot (see below for description
-    of a "process slot"). This feature, however, can only be used in
-    the SPMD model and will return an error (without beginning execution
-    of the application) otherwise.
-
-To map processes across sets of objects:
-
-`--map-by <object>`
-
-:   Map to the specified object. Supported options include `slot`, `hwthread`,
-    `core` (default), `l1cache`, `l2cache`, `l3cache`, `numa`, `package`, `node`,
-    `seq`, `ppr`, `rankfile`, and `pe-list`.
-
-Any object can include qualifiers by adding a colon (`:`) and any colon-delimited
-combination of one or more of the following to the `--map-by` option:
-
- - `PE=n` bind `n` processing elements to each process (can not be used in
-    combination with rankfile or pe-list directives)
- - `SPAN` load balance the processes across the allocation (can not be used in
-    combination with slot, node, seq, ppr, rankfile, or pe-list directives)
- - `OVERSUBSCRIBE` allow more processes on a node than processing elements
- - `NOOVERSUBSCRIBE` means `!OVERSUBSCRIBE`
- - `NOLOCAL` do not launch processes on the same node as `prun`
- - `HWTCPUS` use hardware threads as CPU slots
- - `CORECPUS` use cores as CPU slots (default)
- - `INHERIT`
- - `NOINHERIT` means `!INHERIT`
- - `FILE=<path>` (path to file containing sequential or rankfile entries).
- -  ORDERED only applies to the PE-LIST option to indicate that procs
-    are to be bound to each of the specified CPUs in the order
-    in which they are assigned (i.e., the first proc on a node shall
-    be bound to the first CPU in the list, the second proc shall be
-    bound to the second CPU, etc.)
-
-`ppr` policy example: `--map-by ppr:N:<object>` will launch `N` times the
-number of objects of the specified type on each node.
-
-Note that directives and qualifiers are case-insensitive and can be shortened
-to the minimum number of characters to uniquely identify them. Thus, "L1CACHE"
-can be given as "l1cache" or simply as "L1".
-
-To order processes' ranks:
-
-`--rank-by <object>`
-
-:   Rank in round-robin fashion according to the specified object. The default
-    follows the mapping pattern. Supported options include `slot`, `node`,
-    `fill`, and `span`.
-
-There are no qualifiers for the `--rank-by` directive.
-
-To bind processes to sets of objects:
-
-`--bind-to <object>`
-
-:   Bind processes to the specified object. See defaults in Quick Summary.
-    Supported options include `none`, `hwthread`, `core`, `l1cache`,
-    `l2cache`, `l3cache`, `numa`, and `package`.
-
-Any object can include qualifiers by adding a colon (`:`) and any colon-delimited
-combination of one or more of the following to the `--bind-to` option:
-
- - `overload-allowed` allows for binding more than one process in relation to a CPU
- - `if-supported` if binding to that object is supported on this system
-
-** Examples: Specifying Host Nodes
-
-Host nodes can be identified on the command line with the `--host` option or
-in a hostfile.
-
-For example, assuming no other resource manager or scheduler is involved,
-
-`prun --host aa,aa,bb ./a.out`
-
-:   launches two processes on node `aa` and one on `bb`.
-
-`prun --host aa ./a.out`
-
-:   launches one process on node `aa`.
-
-`prun --host aa:5 ./a.out`
-
-:   launches five processes on node `aa`.
-
-Or, consider the hostfile
-
-```
-$ cat myhostfile
-aa slots=2
-bb slots=2
-cc slots=2
-```
-
-Here, we list both the host names (`aa`, `bb`, and `cc`) but also how
-many "slots" there are for each. Slots indicate how many processes can
-potentially execute on a node. For best performance, the number of
-slots may be chosen to be the number of cores on the node or the
-number of processor sockets.
-
-If the hostfile does not provide slots information, the PRRTE DVM will attempt
-to discover the number of cores (or hwthreads, if the `:HWTCPUS` qualifier to
-the `--map-by` option is set) and set the number of slots to that value.
-
-Examples using the hostfile above with and without the `--host` option
-
-`prun --hostfile myhostfile ./a.out`
-
-:   will launch two processes on each of the three nodes.
-
-`prun --hostfile myhostfile --host aa ./a.out`
-
-:   will launch two processes, both on node `aa`.
-
-`prun --hostfile myhostfile --host dd ./a.out`
-
-:   will find no hosts to run on and abort with an error. That is, the
-    specified host `dd` is not in the specified hostfile.
-
-When running under resource managers (e.g., SLURM, Torque, etc.), PRTE will
-obtain both the hostnames and the number of slots directly from the resource
-manger. The behavior of `--host` in that environment will behave the same as
-if a hostfile was provided (since it is provided by the resource manager).
-
-
-**  Examples: Specifying Number of Processes
-
-As we have just seen, the number of processes to run can be set using
-the hostfile. Other mechanisms exist.
-
-The number of processes launched can be specified as a multiple of the
-number of nodes or processor sockets available. Consider the hostfile below for
-the examples that follow.
-
-```
-$ cat myhostfile
-aa
-bb
-```
-
-For example,
-
-`prun --hostfile myhostfile --map-by ppr:2:package ./a.out`
-
-:   launches processes 0-3 on node `aa` and process 4-7 on node `bb`, where
-    `aa` and `bb` are both dual-package nodes. The `--map-by ppr:2:package`
-    option also turns on the `--bind-to package` option, which is discussed
-    in a later section.
-
-`prun --hostfile myhostfile --map-by ppr:2:node ./a.out`
-
-:   launches processes 0-1 on node `aa` and processes 2-3 on node `bb`.
-
-`prun --hostfile myhostfile --map-by ppr:1:node ./a.out`
-
-:   launches one process per host node.
-
-Another alternative is to specify the number of processes with the `--np`
-option. Consider now the hostfile
-
-```
-$ cat myhostfile
-aa slots=4
-bb slots=4
-cc slots=4
-```
-
-Now,
-
-`prun --hostfile myhostfile --np 6 ./a.out`
-
-:   will launch processes 0-3 on node `aa` and processes 4-5 on node `bb`.
-    The remaining slots in the hostfile will not be used since the `-np`
-    option indicated that only 6 processes should be launched.
-
-
--- Examples: Mapping Processes to Nodes Using Policies --
-
-The examples above illustrate the default mapping of process processes
-to nodes. This mapping can also be controlled with various `prun`/`prterun`
-options that describe mapping policies.
-
-```
-$ cat myhostfile
-aa slots=4
-bb slots=4
-cc slots=4
-```
-
-Consider the hostfile above, with `--np 6`:
-
-```
-                              node aa      node bb      node cc
-prun                          0 1 2 3      4 5
-prun --map-by node            0 3          1 4          2 5
-prun --map-by node:NOLOCAL                 0 2 4        1 3 5
-```
-
-The `--map-by node` option will load balance the processes across the
-available nodes, numbering each process by node in a round-robin fashion.
-
-The `:NOLOCAL` qualifier to `--map-by` prevents any processes from being mapped
-onto the local host (in this case node `aa`). While `prun` typically consumes
-few system resources, the `:NOLOCAL` qualifier can be helpful for launching
-very large jobs where `prun` may actually need to use noticeable amounts of
-memory and/or processing time.
-
-Just as `--np` can specify fewer processes than there are slots, it can
-also oversubscribe the slots. For example, with the same hostfile:
-
-`prun --hostfile myhostfile --np 14 ./a.out`
-
-:   will produce an error since the default `:NOOVERSUBSCRIBE` qualifier to
-    `--map-by` prevents oversubscription.
-
-To oversubscribe the nodes you can use the `:OVERSUBSCRIBE` qualifier to
-`--map-by`:
-
-`prun --hostfile myhostfile --np 14 --map-by :OVERSUBSCRIBE ./a.out`
-
-:   will launch processes 0-5 on node `aa`, 6-9 on `bb`, and 10-13 on `cc`.
-
-Limits to oversubscription can also be specified in the hostfile itself
-with the `max_slots` field:
-```
-$ cat myhostfile
-aa slots=4 max_slots=4
-bb         max_slots=8
-cc slots=4
-```
-
-The `max_slots` field specifies such a limit. When it does, the `slots`
-value defaults to the limit. Now:
-
-`prun --hostfile myhostfile --np 14 --map-by :OVERSUBSCRIBE ./a.out`
-
-:   causes the first 12 processes to be launched as before, but the
-    remaining two processes will be forced onto node cc. The other two
-    nodes are protected by the hostfile against oversubscription by this
-    job.
-
-Using the `:NOOVERSUBSCRIBE` qualifier to `--map-by` option can be helpful
-since the PRTE DVM currently does not get "max_slots" values from the
-resource manager.
-
-
-Of course, `--np` can also be used with the `--host` option. For
-example,
-
-`prun --host aa,bb --np 8 ./a.out`
-
-:   will produce an error since the default `:NOOVERSUBSCRIBE` qualifier to
-    `--map-by` prevents oversubscription.
-
-`prun --host aa,bb --np 8 --map-by :OVERSUBSCRIBE ./a.out`
-
-:   launches 8 processes. Since only two hosts are specified, after the
-    first two processes are mapped, one to `aa` and one to `bb`, the
-    remaining processes oversubscribe the specified hosts evenly.
-
-`prun --host aa:2,bb:6 --np 8 ./a.out`
-
-:   launches 8 processes. Processes 0-1 on node `aa` since it has 2 slots and
-    processes 2-7 on node `bb` since it has 6 slots.
-
-And here is a MIMD example:
-
-`prun --host aa --np 1 hostname : --host bb,cc --np 2 uptime`
-
-:   will launch process 0 running `hostname` on node `aa` and processes 1
-    and 2 each running `uptime` on nodes `bb` and `cc`, respectively.
-
-#
-#  FUNDAMENTALS
-#
-[placement-fundamentals]
---------------- Mapping, Ranking, and Binding Fundamentals -------------------
-
-The mapping of processes to nodes can be defined not just with
-general policies but also, if necessary, using arbitrary mappings that
-cannot be described by a simple policy. Supported directives, given on
-the cmd line via the `--map-by` option, include:
-
--   SEQ (often accompanied by the file=<path> qualifier) assigns
-    one process to each node specified in the file. The sequential
-    file is to contain an entry for each desired process, one per
-    line of the file.
-
--   RANKFILE (often accompanied by the file=<path> qualifier) assigns
-    one process to the node/resource specified in each entry of the
-    file, one per line of the file.
-
-For example, using the hostfile below:
-```
-$ cat myhostfile
-aa slots=4
-bb slots=4
-cc slots=4
-```
-
-The command below will launch three processes, one on each of nodes `aa`, `bb`,
-and `cc`, respectively. The slot counts don't matter; one process is launched
-per line on whatever node is listed on the line.
-```
-$ prun --hostfile myhostfile --map-by seq ./a.out
-```
-
-Impact of the ranking option is best illustrated by considering the following
-hostfile and test cases where each node contains two packages (each package with
-two cores). Using the `--map-by ppr:2:package` option, we map two processes onto
-each package and utilize the `--rank-by` option as show below:
-
-```
-$ cat myhostfile
-aa
-bb
-```
-
-```
-                         node aa       node bb
---rank-by core           0 1 ! 2 3     4 5 ! 6 7
---rank-by package        0 2 ! 1 3     4 6 ! 5 7
---rank-by package:SPAN   0 4 ! 1 5     2 6 ! 3 7
-```
-
-Ranking by slot provides the identical result as ranking by core in this
-case - a simple progression of ranks across each node. Ranking by package
-does a round-robin ranking across packages within each node until all
-processes have been assigned a rank, and then progresses to the next node.
-Adding the `:SPAN` qualifier to the ranking directive causes the ranking
-algorithm to treat the entire allocation as a single entity - thus, the
-process ranks are assigned across all packages before circling back around
-to the beginning.
-
-The binding operation restricts the process to a subset of the CPU resources
-on the node.
-
-The processors to be used for binding can be identified in terms of
-topological groupings - e.g., binding to an l3cache will bind each
-process to all processors within the scope of a single L3 cache within
-their assigned location. Thus, if a process is assigned by the mapper to
-a certain package, then a `--bind-to l3cache` directive will cause the
-process to be bound to the processors that share a single L3 cache
-within that package.
-
-To help balance loads, the binding directive uses a round-robin method,
-binding a process to the first available specified object type within
-the object where the process was mapped. For example, consider the case
-where a job is mapped to the package level, and then bound to core. Each
-package will have multiple cores, so if multiple processes are mapped to
-a given package, the binding algorithm will assign each process located
-to a package to a unique core in a round-robin manner.
-
-Binding can only be done to the mapped object or to a resource located
-within that object.
-
-An object is considered completely consumed when the number of
-processes bound to it equals the number of CPUs within it. Unbound
-processes are not considered in this computation. Additional
-processes cannot be mapped to consumed objects unless the
-OVERLOAD qualifier is provided via the "--bind-to" command
-line option.
-
-Default process mapping/ranking/binding policies can also be set with MCA
-parameters, overridden by the command line options when provided. MCA
-parameters can be set on the `prte` command line when starting the
-DVM (or in the `prterun` command line for a single-execution job), but
-also in a system or user `mca-params.conf` file or as environment
-variables, as described in the MCA section below. Some examples include:
-
-```
-prun option              MCA parameter key          value
---map-by core        rmaps_default_mapping_policy   core
---map-by package     rmaps_default_mapping_policy   package
---rank-by core       rmaps_default_ranking_policy   core
---bind-to core       hwloc_default_binding_policy   core
---bind-to package    hwloc_default_binding_policy   package
---bind-to none       hwloc_default_binding_policy   none
-```
-#
-#  LIMITS
-#
-[placement-limits]
------------  Difference between overloading and oversubscription  -----------
-
-This section explores the difference between these two options. Users are often
-confused by the difference between these two scenarios. As such this section
-provides a number of scenarios to help illustrate the differences.
-
- - `--map-by :OVERSUBSCRIBE` allow more processes on a node than allocated slots
- - `--bind-to <object>:overload-allowed` allows for binding more than one process
-    in relation to a CPU
-
-The important thing to remember with _oversubscribing_ is that it can be
-defined separately from the actual number of CPUs on a node. This allows the
-mapper to place more or fewer processes per node than CPUs. By default, PRRTE
-uses cores to determine slots in the absence of such information provided in
-the hostfile or by the resource manager (except in the case of the `--host`
-as described in the "Specifying Host Nodes" section).
-
-The important thing to remember with _overloading_ is that it is defined as
-binding more processes than CPUs. By default, PRRTE uses cores as a means of
-counting the number of CPUs. However, the user can adjust this. For example
-when using the `:HWTCPUS` qualifier to the `--map-by` option PRRTE will use
-hardware threads as a means of counting the number of CPUs.
-
-For the following examples consider a node with:
- - Two processor packages,
- - Ten cores per package, and
- - Eight hardware threads per core.
-
-Consider the node from above with the hostfile below:
-
-```
-$ cat myhostfile
-node01 slots=32
-node02 slots=32
-```
-
-The "slots" tells PRRTE that it can place up to 32 processes before
-_oversubscribing_ the node.
-
-If we run the following:
-```
-prun --np 34 --hostfile myhostfile --map-by core --bind-to core hostname
-```
-
-It will return an error at the binding time indicating an _overloading_ scenario.
-
-The mapping mechanism assigns 32 processes to `node01` matching the "slots"
-specification in the hostfile. The binding mechanism will bind the first 20
-processes to unique cores leaving it with 12 processes that it cannot bind
-without overloading one of the cores (putting more than one process on the
-core).
-
-Using the `overload-allowed` qualifier to the `--bind-to core` option tells
-PRRTE that it may assign more than one process to a core.
-
-If we run the following:
-```
-prun --np 34 --hostfile myhostfile --map-by core --bind-to core:overload-allowed hostname
-```
-
-This will run correctly placing 32 processes on `node01`, and 2 processes on
-`node02`. On `node01` two processes are bound to cores 0-11 accounting for
-the overloading of those cores.
-
-Alternatively, we could use hardware threads to give binding a lower level
-CPU to bind to without overloading.
-
-If we run the following:
-```
-prun --np 34 --hostfile myhostfile --map-by core:HWTCPUS --bind-to hwthread hostname
-```
-
-This will run correctly placing 32 processes on `node01`, and 2 processes on
-`node02`. On `node01` two processes are mapped to cores 0-11 but bound to
-different hardware threads on those cores (the logical first and second
-hardware thread). Thus no hardware threads are overloaded at binding time.
-
-In both of the examples above the node is not oversubscribed at mapping time
-because the hostfile set the oversubscription limit to "slots=32" for each
-node. It is only after we exceed that limit that PRRTE will throw an
-oversubscription error.
-
-Consider next if we ran the following:
-```
-prun --np 66 --hostfile myhostfile --map-by core:HWTCPUS --bind-to hwthread hostname
-```
-
-This will return an error at mapping time indicating an oversubscription
-scenario. The mapping mechanism will assign all of the available slots
-(64 across 2 nodes) and be left two processes to map. The only way to map
-those processes is to exceed the number of available slots putting the job
-into an oversubscription scenario.
-
-You can force PRRTE to oversubscribe the nodes by using the `:OVERSUBSCRIBE`
-qualifier to the `--map-by` option as seen in the example below:
-```
-prun --np 66 --hostfile myhostfile --map-by core:HWTCPUS:OVERSUBSCRIBE --bind-to hwthread hostname
-```
-
-This will run correctly placing 34 processes on `node01` and 32 on `node02`.
-Each process is bound to a unique hardware thread.
-
-** Overloading vs Oversubscription: Package Example
-
-Let's extend these examples by considering the package level.
-Consider the same node as before, but with the hostfile below:
-```
-$ cat myhostfile
-node01 slots=22
-node02 slots=22
-```
-
-The lowest level CPUs are 'cores' and we have 20 total (10 per package).
-
-If we run:
-```
-prun --np 20 --hostfile myhostfile --map-by package --bind-to package:REPORT hostname
-```
-
-Then 10 processes are mapped to each package, and bound at the package level.
-This is not overloading since we have 10 CPUs (cores) available in the package
-at the hardware level.
-
-However, if we run:
-```
-prun --np 21 --hostfile myhostfile --map-by package --bind-to package:REPORT hostname
-```
-
-Then 11 processes are mapped to the first package and 10 to the second package.
-At binding time we have an overloading scenario because there are only
-10 CPUs (cores) available in the package at the hardware level. So the first
-package is overloaded.
-
-** Overloading vs Oversubscription: Hardware Threads Example
-
-Similarly, if we consider hardware threads.
-
-Consider the same node as before, but with the hostfile below:
-```
-$ cat myhostfile
-node01 slots=165
-node02 slots=165
-```
-
-The lowest level CPUs are 'hwthreads' (because we are going to use the
-`:HWTCPUS` qualifier) and we have 160 total (80 per package).
-
-If we re-run (from the package example) and add the `:HWTCPUS` qualifier:
-```
-prun --np 21 --hostfile myhostfile --map-by package:HWTCPUS --bind-to package:REPORT hostname
-```
-
-Without the `:HWTCPUS` qualifier this would be overloading (as we saw
-previously). The mapper places 11 processes on the first package and 10 to the
-second package. The processes are still bound to the package level. However,
-with the `:HWTCPUS` qualifier, it is not overloading since we have
-80 CPUs (hwthreads) available in the package at the hardware level.
-
-Alternatively, if we run:
-```
-prun --np 161 --hostfile myhostfile --map-by package:HWTCPUS --bind-to package:REPORT hostname
-```
-
-Then 81 processes are mapped to the first package and 80 to the second package.
-At binding time we have an overloading scenario because there are only
-80 CPUs (hwthreads) available in the package at the hardware level.
-So the first package is overloaded.
-
-#
-#  DIAGNOSTICS
-#
-[placement-diagnostics]
---------------------------------  Diagnostics  ----------------------------------------
-
-PRRTE provides various diagnostic reports that aid the user in verifying and
-tuning the mapping/ranking/binding for a specific job.
-
-The `:REPORT` qualifier to the `--bind-to` command line option can be used to
-report process bindings.
-
-As an example, consider a node with:
- - Two processor packages,
- - Four cores per package, and
- - Eight hardware threads per core.
-
-In each of the examples below the binding is reported in a human readable
-format.
-
-```
-$ prun --np 4 --map-by core --bind-to core:REPORT ./a.out
-[node01:103137] MCW rank 0 bound to package[0][core:0]
-[node01:103137] MCW rank 1 bound to package[0][core:1]
-[node01:103137] MCW rank 2 bound to package[0][core:2]
-[node01:103137] MCW rank 3 bound to package[0][core:3]
-```
-
-In the example above, processes are bound to successive cores on the
-first package.
-
-```
-$ prun --np 4 --map-by package --bind-to package:REPORT ./a.out
-[node01:103115] MCW rank 0 bound to package[0][core:0-9]
-[node01:103115] MCW rank 1 bound to package[1][core:10-19]
-[node01:103115] MCW rank 2 bound to package[0][core:0-9]
-[node01:103115] MCW rank 3 bound to package[1][core:10-19]
-```
-
-In the example above, processes are bound to all cores on successive packages
-in a round-robin fashion.
-
-```
-$ prun --np 4 --map-by package:PE=2 --bind-to core:REPORT ./a.out
-[node01:103328] MCW rank 0 bound to package[0][core:0-1]
-[node01:103328] MCW rank 1 bound to package[1][core:10-11]
-[node01:103328] MCW rank 2 bound to package[0][core:2-3]
-[node01:103328] MCW rank 3 bound to package[1][core:12-13]
-```
-
-The example above shows us that 2 cores have been bound per process.
-The `:PE=2` qualifier states that 2 CPUs underneath the package
-(which would be cores in this case) are mapped to each process.
-
-
-```
-$ prun --np 4 --map-by core:PE=2:HWTCPUS --bind-to :REPORT  hostname
-[node01:103506] MCW rank 0 bound to package[0][hwt:0-1]
-[node01:103506] MCW rank 1 bound to package[0][hwt:8-9]
-[node01:103506] MCW rank 2 bound to package[0][hwt:16-17]
-[node01:103506] MCW rank 3 bound to package[0][hwt:24-25]
-```
-
-The example above shows us that 2 hardware threads have been bound per process.
-In this case `prun` is directing the DVM to map by hardware threads since we
-used the `:HWTCPUS` qualifier. Without that qualifier this command would return
-an error since by default the DVM will not map to resources smaller than a core.
-The `:PE=2` qualifier states that 2 processing elements underneath the core
-(which would be hardware threads in this case) are mapped to each process.
-
-
-```
-$ prun --np 4 --bind-to none:REPORT  hostname
-[node01:107126] MCW rank 0 is not bound (or bound to all available processors)
-[node01:107126] MCW rank 1 is not bound (or bound to all available processors)
-[node01:107126] MCW rank 2 is not bound (or bound to all available processors)
-[node01:107126] MCW rank 3 is not bound (or bound to all available processors)
-```
-
-Binding is turned off in the above example, as reported.
-#
-#  RANKFILES
-#
-[placement-rankfiles]
----------------------------------  Rankfiles  ------------------------------------
-
-Another way to specify arbitrary mappings is with a rankfile, which gives you
-detailed control over process binding as well.
-
-Rankfiles are text files that specify detailed information about how individual
-processes should be mapped to nodes, and to which processor(s) they should be
-bound. Each line of a rankfile specifies the location of one process. The
-general form of each line in the rankfile is:
-
-```
-rank <N>=<hostname> slot=<slot list>
-```
-
-For example:
-```
-$ cat myrankfile
-rank 0=aa slot=10-12
-rank 1=bb slot=0,1,4
-rank 2=cc slot=1-2
-$ prun --host aa,bb,cc,dd --map-by rankfile:FILE=myrankfile ./a.out
-```
-
-Means that
-
-```
-Rank 0 runs on node aa, bound to logical cores 10-12.
-Rank 1 runs on node bb, bound to logical cores 0, 1, and 4.
-Rank 2 runs on node cc, bound to logical cores 1 and 2.
-```
-
-Similarly:
-```
-$ cat myrankfile
-rank 0=aa slot=1:0-2
-rank 1=bb slot=0:0,1,4
-rank 2=cc slot=1-2
-$ prun --host aa,bb,cc,dd --map-by rankfile:FILE=myrankfile ./a.out
-```
-
-Means that
-
-```
-Rank 0 runs on node aa, bound to logical package 1, cores 10-12 (the 0th through
-       2nd cores on that package).
-Rank 1 runs on node bb, bound to logical package 0, cores 0, 1, and 4.
-Rank 2 runs on node cc, bound to logical cores 1 and 2.
-```
-
-The hostnames listed above are "absolute," meaning that actual resolvable
-hostnames are specified. However, hostnames can also be specified as
-"relative," meaning that they are specified in relation to an
-externally-specified list of hostnames (e.g., by `prun`'s `--host` argument,
-a hostfile, or a job scheduler).
-
-The "relative" specification is of the form "`+n<X>`", where `X` is an integer
-specifying the Xth hostname in the set of all available hostnames, indexed
-from 0. For example:
-
-```
-$ cat myrankfile
-rank 0=+n0 slot=10-12
-rank 1=+n1 slot=0,1,4
-rank 2=+n2 slot=1-2
-$ prun --host aa,bb,cc,dd --map-by rankfile:FILE=myrankfile ./a.out
-```
-
-All package/core slot locations are be specified as *logical* indexes. You can
-use tools such as HWLOC's "lstopo" to find the logical indexes of packages and
-cores.
 
 #
 #  DEPRECATED OPTIONS
@@ -1826,14 +829,14 @@ These deprecated options will be removed in a future release.
 #  ALL
 #
 [placement-all]
-#include#help-prte-rmaps-base#placement
+#include#help-schizo-detail#placement
 
-#include#help-prte-rmaps-base#placement-examples
+#include#help-schizo-detail#placement-examples
 
-#include#help-prte-rmaps-base#placement-fundamentals
+#include#help-schizo-detail#placement-fundamentals
 
-#include#help-prte-rmaps-base#placement-limits
+#include#help-schizo-detail#placement-limits
 
-#include#help-prte-rmaps-base#placement-diagnostics
+#include#help-schizo-detail#placement-diagnostics
 
-#include#help-prte-rmaps-base#placement-rankfiles
+#include#help-schizo-detail#placement-rankfiles
diff --git a/src/mca/rmaps/base/rmaps_base_support_fns.c b/src/mca/rmaps/base/rmaps_base_support_fns.c
index c7d04044ab..5aa6f473a9 100644
--- a/src/mca/rmaps/base/rmaps_base_support_fns.c
+++ b/src/mca/rmaps/base/rmaps_base_support_fns.c
@@ -77,27 +77,6 @@ int prte_rmaps_base_filter_nodes(prte_app_context_t *app, pmix_list_t *nodes, bo
         }
         free(hosts);
     }
-    /* did the app_context contain an add-hostfile? */
-    hosts = NULL;
-    if (prte_get_attribute(&app->attributes, PRTE_APP_ADD_HOSTFILE, (void **) &hosts, PMIX_STRING) &&
-        NULL != hosts) {
-        /* yes - filter the node list through the file, removing
-         * any nodes not found in the file
-         */
-        if (PRTE_SUCCESS != (rc = prte_util_filter_hostfile_nodes(nodes, hosts, remove))) {
-            free(hosts);
-            PRTE_ERROR_LOG(rc);
-            return rc;
-        }
-        /** check that anything is here */
-        if (0 == pmix_list_get_size(nodes)) {
-            pmix_show_help("help-prte-rmaps-base.txt", "prte-rmaps-base:no-mapped-node", true,
-                           app->app, "-add-hostfile", hosts);
-            free(hosts);
-            return PRTE_ERR_SILENT;
-        }
-        free(hosts);
-    }
     /* now filter the list through any -host specification */
     hosts = NULL;
     if (prte_get_attribute(&app->attributes, PRTE_APP_DASH_HOST, (void **) &hosts, PMIX_STRING) &&
@@ -116,24 +95,6 @@ int prte_rmaps_base_filter_nodes(prte_app_context_t *app, pmix_list_t *nodes, bo
         }
         free(hosts);
     }
-    /* now filter the list through any add-host specification */
-    hosts = NULL;
-    if (prte_get_attribute(&app->attributes, PRTE_APP_ADD_HOST, (void **) &hosts, PMIX_STRING) &&
-        NULL != hosts) {
-        if (PRTE_SUCCESS != (rc = prte_util_filter_dash_host_nodes(nodes, hosts, remove))) {
-            PRTE_ERROR_LOG(rc);
-            free(hosts);
-            return rc;
-        }
-        /** check that anything is left! */
-        if (0 == pmix_list_get_size(nodes)) {
-            pmix_show_help("help-prte-rmaps-base.txt", "prte-rmaps-base:no-mapped-node", true,
-                           app->app, "-add-host", hosts);
-            free(hosts);
-            return PRTE_ERR_SILENT;
-        }
-        free(hosts);
-    }
 
     return rc;
 }
diff --git a/src/mca/rmaps/rank_file/rmaps_rank_file.c b/src/mca/rmaps/rank_file/rmaps_rank_file.c
index b5f7f4f990..6aa149f388 100644
--- a/src/mca/rmaps/rank_file/rmaps_rank_file.c
+++ b/src/mca/rmaps/rank_file/rmaps_rank_file.c
@@ -19,7 +19,7 @@
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2016-2022 IBM Corporation.  All rights reserved.
  *
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -45,6 +45,7 @@
 #include "src/util/pmix_if.h"
 #include "src/util/pmix_net.h"
 #include "src/util/proc_info.h"
+#include "src/util/pmix_string_copy.h"
 
 #include "src/mca/errmgr/errmgr.h"
 #include "src/mca/ess/ess.h"
@@ -65,7 +66,6 @@ prte_rmaps_base_module_t prte_rmaps_rank_file_module = {
 static int prte_rmaps_rank_file_parse(const char *);
 static char *prte_rmaps_rank_file_parse_string_or_int(void);
 
-static char *prte_getline(FILE *fp);
 static int prte_rmaps_rf_lsf_convert_affinity_to_rankfile(char *affinity_file, char **aff_rankfile);
 static int prte_rmaps_rf_process_lsf_affinity_hostfile(prte_job_t *jdata, prte_rmaps_options_t *options, char *affinity_file);
 
@@ -748,21 +748,6 @@ static int prte_rmaps_rf_process_lsf_affinity_hostfile(prte_job_t *jdata,
     return PRTE_SUCCESS;
 }
 
-static char *prte_getline(FILE *fp)
-{
-    char *ret, *buff;
-    char input[1024];
-
-    ret = fgets(input, 1024, fp);
-    if (NULL != ret) {
-        input[strlen(input) - 1] = '\0'; /* remove newline */
-        buff = strdup(input);
-        return buff;
-    }
-
-    return NULL;
-}
-
 static int prte_rmaps_rf_lsf_convert_affinity_to_rankfile(char *affinity_file, char **aff_rankfile)
 {
     FILE *fp;
@@ -800,7 +785,7 @@ static int prte_rmaps_rf_lsf_convert_affinity_to_rankfile(char *affinity_file, c
         return PRTE_ERR_NOT_FOUND;
     }
 
-    while (NULL != (hstname = prte_getline(fp))) {
+    while (NULL != (hstname = pmix_getline(fp))) {
         if (0 == strlen(hstname)) {
             free(hstname);
             /* blank line - ignore */
diff --git a/src/mca/rmaps/seq/rmaps_seq.c b/src/mca/rmaps/seq/rmaps_seq.c
index 77cd2dd8a8..51999e8c66 100644
--- a/src/mca/rmaps/seq/rmaps_seq.c
+++ b/src/mca/rmaps/seq/rmaps_seq.c
@@ -16,7 +16,7 @@
  * Copyright (c) 2015-2019 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2016      IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -38,6 +38,7 @@
 #include "src/hwloc/hwloc-internal.h"
 #include "src/util/pmix_if.h"
 #include "src/util/pmix_net.h"
+#include "src/util/pmix_string_copy.h"
 
 #include "src/mca/errmgr/errmgr.h"
 #include "src/mca/ess/ess.h"
@@ -84,7 +85,6 @@ static void sn_des(seq_node_t *p)
 }
 PMIX_CLASS_INSTANCE(seq_node_t, pmix_list_item_t, sn_con, sn_des);
 
-static char *prte_getline(FILE *fp);
 static int process_file(char *path, pmix_list_t *list);
 
 static bool quickmatch(prte_node_t *nd, char *name)
@@ -406,21 +406,6 @@ static int prte_rmaps_seq_map(prte_job_t *jdata,
     return PRTE_ERR_SILENT;
 }
 
-static char *prte_getline(FILE *fp)
-{
-    char *ret, *buff;
-    char input[1024];
-
-    ret = fgets(input, 1024, fp);
-    if (NULL != ret) {
-        input[strlen(input) - 1] = '\0'; /* remove newline */
-        buff = strdup(input);
-        return buff;
-    }
-
-    return NULL;
-}
-
 static int process_file(char *path, pmix_list_t *list)
 {
     char *hstname = NULL;
@@ -434,7 +419,7 @@ static int process_file(char *path, pmix_list_t *list)
         PRTE_ERROR_LOG(PRTE_ERR_NOT_FOUND);
         return PRTE_ERR_NOT_FOUND;
     }
-    while (NULL != (hstname = prte_getline(fp))) {
+    while (NULL != (hstname = pmix_getline(fp))) {
         if (0 == strlen(hstname)) {
             free(hstname);
             /* blank line - ignore */
diff --git a/src/mca/schizo/base/Makefile.am b/src/mca/schizo/base/Makefile.am
index 0928c09a43..963240b03a 100644
--- a/src/mca/schizo/base/Makefile.am
+++ b/src/mca/schizo/base/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Copyright (c) 2015-2020 Intel, Inc.  All rights reserved.
 # Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -10,9 +10,7 @@
 #
 
 dist_prtedata_DATA += \
-    base/help-schizo-base.txt \
-    base/help-schizo-cli.txt \
-    base/help-schizo-deprecated.txt
+    base/help-schizo-base.txt
 
 headers += \
         base/base.h
diff --git a/src/mca/schizo/base/help-schizo-base.txt b/src/mca/schizo/base/help-schizo-base.txt
index 67c2559cbc..c497a0b00a 100644
--- a/src/mca/schizo/base/help-schizo-base.txt
+++ b/src/mca/schizo/base/help-schizo-base.txt
@@ -183,3 +183,13 @@ values:
   Option:  %s <MCA param name> <param value>
 
 Please provide the missing values and try again.
+#
+[non-supporting-pmix]
+The given command line directive is technically valid, but the
+underlying PMIx version being employed lacks the necessary attribute
+definitions to support it.
+
+  Directive:  %s
+  Option:     %s
+
+We are therefore unable to satisfy this request.
diff --git a/src/mca/schizo/base/help-schizo-cli.txt b/src/mca/schizo/base/help-schizo-cli.txt
deleted file mode 100644
index 23181b016c..0000000000
--- a/src/mca/schizo/base/help-schizo-cli.txt
+++ /dev/null
@@ -1,728 +0,0 @@
-# -*- text -*-
-#
-# Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-#  DISPLAY
-#
-[display]
-The "display" command line directive must be accompanied by a comma-delimited
-list of case-insensitive options indicating what information about the job
-and/or allocation is to be displayed. The full directive need not be provided -
-only enough characters are required to uniquely identify the directive. For
-example, ALL is sufficient to represent the ALLOCATION directive - while MAP
-can not be used to represent MAP-DEVEL (though MAP-D would suffice).
-
-Supported values include:
-
--   ALLOCATION displays the detected hosts and slot assignments for this job
-
--   BINDINGS displays the resulting bindings applied to processes in this job
-
--   MAP displays the resulting locations assigned to processes in this job
-
--   MAP-DEVEL displays a more detailed report on the locations assigned to
-    processes in this job that includes local and node ranks, assigned
-    bindings, and other data
-
--   TOPO=LIST displays the topology of each node in the semicolon-delimited list
-    that is allocated to the job
-
--   CPUS[=LIST] displays the available CPUs on the provided semicolon-delimited
-    list of nodes (defaults to all nodes)
-
-The display command line directive can include qualifiers by adding a colon (:)
-and any combination of one or more of the following (delimited by colons):
-
--   PARSEABLE directs that the output be provided in a format that is easily
-    parsed by machines. Note that PARSABLE is also accepted as a typical
-    spelling for the qualifier.
-
-Provided qualifiers will apply to ALL of the display directives.
-#
-#  OUTPUT
-#
-[output]
-The "output" command line directive must be accompanied by a comma-delimited
-list of case-insensitive options that control how output is generated. The
-full directive need not be provided - only enough characters are required
-to uniquely identify the directive. For example, MERGE is sufficient to
-represent the MERGE-STDERR-TO-STDOUT directive - while TAG can not be used
-to represent TAG-DETAILED (though TAG-D would suffice).
-
-Supported values include:
-
--   TAG marks each output line with the [job,rank]<stream>: of the process that
-    generated it
-
--   TAG-DETAILED marks each output line with a detailed annotation containing
-    [namespace,rank][hostname:pid]<stream>: of the process that generated it
-
--   TAG-FULLNAME marks each output line with the [namespace,rank]<stream>: of
-    the process that generated it
-
--   TIMESTAMP prefixes each output line with a [datetime]<stream>: stamp. Note
-    that the timestamp will be the time when the line is output by the DVM and
-    not the time when the source output it
-
--   XML provides all output in a pseudo-XML format
-
--   MERGE-STDERR-TO-STDOUT merges stderr into stdout
-
--   DIR=DIRNAME redirects output from application processes into DIRNAME/job/rank/std[out,err,diag]. The provided name will be
-    converted to an absolute path
-
--   FILE=FILENAME redirects output from application processes into
-    filename.rank. The provided name will be converted to an absolute
-    path
-
-Supported qualifiers include NOCOPY (do not copy the output to the
-stdout/err streams), and RAW (do not buffer the output into complete
-lines, but instead output it as it is received).
-#
-#  DVM-HOSTFILE
-#
-[dvm-hostfile]
-PRRTE supports several levels of user-specified host lists based on an established
-precedence order. Users can specify a default hostfile that contains a list of
-nodes to be used by the DVM. Only one default hostfile can be provided for a given
-DVM. In addition, users can specify a hostfile that contains a list of nodes to be
-used for a DVM, or can provide a comma-delimited list of nodes to be used for that
-DVM via the --host command line option.
-
-The precedence order applied to these various options depends to some extent on
-the local environment. The following table illustrates how host and hostfile directives
-work together to define the set of hosts upon which a DVM will execute in the absence
-of a resource manager (RM):
-
- default
- hostfile      host        hostfile       Result
-----------    ------      ----------      -----------------------------------------
- unset        unset          unset        The DVM will consist solely of the local
-                                          host where the DVM was started.
- unset         set           unset        Host option defines resource list for the DVM
- unset        unset           set         Hostfile defines resource list for the DVM
- unset         set            set         Hostfile defines resource list for the DVM,
-                                          then host filters the list to define the final
-                                          set of nodes to be used by the DVM
-  set         unset          unset        Default hostfile defines resource list for the DVM
-  set          set           unset        Default hostfile defines resource list for the DVM,
-                                          then host filters the list to define the final
-                                          set of nodes to be used by the DVM
-  set          set            set         Default hostfile defines resource list for the DVM,
-                                          then hostfile filters the list, and then host filters
-                                          the list to define the final set of nodes to be
-                                          used by the DVM
-
-This changes somewhat in the presence of an RM as that entity specifies the
-initial allocation of nodes. In this case, the default hostfile, hostfile and host
-directives are all used to filter the RM's specification so that a user can utilize different
-portions of the allocation for different DVMs. This is done according to the same precedence
-order as in the prior table, with the RM providing the initial pool of nodes.
-
-#include#help-schizo-cli#hostfile-syntax
-#
-#  HOSTFILE-SYNTAX
-#
-[hostfile-syntax]
-Hostfile syntax consists of a node name on each line, optionally including a designated number
-of "slots":
-
-node01  slots=10
-node13  slots=5
-...
-
-Blank lines and lines beginning with a '#' are ignored.  A "slot" is the PRRTE term for an
-allocatable unit where we can launch a process. In the absence of the slot parameter, PRRTE
-will assign either the number of slots to be the number of CPUs detected on the node or the
-RM assigned value if operating in the presence of an RM. Note that in the latter case, the
-user-specified number of slots is capped by the RM-assigned value.
-#
-#  LAUNCHER-HOSTFILE
-#
-[launcher-hostfile]
-PRRTE supports several levels of user-specified hostfiles based on an established
-precedence order. Users can specify a hostfile that contains a list of nodes to be
-used for the job, or can provide a comma-delimited list of nodes to be used for that
-job via the --host command line option.
-
-The precedence order applied to these various options depends to some extent on
-the local environment. The following table illustrates how host and hostfile directives
-work together to define the set of hosts upon which a DVM will execute the job in the
-absence of a resource manager (RM):
-
- host        hostfile       Result
-------      ----------      -----------------------------------------
-unset          unset        The DVM will utilize all its available resources
-                            when mapping the job.
- set           unset        Host option defines resource list for the job
-unset           set         Hostfile defines resource list for the job
- set            set         Hostfile defines resource list for the job,
-                            then host filters the list to define the final
-                            set of nodes to be used for the job
-
-#include#help-schizo-cli#hostfile-syntax
-
-#include#help-schizo-cli#relative-indexing
-
-#
-#  RELATIVE-INDEXING
-#
-[relative-indexing]
-**************************
-    Relative Indexing
-**************************
-
-Hostfile and --host specifications can also be made using relative indexing. This allows a
-user to stipulate which hosts are to be used for a given app_context without specifying the
-particular host name, but rather its relative position in the allocation.
-
-This can probably best be understood through consideration of a few examples. Consider the case
-where a DVM is comprised of a set of nodes named "foo1, foo2, foo3, foo4". The user wants the
-first app_context to have exclusive use of the first two nodes, and a second app_context
-to use the last two nodes. Of course, the user could printout the allocation to find the names
-of the nodes allocated to them and then use --host to specify this layout, but this is cumbersome
-and would require hand-manipulation for every invocation.
-
-A simpler method is to utilize PRRTE's relative indexing capability to specify the desired
-layout. In this case, a command line containing:
-
---host +n1,+n2 ./app1 : --host +n3,+n4 ./app2
-
-would provide the desired pattern. The "+" syntax indicates that the information is being
-provided as a relative index into the existing allocation. Two methods of relative indexing
-are supported:
-
-+n#    A relative index into the allocation referencing the "#" node. PRRTE will substitute
-       the "#" node in the allocation
-
-+e[:#] A request for "#" empty nodes - i.e., PRRTE is to substitute this reference with
-       nodes that have not yet been used by any other app_context. If the ":#" is not
-       provided, PRRTE will substitute the reference with all empty nodes. Note that PRRTE
-       does track the empty nodes that have been assigned in this manner, so multiple
-       uses of this option will result in assignment of unique nodes up to the limit of the
-       available empty nodes. Requests for more empty nodes than are available will generate
-       an error.
-
-Relative indexing can be combined with absolute naming of hosts in any arbitrary manner,
-and can be used in hostfiles as well as with the --host command line option. In addition,
-any slot specification provided in hostfiles will be respected - thus, a user can specify
-that only a certain number of slots from a relative indexed host are to be used for a
-given app_context.
-
-Another example may help illustrate this point. Consider the case where the user has a
-hostfile containing:
-
-dummy1 slots=4
-dummy2 slots=4
-dummy3 slots=4
-dummy4 slots=4
-dummy5 slots=4
-
-This may, for example, be a hostfile that describes a set of commonly-used resources that
-the user wishes to execute applications against. For this particular application, the user
-plans to map byslot, and wants the first two ranks to be on the second node of any allocation,
-the next ranks to land on an empty node, have one rank specifically on dummy4, the next rank
-to be on the second node of the allocation again, and finally any remaining ranks to be on
-whatever empty nodes are left. To accomplish this, the user provides a hostfile of:
-
-+n2 slots=2
-+e:1
-dummy4 slots=1
-+n2
-+e
-
-The user can now use this information in combination with PRRTE's sequential mapper to
-obtain their specific layout:
-
-<launcher> --hostfile dummyhosts --hostfile mylayout --prtemca rmaps seq ./my_app
-
-which will result in:
-
-rank0 being mapped to dummy3
-rank1 to dummy1 as the first empty node
-rank2 to dummy4
-rank3 to dummy3
-rank4 to dummy2 and rank5 to dummy5 as the last remaining unused nodes
-
-Note that the sequential mapper ignores the number of slots arguments as it only
-maps one rank at a time to each node in the list.
-
-If the default round-robin mapper had been used, then the mapping would have resulted in:
-
-ranks 0 and 1 being mapped to dummy3 since two slots were specified
-ranks 2-5 on dummy1 as the first empty node, which has four slots
-rank6 on dummy4 since the hostfile specifies only a single slot from that node is to be used
-ranks 7 and 8 on dummy3 since only two slots remain available
-ranks 9-12 on dummy2 since it is the next available empty node and has four slots
-ranks 13-16 on dummy5 since it is the last remaining unused node and has four slots
-
-Thus, the use of relative indexing can allow for complex mappings to be ported across
-allocations, including those obtained from automated resource managers, without the need
-for manual manipulation of scripts and/or command lines.
-#
-#  DASH-HOST
-#
-[dash-host]
-Host syntax consists of a comma-delimited list of node names, each entry optionally containing
-a ":N" extension indicating the number of slots to assign to that entry:
-
---host node01:5,node02
-
-In the absence of the slot extension, one slot will be assigned to the node. Duplicate entries
-are aggregated and the number of slots assigned to that node are summed together.
-
-Note: A "slot" is the PRRTE term for an allocatable unit where we can launch a process. Thus,
-the number of slots equates to the maximum number of processes PRRTE may start on that node
-without oversubscribing it.
-#
-#  SESSION-DIR
-#
-[session-dir]
-PRRTE establishes a "session directory" to serve as a top-level location for temporary
-files used by both the local PRRTE daemon and its child processes.
-By default, the session directory is set to
-
-  <system-tmpdir>/prte.<nodename>.<uid>
-
-This can be altered by setting the "prte_top_session_dir" MCA parameter (either in the environment, on the
-cmd line, or in a default parameter file). The session directory name can further be altered to include
-the PID of the daemon process, if desired:
-
-  <system-tmpdir>/prte.<nodename>.<pid>.<uid>
-
-by setting the "prte_add_pid_to_session_dirname" MCA parameter.
-#
-#  TMPDIR
-#
-[tmpdir]
-PRRTE establishes a session directory tree to server as an isolated location for storage
-of temporary files used by both local PRRTE daemons and their child processes. This is
-done to enable quick and easy cleanup in the event that PRRTE is unable to fully cleanup
-after itself. The root of the session directory defaults to the system temporary directory
-as defined in the environment using (in precedence order) the envars TMPDIR, TEMP, and
-finally TMP. In the absence of any of those variables, PRRTE will default to the "/tmp"
-location.
-#
-#  TMPDIR-TOOL
-#
-[tmpdir-tool]
-PRRTE establishes a session directory tree to server as an isolated location for storage
-of temporary files used by both local PRRTE daemons and their child processes. This is
-done to enable quick and easy cleanup in the event that PRRTE is unable to fully cleanup
-after itself.
-
-In the case of tools, the rendezvous files containing connection information for a target
-server are located in the session directory tree. Thus, it may be necessary to point the
-tool at the location where those files can be found if that location is other than the
-expected default.
-
-The root of the session directory defaults to the system temporary directory
-as defined in the environment using (in precedence order) the envars TMPDIR, TEMP, and
-finally TMP. In the absence of any of those variables, PRRTE will default to the "/tmp"
-location.
-#
-#  PRTEMCA
-#
-[prtemca]
-Pass a PRRTE MCA parameter
-
-Syntax: --prtemca <arg0> <arg1>
-where arg0 is the parameter name and arg1 is the parameter value
-#
-#  PMIXMCA
-#
-[pmixmca]
-Pass a PMIx MCA parameter
-
-Syntax: --pmixmca <arg0> <arg1>
-where arg0 is the parameter name and arg1 is the parameter value
-#
-#  TUNE
-#
-[tune]
-Comma-delimited list of one or more files containing PRRTE and PMIx MCA params
-for tuning DVM and/or application operations. Parameters in the file will be
-treated as _generic_ parameters and subject to the translation rules/uncertainties.
- See "--help mca" for more information.
-
-Syntax in the file is:
-
-param = value
-
-with one parameter and its associated value per line. Empty lines and lines beginning
-with the '#' character are ignored.
-#
-#  DEBUG-DAEMONS
-#
-[debug-daemons]
-Debug daemon output enabled. This is a somewhat limited stream of information normally
-used to simply confirm that the daemons started. Includes leaving the output streams
-open.
-#
-#  DEBUG-DAEMONS-FILE
-[debug-daemons-file]
-Debug daemon output is enabled and all output from the daemons is redirected into
-files named
-
-   output-prted-<daemon-nspace>-<nodename>.log
-
-to avoid conflict on shared file systems. The files are located in the top-level
-session directory assigned to the DVM.
-
-#include#help-schizo-cli#session-dir
-#
-#  LEAVE-SESSION-ATTACHED
-#
-[leave-session-attached]
-Do not discard stdout/stderr of remote PRRTE daemons. The primary use for this option
-is to ensure that the daemon output streams (i.e., stdout and stderr) remain open after
-launch, thus allowing the user to see any daemon-generated error messages. Otherwise,
-the daemon will "daemonize" itself upon launch, thereby closing its output streams.
-#
-#  PREFIX
-#
-[prefix]
-Prefix to be used to look for PRRTE executables. PRRTE automatically sets the prefix
-for remote daemons if it was either configured with the --enable-prte-prefix-by-default
-option OR prte itself was executed with an absolute path to the prte cmd. This option
-overrides those settings, if present, and forces use of the provided path.
-#
-#  NO-PREFIX
-#
-[noprefix]
-Disable automatic --prefix behavior. PRRTE automatically sets the prefix for remote
-daemons if it was either configured with the --enable-prte-prefix-by-default option
-OR prte itself was executed with an absolute path to the prte cmd. This option disables
-that behavior.
-#
-#  FORWARD-SIGNALS
-#
-[forward-signals]
-Comma-delimited list of additional signals (names or integers) to forward to application
-processes ["none" => forward nothing]. Signals provided by default include SIGTSTP,
-SIGUSR1, SIGUSR2, SIGABRT, SIGALRM, and SIGCONT
-#
-#  ALLOW-RUN-AS-ROOT
-#
-[allow-run-as-root]
-Allow execution as root (STRONGLY DISCOURAGED).
-
-Running as root exposes the user to potentially catastrophic file system corruption
-and damage - e.g., if the user accidentally points the root of the session directory
-to a system required point, this directory and all underlying elements will be
-deleted upon job completion, thereby rendering the system inoperable.
-
-It is recognized that some environments (e.g., containers) may require operation as
-root, and that the user accepts the risks in those scenarios. Accordingly, one can
-override PRRTE's run-as-root protection by providing one of the following:
-
-  * the "--allow-run-as-root" cmd line directive
-  * adding BOTH of the following environmental parameters
-    * PRTE_ALLOW_RUN_AS_ROOT=1
-    * PRTE_ALLOW_RUN_AS_ROOT_CONFIRM=1
-
-Again, we recommend this only be done if absolutely necessary.
-#
-#  X
-#
-[x]
-Export an environment variable, optionally specifying a value. For example:
-
-  * "-x foo" exports the environment variable foo and takes its value from the
-    current environment
-  * "-x foo=bar" exports the environment variable name foo and sets its value
-    to "bar" in the started processes
-  * "-x foo*" exports all current environmental variables starting with "foo"
-#
-#  STREAM-BUFFERING
-#
-[stream-buffering]
-Adjust buffering for stdout/stderr
-    [0 => unbuffered]
-    [1 => line buffered]
-    [2 => fully buffered]
-#
-#  PERSONALITY
-#
-[personality]
-Specify the personality to be used. This governs selection of the plugin
-responsible for defining and parsing the command line, harvesting and
-forwarding environmental variables, and providing library-dependent
-support to the launched processes. Examples include "ompi" for an
-application compiled with Open MPI, "mpich" for one built against
-the MPICH library, or "oshmem" for an OpenSHMEM application compiled
-against SUNY's reference library.
-#
-#  RUNTIME-OPTIONS
-#
-[runtime-options]
-The "runtime-options" command line directive must be accompanied by a
-comma-delimited list of case-insensitive options that control the runtime
-behavior of the job. The full directive need not be provided - only enough
-characters are required to uniquely identify the directive.
-
-Runtime options are typically "true" or "false", though this is not a
-requirement on developers. Since the value of each option may need to
-be set (e.g., to override a default set by MCA parameter), the syntax
-of the command line directive includes the use of an '=' character to
-allow inclusion of a value for the option. For example, one can set
-the ABORT-NONZERO-STATUS option to "true" by specifying it as
-"ABORT-NONZERO-STATUS=1". Note that boolean options can be set to "true"
-using a non-zero integer or a case-insensitive string of the word "true".
-For the latter representation, the user need only provide at least the
-'T' character. The same policy applies to setting a boolean option to
-"false".
-
-Note that a boolean option will default to "true" if provided without
-a value. Thus, "--runtime-options abort-nonzero" is sufficient to set the
-"ABORT-NONZERO-STATUS" option to "true".
-
-Supported values include:
-
--   ERROR-NONZERO-STATUS[=(bool)] if set to false, this directs the runtime
-    to treat a process that exits with non-zero status as a normal termination.
-    If set to true, the runtime will consider such an occurrence as an
-    error termination and take appropriate action - i.e. the job will be
-    terminated unless a runtime option directs otherwise. This option
-    defaults to a true value if the option is given without a value.
-
--   DONOTLAUNCH directs the runtime to map but not launch the specified
-    job. This is provided to help explore possible process placement patterns
-    before actually starting execution. No value need be passed as this is
-    not an option that can be set by default in PRRTE.
-
--   SHOW-PROGRESS[=(bool)] requests that the runtime provide progress reports
-    on its startup procedure - i.e., the launch of its daemons in support
-    of a job. This is typically used to debug DVM startup on large systems.
-    This option defaults to a true value if the option is given without a value.
-
--   NOTIFYERRORS[=(bool)] if set to true, requests that the runtime provide
-    a PMIx event whenever a job encounters an error - e.g., a process fails.
-    The event is to be delivered to each remaining process in the job. This
-    option defaults to a true value if the option is given without a value.
-    See "--help notifications" for more detail as to the PMIx event codes
-    available for capturing failure events.
-
--   RECOVERABLE[=(bool)] if set to true, this indicates that the application
-    wishes to consider the job as recoverable - i.e., the application is
-    assuming responsibility for recovering from any process failure. This
-    could include application-driven spawn of a substitute process or
-    internal compensation for the missing process. This option defaults to
-    a true value if the option is given without a value.
-
--   AUTORESTART[=(bool)] if set to true, this requests that the runtime
-    automatically restart failed processes up to "max restarts" number of
-    times. This option defaults to a true value if the option is given
-    without a value.
-
--   CONTINUOUS[=(bool)] if set to true, this informs the runtime that the
-    processes in this job are to run until explicitly terminated. Processes
-    that fail are to be automatically restarted up to "max restarts"
-    number of times. Notification of process failure is to be delivered
-    to all processes in the application. This is the equivalent of specifying
-    RECOVERABLE, NOTIFYERRORS, and AUTORESTART options except that the runtime,
-    not the application, assumes responsibility for process recovery. This
-    option defaults to a true value if the option is given without a value.
-
--   MAX-RESTARTS=<int> indicates the maximum number of times a given process
-    is to be restarted. This can be set at the application or job level (which
-    will then apply to all applications in that job).
-
--   EXEC-AGENT=<path> indicates the executable that shall be used to start
-    an application process. The resulting command for starting an application
-    process will be "<path> app <app-argv>". The path may contain its own
-    command line arguments.
-
--   DEFAULT-EXEC-AGENT directs the runtime to use the system default exec
-    agent to start an application process. No value need be passed as this is
-    not an option that can be set by default in PRRTE.
-
--   OUTPUT-PROCTABLE[(=channel)] directs the runtime to report the convential
-    debugger process table (includes PID and host location of each process in
-    the application). Output is directed to stdout if the channel is "-",
-    stderr if "+", or into the specified file otherwise. If no channel is
-    specified, output will be directed to stdout.
-
--   STOP-ON-EXEC directs the runtime to stop the application process(es) immediately
-    upon exec'ing them. The directive will apply to all processes in the job.
-
--   STOP-IN-INIT indicates that the runtime should direct the application process(es)
-    to stop in PMIx_Init. The directive will apply to all processes in the job.
-
--   STOP-IN-APP indicates that the runtime should direct application processes to
-    stop at some application-defined place and notify they are ready-to-debug. The
-    directive will apply to all processes in the job.
-
--   TIMEOUT=<string> directs the runtime to terminate the job after it has executed for
-    the specified time. Time is specified in colon-delimited format - e.g.,
-    "01:20:13:05" to indicate 1 day, 20 hours, 13 minutes and 5 seconds. Time specified
-    without colons will be assumed to have been given in seconds.
-
--   SPAWN-TIMEOUT=<string> directs the runtime to terminate the job if job launch is
-    not completed within the specified time. Time is specified in colon-delimited
-    format - e.g., "01:20:13:05" to indicate 1 day, 20 hours, 13 minutes and 5 seconds.
-    Time specified without colons will be assumed to have been given in seconds.
-
--   REPORT-STATE-ON-TIMEOUT[(=bool)] directs the runtime to provide a detailed report
-    on job and application process state upon job timeout. This option defaults to a
-    true value if the option is given without a value.
-
--   GET-STACK-TRACES[(=bool)] requests that the runtime provide stack traces on all
-    application processes still executing upon timeout. This option defaults to a true
-    value if the option is given without a value.
-
--   REPORT-CHILD-JOBS-SEPARATELY[(=bool)] directs the runtime to report the exit status
-    of any child jobs spawned by the primary job separately. If false, then the final
-    exit status reported will be zero if the primary job and all spawned jobs exit
-    normally, or the first non-zero status returned by either primary or child jobs.
-    This option defaults to a true value if the option is given without a value.
-
--   AGGREGATE-HELP-MESSAGES[(=bool)] directs the runtime to aggregate help messages,
-    reporting each unique help message once accompanied by the number of processes
-    that reported it. This option defaults to a true value if the option is given
-    without a value.
-
--   FWD-ENVIRONMENT[(=bool)] directs the runtime to forward the entire local environment
-    in support of the application. This option defaults to a true value if the option is
-    given without a value.
-
-The runtime-options command line option has no qualifiers. Note that directives
-are case-insensitive.
-#
-# NOTIFICATIONS
-#
-[notifications]
-PRRTE provides notifications on a variety of process and job states. Each notification
-includes not only the PMIx event code that generated it, but also information on
-the cause of the event to the extent to which this is known.
-
-Supported job events include:
-
--   PMIX_READY_FOR_DEBUG indicates that all processes in the reported nspace have
-    reached the specified debug stopping point.
-
--   PMIX_LAUNCH_COMPLETE indicates that the reported nspace has been launched - i.e.,
-    the involved PRRTE daemons all report that their respective child processes
-    have completed fork/exec.
-
--   PMIX_ERR_JOB_CANCELED indicates that the job was cancelled by user command, usually
-    issued via an appropriate PMIx-enabled tool.
-
--   PMIX_ERR_JOB_FAILED_TO_LAUNCH indicates that the specified job failed to launch.
-    This can be due to a variety of factors that include inability to find the
-    executable on at least one involved node.
-
-
-Supported process events include:
-
--   PMIX_ERR_PROC_TERM_WO_SYNC indicates that at least one process in the job called
-    PMIx_Init, thus indicating some notion of a global existence, and at least one
-    process in the job subsequently exited without calling PMIx_Finalize. This usually
-    indicates a failure somewhere in the application itself that precluded an orderly
-    shutdown of the process. Notification will include the process ID that exited
-    in this manner.
-
--   PMIX_EVENT_PROC_TERMINATED indicates that the reported process terminated normally.
-    Notification will include the process ID that exited and its exit status.
-
--   PMIX_ERR_PROC_KILLED_BY_CMD indicates that the reported process was killed by
-    PRRTE command. This typically occurs in response to a Ctrl-C (or equivalent)
-    being applied to the PRRTE launcher, thereby instructing PRRTE to forcibly
-    terminate its processes. The event currently will only be issued in the
-    case where forcible termination is commanded via a tool that can pass the
-    process IDs that are specifically to be terminated - otherwise, in the case
-    of the Ctrl-C event previously described, all processes in the job will be
-    terminated, leaving none to be notified. Notification will include the process
-    ID that was terminated.
-
--   PMIX_ERR_PROC_SENSOR_BOUND_EXCEEDED indicates that the specified process
-    exceeded a previously-set sensor boundary - e.g., it may have grown beyond
-    a defined memory limit. Such events may or may not automatically trigger
-    termination by command, depending upon the behavior of the sensor. Notification
-    will include the process ID that exceeded the sensor boundary plus whatever
-    information the sensor provides regarding measurements and bounds.
-
--   PMIX_ERR_PROC_ABORTED_BY_SIG indicates that the specified process was killed
-    by a signal - e.g., a segmentation fault/violation or an externally applied
-    signal. Notifications will include the process ID that was killed and the
-    corresponding reported signal.
-
--   PMIX_ERR_PROC_REQUESTED_ABORT indicates that the specified process has aborted
-    by calling the PMIx_Abort function. Notification will include the process ID
-    that called abort and its exit status.
-
--   PMIX_ERR_EXIT_NONZERO_TERM indicates that the specified process terminated with
-    a non-zero exit status. This notification is only generated in the case where
-    the runtime option ERROR-NONZERO-STATUS is set to true, thereby indicating that
-    a process exiting with non-zero status is to be considered an error. As PRRTE can
-    be overwhelmed by a large job where every process exits with a non-zero status,
-    only the _first_ process in a given job that exits with a non-zero status will
-    generate a notification unless the RECOVERABLE runtime option is also provided
-    as otherwise the job will be immediately terminated. Notifications will include
-    the process ID that exited and the status it returned.
-
--   PMIX_ERR_PROC_RESTART indicates that the specified process has been restarted.
-    Additional information may include the hostname where the process is now
-    executing.
-#
-#  DVM
-#
-[dvm]
-A required argument is passed to the "--dvm" directive to specify the
-location of the DVM controller (e.g., "--dvm pid:12345") or by passing
-the string "search" to instead search for an existing controller.
-
-Supported options include:
-
-search          directs the tool to search for available DVM controllers
-                it is authorized to use, connecting to the first such
-                candidate it finds.
-
-pid:<arg>       provides the PID of the target DVM controller. This can
-                be given as either the PID itself (arg = int) or the path
-                to a file that contains the PID (arg = file:<path>)
-
-file:<path>     provides the path to a PMIx rendezvous file that is
-                output by PMIx servers - the file contains all the
-                required information for completing the connection
-
-uri:<arg>       specifies the URI of the DVM controller, or the name of
-                the file (specified as file:filename) that contains that info
-
-ns:<arg>        specifies the namespace of the DVM controller
-
-system          exclusively find and use the system-level DVM controller
-
-system-first    look for a system-level DVM controller, fall back to searching
-                for an available DVM controller the command is authorized to
-                use if a system-level controller is not found
-
-Examples:
-  <command> --dvm file:dvm_uri.txt --np 4 ./a.out
-
-  <command> --dvm pid:12345 --np 4 ./a.out
-
-  <command> --dvm uri:file:dvm_uri.txt --np 4 ./a.out
-
-  <command> --dvm ns:prte-node1-2095 --np 4 ./a.out
-
-  <command> --dvm pid:file:prte_pid.txt --np 4 ./a.out
-
-  <command> --dvm search --np 4 ./a.out
-#
-# NON-SUPPORTING PMIX
-#
-[non-supporting-pmix]
-The given command line directive is technically valid, but the underlying
-PMIx version being employed lacks the necessary attribute definitions to
-support it.
-
-  Directive:  %s
-  Option:     %s
-
-We are therefore unable to satisfy this request.
diff --git a/src/mca/schizo/base/help-schizo-deprecated.txt b/src/mca/schizo/base/help-schizo-deprecated.txt
deleted file mode 100644
index 9ad80a7406..0000000000
--- a/src/mca/schizo/base/help-schizo-deprecated.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- text -*-
-#
-# Copyright (c) 2022 Nanook Consulting.  All rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-#  MCA
-#
-Syntax: --mca <arg0> <arg1>
-where arg0 is the parameter name and arg1 is the parameter value
-
-Pass generic MCA parameters - i.e., parameters whose project affiliation
-must be determined by PRRTE based on matching the name of the parameter with defined values
-from various projects that PRRTE knows about.
-
-DEPRECATED: This translation can be incomplete (e.g., if a project adds or changes
-parameters) - thus, it is strongly recommended that users use project-specific parameters
-such as "prtemca" or "pmixmca".
-#
-#  GMCA
-#
-Syntax: --gmca <arg0> <arg1>
-where arg0 is the parameter name and arg1 is the parameter value. The "g" prefix
-indicates that this parameter is to be applied to _all_ application contexts and
-not just the one in which the directive appears.
-
-Pass generic MCA parameters - i.e., parameters whose project affiliation
-must be determined by PRRTE based on matching the name of the parameter with defined values
-from various projects that PRRTE knows about. This translation can be incomplete (e.g., if
-a known project adds or changes parameters) - thus, it is strongly recommended that users
-use project-specific parameters such as "prtemca" or "pmixmca".
-
-DEPRECATED: This translation can be incomplete (e.g., if  known project adds or changes
-parameters) - thus, it is strongly recommended that users use project-specific parameters
-such as "gprtemca" or "gpmixmca".
-#
-#  XML
-#
-[xml]
-Provide all output in XML format
-
-DEPRECATED: please use "--output"
-
-#include#help-schizo-cli#output
-#
-# TAG-OUTPUT
-#
-[tag-output]
-Tag all output with [job,rank]
-
-DEPRECATED: please use "--output tag"
-
-#include#help-schizo-cli#output
-#
-#  TIMESTAMP-OUTPUT
-#
-[timestamp-output]
-Timestamp all application process output
-
-DEPRECATED: please use "--output timestamp"
-
-#include#help-schizo-cli#output
-#
-#  OUTPUT-DIRECTORY
-#
-[output-directory]
-Redirect output from application processes into filename/job/rank/std[out,err,diag]. A
-relative path value will be converted to an absolute path. The directory name may include a
-colon followed by a comma-delimited list of optional case-insensitive directives. Supported
-directives currently include NOJOBID (do not include a job-id directory level) and NOCOPY
-(do not copy the output to the stdout/err streams)
-
-DEPRECATED: please use "--output dir=<path>"
-
-#include#help-schizo-cli#output
-#
-#  OUTPUT-FILENAME
-#
-[output-filename]
-Redirect output from application processes into filename.rank. A relative path value will be
-converted to an absolute path. The directory name may include a colon followed by a
-comma-delimited list of optional case-insensitive directives. Supported directives currently
-include NOCOPY (do not copy the output to the stdout/err streams)
-
-DEPRECATED: please use "--output file=<path>"
-
-#include#help-schizo-cli#output
-#
-#  MERGE-STDERR-TO-STDOUT
-#
-[merge-stderr-to-stdout]
-Merge stderr to stdout for each process
-
-DEPRECATED: please "--output merge"
-
-#include#help-schizo-cli#output
-#
-#  DISPLAY-DEVEL-MAP
-#
-[display-devel-map]
-Display a detailed process map (mostly intended for developers)
-just before launch
-
-DEPRECATED: please use "--display map-devel"
-
-#include#help-schizo-cli#display
-#
-#  DISPLAY-TOPO
-#
-[display-topo]
-Display the topology as part of the process map (mostly intended
-for developers) just before launch
-
-DEPRECATED: please use "--display topo"
-
-#include#help-schizo-cli#display
-#
-#  REPORT-BINDINGS
-#
-[report-bindings]
-Display process bindings to stderr
-
-DEPRECATED: please use "--display bindings"
-
-#include#help-schizo-cli#display
-#
-#  DISPLAY-DEVEL-ALLOCATION
-#
-[display-devel-allocation]
-Display a detailed list (mostly intended for developers) of the
-allocation being used by this job
-
-DEPRECATED: please use "--display alloc-devel"
-
-#include#help-schizo-cli#display
-#
-#  DISPLAY-MAP
-#
-[display-map]
-Display the process map just before launch
-
-DEPRECATED: please use "--display map"
-
-#include#help-schizo-cli#display
-#
-#  DISPLAY-ALLOCATION
-#
-[display-allocation]
-Display the allocation being used by this job
-
-DEPRECATED: please use "--display alloc"
-
-#include#help-schizo-cli#display
-#
diff --git a/src/mca/schizo/base/schizo_base_stubs.c b/src/mca/schizo/base/schizo_base_stubs.c
index 95b7fe3714..71930c6778 100644
--- a/src/mca/schizo/base/schizo_base_stubs.c
+++ b/src/mca/schizo/base/schizo_base_stubs.c
@@ -18,6 +18,8 @@
 
 #include "src/class/pmix_list.h"
 
+#include "src/include/pmix_frameworks.h"
+#include "src/include/prte_frameworks.h"
 #include "src/mca/errmgr/errmgr.h"
 #include "src/mca/schizo/base/base.h"
 #include "src/runtime/prte_globals.h"
@@ -240,55 +242,30 @@ char *prte_schizo_base_strip_quotes(char *p)
     return pout;
 }
 
-static char *prte_frameworks[] = {
-    "errmgr",
-    "ess",
-    "filem",
-    "grpcomm",
-    "iof",
-    "odls",
-    "oob",
-    "plm",
-    "propagate",
-    "prtebacktrace",
-    "prtedl",
-    "prteif",
-    "prteinstalldirs",
-    "prtereachable",
-    "ras",
-    "rmaps",
-    "rml",
-    "routed",
-    "rtc",
-    "schizo",
-    "state",
-    // inherited from OPAL
-    "hwloc",
-    "if",
-    "reachable",
-    NULL,
-};
-
 bool prte_schizo_base_check_prte_param(char *param)
 {
-    char **tmp;
+    char *p;
     size_t n;
+    int len;
+
+    p = strchr(param, '_');
+    len = (int)(p - param);
 
-    tmp = PMIX_ARGV_SPLIT_COMPAT(param, '_');
-    for (n=0; NULL != prte_frameworks[n]; n++) {
-        if (0 == strncmp(tmp[0], prte_frameworks[n], strlen(prte_frameworks[n]))) {
-            PMIX_ARGV_FREE_COMPAT(tmp);
+    if (0 == strncmp(param, "prte", len)) {
+        return true;
+    }
+    for (n=0; NULL != prte_framework_names[n]; n++) {
+        if (0 == strncmp(param, prte_framework_names[n], len)) {
             return true;
         }
     }
-    PMIX_ARGV_FREE_COMPAT(tmp);
     return false;
 }
 
 int prte_schizo_base_parse_prte(int argc, int start, char **argv, char ***target)
 {
     int i, j;
-    bool ignore;
+    bool use;
     char *p1, *p2, *param;
 
     for (i = 0; i < (argc - start); ++i) {
@@ -331,18 +308,8 @@ int prte_schizo_base_parse_prte(int argc, int start, char **argv, char ***target
 
             /* this is a generic MCA designation, so see if the parameter it
              * refers to belongs to one of our frameworks */
-            ignore = true;
-            if (0 == strncmp("prte", p1, strlen("prte"))) {
-                ignore = false;
-            } else {
-                for (j = 0; NULL != prte_frameworks[j]; j++) {
-                    if (0 == strncmp(p1, prte_frameworks[j], strlen(prte_frameworks[j]))) {
-                        ignore = false;
-                        break;
-                    }
-                }
-            }
-            if (!ignore) {
+            use = prte_schizo_base_check_prte_param(p1);
+            if (use) {
                 /* replace the generic directive with a PRRTE specific
                  * one so we know this has been processed */
                 free(argv[i]);
@@ -386,55 +353,58 @@ int prte_schizo_base_parse_prte(int argc, int start, char **argv, char ***target
     return PRTE_SUCCESS;
 }
 
-static char *pmix_frameworks[] = {
-    "bfrops",
-    "gds",
-    "pcompress",
-    "pdl",
-    "pfexec",
-    "pif",
-    "pinstalldirs",
-    "ploc",
-    "plog",
-    "pmdl",
-    "pnet",
-    "preg",
-    "prm",
-    "psec",
-    "psensor",
-    "pshmem",
-    "psquash",
-    "pstat",
-    "pstrg",
-    "ptl",
-    "mca",  // mca base now resides in pmix
-    NULL
-};
+static char **pmix_frameworks_tocheck = pmix_framework_names;
+static bool pmix_frameworks_setup = false;
+
+static void setup_pmix_frameworks(void)
+{
+    if (pmix_frameworks_setup) {
+        return;
+    }
+    pmix_frameworks_setup = true;
+
+    char *env = getenv("PMIX_MCA_PREFIXES");
+    if (NULL == env) {
+        return;
+    }
+
+    // If we found the env variable, it will be a comma-delimited list
+    // of values.  Split it into an argv-style array.
+    char **tmp = PMIX_ARGV_SPLIT_COMPAT(env, ',');
+    if (NULL != tmp) {
+        pmix_frameworks_tocheck = tmp;
+    }
+}
 
 bool prte_schizo_base_check_pmix_param(char *param)
 {
-    char **tmp;
+    char *p;
     size_t n;
+    int len;
+
+    setup_pmix_frameworks();
 
-    tmp = PMIX_ARGV_SPLIT_COMPAT(param, '_');
-    for (n=0; NULL != pmix_frameworks[n]; n++) {
-        if (0 == strncmp(tmp[0], pmix_frameworks[n], strlen(pmix_frameworks[n]))) {
-            PMIX_ARGV_FREE_COMPAT(tmp);
+    p = strchr(param, '_');
+    len = (int)(p - param);
+
+    if (0 == strncmp(param, "pmix", len)) {
+        return true;
+    }
+    for (n=0; NULL != pmix_frameworks_tocheck[n]; n++) {
+        if (0 == strncmp(param, pmix_frameworks_tocheck[n], len)) {
             return true;
         }
     }
-    PMIX_ARGV_FREE_COMPAT(tmp);
     return false;
 }
 
 int prte_schizo_base_parse_pmix(int argc, int start, char **argv, char ***target)
 {
     int i, j;
-    bool ignore;
+    bool use;
     char *p1, *p2, *param;
 
     for (i = 0; i < (argc - start); ++i) {
-        ignore = true;
         if (0 == strcmp("--pmixmca", argv[i]) || 0 == strcmp("--gpmixmca", argv[i])) {
             if (NULL == argv[i + 1] || NULL == argv[i + 2]) {
                 /* this is an error */
@@ -472,20 +442,42 @@ int prte_schizo_base_parse_pmix(int argc, int start, char **argv, char ***target
             p1 = prte_schizo_base_strip_quotes(argv[i + 1]);
             p2 = prte_schizo_base_strip_quotes(argv[i + 2]);
 
-            /* this is a generic MCA designation, so see if the parameter it
-             * refers to belongs to one of our frameworks */
-            if (0 == strncmp("pmix", p1, strlen("pmix"))) {
-                ignore = false;
-            } else {
-                for (j = 0; NULL != pmix_frameworks[j]; j++) {
-                    if (0 == strncmp(p1, pmix_frameworks[j], strlen(pmix_frameworks[j]))) {
-                        ignore = false;
-                        break;
-                    }
+            // see if this param references the MCA "base"
+            if (0 == strncmp(p1, "mca_base_", strlen("mca_base_"))) {
+                /* we have multiple projects that utilize the MCA
+                 * framework system. Since this was given as a generic
+                 * parameter, we cannot tell which of those projects
+                 * are being targeted. So we have no choice but to
+                 * apply the param to ALL of them
+                 */
+                if (NULL == target) {
+                    asprintf(&param, "PMIX_MCA_%s", p1);
+                    setenv(param, p2, true);
+                    free(param);
+                    // PRRTE shares the MCA base with PMIx, so no
+                    // need to cover that project
+                    asprintf(&param, "OMPI_MCA_%s", p1);
+                    setenv(param, p2, true);
+                    free(param);
+                } else {
+                    PMIX_ARGV_APPEND_NOSIZE_COMPAT(target, "--pmixmca");
+                    PMIX_ARGV_APPEND_NOSIZE_COMPAT(target, p1);
+                    PMIX_ARGV_APPEND_NOSIZE_COMPAT(target, p2);
+                    PMIX_ARGV_APPEND_NOSIZE_COMPAT(target, "--omca");
+                    PMIX_ARGV_APPEND_NOSIZE_COMPAT(target, p1);
+                    PMIX_ARGV_APPEND_NOSIZE_COMPAT(target, p2);
                 }
+                free(p1);
+                free(p2);
+                i += 2;
+                continue;
             }
-            if (!ignore) {
-                /* replace the generic directive with a PRRTE specific
+
+            /* this is a generic MCA designation, so see if the parameter it
+             * refers to belongs to one of our frameworks */
+            use = prte_schizo_base_check_pmix_param(p1);
+            if (use) {
+                /* replace the generic directive with a PMIx specific
                  * one so we know this has been processed */
                 free(argv[i]);
                 argv[i] = strdup("--pmixmca");
diff --git a/src/mca/schizo/ompi/Makefile.am b/src/mca/schizo/ompi/Makefile.am
index 45417d1516..39e1e57699 100644
--- a/src/mca/schizo/ompi/Makefile.am
+++ b/src/mca/schizo/ompi/Makefile.am
@@ -2,7 +2,8 @@
 # Copyright (c) 2015-2020 Intel, Inc.  All rights reserved.
 # Copyright (c) 2017      IBM Corporation.  All rights reserved.
 # Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -13,13 +14,28 @@
 AM_CFLAGS = \
             -DDEFAULT_PARAM_FILE_PATH="\"@AMCA_PARAM_SETS_DIR@\""
 
+# We install the "source" RST file so that Open MPI can find it and
+# use it when building against an external PRTE installation.
+#
+# See src/docs/included-content/Makefile.am for an explanation why we
+# install this file into the "data" directory (vs. the "doc"
+# directory).
+#
+# NOTE: This file is a ReStructured Text file (RST), but we
+# intentionally name it .rstxt.  See the comment in the Open MPI
+# docs/Makefile.am file for an explanation why.
+rstdir = $(prtedatadir)/rst/schizo-ompi-rst-content
+dist_rst_DATA = \
+        schizo-ompi-cli.rstxt
+
+# Install the help file
 dist_prtedata_DATA = \
-    help-schizo-ompi.txt
+        help-schizo-ompi.txt
 
 sources = \
-          schizo_ompi_component.c \
-          schizo_ompi.h \
-          schizo_ompi.c
+        schizo_ompi_component.c \
+        schizo_ompi.h \
+        schizo_ompi.c
 
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
diff --git a/src/mca/schizo/ompi/help-schizo-ompi.txt b/src/mca/schizo/ompi/help-schizo-ompi.txt
index a3b3dc4655..2d6ab9da53 100644
--- a/src/mca/schizo/ompi/help-schizo-ompi.txt
+++ b/src/mca/schizo/ompi/help-schizo-ompi.txt
@@ -1,8 +1,9 @@
-	# -*- text -*-
+# -*- text -*-
 #
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
 # Copyright (c) 2022      Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2022      IBM Corporation.  All rights reserved.
+# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -19,179 +20,9 @@
 %s (%s) %s
 
 Usage: %s [OPTION]...
-Initiate an instance of the PMIx Reference RTE (PRRTE) DVM
 
-/*****      General Options      *****/
-
--h|--help                            This help message
--h|--help <arg0>                     Help for the specified option
--v|--verbose                         Enable typical debug options
--V|--version                         Print version and exit
-
-
-/*****       Debug Options       *****/
-
-   --debug-daemons                   Debug daemons - if not set, the "verbose" setting will be limited to
-                                     the DVM controller to reduce clutter
-   --debug-daemons-file              Enable debugging of any PRTE daemons used by this application, storing
-                                     their verbose output in files
-   --display <arg0>                  Comma-delimited list of options for displaying information about the
-                                     allocation and job. Allowed values for <arg0>:
-                                       allocation, bind, map, map-devel, topo
-   --get-stack-traces                Get stack traces of all application procs on timeout
-   --leave-session-attached          Do not discard stdout/stderr of remote PRTE daemons
-   --report-state-on-timeout         Report all job and process states upon timeout
-   --spawn-timeout <arg0>            Timeout the job if spawn takes more than the specified number of seconds
-   --test-suicide <arg0>             Suicide instead of clean abort after delay
-   --timeout <arg0>                  Timeout the job after the specified number of seconds
-   --output-proctable <arg0>         Print the complete proctable to stdout after launch, allowed <arg0>
-                                     values are '+', '-', or a filename.
-
-
-/*****      Output Options       *****/
-
-   --output <arg0>                   Comma-delimited list of options that control how output is
-                                     generated.
-                                       Allowed values for <arg0>:
-                                     tag, timestamp, xml, merge-stderr-to-stdout, dir=DIRNAME, file=filename.
-                                       The dir option redirects output from application processes into
-                                     DIRNAME/job/rank/std[out,err,diag].
-                                       The file option redirects output from application processes into
-                                     filename.rank. In both cases, the provided name will be converted to an
-                                     absolute path.
-                                       Supported qualifiers include NOCOPY (do not copy the output to the
-                                     stdout/err streams).
-   --report-child-jobs-separately    Return the exit status of the primary job only
-   --xterm <arg0>                    Create a new xterm window and display output from the specified ranks
-                                     there
-
-
-
-/*****       Input Options       *****/
-
-   --stdin <arg0>                    Specify procs to receive stdin [rank, all, none] (default: 0, indicating
-                                     rank 0)
-
-
-
-/*****      Mapping Options      *****/
-
-   --map-by <arg0>                   Mapping Policy for job [slot | hwthread | core (default:np<=2) | l1cache
-                                     | l2cache | l3cache | numa (default:np>2) | package | node | seq | dist |
-                                     ppr |,rankfile].
-                                       Supported colon-delimited modifiers are: PE=y
-                                     (for multiple cpus/proc), SPAN, OVERSUBSCRIBE, NOOVERSUBSCRIBE, NOLOCAL,
-                                     HWTCPUS, CORECPUS, DEVICE(for dist policy), INHERIT, NOINHERIT,
-                                     PE-LIST=a,b (comma-delimited ranges of cpus to use for this job),
-                                     FILE=<path> for seq and rankfile options
-
-
-
-/*****      Ranking Options      *****/
-
-   --rank-by <arg0>                  Ranking Policy for job [slot | node | fill | span]
-
-
-
-/*****      Binding Options      *****/
-
-   --bind-to <arg0>                  Binding policy for job. Allowed values for <arg0>:
-                                       none, hwthread, core, l1cache, l2cache, l3cache, numa, package,
-                                       ("none" is the default when oversubscribed.
-                                       "core" is the default when np<=2, and "numa" is the default when np>2).
-                                     Allowed colon-delimited qualifiers: overload-allowed, if-supported
-
-
-
-/*****     Developer Options     *****/
-
-   --do-not-launch                   Perform all necessary operations to prepare to launch the application,
-                                     but do not actually launch it (usually used to test mapping patterns)
-
-
-
-/*****      Launch Options       *****/
-
-   --default-hostfile <arg0>         Provide a default hostfile
--H|--host <arg0>                     List of hosts to invoke processes on
-   --hostfile <arg0>                 Provide a hostfile
-   --initial-errhandler <arg0>       Specify the initial error handler that is attached to predefined
-                                     communicators during the first MPI call.
-   --machinefile <arg0>              Provide a hostfile
-   --mca <arg0> <arg1>               Pass context-specific MCA parameters; they are considered global if
-                                     --gmca is not used and only one context is specified (arg0 is the
-                                     parameter name; arg1 is the parameter value)
-   --path <arg0>                     PATH to be used to look for executables to start processes
-   --pmixmca <arg0> <arg1>           Pass context-specific PMIx MCA parameters; they are considered global if
-                                     only one context is specified (arg0 is the parameter name; arg1 is the parameter value)
-   --preload-files <arg0>            Preload the comma separated list of files to the remote machines current
-                                     working directory before starting the remote process.
-   --prtemca <arg0> <arg1>           Pass context-specific PRTE MCA parameters to the DVM
-   --pset <arg0>                     User-specified name assigned to the processes in their given application
-   --rankfile <arg0>                 Name of file to specify explicit task mapping
--s|--preload-binary                  Preload the binary on the remote machine before starting the remote
-                                     process.
-   --set-cwd-to-session-dir          Set the working directory of the started processes to their session
-                                     directory
-   --show-progress                   Output a brief periodic report on launch progress
-   --wd <arg0>                       Synonym for --wdir
-   --wdir <arg0>                     Set the working directory of the started processes
--x <arg0>                            Export an environment variable, optionally specifying a value (e.g., "-x
-                                     foo" exports the environment variable foo and takes its value from the
-                                     current environment; "-x foo=bar" exports the environment variable name
-                                     foo and sets its value to "bar" in the started processes; "-x foo*"
-                                     exports all current environmental variables starting with "foo")
-
-
-
-/*****    Specific Options   *****/
-
-   --allow-run-as-root               Allow execution as root (STRONGLY DISCOURAGED)
-   --daemonize                       Daemonize the DVM daemons into the background
-   --forward-signals <arg0>          Comma-delimited list of additional signals (names or integers) to forward
-                                     to application processes ("none" => forward nothing). Signals provided by
-                                     default include SIGTSTP, SIGUSR1, SIGUSR2, SIGABRT, SIGALRM, and SIGCONT
-   --launch-agent <arg0>             Name of daemon executable used to start processes on remote nodes
-                                     (default: prted)
-   --max-vm-size <arg0>              Number of daemons to start
-   --noprefix                        Disable automatic --prefix behavior
-   --personality <arg0>              Specify the personality to be used
-   --prefix <arg0>                   Prefix to be used to look for RTE executables
-   --set-sid                         Direct the DVM daemons to separate from the current session
-   --singleton <arg0>                ID of the singleton process that started us
-   --tmpdir <arg0>                   Set the root for the session directory tree
-   --tune <arg0>                     File(s) containing MCA params for tuning DVM operations
-   --dvm  <arg0>                     Use a persistent DVM instead of instantiating independent runtime
-                                     infrastructure. Required argument passed to indicate the
-                                     pid, uri, file containing the uri, or namespace of the DVM.
-                                     Specify "--dvm search" to search for DVM controller, using first found.
-
-
-
-/*****    Fault Tolerance Options (if enabled)    *****/
-   --enable-recovery                 Enable recovery from process failure (Default = disabled)
-   --max-restarts                    Max number of times to restart a failed process
-   --disable-recovery                Disable recovery (resets all recovery options to off)
-   --continuous                      Job is to run until explicitly terminated
-   --with-ft                         Specify the type(s) of error handling that the application will use.
-
-
-/*****    MPI Options    *****/
-   --initial-errhandler              Specify the initial error handler that is attached to predefined
-                                     communicators during the first MPI call.
-   --display-comm                    Display table of communication methods between ranks during MPI_Init
-   --display-comm-finalize           "Display table of communication methods between ranks during MPI_Finalize
-   --soft                            This option is unsupported, but mandated by the MPI standard
-   --arch <arg0>                     This option is unsupported, but mandated by the MPI standard
-   --file <arg0>                     This option is unsupported, but mandated by the MPI standard
-
-/*****    Options for debugger/tools use   *****/
-   --keepalive <arg0>                Pipe to monitor - DVM will terminate upon closure
-   --report-pid <arg0>               Printout pid on stdout (-), stderr (+), or a file (anything else)
-   --report-uri <arg0>               Printout URI on stdout (-), stderr (+), or a file (anything else)
-   --stop-on-exec <arg0>             If supported, stop each specified process at start of execution
-   --stop-in-init <arg0>             Direct the specified processes to stop in PMIx_Init
-   --stop-in-app <arg0>              Direct the specified processes to stop at an application-controlled location
+See the mpirun(1) man page or HTML help for a detailed list of command
+line options that are available.
 
 %s
 #
@@ -254,7 +85,7 @@ If neither the --hostfile or --host options are specified, this will be the set
 
 The --hostfile and --host options can be used to select a subset of nodes from the default set to be used.
 
-If both the --hostfile and --host options are specified, then the --hostfile option specifies the 
+If both the --hostfile and --host options are specified, then the --hostfile option specifies the
 initial subset of nodes used from the default-hostfile set, and the --host option specifies what subset of
 nodes from that second subset will be used as the final subset of nodes used.
 
@@ -521,7 +352,7 @@ An internal Open MPI environment variable needed for Java support was not set.
 Open MPI 5.0.0 or newer is required for this support.
 #
 [output-proctable]
-Print the complete proctable to stdout after launch. This option accepts an optional argument, 
+Print the complete proctable to stdout after launch. This option accepts an optional argument,
 which must be + to print to stdout, - to print to stderr, or a valid filename to print to
 a file. For instance --output-proctable=+
 
diff --git a/src/mca/schizo/ompi/schizo-ompi-cli.rstxt b/src/mca/schizo/ompi/schizo-ompi-cli.rstxt
new file mode 100644
index 0000000000..4cd2a4e2bc
--- /dev/null
+++ b/src/mca/schizo/ompi/schizo-ompi-cli.rstxt
@@ -0,0 +1,471 @@
+.. -*- rst -*-
+
+   Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+   Copyright (c) 2022      Cisco Systems, Inc.  All rights reserved.
+   Copyright (c) 2022      IBM Corporation.  All rights reserved.
+   Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
+   $COPYRIGHT$
+
+   Additional copyrights may follow
+
+   $HEADER$
+
+General command line options
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following general command line options are available.
+
+* ``-h`` | ``--help``: This help message
+
+* ``-v`` | ``--verbose``: Enable extra verbose output
+
+* ``-V`` | ``--version``: Print version and exit
+
+Launch options
+^^^^^^^^^^^^^^
+
+* ``--default-hostfile <filename>``: Provide a default hostfile.
+
+* ``-H`` | ``--host <list>``: Comma-delimited list of hosts on which to
+  to invoke processes.
+  :ref:`See below for details <label-schizo-ompi-host>`.
+
+* ``--hostfile <filename>``: Provide a hostfile.
+  :ref:`See below for details <label-schizo-ompi-hostfile>`.
+
+* ``--machinefile <filename>``: Synonym for ``--hostfile``.
+
+* ``--mca <key> <value>``: Pass context-specific MCA parameters; they
+  are considered global if ``--gmca`` is not used and only one context
+  is specified (``<key>`` is the parameter name; ``<value>`` is the
+  parameter value).
+
+* ``--path <path>``: Path to be used to look for executables to start
+  processes.
+
+* ``--pmixmca <key> <value>``: Pass context-specific PMIx MCA
+  parameters; they are considered global if only one context is
+  specified (``<key>>`` is the parameter name; ``<value>`` is the
+  parameter value).
+  :ref:`See below for details <label-schizo-ompi-pmixmca>`.
+
+* ``--preload-files <list>``: Preload the comma-separated list of
+  files to the remote machines current working directory before
+  starting the remote process.
+
+* ``--prtemca <key> <value>``: Pass context-specific PRTE MCA
+  parameters to the DVM.
+  :ref:`See below for details <label-schizo-ompi-prtemca>`.
+
+* ``--pset <name>``: User-specified name assigned to the processes in
+  their given application.
+
+* ``--rankfile <filename>``: Name of file to specify explicit task
+  mapping.
+
+* ``--runtime-options <list>``: List of options to pass to the launcher.
+  :ref:`See below for details <label-schizo-ompi-runtime-options>`.
+
+* ``-s`` | ``--preload-binary``: Preload the binary on the remote
+  machine before starting the remote process.
+
+* ``--set-cwd-to-session-dir``: Set the working directory of the
+  started processes to their session directory.
+
+* ``--show-progress``: Output a brief periodic report on launch
+  progress.
+
+* ``--wd <dir>``: Synonym for ``--wdir``.
+
+* ``--wdir <dir>``: Set the working directory of the started processes.
+
+* ``-x <var>``: Export a environment variable, optionally specifying a value.
+  :ref:`See below for details <label-schizo-ompi-x>`.
+
+Mapping, ranking, and binding options
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* ``--map-by <value>``: Controls how processes are distributed within
+  a host.  :ref:`See below for details <label-schizo-ompi-map-by>`.
+
+* ``--rank-by <value>``: Controls how processes are ordered in
+  ``MPI_COMM_WORLD``.  :ref:`See below for details
+  <label-schizo-ompi-rank-by>`.
+
+* ``--bind-to <value>``: Controls the resources to which processes are
+  bound within a host.  :ref:`See below for details
+  <label-schizo-ompi-bind-to>`.
+
+Output options
+^^^^^^^^^^^^^^
+
+* ``--output <list>``: Comma-delimited list of options that control
+  how output is generated.  :ref:`See below for details
+  <label-schizo-ompi-output>`.
+
+* ``--report-child-jobs-separately``: Return the exit status of the
+  primary job only.
+
+* ``--stream-buffering <value>``: Control how output is buffered.
+  :ref:`See below for details <label-schizo-ompi-stream-buffering>`.
+
+* ``--xterm <list>``: Create a new xterm window and display output
+  from the specified ranks there.
+
+Input options
+^^^^^^^^^^^^^
+
+* ``--stdin <list>``: Specify procs to receive stdin; alloable values
+  in ``<list>`` are: comma-delimited list of integer ranks, ``all``,
+  ``none``.  Defaults to ``0``, indicating rank 0.
+
+Specific options
+^^^^^^^^^^^^^^^^
+
+* ``--allow-run-as-root``: Allow execution as root **(STRONGLY
+  DISCOURAGED)**.  :ref:`See below for details
+  <label-schizo-ompi-allow-run-as-root>`.
+
+* ``--daemonize``: Daemonize the DVM daemons into the background.
+
+* ``--forward-signals <list>``: Comma-delimited list of additional
+  signals (names or integers) to forward to application
+  processes.
+  :ref:`See below for details <label-schizo-ompi-forward-signals>`.
+
+* ``--launch-agent <agent>``: Name of daemon executable used to start
+  processes on remote nodes (default: ``prted``).
+
+* ``--max-vm-size <size>``: Number of daemons to start.
+
+* ``--noprefix``: Disable automatic ``--prefix`` behavior.
+  :ref:`See below for details <label-schizo-ompi-noprefix>`.
+
+* ``--prefix <prefix>``: Prefix to be used to look for RTE executables.
+
+* ``--set-sid``: Direct the DVM daemons to separate from the current
+  session.
+
+* ``--singleton <id>``: ID of the singleton process that started us.
+
+* ``--tmpdir <dir>``: Set the root for the session directory tree.
+
+* ``--tune <filename>``: File(s) containing MCA params for tuning DVM
+  operations.
+  :ref:`See below for details <label-schizo-ompi-tune>`.
+
+MPI Options
+^^^^^^^^^^^
+
+* ``--initial-errhandler``: Specify the initial error handler that is
+  attached to predefined communicators during the first MPI call.
+* ``--display-comm``: Display table of communication methods between
+  MPI_COMM_WORLD ranks during MPI_Init
+* ``--display-comm-finalize``: Display table of communication methods
+  between ranks during MPI_Finalize
+* ``--soft``: This option does nothing, but is mandated by the MPI
+  standard
+* ``--arch <filename>``: This option does nothing, but is mandated by
+  the MPI standard
+* ``--file <filename>``: This option does nothing, but is mandated by
+  the MPI standard
+
+Debugger / tool options
+^^^^^^^^^^^^^^^^^^^^^^^
+
+* ``--keepalive <filename>``: Named pipe filename to monitor |mdash|
+  DVM will terminate upon closure
+* ``--report-pid <value>``: Print out PID on stdout (``-``), stderr
+  (``+``), or a filename (anything else)
+* ``--report-uri <value>``: Print out URI on stdout (``-``), stderr
+  (``+``), or a filename (anything else)
+* ``--stop-on-exec <value>``: If supported, stop each specified
+  process at start of execution
+* ``--stop-in-init <value>``: Direct the specified processes to stop
+  in the MPI initialization function
+* ``--stop-in-app <value>``: Direct the specified processes to stop at
+  an application-controlled location
+
+Debug options
+^^^^^^^^^^^^^
+
+* ``--debug-daemons``: Debug daemons |mdash| if not set, the "verbose"
+  setting will be limited to the DVM controller to reduce clutter.
+  :ref:`See below for details <label-schizo-ompi-debug-daemons>`.
+
+* ``--debug-daemons-file``: Enable debugging of any PRTE daemons used
+  by this application, storing their verbose output in files.
+  :ref:`See below for details <label-schizo-ompi-debug-daemons-file>`.
+
+* ``--display <value>``: Comma-delimited list of options for
+  displaying information about the allocation and job. Allowed values
+  for ``<value>``: ``allocation``, ``bind``, ``map``, ``map-devel``,
+  ``topo``.
+  :ref:`See below for details <label-schizo-ompi-display>`.
+
+* ``--get-stack-traces``: If a timeout occurs, get stack traces of all
+  application processes.
+
+* ``--leave-session-attached``: Do not discard stdout/stderr of remote
+  PRTE daemons.
+  :ref:`See below for details <label-schizo-ompi-leave-session-attached>`.
+
+* ``--report-state-on-timeout``: Report all job and process states
+  upon timeout.
+
+* ``--spawn-timeout <seconds>``: Timeout the job if spawn takes more
+  than the specified number of seconds.
+
+* ``--test-suicide <seconds>``: Suicide instead of clean abort after
+  delay.
+
+* ``--timeout <seconds>``: Timeout the job after the specified number
+  of seconds.
+
+* ``--output-proctable <value>``: Print the complete proctable to
+  stdout after launch; allowed ``<value>`` values are ``+``, ``-``, or
+  a filename.
+
+Fault Tolerance Options
+^^^^^^^^^^^^^^^^^^^^^^^
+
+These options are only available is Open MPI / PRRTE were compiled
+with Fault Tolerance functionality enabled.
+
+* ``--enable-recovery``: Enable recovery from process failure (Default
+  = disabled)
+* ``--max-restarts``: Max number of times to restart a failed process
+* ``--disable-recovery``: Disable recovery (resets all recovery
+  options to off)
+* ``--continuous``: Job is to run until explicitly terminated
+* ``--with-ft``: Specify the type(s) of error handling that the
+  application will use.
+
+Details of individual command line options
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The sections below offer more detail than the abbreviated lists,
+above.
+
+.. _label-schizo-ompi-allow-run-as-root:
+
+The ``--allow-run-as-root`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-allow-run-as-root.rst
+
+.. _label-schizo-ompi-bind-to:
+
+The ``--bind-to`` option
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-bind-to.rst
+
+.. _label-schizo-ompi-debug-daemons:
+
+The ``--debug-daemons`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-debug-daemons.rst
+
+.. _label-schizo-ompi-debug-daemons-file:
+
+The ``--debug-daemons-file`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-debug-daemons-file.rst
+
+.. _label-schizo-ompi-display:
+
+The ``--display`` option
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-display.rst
+
+.. _label-schizo-ompi-forward-signals:
+
+The ``--forward-signals`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-forward-signals.rst
+
+.. _label-schizo-ompi-host:
+
+The ``--host`` option
+~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-dash-host.rst
+
+.. _label-schizo-ompi-hostfile:
+
+The ``--hostfile`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-dvm-hostfile.rst
+
+.. _label-schizo-ompi-leave-session-attached:
+
+The ``--leave-session-attached`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-leave-session-attached.rst
+
+.. _label-schizo-ompi-map-by:
+
+The ``--map-by`` option
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-map-by.rst
+
+.. _label-schizo-ompi-output:
+
+The ``--output`` option
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-output.rst
+
+.. _label-schizo-ompi-pmixmca:
+
+The ``--pmixmca`` option
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-pmixmca.rst
+
+.. _label-schizo-ompi-prefix:
+
+The ``--prefix`` option
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-prefix.rst
+
+.. _label-schizo-ompi-prtemca:
+
+The ``--prtemca`` option
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-prtemca.rst
+
+.. _label-schizo-ompi-noprefix:
+
+The ``--noprefix`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-noprefix.rst
+
+.. _label-schizo-ompi-rank-by:
+
+The ``--rank-by`` option
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-rank-by.rst
+
+.. _label-schizo-ompi-runtime-options:
+
+The ``--runtime-options`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-runtime-options.rst
+
+.. _label-schizo-ompi-stream-buffering:
+
+The ``--stream-buffering`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-stream-buffering.rst
+
+.. _label-schizo-ompi-tune:
+
+The ``--tune`` option
+~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-tune.rst
+
+.. _label-schizo-ompi-x:
+
+The ``-x`` option
+~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/cli-x.rst
+
+
+Deprecated command line options
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following command line options are deprecated, and should
+generally not be used.  They may be removed in a future release of
+Open MPI.
+
+The ``--bind-to-core`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-bind-to-core.rst
+
+The ``--display-allocation`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-display-allocation.rst
+
+The ``--display-devel-allocation`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-display-devel-allocation.rst
+
+The ``--display-devel-map`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-display-devel-map.rst
+
+The ``--display-map`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-display-map.rst
+
+The ``--display-topo`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-display-topo.rst
+
+The ``--gmca`` option
+~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-gmca.rst
+
+The ``--mca`` option
+~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-mca.rst
+
+The ``--merge-stderr-to-stdout`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-merge-stderr-to-stdout.rst
+
+The ``--output-directory`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-output-directory.rst
+
+The ``--output-filename`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-output-filename.rst
+
+The ``--report-bindings`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-report-bindings.rst
+
+The ``--tag-output`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-tag-output.rst
+
+The ``--timestamp-output`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-timestamp-output.rst
+
+The ``--xml`` option
+~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /prrte-rst-content/deprecated-xml.rst
diff --git a/src/mca/schizo/prte/Makefile.am b/src/mca/schizo/prte/Makefile.am
index bb402d067a..4e2bbe8cb2 100644
--- a/src/mca/schizo/prte/Makefile.am
+++ b/src/mca/schizo/prte/Makefile.am
@@ -2,7 +2,8 @@
 # Copyright (c) 2015-2020 Intel, Inc.  All rights reserved.
 # Copyright (c) 2017      IBM Corporation.  All rights reserved.
 # Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2022      Nanook Consulting  All rights reserved.
+# Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -13,14 +14,6 @@
 AM_CFLAGS = \
     -DPRTE_GREEK_VERSION="\"@PRTE_GREEK_VERSION@\""
 
-dist_prtedata_DATA = \
-    help-schizo-prte.txt \
-    help-schizo-prted.txt \
-    help-schizo-prun.txt \
-    help-schizo-pterm.txt \
-    help-schizo-pinfo.txt \
-    help-schizo-prterun.txt
-
 sources = \
           schizo_prte_component.c \
           schizo_prte.h \
diff --git a/src/mca/schizo/prte/help-schizo-pinfo.txt b/src/mca/schizo/prte/help-schizo-pinfo.txt
deleted file mode 100644
index 03dc5c90f2..0000000000
--- a/src/mca/schizo/prte/help-schizo-pinfo.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- text -*-
-#
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-#
-[usage]
-%s (%s) %s
-
-Usage: %s [OPTION]...
-Provide detailed information on your PRRTE installation.
-
-The following list of command line options are available. Note that
-more detailed help for any option can be obtained by adding that
-option to the help request as "--help <option>".
-
-/*****      General Options      *****/
-
--a|--all                             Show all configuration options and MCA parameters
-   --arch                            Show architecture PRRTE was compiled on
--c|--config                          Show configuration options
--h|--help                            This help message
-   --hostname                        Show the hostname that PRRTE was configured and built on
-   --internal                        Show internal MCA parameters (not meant to be modified by users)
-   --param <arg0>:<arg1>,<arg2>      Show MCA parameters.  The first parameter is the framework (or the
-                                     keyword "all"); the second parameter is a comma-delimited list of
-                                     specific component names (if only <arg0> is given, then all
-                                     components will be reported).
-   --path <arg0>                     Show paths that PRRTE was configured with.  Accepts the following
-                                     parameters: prefix, bindir, libdir, incdir, mandir, pkglibdir,
-                                     sysconfdir
-   --show-version <arg0>:<arg1>      Show version of PRRTE or a component.  The first parameter can be the
-                                     keywords "prte" or "all", a framework name (indicating all components in
-                                     a framework), or a framework:component string (indicating a specific
-                                     component).  The second parameter can be one of: full, major, minor,
-                                     release, greek, svn.
--V|--version                         Print version and exit
-
-
-Report bugs to %s
-#
-[param]
-Syntax: --param <arg0> <arg1>
-Show MCA parameters.  The first parameter is the framework (or the
-keyword "all"); the second parameter is the specific component name (or
-the keyword "all").
-#
-[internal]
-Syntax: --internal
-Show internal MCA parameters (i.e., parameters not meant to be modified by users)
-#
-[path]
-Syntax: --path <arg0>
-Show the paths with which PRRTE was configured.  Accepts the following
-parameters: prefix, bindir, libdir, incdir, mandir, pkglibdir,
-sysconfdir
-#
-[arch]
-Syntax: --arch
-Show architecture PRRTE was compiled on
-#
-[config]
-Syntax: -c or --config
-Show configuration options used to configure PRRTE
-#
-[hostname]
-Syntax: --hostname
-Show the hostname upon which PRRTE was configured and built
-#
-[all]
-Syntax: -a or --all
-Show all configuration options and MCA parameters
diff --git a/src/mca/schizo/prte/help-schizo-prte.txt b/src/mca/schizo/prte/help-schizo-prte.txt
deleted file mode 100644
index 1aa7f4fb62..0000000000
--- a/src/mca/schizo/prte/help-schizo-prte.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-# -*- text -*-
-#
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
-# Copyright (c) 2022      IBM Corporation.  All rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-#
-[version]
-%s (%s) %s
-
-%s
-#
-[usage]
-%s (%s) %s
-
-Usage: %s [OPTION]...
-Initiate an instance of the PMIx Reference RTE (PRRTE) DVM
-
-The following list of command line options are available. Note that
-more detailed help for any option can be obtained by adding that
-option to the help request as "--help <option>".
-
-/*****      General Options      *****/
-
--h|--help                            This help message
--h|--help <arg0>                     Help for the specified option
--v|--verbose                         Enable typical debug options
--V|--version                         Print version and exit
-
-
-/*****       Debug Options       *****/
-
-   --debug-daemons                   Debug daemons - if not set, any "verbose" settings will be limited to
-                                     the DVM controller to reduce clutter
-   --debug-daemons-file              Enable debugging of any PRRTE daemons used by this application, storing
-                                     their verbose output in files
-   --leave-session-attached          Do not discard stdout/stderr of remote PRRTE daemons
-   --test-suicide <arg0>             Direct that the specified daemon suicide after delay
-   --display <arg0>                  Comma-delimited list of options for displaying information
-
-
-/*****       DVM Options        *****/
-
-   --runtime-options <arg0>          Comma-delimited list of runtime directives for the job (e.g., show
-                                     progress reports on DVM startup for large systems)
-   --default-hostfile <arg0>         Provide a default hostfile
--H|--host <arg0>                     List of hosts to use for the DVM
-   --hostfile <arg0>                 Provide a hostfile
-   --machinefile <arg0>              Provide a hostfile (synonym for "hostfile")
-   --pmixmca <arg0> <arg1>           Pass PMIx MCA parameters
-   --prtemca <arg0> <arg1>           Pass PRTE MCA parameters to the DVM
-   --show-progress                   Output a brief periodic report on DVM startup progress
--x <arg0>                            Export an environment variable, optionally specifying a value
-   --allow-run-as-root               Allow execution as root (STRONGLY DISCOURAGED)
-   --daemonize                       Daemonize the DVM daemons into the background
-   --forward-signals <arg0>          Additional signals (names or integers) to forward
-   --keepalive <arg0>                Pipe to monitor - DVM will terminate upon closure
-   --launch-agent <arg0>             Name of daemon executable used to start processes on remote nodes
-                                     (default: prted)
-   --max-vm-size <arg0>              Max number of daemons to start
-   --no-ready-msg                    Do not print a DVM ready message
-   --noprefix                        Disable automatic --prefix behavior
-   --prefix <arg0>                   Prefix to be used to look for RTE executables
-   --report-pid <arg0>               Printout pid on stdout [-], stderr [+], or a file [anything else]
-   --report-uri <arg0>               Printout URI on stdout [-], stderr [+], or a file [anything else]
-   --set-sid                         Direct the DVM daemons to separate from the current session
-   --singleton <arg0>                ID of the singleton process that started us
-   --system-server                   Start the DVM as the system server
-   --tmpdir <arg0>                   Set the root for the session directory tree
-   --tune <arg0>                     File(s) containing MCA params for tuning DVM operations
-   --timeout <arg0>                  Timeout DVM startup if time exceeds the specified number of seconds
-
-Report bugs to %s
-#
-[prtemca]
-#include#help-schizo-cli#prtemca
-#
-[pmixmca]
-#include#help-schizo-cli#pmixmca
-#
-[tune]
-#include#help-schizo-cli#tune
-#
-[no-ready-msg]
-Do not print a DVM ready message
-#
-[daemonize]
-Daemonize the DVM daemons and controller into the background
-#
-[system-server]
-Start the DVM controller and its daemons as the system server on their nodes
-#
-[set-sid]
-Direct the DVM (controller and daemons) to separate from the current session
-#
-[report-pid]
-Printout DVM controller's PID on stdout [-], stderr [+], or a file [anything else]
-#
-[report-uri]
-Printout DVM controller's URI on stdout [-], stderr [+], or a file [anything else]
-#
-[test-suicide]
-Test DVM cleanup upon daemon failure by having one daemon suicide after delay
-#
-[default-hostfile]
-Specify a default hostfile.
-
-#include#help-schizo-cli#dvm-hostfile
-#
-[singleton]
-DVM is being started by a singleton process (i.e., one not started by a DVM) - the
-argument must be the PMIx ID of the singleton process that started us
-#
-[keepalive]
-Pipe for DVM controller to monitor - DVM will terminate upon closure
-#
-[launch-agent]
-Name of daemon executable used to start processes on remote nodes (default: prted).
-This is the executable the DVM controller shall start on each remote node when
-establishing the DVM.
-#
-[max-vm-size]
-Maximum number of daemons to start - sets the maximum size of the DVM.
-#
-[debug-daemons]
-Debug daemon output enabled. This is a somewhat limited stream of information normally
-used to simply confirm that the daemons started. Includes leaving the output streams
-open.
-#
-[debug-daemons-file]
-#include#help-schizo-cli#debug-daemons-file
-#
-[leave-session-attached]
-#include#help-schizo-cli#leave-session-attached
-#
-[tmpdir]
-Define the root location for the PRRTE session directory tree
-
-#include#help-schizo-cli#tmpdir
-#
-[prefix]
-#include#help-schizo-cli#prefix
-#
-[noprefix]
-#include#help-schizo-cli#no-prefix
-#
-[forward-signals]
-#include#help-schizo-cli#forward-signals
-#
-[allow-run-as-root]
-#include#help-schizo-cli#allow-run-as-root
-#
-[no-aggregate-help]
-Do not aggregate "show_help" output. PRRTE defaults to aggregating messages generated
-by its "show_help" subsystem so that only one is printed out per topic (along with the
-number of processes that reported the same issue). This is done to avoid users receiving
-a flood of one-per-process error messages, all containing the identical error report.
-Setting this option turns off the aggregation, thereby allowing the user to see duplicate
-reports from multiple processes.
-#
-[timeout]
-Timeout DVM startup if time exceeds the specified number of seconds. The DVM startup
-will abort after the specified interval.
-#
-[x]
-#include#help-schizo-cli#x
-#
-[show-progress]
-Output a brief periodic report on DVM startup progress
-#
-[hostfile]
-#include#help-schizo-cli#dvm-hostfile
-#
-[machinefile]
-Provide a hostfile (synonym for "hostfile")
-
-#include#help-schizo-cli#dvm-hostfile
-#
-[host]
-#include#help-schizo-cli#dash-host
-#
-[display]
-#include#help-schizo-cli#display
-#
-#
-#  DEPRECATED OPTIONS
-#
diff --git a/src/mca/schizo/prte/help-schizo-prted.txt b/src/mca/schizo/prte/help-schizo-prted.txt
deleted file mode 100644
index 280b79d45b..0000000000
--- a/src/mca/schizo/prte/help-schizo-prted.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- text -*-
-#
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
-# Copyright (c) 2022      IBM Corporation.  All rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-#
-[usage]
-%s (%s) %s
-
-Usage: %s [OPTION]...
-
-The following list of command line options are available. Note that
-more detailed help for any option can be obtained by adding that
-option to the help request as "--help <option>".
-
-/*****      General Options      *****/
-
--h|--help                            This help message
--h|--help <arg0>                     Help for the specified option
--v|--verbose                         Enable typical debug options
--V|--version                         Print version and exit
-
-
-/*****       Debug Options       *****/
-
-   --debug                           Top-level PRTE debug switch (default: false) This option will be
-                                     deprecated, use --debug-devel instead.
-   --debug-daemons-file              Enable debugging of any PRTE daemons used by this application, storing
-                                     output in files
-   --leave-session-attached          Do not daemonize the prted
-   --test-suicide <arg0>             Suicide instead of clean abort after specified delay
-
-
-
-/*****      DVM Options       *****/
-
-   --pmixmca <arg0> <arg1>           Pass context-specific PMIx MCA parameters (arg0 is the
-                                     parameter name; arg1 is the parameter value)
-   --prtemca <arg0> <arg1>           Pass context-specific PRTE MCA parameters; they are considered global if
-                                     --gmca is not used and only one context is specified (arg0 is the
-                                     parameter name; arg1 is the parameter value)
-   --dvm-master-uri <arg0>           Specify the URI of the DVM master, or the name of the file (specified as
-                                     file:filename) that contains that info
-   --parent-uri <arg0>               Specify the URI of the prted acting as the parent of this prted
-                                     in a tree-based spawn operation
-   --tree-spawn                      A tree-based spawn operation is in progress
-
-
-/*****    Specific Options   *****/
-
-   --set-sid                         Direct the DVM daemons to separate from the current session
-   --system-server                   Start the DVM as the system server
-   --pubsub-server <arg0>            Contact information for external PRRTE publish/lookup
-                                     data server
-
-Report bugs to %s
-#
-[version]
-%s (%s) %s
-
-Report bugs to %s
-#
-[dvm-master-uri]
-Specify the URI of the DVM master, or the name of the file (specified as
-file:filename) that contains that info
-#
-[test-suicide]
-Test DVM cleanup upon daemon failure by having one daemon suicide after delay
-#
-[system-server]
-Start the daemon as the system server on its node
-#
-[set-sid]
-Direct the daemon to separate from the current session
-#
-[prtemca]
-#include#help-schizo-cli#prtemca
-#
-[pmixmca]
-#include#help-schizo-cli#pmixmca
-#
-[leave-session-attached]
-#include#help-schizo-cli#leave-session-attached
-#
-[parent-uri]
-Specify the URI of the prted acting as the parent of this prted
-in a tree-based spawn operation
-#
-[tree-spawn]
-A tree-based spawn operation is in progress
-#
-[pubsub-server]
-Contact information for external PRRTE publish/lookup data server
diff --git a/src/mca/schizo/prte/help-schizo-prterun.txt b/src/mca/schizo/prte/help-schizo-prterun.txt
deleted file mode 100644
index 9d54e57001..0000000000
--- a/src/mca/schizo/prte/help-schizo-prterun.txt
+++ /dev/null
@@ -1,409 +0,0 @@
-# -*- text -*-
-#
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
-# Copyright (c) 2022      IBM Corporation.  All rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-#
-[version]
-%s (%s) %s
-
-%s
-#
-[usage]
-%s (%s) %s
-
-Usage: %s [OPTION]...
-Initiate an instance of the PMIx Reference RTE (PRRTE) DVM
-
-The following list of command line options are available. Note that
-more detailed help for any option can be obtained by adding that
-option to the help request as "--help <option>".
-
-/*****      General Options      *****/
-
--h|--help                            This help message
--h|--help <arg0>                     Help for the specified option
--v|--verbose                         Enable typical debug options
--V|--version                         Print version and exit
-
-
-/*****       Debug Options       *****/
-
-   --debug-daemons                   Debug daemons - if not set, any "verbose" settings will be limited to
-                                     the prterun itself to reduce clutter
-   --debug-daemons-file              Enable debugging of any PRRTE daemons used by this application, storing
-                                     their verbose output in files
-   --display <arg0>                  Options for displaying information about the allocation and job.
-   --spawn-timeout <arg0>            Timeout the job if spawn takes more than the specified number of seconds
-   --timeout <arg0>                  Timeout the job if execution is not complete after the specified
-                                     number of seconds
-   --get-stack-traces                Get stack traces of all application procs on timeout
-   --leave-session-attached          Do not discard stdout/stderr of remote PRRTE daemons
-   --report-state-on-timeout         Report all job and process states upon timeout
-   --stop-on-exec                    If supported, stop each specified process at start of execution
-   --stop-in-init                    Direct the specified processes to stop in PMIx_Init
-   --stop-in-app                     Direct the specified processes to stop at an application-controlled location
-   --test-suicide <arg0>             Direct that the specified daemon suicide after delay
-   --do-not-launch                   Perform all necessary operations to prepare to launch the application,
-                                     but do not actually launch it (usually used to test mapping patterns)
-
-
-
-/*****      Output Options       *****/
-
-   --output <arg0>                   Comma-delimited list of options that control how output is
-                                     generated.
-   --report-child-jobs-separately    Return the exit status of the primary job only
-   --xterm <arg0>                    Create a new xterm window for each of the comma-delimited ranges
-                                     of application process ranks
-
-
-
-/*****       Input Options       *****/
-
-   --stdin <arg0>                    Specify application rank(s) to receive stdin [rank, all, none]
-                                     (default: 0, indicating rank 0)
-
-
-
-/*****      Placement Options      *****/
-
-   --map-by <arg0>                   Mapping Policy for job
-   --rank-by <arg0>                  Ranking Policy for job
-   --bind-to <arg0>                  Binding policy for job.
-
-
-
-/*****      Launch Options       *****/
-   --runtime-options <arg0>          Comma-delimited list of runtime directives for the job (e.g., do not
-                                     abort if a process exits on non-zero status)
--c|--np <arg0>                       Number of processes to run
--n|--n <arg0>                        Number of processes to run
--N|--npernode <arg0>                 Run designated number of processes on each node
-   --personality <arg0>              Specify the personality to be used
--H|--host <arg0>                     List of hosts to invoke processes on
-   --hostfile <arg0>                 Provide a hostfile
-   --machinefile <arg0>              Provide a hostfile (synonym for hostfile)
-   --pmixmca <arg0> <arg1>           Pass context-specific PMIx MCA parameters; they are considered global if
-                                     only one context is specified (arg0 is the parameter name; arg1 is the parameter value)
-   --gpmixmca <arg0> <arg1>          Pass global PMIx MCA parameters that are applicable to all contexts (arg0
-                                     is the parameter name; arg1 is the parameter value)
-   --preload-files <arg0>            Preload the comma separated list of files to the remote machines current
-                                     working directory before starting the remote process.
-   --prtemca <arg0> <arg1>           Pass context-specific PRRTE MCA parameters to the DVM
-   --pset <arg0>                     User-specified name assigned to the processes in their given application
--s|--preload-binary                  Preload the binary on the remote machine before starting the remote
-                                     process.
-   --set-cwd-to-session-dir          Set the working directory of the started processes to their session
-                                     directory
-   --show-progress                   Output a brief periodic report on launch progress
-   --wd <arg0>                       Synonym for --wdir
-   --wdir <arg0>                     Set the working directory of the started processes
--x <arg0>                            Export an environment variable, optionally specifying a value
-
-
-/*****    Specific Options   *****/
-
-   --allow-run-as-root               Allow execution as root (STRONGLY DISCOURAGED)
-   --daemonize                       Daemonize the prterun and its daemons into the background
-   --forward-signals <arg0>          Comma-delimited list of additional signals (names or integers) to forward
-                                     to application processes ["none" => forward nothing].
-   --keepalive <arg0>                Pipe to monitor - DVM will terminate upon closure
-   --launch-agent <arg0>             Name of daemon executable used to start processes on remote nodes
-                                     (default: prted)
-   --max-vm-size <arg0>              Number of daemons to start
-   --no-ready-msg                    Do not print a DVM ready message
-   --noprefix                        Disable automatic --prefix behavior
-   --prefix <arg0>                   Prefix to be used to look for RTE executables
-   --report-pid <arg0>               Printout pid on stdout [-], stderr [+], or a file [anything else]
-   --report-uri <arg0>               Printout URI on stdout [-], stderr [+], or a file [anything else]
-   --set-sid                         Direct the DVM daemons to separate from the current session
-   --singleton <arg0>                ID of the singleton process that started us
-   --tmpdir <arg0>                   Set the root for the session directory tree
-   --tune <arg0>                     File(s) containing MCA params for tuning DVM operations
-   --dvm  <arg0>                     Use a persistent DVM instead of instantiating independent runtime
-                                     infrastructure. The argument indicates the pid, uri,
-                                     file containing the uri, or namespace of the DVM.
-
-Report bugs to %s
-#
-[dvm]
-Utilize an existing persistent DVM instead of instantiating an
-independent runtime infrastructure. This mimics the "prun" command,
-but is provided as a convenience option for those wanting to embed
-the "prterun" command in a script that can be optionally used to
-run either independently or under a persistent DVM.
-
-#include#help-schizo-cli#dvm
-#
-[prtemca]
-#include#help-schizo-cli#prtemca
-#
-[pmixmca]
-#include#help-schizo-cli#pmixmca
-#
-[gpmixmca]
-Syntax: --gpmixmca <arg0> <arg1>
-where arg0 is the parameter name and arg1 is the parameter value. The "g" prefix
-indicates that this PMIx parameter is to be applied to _all_ application contexts and
-not just the one in which the directive appears.
-#
-[tune]
-#include#help-schizo-cli#tune
-#
-[daemonize]
-Daemonize the prterun and the DVM daemons into the background
-#
-[system-server]
-Start prterun and its daemons as the system server on their nodes
-#
-[set-sid]
-Direct the DVM (controller and daemons) to separate from the current session
-#
-[report-pid]
-Printout prterun's PID on stdout [-], stderr [+], or a file [anything else]
-#
-[report-uri]
-Printout prterun's URI on stdout [-], stderr [+], or a file [anything else]
-#
-[test-suicide]
-Test DVM cleanup upon daemon failure by having one daemon suicide after delay
-#
-[singleton]
-prterun is being started by a singleton process (i.e., one not started by prterun) - the
-argument must be the PMIx ID of the singleton process that started us
-#
-[keepalive]
-Pipe for prterun to monitor - job will terminate upon closure
-#
-[launch-agent]
-Name of daemon executable used to start processes on remote nodes (default: prted).
-This is the executable prterun shall start on each remote node when establishing the DVM.
-#
-[max-vm-size]
-Maximum number of daemons to start
-#
-[debug-daemons]
-#include#help-schizo-cli#debug-daemons
-#
-[debug-daemons-file]
-#include#help-schizo-cli#debug-daemons-file
-#
-[leave-session-attached]
-#include#help-schizo-cli#leave-session-attached
-#
-[tmpdir]
-Define the root location for the PRRTE session directory tree
-
-#include#help-schizo-cli#tmpdir
-#
-[prefix]
-#include#help-schizo-cli#prefix
-#
-[noprefix]
-#include#help-schizo-cli#no-prefix
-#
-[forward-signals]
-#include#help-schizo-cli#forward-signals
-#
-[allow-run-as-root]
-#include#help-schizo-cli#allow-run-as-root
-#
-[report-child-jobs-separately]
-Return the exit status of the primary job only
-#
-[timeout]
-Timeout the job if execution time exceeds the specified number of seconds
-#
-[report-state-on-timeout]
-Report all job and process states upon timeout
-#
-[get-stack-traces]
-Get stack traces of all application procs on timeout
-#
-[spawn-timeout]
-Timeout the job if spawn takes more than the specified number of seconds
-#
-[np]
-Specify number of application processes to be started
-#
-[n]
-Specify number of application processes to be started
-#
-[N]
-Specify number of application processes per node to be started
-#
-[app]
-Provide an appfile; ignore all other command line options
-#
-[xterm]
-Create a new xterm window and display output from the specified ranks there.
-Ranks are specified as a comma-delimited list of ranges - e.g., "1,3-6,9",
-or as "all"."
-#
-[stop-on-exec]
-If supported, stop each process at start of execution
-#
-[stop-in-init]
-Include the PMIX_DEBUG_STOP_IN_INIT attribute in the application's
-job info directing that the specified ranks stop in PMIx_Init pending
-release. Ranks are specified as a comma-delimited list of ranges - e.g., "1,3-6,9",
-or as "all".
-#
-[stop-in-app]
-Include the PMIX_DEBUG_STOP_IN_APP attribute in the application's
-job info directing that the specified ranks stop at an application-determined
-point pending release. Ranks are specified as a comma-delimited list of
-ranges - e.g., "1,3-6,9", or as "all".
-#
-[x]
-#include#help-schizo-cli#x
-#
-[wdir]
-Set the working directory of the started processes
-#
-[wd]
-Synonym for --wdir
-#
-[set-cwd-to-session-dir]
-Set the working directory of the started processes to their session directory
-#
-[path]
-PATH to be used to look for executables to start processes
-#
-[show-progress]
-Output a brief periodic report on launch progress
-#
-[pset]
-User-specified name assigned to the processes in their given application
-#
-[hostfile]
-#include#help-schizo-cli#launcher-hostfile
-#
-[machinefile]
-Provide a hostfile (synonym for "hostfile")
-
-#include#help-schizo-cli#launcher-hostfile
-#
-[host]
-#include#help-schizo-cli#dash-host
-
-#include#help-schizo-cli#relative-indexing
-#
-[personality]
-#include#help-schizo-cli#personality
-#
-[preload-files]
-Syntax: --preload-files <arg0>
-
-Preload the comma separated list of files to the remote machines current
-working directory before starting the remote process.
-#
-[preload-binary]
-Syntax: --preload-binary
-
-Preload the binary on the remote machine before starting the
-remote process.
-#
-[output]
-#include#help-schizo-cli#output
-#
-[stdin]
-Specify procs to receive stdin [rank, "all", "none"] (default: 0, indicating rank 0)
-#
-[map-by]
-#include#help-prte-rmaps-base#map-by-option
-#
-[rank-by]
-#include#help-prte-rmaps-base#rank-by-option
-#
-[bind-to]
-#include#help-prte-hwloc-base#bind-to-option
-#
-[runtime-options]
-#include#help-schizo-cli#runtime-options
-#
-[rankfile]
-Name of file to specify explicit task mapping
-#
-[placement]
-#include#help-prte-rmaps-base#placement
-#
-[placement-examples]
-#include#help-prte-rmaps-base#placement-examples
-#
-[placement-all]
-#include#help-prte-rmaps-base#placement-all
-#
-[placement-fundamentals]
-#include#help-prte-rmaps-base#placement-fundamentals
-#
-[placement-limits]
-#include#help-prte-rmaps-base#placement-limits
-#
-[placement-diagnostics]
-#include#help-prte-rmaps-base#placement-diagnostics
-#
-[placement-rankfiles]
-#include#help-prte-rmaps-base#placement-rankfiles
-#
-[placement-deprecated]
-#include#help-prte-rmaps-base#placement-deprecated
-#
-[display]
-#include#help-schizo-cli#display
-#
-[do-not-launch]
-Perform all necessary operations to prepare to launch the application, but do not actually
-launch it (usually used to test mapping patterns)
-#
-#
-#  DEPRECATED OPTIONS
-#
-[mca]
-#include#help-schizo-deprecated#mca
-#
-[gmca]
-#include#help-schizo-deprecated#gmca
-#
-[xml]
-#include#help-schizo-deprecated#xml
-#
-[tag-output]
-#include#help-schizo-deprecated#tag-output
-#
-[timestamp-output]
-#include#help-schizo-deprecated#timestamp-output
-#
-[output-directory]
-#include#help-schizo-deprecated#output-directory
-#
-[output-filename]
-#include#help-schizo-deprecated#output-filename
-#
-[merge-stderr-to-stdout]
-#include#help-schizo-deprecated#merge-stderr-to-stdout
-#
-[display-devel-map]
-#include#help-schizo-deprecated#display-devel-map
-#
-[display-topo]
-#include#help-schizo-deprecated#display-topo
-#
-[report-bindings]
-#include#help-schizo-deprecated#report-bindings
-#
-[display-devel-allocation]
-#include#help-schizo-deprecated#display-devel-allocation
-#
-[display-map]
-#include#help-schizo-deprecated#display-map
-#
-[display-allocation]
-#include#help-schizo-deprecated#display-allocation
-#
diff --git a/src/mca/schizo/prte/help-schizo-prun.txt b/src/mca/schizo/prte/help-schizo-prun.txt
deleted file mode 100644
index b22a15a034..0000000000
--- a/src/mca/schizo/prte/help-schizo-prun.txt
+++ /dev/null
@@ -1,327 +0,0 @@
-# -*- text -*-
-#
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
-# Copyright (c) 2022      IBM Corporation.  All rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-#
-#
-[version]
-%s (%s) %s
-
-%s
-#
-[usage]
-%s (%s) %s
-
-Usage: %s [OPTION]...
-Submit job to the PMIx Reference RTE
-
-The following list of command line options are available. Note that
-more detailed help for any option can be obtained by adding that
-option to the help request as "--help <option>".
-
-/*****      General Options      *****/
-
--h|--help                            This help message
--h|--help <arg0>                     Help for the specified option
--v|--verbose                         Enable typical debug options
--V|--version                         Print version and exit
-
-/*****       Debug Options       *****/
-
-   --display <arg0>                  Comma-delimited list of options for displaying information about the
-                                     allocation and job. Allowed values: allocation, bind, map, map-devel,
-                                     topo
-   --timeout <arg0>                  Timeout the job after the specified number of seconds
-   --spawn-timeout <arg0>            Timeout the job if spawn takes more than the specified number of seconds
-   --get-stack-traces                Get stack traces of all application procs on timeout
-   --report-state-on-timeout         Report all job and process states upon timeout
-   --stop-on-exec                    If supported, stop each specified process at start of execution
-   --stop-in-init                    Direct the specified processes to stop in PMIx_Init
-   --stop-in-app                     Direct the specified processes to stop at an application-controlled location
-
-
-
-/*****      Output Options       *****/
-
-   --output <arg0>                   Comma-delimited list of options that control how output is
-                                     generated. Allowed values: tag, tag-detailed, tag-fullname,
-                                     timestamp, xml, merge-stderr-to-stdout, dir=DIRNAME,
-                                     file=filename. The dir option redirects output from
-                                     application processes into DIRNAME/job/rank/std[out,err,diag]. The file
-                                     option redirects output from application processes into filename.rank. In
-                                     both cases, the provided name will be converted to an absolute path.
-                                     Supported qualifiers include NOCOPY (do not copy the output to the
-                                     stdout/err streams).
-   --report-child-jobs-separately    Return the exit status of the primary job only
-   --xterm <arg0>                    Create a new xterm window and display output from the specified ranks
-                                     there
-
-
-
-/*****       Input Options       *****/
-
-   --stdin <arg0>                    Specify procs to receive stdin [rank, all, none] (default: 0, indicating
-                                     rank 0)
-
-
-
-/*****      Placement Options      *****/
-
-   --map-by <arg0>                   Mapping Policy for job
-   --rank-by <arg0>                  Ranking Policy for job
-   --bind-to <arg0>                  Binding policy for job.
-
-
-
-/*****      Launch Options       *****/
-   --runtime-options <arg0>          Comma-delimited list of runtime directives for the job (e.g., do not
-                                     abort if a process exits on non-zero status)
--c|--np <arg0>                       Number of processes to run
--n|--n <arg0>                        Number of processes to run
--N <arg0>                            Number of processes to run per node
-   --app <arg0>                      Provide an appfile; ignore all other command line options
--H|--host <arg0>                     List of hosts to invoke processes on
-   --hostfile <arg0>                 Provide a hostfile
-   --machinefile <arg0>              Provide a hostfile
-   --path <arg0>                     PATH to be used to look for executables to start processes
-   --pmixmca <arg0> <arg1>           Pass context-specific PMIx MCA parameters; they are considered global if
-                                     only one context is specified (arg0 is the parameter name; arg1 is the parameter value)
-   --gpmixmca <arg0> <arg1>          Pass global PMIx MCA parameters that are applicable to all contexts (arg0
-                                     is the parameter name; arg1 is the parameter value)
-   --tune <arg0>                     File(s) containing MCA params for tuning operations
-   --preload-files <arg0>            Preload the comma separated list of files to the remote machines current
-                                     working directory before starting the remote process.
-   --pset <arg0>                     User-specified name assigned to the processes in their given application
-   --rankfile <arg0>                 Name of file to specify explicit task mapping
--s|--preload-binary                  Preload the binary on the remote machine before starting the remote
-                                     process.
-   --set-cwd-to-session-dir          Set the working directory of the started processes to their session
-                                     directory
-   --show-progress                   Output a brief periodic report on launch progress
-   --wd <arg0>                       Synonym for --wdir
-   --wdir <arg0>                     Set the working directory of the started processes
--x <arg0>                            Export an environment variable, optionally specifying a value (e.g., "-x
-                                     foo" exports the environment variable foo and takes its value from the
-                                     current environment; "-x foo=bar" exports the environment variable name
-                                     foo and sets its value to "bar" in the started processes; "-x foo*"
-                                     exports all current environmental variables starting with "foo")
-
-
-
-/*****    Specific Options   *****/
-   --do-not-connect                  Do not connect to a server
-   --dvm-uri <arg0>                  Specify the URI of the DVM master, or the name of the file (specified as
-                                     file:filename) that contains that info
-   --namespace <arg0>                Namespace of the daemon to which we should connect
-   --pid <arg0>                      PID of the daemon to which we should connect (int => PID or file:<file>
-                                     for file containing the PID
-   --system-server-first             First look for a system server and connect to it if found
-   --system-server-only              Connect only to a system-level server
-   --tmpdir <arg0>                   Set the root for the session directory tree
-   --wait-to-connect <arg0>          Delay specified number of seconds before trying to connect
-   --num-connect-retries <arg0>      Max number of times to try to connect
-   --personality <arg0>              Specify the personality to be used
-   --allow-run-as-root               Allow execution as root (STRONGLY DISCOURAGED)
-   --forward-signals <arg0>          Comma-delimited list of additional signals (names or integers) to forward
-                                     to application processes ["none" => forward nothing]. Signals provided by
-                                     default include SIGTSTP, SIGUSR1, SIGUSR2, SIGABRT, SIGALRM, and SIGCONT
-
-Report bugs to %s
-#
-[dvm-uri]
-Specify the URI of the DVM master, or the name of the file (specified as
-file:filename) that contains that info
-#
-[num-connect-retries]
-Max number of times to try to connect to the specified server (int)
-#
-[pid]
-PID of the daemon to which we should connect (int => PID or file:<file>
-for file containing the PID
-#
-[namespace]
-Namespace of the daemon we are to connect to (char*)
-#
-[system-server-first]
-First look for a system server and connect to it if found
-#
-[system-server-only]
-Connect only to a system-level server - abort if one is not found
-#
-[tmpdir]
-Define the root location for the PRRTE session directory tree
-
-#include#help-schizo-cli#tmpdir-tool
-#
-[wait-to-connect]
-Delay specified number of seconds before trying to connect
-#
-[hostfile]
-#include#help-schizo-cli#launcher-hostfile
-#
-[host]
-#include#help-schizo-cli#dash-host
-#
-[parseable]
-Output information (e.g., help messages) in machine-parseable
-friendly format
-#
-[parsable]
-Output information (e.g., help messages) in machine-parseable
-friendly format
-#
-[np]
-Specify number of application processes to be started
-#
-[no-ready-msg]
-Do not print a DVM ready message
-#
-[daemonize]
-Daemonize the DVM daemons into the background
-#
-[system-server]
-Start the DVM as the system server
-#
-[set-sid]
-Direct the DVM daemons to separate from the current session
-#
-[report-pid]
-Printout PID on stdout [-], stderr [+], or a file [anything else]
-#
-[report-uri]
-Printout URI on stdout [-], stderr [+], or a file [anything else]
-#
-[test-suicide]
-Suicide instead of clean abort after delay
-#
-[singleton]
-ID of the singleton process that started us
-#
-[keepalive]
-Pipe to monitor - DVM will terminate upon closure
-#
-[map-by]
-#include#help-prte-rmaps-base#map-by-option
-#
-[rank-by]
-#include#help-prte-rmaps-base#rank-by-option
-#
-[bind-to]
-#include#help-prte-hwloc-base#bind-to-option
-#
-[runtime-options]
-#include#help-schizo-cli#runtime-options
-#
-[display]
-#include#help-schizo-cli#display
-#
-[output]
-#include#help-schizo-cli#output
-#
-[rankfile]
-Name of file to specify explicit task mapping
-#
-[placement]
-#include#help-prte-rmaps-base#placement
-#
-[placement-all]
-#include#help-prte-rmaps-base#placement-all
-#
-[placement-examples]
-#include#help-prte-rmaps-base#placement-examples
-#
-[placement-fundamentals]
-#include#help-prte-rmaps-base#placement-fundamentals
-#
-[placement-limits]
-#include#help-prte-rmaps-base#placement-limits
-#
-[placement-diagnostics]
-#include#help-prte-rmaps-base#placement-diagnostics
-#
-[placement-rankfiles]
-#include#help-prte-rmaps-base#placement-rankfiles
-#
-[placement-deprecated]
-#include#help-prte-rmaps-base#placement-deprecated
-#
-[do-not-launch]
-Perform all necessary operations to prepare to launch the
-application, but do not actually launch it (usually used
-to test mapping patterns)
-#
-[display-devel-map]
-Display a detailed process map (mostly intended for developers)
-just before launch
-#
-[display-topo]
-Display the topology as part of the process map (mostly intended
-for developers) just before launch
-#
-[report-bindings]
-"Display process bindings to stderr
-#
-[display-devel-allocation]
-Display a detailed list (mostly intended for developers) of the
-allocation being used by this job
-#
-[display-map]
-Display the process map just before launch
-#
-[display-allocation]
-Display the allocation being used by this job
-#
-[enable-recovery]
-Enable recovery from process failure [Default = disabled]
-#
-[max-restarts]
-Max number of times to restart a failed process
-#
-[disable-recovery]
-Disable recovery (resets all recovery options to off)
-#
-[continuous]
-Job is to run until explicitly terminated
-#
-[personality]
-Specify the personality to be used
-#
-[prte-server]
-Specify the URI of the publish/lookup server, or the name
-of the file (specified as file:filename) that contains that info
-#
-[dvm-master-uri]
-URI for the DVM master
-#
-[parent-uri]
-URI for the parent if tree launch is enabled
-#
-[tree-spawn]
-Tree-based spawn in progress
-#
-[daemonize]
-Daemonize the DVM daemons into the background
-#
-[set-sid]
-Direct the DVM daemons to separate from the current session
-#
-[prtemca]
-Pass context-specific PRTE MCA parameters (arg0 is the
-parameter name; arg1 is the parameter value)
-#
-[pmixmca]
-Pass context-specific PMIx MCA parameters (arg0 is the
-parameter name; arg1 is the parameter value)
-#
-[debug-daemons-file]
-Enable debugging of any PRTE daemons used by this
-application, storing output in files
-#
-[leave-session-attached]
-Do not discard stdout/stderr of remote PRTE daemons
diff --git a/src/mca/schizo/prte/help-schizo-pterm.txt b/src/mca/schizo/prte/help-schizo-pterm.txt
deleted file mode 100644
index 4d5efbc75a..0000000000
--- a/src/mca/schizo/prte/help-schizo-pterm.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- text -*-
-#
-# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
-# Copyright (c) 2022      IBM Corporation.  All rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-#
-
-#
-[usage]
-%s (%s) %s
-
-Usage: %s [OPTION]...
-Terminate an instance of the PMIx Reference RTE (PRRTE) DVM
-
-/*****      General Options      *****/
-
--h|--help                            This help message
--h|--help <arg0>                     Help for the specified option
--v|--verbose                         Enable typical debug options
--V|--version                         Print version and exit
-
-
-
-/*****    Specific Options   *****/
-
-   --pmixmca <arg0> <arg1>           Pass context-specific PMIx MCA parameters (arg0 is the
-                                     parameter name; arg1 is the parameter value)
-   --dvm-uri <arg0>                  Specify the URI of the DVM master, or the name of the file (specified as
-                                     file:filename) that contains that info
-   --num-connect-retries <arg0>      Max number of times to try to connect (int)
-   --pid <arg0>                      PID of the daemon to which we should connect (int => PID or file:<file>
-                                     for file containing the PID
-   --namespace <arg0>                Namespace of the daemon we are to connect to (char*)
-   --system-server-first             First look for a system server and connect to it if found
-   --system-server-only              Connect only to a system-level server
-   --wait-to-connect                 Delay specified number of seconds before trying to connect
-
-
-Report bugs to %s
-#
-[version]
-%s (%s) %s
-
-Report bugs to %s
-#
-[dvm-uri]
-Specify the URI of the DVM master, or the name of the file (specified as
-file:filename) that contains that info
-#
-[num-connect-retries]
-Max number of times to try to connect to the specified server (int)
-#
-[pid]
-PID of the daemon to which we should connect (int => PID or file:<file>
-for file containing the PID
-#
-[namespace]
-Namespace of the daemon we are to connect to (char*)
-#
-[system-server-first]
-First look for a system server and connect to it if found
-#
-[system-server-only]
-Connect only to a system-level server - abort if one is not found
-#
-[wait-to-connect]
-Delay specified number of seconds before trying to connect
-#
-[pmixmca]
-#include#help-schizo-cli#pmixmca
diff --git a/src/mca/schizo/prte/schizo_prte.c b/src/mca/schizo/prte/schizo_prte.c
index ce2dea58d8..a45b7c790c 100644
--- a/src/mca/schizo/prte/schizo_prte.c
+++ b/src/mca/schizo/prte/schizo_prte.c
@@ -192,7 +192,9 @@ static struct option prterunoptions[] = {
     PMIX_OPTION_DEFINE(PRTE_CLI_PSET, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE(PRTE_CLI_HOSTFILE, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE("machinefile", PMIX_ARG_REQD),
+    PMIX_OPTION_DEFINE(PRTE_CLI_ADDHOSTFILE, PMIX_ARG_REQD),
     PMIX_OPTION_SHORT_DEFINE(PRTE_CLI_HOST, PMIX_ARG_REQD, 'H'),
+    PMIX_OPTION_DEFINE(PRTE_CLI_ADDHOST, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE(PRTE_CLI_PRELOAD_FILES, PMIX_ARG_REQD),
     PMIX_OPTION_SHORT_DEFINE(PRTE_CLI_PRELOAD_BIN, PMIX_ARG_NONE, 's'),
     PMIX_OPTION_DEFINE(PRTE_CLI_DO_NOT_AGG_HELP, PMIX_ARG_NONE),
@@ -304,7 +306,9 @@ static struct option prunoptions[] = {
     PMIX_OPTION_DEFINE(PRTE_CLI_PSET, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE(PRTE_CLI_HOSTFILE, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE("machinefile", PMIX_ARG_REQD),
+    PMIX_OPTION_DEFINE(PRTE_CLI_ADDHOSTFILE, PMIX_ARG_REQD),
     PMIX_OPTION_SHORT_DEFINE(PRTE_CLI_HOST, PMIX_ARG_REQD, 'H'),
+    PMIX_OPTION_DEFINE(PRTE_CLI_ADDHOST, PMIX_ARG_REQD),
     PMIX_OPTION_DEFINE(PRTE_CLI_PRELOAD_FILES, PMIX_ARG_REQD),
     PMIX_OPTION_SHORT_DEFINE(PRTE_CLI_PRELOAD_BIN, PMIX_ARG_NONE, 's'),
     PMIX_OPTION_DEFINE(PRTE_CLI_DO_NOT_AGG_HELP, PMIX_ARG_NONE),
@@ -398,6 +402,7 @@ static struct option prtedoptions[] = {
     PMIX_OPTION_DEFINE(PRTE_CLI_DEBUG_DAEMONS_FILE, PMIX_ARG_NONE),
     PMIX_OPTION_DEFINE(PRTE_CLI_TEST_SUICIDE, PMIX_ARG_NONE),
     PMIX_OPTION_DEFINE(PRTE_CLI_LEAVE_SESSION_ATTACHED, PMIX_ARG_NONE),
+    PMIX_OPTION_DEFINE(PRTE_CLI_BOOTSTRAP, PMIX_ARG_NONE),
 
     PMIX_OPTION_END
 };
diff --git a/src/mca/schizo/schizo.h b/src/mca/schizo/schizo.h
index 9aedbf1ccf..30167d9405 100644
--- a/src/mca/schizo/schizo.h
+++ b/src/mca/schizo/schizo.h
@@ -5,7 +5,7 @@
  *                         reserved.
  * Copyright (c) 2020      IBM Corporation.  All rights reserved.
  * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2021-2023 Nanook Consulting  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * Copyright (c) 2022      Triad National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
diff --git a/src/mca/state/base/state_base_fns.c b/src/mca/state/base/state_base_fns.c
index b52bc68304..6a547eaee2 100644
--- a/src/mca/state/base/state_base_fns.c
+++ b/src/mca/state/base/state_base_fns.c
@@ -80,7 +80,7 @@ void prte_state_base_activate_job_state(prte_job_t *jdata, prte_job_state_t stat
                 caddy->job_state = state;
                 PMIX_RETAIN(jdata);
             }
-            PMIX_THREADSHIFT(caddy, prte_event_base, s->cbfunc, s->priority);
+            PRTE_PMIX_THREADSHIFT(caddy, prte_event_base, s->cbfunc, s->priority);
             return;
         }
     }
@@ -109,7 +109,7 @@ void prte_state_base_activate_job_state(prte_job_t *jdata, prte_job_state_t stat
         PMIX_RETAIN(jdata);
     }
     PRTE_REACHING_JOB_STATE(jdata, state, s->priority);
-    PMIX_THREADSHIFT(caddy, prte_event_base, s->cbfunc, s->priority);
+    PRTE_PMIX_THREADSHIFT(caddy, prte_event_base, s->cbfunc, s->priority);
 }
 
 int prte_state_base_add_job_state(prte_job_state_t state, prte_state_cbfunc_t cbfunc, int priority)
@@ -237,7 +237,7 @@ void prte_state_base_activate_proc_state(pmix_proc_t *proc, prte_proc_state_t st
             caddy = PMIX_NEW(prte_state_caddy_t);
             caddy->name = *proc;
             caddy->proc_state = state;
-            PMIX_THREADSHIFT(caddy, prte_event_base, s->cbfunc, s->priority);
+            PRTE_PMIX_THREADSHIFT(caddy, prte_event_base, s->cbfunc, s->priority);
             return;
         }
     }
@@ -262,7 +262,7 @@ void prte_state_base_activate_proc_state(pmix_proc_t *proc, prte_proc_state_t st
     caddy->name = *proc;
     caddy->proc_state = state;
     PRTE_REACHING_PROC_STATE(proc, state, s->priority);
-    PMIX_THREADSHIFT(caddy, prte_event_base, s->cbfunc, s->priority);
+    PRTE_PMIX_THREADSHIFT(caddy, prte_event_base, s->cbfunc, s->priority);
 }
 
 int prte_state_base_add_proc_state(prte_proc_state_t state, prte_state_cbfunc_t cbfunc,
diff --git a/src/mca/state/dvm/state_dvm.c b/src/mca/state/dvm/state_dvm.c
index da42dc7142..725fc6582d 100644
--- a/src/mca/state/dvm/state_dvm.c
+++ b/src/mca/state/dvm/state_dvm.c
@@ -4,7 +4,7 @@
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2020      IBM Corporation.  All rights reserved.
  * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -64,18 +64,18 @@ static void ready_for_debug(int fd, short args, void *cbata);
  * DVM module - used when mpirun is persistent
  ******************/
 prte_state_base_module_t prte_state_dvm_module = {
-    init,
-    finalize,
-    prte_state_base_activate_job_state,
-    prte_state_base_add_job_state,
-    prte_state_base_set_job_state_callback,
-    prte_state_base_set_job_state_priority,
-    prte_state_base_remove_job_state,
-    prte_state_base_activate_proc_state,
-    prte_state_base_add_proc_state,
-    prte_state_base_set_proc_state_callback,
-    prte_state_base_set_proc_state_priority,
-    prte_state_base_remove_proc_state
+    .init = init,
+    .finalize = finalize,
+    .activate_job_state = prte_state_base_activate_job_state,
+    .add_job_state = prte_state_base_add_job_state,
+    .set_job_state_callback = prte_state_base_set_job_state_callback,
+    .set_job_state_priority = prte_state_base_set_job_state_priority,
+    .remove_job_state = prte_state_base_remove_job_state,
+    .activate_proc_state = prte_state_base_activate_proc_state,
+    .add_proc_state = prte_state_base_add_proc_state,
+    .set_proc_state_callback = prte_state_base_set_proc_state_callback,
+    .set_proc_state_priority = prte_state_base_set_proc_state_priority,
+    .remove_proc_state = prte_state_base_remove_proc_state
 };
 
 static void dvm_notify(int sd, short args, void *cbdata);
diff --git a/src/mca/state/prted/state_prted.c b/src/mca/state/prted/state_prted.c
index 8ce616d6a1..4c126120b3 100644
--- a/src/mca/state/prted/state_prted.c
+++ b/src/mca/state/prted/state_prted.c
@@ -49,18 +49,18 @@ static int finalize(void);
  * PRTED module
  ******************/
 prte_state_base_module_t prte_state_prted_module = {
-    init,
-    finalize,
-    prte_state_base_activate_job_state,
-    prte_state_base_add_job_state,
-    prte_state_base_set_job_state_callback,
-    prte_state_base_set_job_state_priority,
-    prte_state_base_remove_job_state,
-    prte_state_base_activate_proc_state,
-    prte_state_base_add_proc_state,
-    prte_state_base_set_proc_state_callback,
-    prte_state_base_set_proc_state_priority,
-    prte_state_base_remove_proc_state
+    .init = init,
+    .finalize = finalize,
+    .activate_job_state = prte_state_base_activate_job_state,
+    .add_job_state = prte_state_base_add_job_state,
+    .set_job_state_callback = prte_state_base_set_job_state_callback,
+    .set_job_state_priority = prte_state_base_set_job_state_priority,
+    .remove_job_state = prte_state_base_remove_job_state,
+    .activate_proc_state = prte_state_base_activate_proc_state,
+    .add_proc_state = prte_state_base_add_proc_state,
+    .set_proc_state_callback = prte_state_base_set_proc_state_callback,
+    .set_proc_state_priority = prte_state_base_set_proc_state_priority,
+    .remove_proc_state = prte_state_base_remove_proc_state
 };
 
 /* Local functions */
diff --git a/src/prted/pmix/pmix_server.c b/src/prted/pmix/pmix_server.c
index 77152fa818..e417aa06d9 100644
--- a/src/prted/pmix/pmix_server.c
+++ b/src/prted/pmix/pmix_server.c
@@ -400,11 +400,10 @@ void pmix_server_register_params(void)
 
     /* whether or not to drop a session-level tool rendezvous point */
     prte_pmix_server_globals.session_server = false;
-    (void)
-        pmix_mca_base_var_register("prte", "pmix", NULL, "session_server",
-                                   "Whether or not to drop a session-level tool rendezvous point",
-                                   PMIX_MCA_BASE_VAR_TYPE_BOOL,
-                                   &prte_pmix_server_globals.session_server);
+    (void) pmix_mca_base_var_register("prte", "pmix", NULL, "session_server",
+                                      "Whether or not to drop a session-level tool rendezvous point",
+                                      PMIX_MCA_BASE_VAR_TYPE_BOOL,
+                                      &prte_pmix_server_globals.session_server);
 
     /* whether or not to drop a system-level tool rendezvous point */
     prte_pmix_server_globals.system_server = false;
@@ -433,6 +432,12 @@ void pmix_server_register_params(void)
         PMIX_ARGV_FREE_COMPAT(tmp);
     }
 
+    prte_pmix_server_globals.system_controller = false;
+    (void) pmix_mca_base_var_register("prte", "pmix", NULL, "system_controller",
+                                      "Whether or not to act as the system-wide controller",
+                                      PMIX_MCA_BASE_VAR_TYPE_BOOL,
+                                      &prte_pmix_server_globals.system_server);
+
 }
 
 static void timeout_cbfunc(int sd, short args, void *cbdata)
@@ -549,6 +554,7 @@ static void regcbfunc(pmix_status_t status, size_t ref, void *cbdata)
     PRTE_HIDE_UNUSED_PARAMS(status, ref);
 
     PMIX_ACQUIRE_OBJECT(lock);
+    lock->status = status;
     PRTE_PMIX_WAKEUP_THREAD(lock);
 }
 
@@ -591,6 +597,7 @@ int pmix_server_init(void)
     PMIX_INFO_LIST_ADD(prc, ilist, PMIX_HOSTNAME, prte_process_info.nodename, PMIX_STRING);
     if (PMIX_SUCCESS != prc) {
         PMIX_INFO_LIST_RELEASE(ilist);
+        rc = prte_pmix_convert_status(prc);
         return rc;
     }
 
@@ -599,6 +606,7 @@ int pmix_server_init(void)
     PMIX_INFO_LIST_ADD(prc, ilist, PMIX_EXTERNAL_AUX_EVENT_BASE, prte_event_base, PMIX_POINTER);
     if (PMIX_SUCCESS != prc) {
         PMIX_INFO_LIST_RELEASE(ilist);
+        rc = prte_pmix_convert_status(prc);
         return rc;
     }
 #endif
@@ -615,12 +623,14 @@ int pmix_server_init(void)
     PMIX_INFO_LIST_INSERT(prc, ilist, &myinf);
     if (PMIX_SUCCESS != prc) {
         PMIX_INFO_LIST_RELEASE(ilist);
+        rc = prte_pmix_convert_status(prc);
         return rc;
     }
     // tell the server to share this topology for us
     PMIX_INFO_LIST_ADD(prc, ilist, PMIX_SERVER_SHARE_TOPOLOGY, NULL, PMIX_BOOL);
     if (PMIX_SUCCESS != prc) {
         PMIX_INFO_LIST_RELEASE(ilist);
+        rc = prte_pmix_convert_status(prc);
         return rc;
     }
 
@@ -654,18 +664,33 @@ int pmix_server_init(void)
         }
     }
 
-    /* if requested, tell the server to drop a system-level
-     * PMIx connection point - only do this for the HNP as, in
-     * at least one case, a daemon can be colocated with the
-     * HNP and would overwrite the server rendezvous file */
-    if (prte_pmix_server_globals.system_server && PRTE_PROC_IS_MASTER) {
-        PMIX_INFO_LIST_ADD(prc, ilist, PMIX_SERVER_SYSTEM_SUPPORT,
-                           NULL, PMIX_BOOL);
-        if (PMIX_SUCCESS != prc) {
-            PMIX_INFO_LIST_RELEASE(ilist);
-            rc = prte_pmix_convert_status(prc);
-            return rc;
+    if (PRTE_PROC_IS_MASTER) {
+        /* if requested, tell the server to drop a system-level
+         * PMIx connection point - only do this for the HNP as, in
+         * at least one case, a daemon can be colocated with the
+         * HNP and would overwrite the server rendezvous file */
+        if (prte_pmix_server_globals.system_server) {
+            PMIX_INFO_LIST_ADD(prc, ilist, PMIX_SERVER_SYSTEM_SUPPORT,
+                               NULL, PMIX_BOOL);
+            if (PMIX_SUCCESS != prc) {
+                PMIX_INFO_LIST_RELEASE(ilist);
+                rc = prte_pmix_convert_status(prc);
+                return rc;
+            }
         }
+#ifdef PMIX_SERVER_SYS_CONTROLLER
+        /* if requested, tell the server that we are the system
+         * controller */
+        if (prte_pmix_server_globals.system_controller) {
+            PMIX_INFO_LIST_ADD(prc, ilist, PMIX_SERVER_SYS_CONTROLLER,
+                               NULL, PMIX_BOOL);
+            if (PMIX_SUCCESS != prc) {
+                PMIX_INFO_LIST_RELEASE(ilist);
+                rc = prte_pmix_convert_status(prc);
+                return rc;
+            }
+        }
+#endif
     }
 
     /* if requested, tell the server library to output our PMIx URI */
@@ -708,6 +733,15 @@ int pmix_server_init(void)
         /* if we are also persistent, then we do not output IOF ourselves */
         if (prte_persistent) {
             flag = false;
+#ifdef PMIX_SERVER_CONTROLLER
+            // declare ourselves the system controller
+            PMIX_INFO_LIST_ADD(prc, ilist, PMIX_SERVER_SYS_CONTROLLER, NULL, PMIX_BOOL);
+            if (PMIX_SUCCESS != prc) {
+                PMIX_INFO_LIST_RELEASE(ilist);
+                rc = prte_pmix_convert_status(prc);
+                return rc;
+            }
+#endif
         } else {
             /* if we have a parent or we are in persistent mode, then we
              * don't write out ourselves */
@@ -809,6 +843,7 @@ int pmix_server_init(void)
     PMIX_INFO_LIST_ADD(prc, ilist, PMIX_HOSTNAME, prte_process_info.nodename, PMIX_STRING);
     if (PMIX_SUCCESS != rc) {
         PMIX_INFO_LIST_RELEASE(ilist);
+        rc = prte_pmix_convert_status(prc);
         return rc;
     }
 
@@ -819,6 +854,7 @@ int pmix_server_init(void)
         free(tmp);
         if (PMIX_SUCCESS != rc) {
             PMIX_INFO_LIST_RELEASE(ilist);
+            rc = prte_pmix_convert_status(prc);
             return rc;
         }
     }
@@ -842,7 +878,9 @@ int pmix_server_init(void)
     prc = PMIX_ERR_LOST_CONNECTION;
     PMIx_Register_event_handler(&prc, 1, NULL, 0, lost_connection_hdlr, regcbfunc, &lock);
     PRTE_PMIX_WAIT_THREAD(&lock);
+    prc = lock.status;
     PRTE_PMIX_DESTRUCT_LOCK(&lock);
+    rc = prte_pmix_convert_status(prc);
 
     return rc;
 }
@@ -1697,14 +1735,6 @@ static void pmix_server_sched(int status, pmix_proc_t *sender,
         goto reply;
     }
 
-    /* unpack the number of info */
-    cnt = 1;
-    rc = PMIx_Data_unpack(NULL, buffer, &ninfo, &cnt, PMIX_SIZE);
-    if (PMIX_SUCCESS != rc) {
-        PMIX_ERROR_LOG(rc);
-        goto reply;
-    }
-
     if (0 == cmd) {
         /* allocation request - unpack the directive */
         cnt = 1;
@@ -1901,6 +1931,8 @@ static void mdcon(prte_pmix_mdx_caddy_t *p)
     p->sig = NULL;
     p->buf = NULL;
     PMIX_BYTE_OBJECT_CONSTRUCT(&p->ctrls);
+    p->procs = NULL;
+    p->nprocs = 0;
     p->info = NULL;
     p->ninfo = 0;
     p->cbdata = NULL;
diff --git a/src/prted/pmix/pmix_server_dyn.c b/src/prted/pmix/pmix_server_dyn.c
index 268ca545cf..5239cae340 100644
--- a/src/prted/pmix/pmix_server_dyn.c
+++ b/src/prted/pmix/pmix_server_dyn.c
@@ -90,8 +90,10 @@ void pmix_server_notify_spawn(pmix_nspace_t jobid, int room, pmix_status_t ret)
     PMIX_RELEASE(req);
 
     /* mark that we sent it */
-    prte_set_attribute(&jdata->attributes, PRTE_JOB_SPAWN_NOTIFIED,
-                       PRTE_ATTR_GLOBAL, NULL, PMIX_BOOL);
+    if (NULL != jdata) {
+        prte_set_attribute(&jdata->attributes, PRTE_JOB_SPAWN_NOTIFIED,
+                           PRTE_ATTR_GLOBAL, NULL, PMIX_BOOL);
+    }
 }
 void pmix_server_launch_resp(int status, pmix_proc_t *sender,
                              pmix_data_buffer_t *buffer,
diff --git a/src/prted/pmix/pmix_server_gen.c b/src/prted/pmix/pmix_server_gen.c
index 050d2ec3ed..de87d9b93c 100644
--- a/src/prted/pmix/pmix_server_gen.c
+++ b/src/prted/pmix/pmix_server_gen.c
@@ -86,7 +86,7 @@ pmix_status_t pmix_server_client_connected_fn(const pmix_proc_t *proc, void *ser
 {
     /* need to thread-shift this request as we are going
      * to access our global list of registered events */
-    PRTE_PMIX_THREADSHIFT(proc, server_object, PRTE_SUCCESS,
+    PRTE_SERVER_PMIX_THREADSHIFT(proc, server_object, PRTE_SUCCESS,
                           NULL, NULL, 0, _client_conn,
                           cbfunc, cbdata);
     return PRTE_SUCCESS;
@@ -118,7 +118,7 @@ pmix_status_t pmix_server_client_finalized_fn(const pmix_proc_t *proc, void *ser
 {
     /* need to thread-shift this request as we are going
      * to access our global list of registered events */
-    PRTE_PMIX_THREADSHIFT(proc, server_object, PRTE_SUCCESS,
+    PRTE_SERVER_PMIX_THREADSHIFT(proc, server_object, PRTE_SUCCESS,
                           NULL, NULL, 0, _client_finalized,
                           cbfunc, cbdata);
     return PRTE_SUCCESS;
@@ -151,7 +151,7 @@ pmix_status_t pmix_server_abort_fn(const pmix_proc_t *proc, void *server_object,
 {
     /* need to thread-shift this request as we are going
      * to access our global list of registered events */
-    PRTE_PMIX_THREADSHIFT(proc, server_object, status, msg, procs, nprocs, _client_abort, cbfunc,
+    PRTE_SERVER_PMIX_THREADSHIFT(proc, server_object, status, msg, procs, nprocs, _client_abort, cbfunc,
                           cbdata);
     return PRTE_SUCCESS;
 }
@@ -784,7 +784,7 @@ void pmix_server_log_fn(const pmix_proc_t *client, const pmix_info_t data[], siz
     /* we cannot directly execute the callback here
      * as it would threadlock - so shift to somewhere
      * safe */
-    PRTE_PMIX_THREADSHIFT(PRTE_NAME_WILDCARD, NULL, rc, NULL, NULL, 0, lgcbfn, cbfunc, cbdata);
+    PRTE_SERVER_PMIX_THREADSHIFT(PRTE_NAME_WILDCARD, NULL, rc, NULL, NULL, 0, lgcbfn, cbfunc, cbdata);
 }
 
 pmix_status_t pmix_server_job_ctrl_fn(const pmix_proc_t *requestor, const pmix_proc_t targets[],
@@ -1000,16 +1000,20 @@ static void group_release(int status, pmix_data_buffer_t *buf, void *cbdata)
     int rc = PRTE_SUCCESS;
     pmix_status_t ret;
     bool assignedID = false;
-    uint32_t cid;
-    size_t n;
+    bool procsadded = false;
+    size_t cid;
+    pmix_proc_t *procs, *members;
+    size_t n, num_members;
+    pmix_data_array_t darray;
     pmix_info_t info;
+    pmix_data_buffer_t dbuf;
     pmix_byte_object_t bo;
     int32_t byused;
-    char *payload;
+    pmix_server_pset_t *pset;
 
     PMIX_ACQUIRE_OBJECT(cd);
 
-    pmix_output_verbose(2, prte_pmix_server_globals.output,
+   pmix_output_verbose(2, prte_pmix_server_globals.output,
                         "%s group request complete",
                         PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
 
@@ -1018,39 +1022,84 @@ static void group_release(int status, pmix_data_buffer_t *buf, void *cbdata)
         goto complete;
     }
 
+    /* if this was a destruct operation, then there is nothing
+     * further we need do */
+    if (PMIX_GROUP_DESTRUCT == cd->op) {
+        /* find this group ID on our list of groups */
+        PMIX_LIST_FOREACH(pset, &prte_pmix_server_globals.groups, pmix_server_pset_t)
+        {
+            if (0 == strcmp(pset->name, cd->grpid)) {
+                pmix_list_remove_item(&prte_pmix_server_globals.groups, &pset->super);
+                PMIX_RELEASE(pset);
+                break;
+            }
+        }
+        rc = status;
+        goto complete;
+    }
+
     /* check for any directives */
-    cd->ninfo = 0;
-    payload = buf->unpack_ptr;
     cnt = 1;
-    rc = PMIx_Data_unpack(NULL, buf, &info, &cnt, PMIX_INFO);
+    rc = PMIx_Data_unpack(NULL, buf, &bo, &cnt, PMIX_BYTE_OBJECT);
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        goto complete;
+    }
+    PMIX_DATA_BUFFER_CONSTRUCT(&dbuf);
+    PMIX_DATA_BUFFER_LOAD(&dbuf, bo.bytes, bo.size);
+
+    cd->ninfo = 2;
+    cnt = 1;
+    rc = PMIx_Data_unpack(NULL, &dbuf, &info, &cnt, PMIX_INFO);
     while (PMIX_SUCCESS == rc) {
         if (PMIX_CHECK_KEY(&info, PMIX_GROUP_CONTEXT_ID)) {
-            PMIX_VALUE_GET_NUMBER(rc, &info.value, cid, uint32_t);
+            PMIX_VALUE_GET_NUMBER(rc, &info.value, cid, size_t);
             if (PMIX_SUCCESS != rc) {
                 PMIX_ERROR_LOG(rc);
                 cd->ninfo = 0;
+                PMIX_DATA_BUFFER_DESTRUCT(&dbuf);
                 goto complete;
             }
             assignedID = true;
             cd->ninfo++;
+        } else if (PMIX_CHECK_KEY(&info, PMIX_GROUP_ADD_MEMBERS)) {
+            members = (pmix_proc_t*)info.value.data.darray->array;
+            num_members = info.value.data.darray->size;
+            PMIX_PROC_CREATE(procs, cd->nprocs + num_members);
+            for (n=0; n < cd->nprocs; n++) {
+                PMIX_XFER_PROCID(&procs[n], &cd->procs[n]);
+            }
+            for (n=0; n < num_members; n++) {
+                PMIX_XFER_PROCID(&procs[n+cd->nprocs], &members[n]);
+            }
+            PMIX_PROC_FREE(cd->procs, cd->nprocs);
+            cd->procs = procs;
+            cd->nprocs += num_members;
+            procsadded = true;
         }
-        /* save where we are */
-        payload = buf->unpack_ptr;
         /* cleanup */
         PMIX_INFO_DESTRUCT(&info);
         /* get the next object */
         cnt = 1;
-        rc = PMIx_Data_unpack(NULL, buf, &info, &cnt, PMIX_INFO);
+        rc = PMIx_Data_unpack(NULL, &dbuf, &info, &cnt, PMIX_INFO);
     }
-    /* restore the unpack location as the last unsuccessful attempt will
-     * have moved it */
-    buf->unpack_ptr = payload;
+    PMIX_DATA_BUFFER_DESTRUCT(&dbuf);
     /* the unpacking loop will have ended when the unpack either
-     * went past the end of the buffer OR it attempted to unpack
-     * the wrong type - so correct the error status here */
-    if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER == rc ||
-        PMIX_ERR_PACK_MISMATCH == rc) {
-        rc = PMIX_SUCCESS;
+     * went past the end of the buffer */
+    if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
+        PMIX_ERROR_LOG(rc);
+        goto complete;
+    }
+    rc = PMIX_SUCCESS;
+
+    if (PMIX_GROUP_CONSTRUCT == cd->op) {
+       /* add it to our list of known groups */
+        pset = PMIX_NEW(pmix_server_pset_t);
+        pset->name = strdup(cd->grpid);
+        pset->num_members = cd->nprocs;
+        PMIX_PROC_CREATE(pset->members, pset->num_members);
+        memcpy(pset->members, cd->procs, cd->nprocs * sizeof(pmix_proc_t));
+        pmix_list_append(&prte_pmix_server_globals.groups, &pset->super);
     }
 
     /* if anything is left in the buffer, then it is
@@ -1065,16 +1114,21 @@ static void group_release(int status, pmix_data_buffer_t *buf, void *cbdata)
         cd->ninfo++;
     }
 
-    if (0 < cd->ninfo) {
-        PMIX_INFO_CREATE(cd->info, cd->ninfo);
-        n = 0;
-        if (assignedID) {
-            PMIX_INFO_LOAD(&cd->info[n], PMIX_GROUP_CONTEXT_ID, &cid, PMIX_UINT32);
-            ++n;
-        }
-        if (NULL != bo.bytes && 0 < bo.size) {
-            PMIX_INFO_LOAD(&cd->info[n], PMIX_GROUP_ENDPT_DATA, &bo, PMIX_BYTE_OBJECT);
-        }
+    PMIX_INFO_CREATE(cd->info, cd->ninfo);
+    n = 0;
+    // pass back the final group membership
+    darray.type = PMIX_PROC;
+    darray.array = cd->procs;
+    darray.size = cd->nprocs;
+    PMIX_INFO_LOAD(&cd->info[n], PMIX_GROUP_MEMBERSHIP, &darray, PMIX_DATA_ARRAY);
+    PMIX_PROC_FREE(cd->procs, cd->nprocs);
+    ++n;
+    if (assignedID) {
+        PMIX_INFO_LOAD(&cd->info[n], PMIX_GROUP_CONTEXT_ID, &cid, PMIX_SIZE);
+        ++n;
+    }
+    if (NULL != bo.bytes && 0 < bo.size) {
+        PMIX_INFO_LOAD(&cd->info[n], PMIX_GROUP_ENDPT_DATA, &bo, PMIX_BYTE_OBJECT);
     }
 
 complete:
@@ -1090,7 +1144,7 @@ static void group_release(int status, pmix_data_buffer_t *buf, void *cbdata)
     }
 }
 
-pmix_status_t pmix_server_group_fn(pmix_group_operation_t op, char *gpid,
+pmix_status_t pmix_server_group_fn(pmix_group_operation_t op, char *grpid,
                                    const pmix_proc_t procs[], size_t nprocs,
                                    const pmix_info_t directives[], size_t ndirs,
                                    pmix_info_cbfunc_t cbfunc, void *cbdata)
@@ -1110,7 +1164,7 @@ pmix_status_t pmix_server_group_fn(pmix_group_operation_t op, char *gpid,
                         PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
 
     /* they are required to pass us an id */
-    if (NULL == gpid) {
+    if (NULL == grpid) {
         return PMIX_ERR_BAD_PARAM;
     }
 
@@ -1130,26 +1184,6 @@ pmix_status_t pmix_server_group_fn(pmix_group_operation_t op, char *gpid,
         }
     }
 
-    if (PMIX_GROUP_CONSTRUCT == op) {
-        /* add it to our list of known groups */
-        pset = PMIX_NEW(pmix_server_pset_t);
-        pset->name = strdup(gpid);
-        pset->num_members = nprocs;
-        PMIX_PROC_CREATE(pset->members, pset->num_members);
-        memcpy(pset->members, procs, nprocs * sizeof(pmix_proc_t));
-        pmix_list_append(&prte_pmix_server_globals.groups, &pset->super);
-    } else if (PMIX_GROUP_DESTRUCT == op) {
-        /* find this group ID on our list of groups */
-        PMIX_LIST_FOREACH(pset, &prte_pmix_server_globals.groups, pmix_server_pset_t)
-        {
-            if (0 == strcmp(pset->name, gpid)) {
-                pmix_list_remove_item(&prte_pmix_server_globals.groups, &pset->super);
-                PMIX_RELEASE(pset);
-                break;
-            }
-        }
-    }
-
     /* if they don't want us to do a fence and they don't want a
      * context id assigned, or they insist on forcing local
      * completion of the operation, then we are done */
@@ -1157,10 +1191,35 @@ pmix_status_t pmix_server_group_fn(pmix_group_operation_t op, char *gpid,
         pmix_output_verbose(2, prte_pmix_server_globals.output,
                             "%s group request - purely local",
                             PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
+        if (PMIX_GROUP_CONSTRUCT == op) {
+            /* add it to our list of known groups */
+            pset = PMIX_NEW(pmix_server_pset_t);
+            pset->name = strdup(grpid);
+            pset->num_members = nprocs;
+            PMIX_PROC_CREATE(pset->members, pset->num_members);
+            memcpy(pset->members, procs, nprocs * sizeof(pmix_proc_t));
+            pmix_list_append(&prte_pmix_server_globals.groups, &pset->super);
+        } else if (PMIX_GROUP_DESTRUCT == op) {
+            /* find this group ID on our list of groups */
+            PMIX_LIST_FOREACH(pset, &prte_pmix_server_globals.groups, pmix_server_pset_t)
+            {
+                if (0 == strcmp(pset->name, grpid)) {
+                    pmix_list_remove_item(&prte_pmix_server_globals.groups, &pset->super);
+                    PMIX_RELEASE(pset);
+                    break;
+                }
+            }
+        }
         return PMIX_OPERATION_SUCCEEDED;
     }
 
     cd = PMIX_NEW(prte_pmix_mdx_caddy_t);
+    cd->grpid = grpid;
+    cd->op = op;
+    /* have to copy the procs in case we add members */
+    PMIX_PROC_CREATE(cd->procs, nprocs);
+    memcpy(cd->procs, procs, nprocs * sizeof(pmix_proc_t));
+    cd->nprocs = nprocs;
     cd->grpcbfunc = group_release;
     cd->infocbfunc = cbfunc;
     cd->cbdata = cbdata;
@@ -1172,7 +1231,7 @@ pmix_status_t pmix_server_group_fn(pmix_group_operation_t op, char *gpid,
         cd->sig->signature = (pmix_proc_t *) malloc(cd->sig->sz * sizeof(pmix_proc_t));
         memcpy(cd->sig->signature, procs, cd->sig->sz * sizeof(pmix_proc_t));
     }
-    /* setup the ctrls blob */
+    /* setup the ctrls blob - this will include any "add_members" directive */
     rc = prte_pack_ctrl_options(&cd->ctrls, directives, ndirs);
     if (PMIX_SUCCESS != rc) {
         PMIX_RELEASE(cd);
diff --git a/src/prted/pmix/pmix_server_internal.h b/src/prted/pmix/pmix_server_internal.h
index 02b23568b2..5277617d49 100644
--- a/src/prted/pmix/pmix_server_internal.h
+++ b/src/prted/pmix/pmix_server_internal.h
@@ -200,7 +200,7 @@ PMIX_CLASS_DECLARATION(prte_pmix_tool_t);
         prte_event_active(&(_cd->ev), PRTE_EV_WRITE, 1);                           \
     } while (0);
 
-#define PRTE_PMIX_THREADSHIFT(p, s, st, m, pl, pn, fn, cf, cb)                     \
+#define PRTE_SERVER_PMIX_THREADSHIFT(p, s, st, m, pl, pn, fn, cf, cb)                     \
     do {                                                                           \
         prte_pmix_server_op_caddy_t *_cd;                                          \
         _cd = PMIX_NEW(prte_pmix_server_op_caddy_t);                               \
@@ -355,6 +355,7 @@ typedef struct {
     bool pubsub_init;
     bool session_server;
     bool system_server;
+    bool system_controller;
     bool scheduler_connected;
     pmix_proc_t scheduler;
     bool scheduler_set_as_server;
diff --git a/src/prted/pmix/pmix_server_queries.c b/src/prted/pmix/pmix_server_queries.c
index ca82e49953..209964cba7 100644
--- a/src/prted/pmix/pmix_server_queries.c
+++ b/src/prted/pmix/pmix_server_queries.c
@@ -19,7 +19,7 @@
  * Copyright (c) 2014-2019 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2020      IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -71,12 +71,12 @@ static void _query(int sd, short args, void *cbdata)
     prte_pmix_server_op_caddy_t *rcd;
     pmix_query_t *q;
     pmix_status_t ret = PMIX_SUCCESS;
+    void *results, *plist, *stack, *cache;
     prte_info_item_t *kv;
     pmix_nspace_t jobid;
     prte_job_t *jdata;
     prte_node_t *node, *ndptr;
-    int k, rc;
-    pmix_list_t results, stack;
+    int j, k, rc;
     size_t m, n, p;
     uint32_t key, nodeid;
     char **nspaces, *hostname, *uri;
@@ -87,7 +87,7 @@ static void _query(int sd, short args, void *cbdata)
     int matched;
     pmix_proc_info_t *procinfo;
     pmix_info_t *info;
-    pmix_data_array_t *darray, dry;
+    pmix_data_array_t dry;
     prte_proc_t *proct;
     pmix_proc_t *proc;
     size_t sz;
@@ -99,7 +99,7 @@ static void _query(int sd, short args, void *cbdata)
                         "%s processing query",
                         PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
 
-    PMIX_CONSTRUCT(&results, pmix_list_t);
+    PMIX_INFO_LIST_START(results);
 
     /* see what they wanted */
     for (m = 0; m < cd->nqueries; m++) {
@@ -199,7 +199,6 @@ static void _query(int sd, short args, void *cbdata)
             if (0 == strcmp(q->keys[n], PMIX_QUERY_NAMESPACES)) {
                 /* get the current jobids */
                 nspaces = NULL;
-                PMIX_CONSTRUCT(&stack, pmix_list_t);
                 for (k = 0; k < prte_job_data->size; k++) {
                     jdata = (prte_job_t *) pmix_pointer_array_get_item(prte_job_data, k);
                     if (NULL == jdata) {
@@ -211,16 +210,18 @@ static void _query(int sd, short args, void *cbdata)
                     }
                 }
                 /* join the results into a single comma-delimited string */
-                kv = PMIX_NEW(prte_info_item_t);
                 tmp = PMIX_ARGV_JOIN_COMPAT(nspaces, ',');
                 PMIX_ARGV_FREE_COMPAT(nspaces);
-                PMIX_INFO_LOAD(&kv->info, PMIX_QUERY_NAMESPACES, tmp, PMIX_STRING);
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_NAMESPACES, tmp, PMIX_STRING);
                 free(tmp);
-                pmix_list_append(&results, &kv->super);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
 
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_NAMESPACE_INFO)) {
+                PMIX_INFO_LIST_START(cache);
                 /* get the current jobids */
-                PMIX_CONSTRUCT(&stack, pmix_list_t);
                 for (k = 0; k < prte_job_data->size; k++) {
                     jdata = (prte_job_t *) pmix_pointer_array_get_item(prte_job_data, k);
                     if (NULL == jdata) {
@@ -228,16 +229,14 @@ static void _query(int sd, short args, void *cbdata)
                     }
                     /* don't show the requestor's job */
                     if (!PMIX_CHECK_NSPACE(PRTE_PROC_MY_NAME->nspace, jdata->nspace)) {
-                        kv = PMIX_NEW(prte_info_item_t);
-                        (void) strncpy(kv->info.key, PMIX_QUERY_NAMESPACE_INFO, PMIX_MAX_KEYLEN);
-                        pmix_list_append(&stack, &kv->super);
-                        /* create the array to hold the nspace and the cmd */
-                        PMIX_DATA_ARRAY_CREATE(darray, 2, PMIX_INFO);
-                        kv->info.value.type = PMIX_DATA_ARRAY;
-                        kv->info.value.data.darray = darray;
-                        info = (pmix_info_t *) darray->array;
+                        PMIX_INFO_LIST_START(stack);
                         /* add the nspace name */
-                        PMIX_INFO_LOAD(&info[0], PMIX_NSPACE, jdata->nspace, PMIX_STRING);
+                        PMIX_INFO_LIST_ADD(rc, stack, PMIX_NSPACE, jdata->nspace, PMIX_STRING);
+                        if (PMIX_SUCCESS != rc) {
+                            PMIX_ERROR_LOG(rc);
+                            PMIX_INFO_LIST_RELEASE(stack);
+                            goto done;
+                        }
                         /* add the cmd line */
                         app = (prte_app_context_t *) pmix_pointer_array_get_item(jdata->apps, 0);
                         if (NULL == app) {
@@ -245,26 +244,80 @@ static void _query(int sd, short args, void *cbdata)
                             goto done;
                         }
                         cmdline = PMIX_ARGV_JOIN_COMPAT(app->argv, ' ');
-                        PMIX_INFO_LOAD(&info[1], PMIX_CMD_LINE, cmdline, PMIX_STRING);
+                        PMIX_INFO_LIST_ADD(rc, stack, PMIX_CMD_LINE, cmdline, PMIX_STRING);
                         free(cmdline);
+                        /* add the job size */
+                        PMIX_INFO_LIST_ADD(rc, stack, PMIX_JOB_SIZE, &jdata->num_procs, PMIX_UINT32);
+                        if (PMIX_SUCCESS != rc) {
+                            PMIX_ERROR_LOG(rc);
+                            PMIX_INFO_LIST_RELEASE(stack);
+                            goto done;
+                        }
+                        /* construct info on each process in the job */
+                        for (j=0; j < jdata->procs->size; j++) {
+                            proct = (prte_proc_t*)pmix_pointer_array_get_item(jdata->procs, j);
+                            if (NULL == proct) {
+                                continue;
+                            }
+                            PMIX_INFO_LIST_START(plist);
+                            /* add the proc's rank */
+                            PMIX_INFO_LIST_ADD(rc, plist, PMIX_RANK, &proct->name.rank, PMIX_PROC_RANK);
+                            if (PMIX_SUCCESS != rc) {
+                                PMIX_ERROR_LOG(rc);
+                                PMIX_INFO_LIST_RELEASE(stack);
+                                PMIX_INFO_LIST_RELEASE(plist);
+                                goto done;
+                            }
+                            /* add the proc's hostname */
+                            PMIX_INFO_LIST_ADD(rc, plist, PMIX_HOSTNAME, proct->node->name, PMIX_STRING);
+                            if (PMIX_SUCCESS != rc) {
+                                PMIX_ERROR_LOG(rc);
+                                PMIX_INFO_LIST_RELEASE(stack);
+                                PMIX_INFO_LIST_RELEASE(plist);
+                                goto done;
+                            }
+                            /* add the proc's local rank */
+                            PMIX_INFO_LIST_ADD(rc, plist, PMIX_LOCAL_RANK, &proct->local_rank, PMIX_UINT16);
+                            if (PMIX_SUCCESS != rc) {
+                                PMIX_ERROR_LOG(rc);
+                                PMIX_INFO_LIST_RELEASE(stack);
+                                PMIX_INFO_LIST_RELEASE(plist);
+                                goto done;
+                            }
+                            /* add to the stack */
+                            PMIX_INFO_LIST_CONVERT(rc, plist, &dry);
+                            if (PMIX_SUCCESS != rc) {
+                                PMIX_ERROR_LOG(rc);
+                                PMIX_INFO_LIST_RELEASE(stack);
+                                PMIX_INFO_LIST_RELEASE(plist);
+                                goto done;
+                            }
+                            PMIX_INFO_LIST_RELEASE(plist);
+                            PMIX_INFO_LIST_ADD(rc, stack, PMIX_PROC_INFO_ARRAY, &dry, PMIX_DATA_ARRAY);
+                            PMIX_DATA_ARRAY_DESTRUCT(&dry);
+                        }
+                        /* add the result to our cache */
+                        PMIX_INFO_LIST_CONVERT(rc, stack, &dry);
+                        if (PMIX_SUCCESS != rc) {
+                            PMIX_ERROR_LOG(rc);
+                            PMIX_INFO_LIST_RELEASE(stack);
+                            goto done;
+                        }
+                        PMIX_INFO_LIST_RELEASE(stack);
+                        PMIX_INFO_LIST_ADD(rc, cache, PMIX_JOB_INFO_ARRAY, &dry, PMIX_DATA_ARRAY);
+                        PMIX_DATA_ARRAY_DESTRUCT(&dry);
                     }
                 }
-                kv = PMIX_NEW(prte_info_item_t);
-                (void) strncpy(kv->info.key, PMIX_QUERY_NAMESPACE_INFO, PMIX_MAX_KEYLEN);
-                kv->info.value.type = PMIX_DATA_ARRAY;
-                m = pmix_list_get_size(&stack);
-                PMIX_DATA_ARRAY_CREATE(darray, m, PMIX_INFO);
-                kv->info.value.data.darray = darray;
-                pmix_list_append(&results, &kv->super);
-                /* join the results into an array */
-                info = (pmix_info_t *) darray->array;
-                p = 0;
-                while (NULL != (kv = (prte_info_item_t *) pmix_list_remove_first(&stack))) {
-                    PMIX_INFO_XFER(&info[p], &kv->info);
-                    PMIX_RELEASE(kv);
-                    ++p;
+                /* add our findings to the results */
+                PMIX_INFO_LIST_CONVERT(rc, cache, &dry);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    PMIX_INFO_LIST_RELEASE(cache);
+                    goto done;
                 }
-                PMIX_LIST_DESTRUCT(&stack);
+                PMIX_INFO_LIST_RELEASE(cache);
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_NAMESPACE_INFO, &dry, PMIX_DATA_ARRAY);
+                PMIX_DATA_ARRAY_DESTRUCT(&dry);
 
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_SPAWN_SUPPORT)) {
                 ans = NULL;
@@ -281,12 +334,15 @@ static void _query(int sd, short args, void *cbdata)
                 PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_BINDTO);
                 PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_COSPAWN_APP);
                 /* create the return kv */
-                kv = PMIX_NEW(prte_info_item_t);
                 tmp = PMIX_ARGV_JOIN_COMPAT(ans, ',');
                 PMIX_ARGV_FREE_COMPAT(ans);
-                PMIX_INFO_LOAD(&kv->info, PMIX_QUERY_SPAWN_SUPPORT, tmp, PMIX_STRING);
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_SPAWN_SUPPORT, tmp, PMIX_STRING);
                 free(tmp);
-                pmix_list_append(&results, &kv->super);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
+
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_DEBUG_SUPPORT)) {
                 ans = NULL;
                 PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_DEBUG_STOP_IN_INIT);
@@ -296,12 +352,15 @@ static void _query(int sd, short args, void *cbdata)
 #endif
                 PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_DEBUG_TARGET);
                 /* create the return kv */
-                kv = PMIX_NEW(prte_info_item_t);
                 tmp = PMIX_ARGV_JOIN_COMPAT(ans, ',');
                 PMIX_ARGV_FREE_COMPAT(ans);
-                PMIX_INFO_LOAD(&kv->info, PMIX_QUERY_DEBUG_SUPPORT, tmp, PMIX_STRING);
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_DEBUG_SUPPORT, tmp, PMIX_STRING);
                 free(tmp);
-                pmix_list_append(&results, &kv->super);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
+
             } else if (0 == strcmp(q->keys[n], PMIX_HWLOC_XML_V1)) {
                 if (NULL != prte_hwloc_topology) {
                     char *xmlbuffer = NULL;
@@ -309,8 +368,7 @@ static void _query(int sd, short args, void *cbdata)
                     kv = PMIX_NEW(prte_info_item_t);
 #if HWLOC_API_VERSION < 0x20000
                     /* get this from the v1.x API */
-                    if (0
-                        != hwloc_topology_export_xmlbuffer(prte_hwloc_topology, &xmlbuffer, &len)) {
+                    if (0 != hwloc_topology_export_xmlbuffer(prte_hwloc_topology, &xmlbuffer, &len)) {
                         PMIX_RELEASE(kv);
                         continue;
                     }
@@ -322,10 +380,14 @@ static void _query(int sd, short args, void *cbdata)
                         continue;
                     }
 #endif
-                    PMIX_INFO_LOAD(&kv->info, PMIX_HWLOC_XML_V1, xmlbuffer, PMIX_STRING);
+                    PMIX_INFO_LIST_ADD(rc, results, PMIX_HWLOC_XML_V1, xmlbuffer, PMIX_STRING);
                     free(xmlbuffer);
-                    pmix_list_append(&results, &kv->super);
+                    if (PMIX_SUCCESS != rc) {
+                        PMIX_ERROR_LOG(rc);
+                        goto done;
+                    }
                 }
+
             } else if (0 == strcmp(q->keys[n], PMIX_HWLOC_XML_V2)) {
                 /* we cannot provide it if we are using v1.x */
 #if HWLOC_API_VERSION >= 0x20000
@@ -337,26 +399,31 @@ static void _query(int sd, short args, void *cbdata)
                         PMIX_RELEASE(kv);
                         continue;
                     }
-                    PMIX_INFO_LOAD(&kv->info, PMIX_HWLOC_XML_V2, xmlbuffer, PMIX_STRING);
+                    PMIX_INFO_LIST_ADD(rc, results, PMIX_HWLOC_XML_V2, xmlbuffer, PMIX_STRING);
                     free(xmlbuffer);
-                    pmix_list_append(&results, &kv->super);
+                    if (PMIX_SUCCESS != rc) {
+                        PMIX_ERROR_LOG(rc);
+                        goto done;
+                    }
                 }
 #endif
 
             } else if (0 == strcmp(q->keys[n], PMIX_PROC_URI)) {
                 /* they want our URI */
-                kv = PMIX_NEW(prte_info_item_t);
-                PMIX_INFO_LOAD(&kv->info, PMIX_PROC_URI, prte_process_info.my_hnp_uri, PMIX_STRING);
-                pmix_list_append(&results, &kv->super);
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_PROC_URI, prte_process_info.my_hnp_uri, PMIX_STRING);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
+
             } else if (0 == strcmp(q->keys[n], PMIX_SERVER_URI)) {
                 /* they want the PMIx URI */
                 if (NULL != hostname) {
                     /* find the node object */
                     node = NULL;
                     for (k = 0; k < prte_node_pool->size; k++) {
-                        if (NULL
-                            == (ndptr = (prte_node_t *) pmix_pointer_array_get_item(prte_node_pool,
-                                                                                    k))) {
+                        ndptr = (prte_node_t *) pmix_pointer_array_get_item(prte_node_pool, k);
+                        if (NULL == ndptr) {
                             continue;
                         }
                         if (0 == strcmp(hostname, ndptr->name)) {
@@ -397,16 +464,18 @@ static void _query(int sd, short args, void *cbdata)
                 }
                 /* get the server uri value - we can block here as we are in
                  * an PRTE progress thread */
-                PRTE_MODEX_RECV_VALUE_OPTIONAL(rc, PMIX_SERVER_URI, &proct->name, (char **) &uri,
-                                               PMIX_STRING);
+                PRTE_MODEX_RECV_VALUE_OPTIONAL(rc, PMIX_SERVER_URI, &proct->name,
+                                               (char **) &uri, PMIX_STRING);
                 if (PRTE_SUCCESS != rc) {
                     ret = prte_pmix_convert_rc(rc);
                     goto done;
                 }
-                kv = PMIX_NEW(prte_info_item_t);
-                PMIX_INFO_LOAD(&kv->info, PMIX_SERVER_URI, uri, PMIX_STRING);
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_SERVER_URI, uri, PMIX_STRING);
                 free(uri);
-                pmix_list_append(&results, &kv->super);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
 
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_PROC_TABLE)) {
                 /* construct a list of values with prte_proc_info_t
@@ -421,15 +490,9 @@ static void _query(int sd, short args, void *cbdata)
                     ret = PMIX_ERR_NOT_FOUND;
                     goto done;
                 }
-                /* setup the reply */
-                kv = PMIX_NEW(prte_info_item_t);
-                (void) strncpy(kv->info.key, PMIX_QUERY_PROC_TABLE, PMIX_MAX_KEYLEN);
-                pmix_list_append(&results, &kv->super);
                 /* cycle thru the job and create an entry for each proc */
-                PMIX_DATA_ARRAY_CREATE(darray, jdata->num_procs, PMIX_PROC_INFO);
-                kv->info.value.type = PMIX_DATA_ARRAY;
-                kv->info.value.data.darray = darray;
-                procinfo = (pmix_proc_info_t *) darray->array;
+                PMIX_DATA_ARRAY_CONSTRUCT(&dry, jdata->num_procs, PMIX_PROC_INFO);
+                procinfo = (pmix_proc_info_t*)dry.array;
                 p = 0;
                 for (k = 0; k < jdata->procs->size; k++) {
                     proct = (prte_proc_t *) pmix_pointer_array_get_item(jdata->procs, k);
@@ -454,6 +517,12 @@ static void _query(int sd, short args, void *cbdata)
                     procinfo[p].state = prte_pmix_convert_state(proct->state);
                     ++p;
                 }
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_PROC_TABLE, &dry, PMIX_DATA_ARRAY);
+                PMIX_DATA_ARRAY_DESTRUCT(&dry);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
 
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_LOCAL_PROC_TABLE)) {
                 /* construct a list of values with prte_proc_info_t
@@ -468,15 +537,9 @@ static void _query(int sd, short args, void *cbdata)
                     ret = PMIX_ERR_NOT_FOUND;
                     goto done;
                 }
-                /* setup the reply */
-                kv = PMIX_NEW(prte_info_item_t);
-                (void) strncpy(kv->info.key, PMIX_QUERY_LOCAL_PROC_TABLE, PMIX_MAX_KEYLEN);
-                pmix_list_append(&results, &kv->super);
                 /* cycle thru the job and create an entry for each proc */
-                PMIX_DATA_ARRAY_CREATE(darray, jdata->num_local_procs, PMIX_PROC_INFO);
-                kv->info.value.type = PMIX_DATA_ARRAY;
-                kv->info.value.data.darray = darray;
-                procinfo = (pmix_proc_info_t *) darray->array;
+                PMIX_DATA_ARRAY_CONSTRUCT(&dry, jdata->num_local_procs, PMIX_PROC_INFO);
+                procinfo = (pmix_proc_info_t *) dry.array;
                 p = 0;
                 for (k = 0; k < jdata->procs->size; k++) {
                     proct = (prte_proc_t *) pmix_pointer_array_get_item(jdata->procs, k);
@@ -503,12 +566,20 @@ static void _query(int sd, short args, void *cbdata)
                         ++p;
                     }
                 }
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_LOCAL_PROC_TABLE, &dry, PMIX_DATA_ARRAY);
+                PMIX_DATA_ARRAY_DESTRUCT(&dry);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
 
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_NUM_PSETS)) {
-                kv = PMIX_NEW(prte_info_item_t);
                 sz = pmix_list_get_size(&prte_pmix_server_globals.psets);
-                PMIX_INFO_LOAD(&kv->info, PMIX_QUERY_NUM_PSETS, &sz, PMIX_SIZE);
-                pmix_list_append(&results, &kv->super);
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_NUM_PSETS, &sz, PMIX_SIZE);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
 
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_PSET_NAMES)) {
                 pmix_server_pset_t *ps;
@@ -524,10 +595,12 @@ static void _query(int sd, short args, void *cbdata)
                     tmp = PMIX_ARGV_JOIN_COMPAT(ans, ',');
                     PMIX_ARGV_FREE_COMPAT(ans);
                     ans = NULL;
-                    kv = PMIX_NEW(prte_info_item_t);
-                    PMIX_INFO_LOAD(&kv->info, PMIX_QUERY_PSET_NAMES, tmp, PMIX_STRING);
-                    pmix_list_append(&results, &kv->super);
+                    PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_PSET_NAMES, tmp, PMIX_STRING);
                     free(tmp);
+                    if (PMIX_SUCCESS != rc) {
+                        PMIX_ERROR_LOG(rc);
+                        goto done;
+                    }
                 }
 
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_PSET_MEMBERSHIP)) {
@@ -555,9 +628,12 @@ static void _query(int sd, short args, void *cbdata)
                 dry.array = psptr->members;
                 dry.type = PMIX_PROC_RANK;
                 dry.size = psptr->num_members;
-                kv = PMIX_NEW(prte_info_item_t);
-                PMIX_INFO_LOAD(&kv->info, PMIX_QUERY_PSET_MEMBERSHIP, &dry, PMIX_DATA_ARRAY);
-                pmix_list_append(&results, &kv->super);
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_PSET_MEMBERSHIP, &dry, PMIX_DATA_ARRAY);
+                PMIX_DATA_ARRAY_DESTRUCT(&dry);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
 
             } else if (0 == strcmp(q->keys[n], PMIX_JOB_SIZE)) {
                 jdata = prte_get_job_data_object(jobid);
@@ -566,17 +642,20 @@ static void _query(int sd, short args, void *cbdata)
                     goto done;
                 }
                 /* setup the reply */
-                kv = PMIX_NEW(prte_info_item_t);
-                (void) strncpy(kv->info.key, PMIX_JOB_SIZE, PMIX_MAX_KEYLEN);
                 key = jdata->num_procs;
-                PMIX_INFO_LOAD(&kv->info, PMIX_JOB_SIZE, &key, PMIX_UINT32);
-                pmix_list_append(&results, &kv->super);
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_JOB_SIZE, &key, PMIX_UINT32);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
 
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_NUM_GROUPS)) {
-                kv = PMIX_NEW(prte_info_item_t);
                 sz = pmix_list_get_size(&prte_pmix_server_globals.groups);
-                PMIX_INFO_LOAD(&kv->info, PMIX_QUERY_NUM_GROUPS, &sz, PMIX_SIZE);
-                pmix_list_append(&results, &kv->super);
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_NUM_GROUPS, &sz, PMIX_SIZE);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
 
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_GROUP_NAMES)) {
                 pmix_server_pset_t *ps;
@@ -587,11 +666,12 @@ static void _query(int sd, short args, void *cbdata)
                 }
                 tmp = PMIX_ARGV_JOIN_COMPAT(ans, ',');
                 PMIX_ARGV_FREE_COMPAT(ans);
-                ans = NULL;
-                kv = PMIX_NEW(prte_info_item_t);
-                PMIX_INFO_LOAD(&kv->info, PMIX_QUERY_GROUP_NAMES, tmp, PMIX_STRING);
-                pmix_list_append(&results, &kv->super);
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_GROUP_NAMES, tmp, PMIX_STRING);
                 free(tmp);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
 
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_GROUP_MEMBERSHIP)) {
                 /* construct a list of values with pmix_proc_t
@@ -613,18 +693,18 @@ static void _query(int sd, short args, void *cbdata)
                     ret = PMIX_ERR_NOT_FOUND;
                     goto done;
                 }
-                /* setup the reply */
-                kv = PMIX_NEW(prte_info_item_t);
-                (void) strncpy(kv->info.key, PMIX_QUERY_GROUP_MEMBERSHIP, PMIX_MAX_KEYLEN);
-                pmix_list_append(&results, &kv->super);
                 /* cycle thru the job and create an entry for each proc */
-                PMIX_DATA_ARRAY_CREATE(darray, grp->num_members, PMIX_PROC);
-                kv->info.value.type = PMIX_DATA_ARRAY;
-                kv->info.value.data.darray = darray;
-                proc = (pmix_proc_t *) darray->array;
+                PMIX_DATA_ARRAY_CONSTRUCT(&dry, grp->num_members, PMIX_PROC);
+                proc = (pmix_proc_t *) dry.array;
                 for (k = 0; k < grp->num_members; k++) {
                     PMIX_LOAD_PROCID(&proc[k], grp->members[k].nspace, grp->members[k].rank);
                 }
+                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_GROUP_MEMBERSHIP, &dry, PMIX_DATA_ARRAY);
+                PMIX_DATA_ARRAY_DESTRUCT(&dry);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
 
 #if PMIX_NUMERIC_VERSION >= 0x00050000
             } else if (0 == strcmp(q->keys[n], PMIX_QUERY_ALLOCATION)) {
@@ -682,15 +762,15 @@ static void _query(int sd, short args, void *cbdata)
                     free(str);
                 }
                 /* convert list to array */
-                PMIX_DATA_ARRAY_CREATE(darray, p, PMIX_INFO);
-                PMIX_INFO_LIST_CONVERT(rc, nodelist, darray);
+                PMIX_INFO_LIST_CONVERT(rc, nodelist, &dry);
                 PMIX_INFO_LIST_RELEASE(nodelist);
                 /* add to results */
-                kv = PMIX_NEW(prte_info_item_t);
-                (void) strncpy(kv->info.key, PMIX_QUERY_ALLOCATION, PMIX_MAX_KEYLEN);
-                kv->info.value.type = PMIX_DATA_ARRAY;
-                kv->info.value.data.darray = darray;
-                pmix_list_append(&results, &kv->super);
+                PMIX_INFO_LIST_ADD(rc, nodelist, PMIX_QUERY_ALLOCATION, &dry, PMIX_DATA_ARRAY);
+                PMIX_DATA_ARRAY_DESTRUCT(&dry);
+                if (PMIX_SUCCESS != rc) {
+                    PMIX_ERROR_LOG(rc);
+                    goto done;
+                }
 #endif
             } else {
                 fprintf(stderr, "Query for unrecognized attribute: %s\n", q->keys[n]);
@@ -700,27 +780,26 @@ static void _query(int sd, short args, void *cbdata)
 
 done:
     rcd = PMIX_NEW(prte_pmix_server_op_caddy_t);
+    PMIX_INFO_LIST_CONVERT(rc, results, &dry);
+    if (PMIX_SUCCESS != rc) {
+        PMIX_ERROR_LOG(rc);
+        ret = rc;
+    }
+    PMIX_INFO_LIST_RELEASE(results);
     if (PMIX_SUCCESS == ret) {
-        if (0 == pmix_list_get_size(&results)) {
+        if (0 == dry.size) {
             ret = PMIX_ERR_NOT_FOUND;
         } else {
-            if (pmix_list_get_size(&results) < cd->ninfo) {
+            if (dry.size < cd->ninfo) {
                 ret = PMIX_QUERY_PARTIAL_SUCCESS;
             } else {
                 ret = PMIX_SUCCESS;
             }
-            /* convert the list of results to an info array */
-            rcd->ninfo = pmix_list_get_size(&results);
-            PMIX_INFO_CREATE(rcd->info, rcd->ninfo);
-            n = 0;
-            PMIX_LIST_FOREACH(kv, &results, prte_info_item_t)
-            {
-                PMIX_INFO_XFER(&rcd->info[n], &kv->info);
-                n++;
-            }
         }
     }
-    PMIX_LIST_DESTRUCT(&results);
+    rcd->ninfo = dry.size;
+    rcd->info = (pmix_info_t*)dry.array;
+    // memory allocated in the data array will be free'd when rcd is released
     cd->infocbfunc(ret, rcd->info, rcd->ninfo, cd->cbdata, qrel, rcd);
     PMIX_RELEASE(cd);
 }
diff --git a/src/prted/prte_app_parse.c b/src/prted/prte_app_parse.c
index bdb9f5d978..7d5834e3e6 100644
--- a/src/prted/prte_app_parse.c
+++ b/src/prted/prte_app_parse.c
@@ -18,7 +18,7 @@
  * Copyright (c) 2016-2019 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2020      IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2023 Nanook Consulting  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * Copyright (c) 2022-2023 Triad National Security, LLC.
  *                         All rights reserved.
  * $COPYRIGHT$
@@ -194,6 +194,13 @@ static int create_app(prte_schizo_base_module_t *schizo, char **argv, pmix_list_
     /* Did the user specify a hostfile? */
     opt = pmix_cmd_line_get_param(&results, PRTE_CLI_HOSTFILE);
     if (NULL != opt) {
+        for (i=0; NULL != opt->values[i]; i++) {
+            if (!pmix_path_is_absolute(opt->values[i])) {
+                value = pmix_os_path(false, cwd, opt->values[i], NULL);
+                free(opt->values[i]);
+                opt->values[i] = value;
+            }
+        }
         tval = PMIX_ARGV_JOIN_COMPAT(opt->values, ',');
         PMIX_INFO_LIST_ADD(rc, app->info, PMIX_HOSTFILE,
                            tval, PMIX_STRING);
@@ -205,6 +212,24 @@ static int create_app(prte_schizo_base_module_t *schizo, char **argv, pmix_list_
         }
     }
 
+    /* Did the user specify an add-hostfile? */
+    opt = pmix_cmd_line_get_param(&results, PRTE_CLI_ADDHOSTFILE);
+    if (NULL != opt) {
+        for (i=0; NULL != opt->values[i]; i++) {
+            if (!pmix_path_is_absolute(opt->values[i])) {
+                value = pmix_os_path(false, cwd, opt->values[i], NULL);
+                free(opt->values[i]);
+                opt->values[i] = value;
+            }
+        }
+        tval = PMIX_ARGV_JOIN_COMPAT(opt->values, ',');
+        PMIX_INFO_LIST_ADD(rc, app->info, PMIX_ADD_HOSTFILE,
+                           tval, PMIX_STRING);
+        free(tval);
+        // we don't add these to the hostfiles array as they
+        // are not part of an initial DVM
+    }
+
     /* Did the user specify any hosts? */
     opt = pmix_cmd_line_get_param(&results, PRTE_CLI_HOST);
     if (NULL != opt) {
@@ -218,6 +243,16 @@ static int create_app(prte_schizo_base_module_t *schizo, char **argv, pmix_list_
         }
     }
 
+    /* Did the user specify any add-hosts? */
+    opt = pmix_cmd_line_get_param(&results, PRTE_CLI_ADDHOST);
+    if (NULL != opt) {
+        tval = PMIX_ARGV_JOIN_COMPAT(opt->values, ',');
+        PMIX_INFO_LIST_ADD(rc, app->info, PMIX_ADD_HOST, tval, PMIX_STRING);
+        free(tval);
+        // we don't add these to the hosts array as they
+        // are not part of an initial DVM
+    }
+
     /* check for bozo error */
     opt = pmix_cmd_line_get_param(&results, PRTE_CLI_NP);
     if (NULL != opt) {
diff --git a/src/rml/rml_recv.c b/src/rml/rml_recv.c
index b237118b78..f006ed8d67 100644
--- a/src/rml/rml_recv.c
+++ b/src/rml/rml_recv.c
@@ -16,7 +16,7 @@
  * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2016-2019 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -67,7 +67,7 @@ void prte_rml_recv_buffer_nb(pmix_proc_t *peer,
     req->post->persistent = persistent;
     req->post->cbfunc = cbfunc;
     req->post->cbdata = cbdata;
-    PMIX_THREADSHIFT(req, prte_event_base, prte_rml_base_post_recv, PRTE_MSG_PRI);
+    PRTE_PMIX_THREADSHIFT(req, prte_event_base, prte_rml_base_post_recv, PRTE_MSG_PRI);
 }
 void prte_rml_recv_cancel(pmix_proc_t *peer, prte_rml_tag_t tag)
 {
@@ -90,5 +90,5 @@ void prte_rml_recv_cancel(pmix_proc_t *peer, prte_rml_tag_t tag)
     req->cancel = true;
     PMIX_XFER_PROCID(&req->post->peer, peer);
     req->post->tag = tag;
-    PMIX_THREADSHIFT(req, prte_event_base, prte_rml_base_post_recv, PRTE_MSG_PRI);
+    PRTE_PMIX_THREADSHIFT(req, prte_event_base, prte_rml_base_post_recv, PRTE_MSG_PRI);
 }
diff --git a/src/rml/routed_radix.c b/src/rml/routed_radix.c
index c3a1dd1ec2..8e3b6d4975 100644
--- a/src/rml/routed_radix.c
+++ b/src/rml/routed_radix.c
@@ -11,6 +11,8 @@
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
  * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2023      Triad National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -198,8 +200,15 @@ void prte_rml_compute_routing_tree(void)
     }
 
     /* compute my direct children and the bitmap that shows which vpids
-     * lie underneath their branch
+     * lie underneath their branch.  destroy list if it is not empty.
+     * this situation can arise when the DVM is being resized.
      */
+
+    if (pmix_list_get_size(&prte_rml_base.children) > 0) {
+        PMIX_LIST_DESTRUCT(&prte_rml_base.children);
+        PMIX_CONSTRUCT(&prte_rml_base.children, pmix_list_t);
+    }
+
     radix_tree(Ii, &prte_rml_base.children, NULL);
 
     if (0 < pmix_output_get_verbosity(prte_rml_base.routed_output)) {
diff --git a/src/runtime/help-prte-runtime.txt b/src/runtime/help-prte-runtime.txt
index 1f903def53..3fb27e80bb 100644
--- a/src/runtime/help-prte-runtime.txt
+++ b/src/runtime/help-prte-runtime.txt
@@ -12,7 +12,7 @@
 #                         All rights reserved.
 # Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
 # Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2021      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -22,12 +22,11 @@
 # This is the US/English general help file for PRTE.
 #
 [prte_init:startup:internal-failure]
-It looks like prte_init failed for some reason; your parallel process is
-likely to abort.  There are many reasons that a parallel process can
-fail during prte_init; some of which are due to configuration or
-environment problems.  This failure appears to be an internal failure;
-here's some additional information (which may only be relevant to an
-PRTE developer):
+It looks like prte_init failed for some reason. There are many reasons
+that can cause PRRTE to fail during prte_init, some of which are due to
+configuration or environment problems.  This failure appears to be an
+internal failure - here's some additional information (which may only
+be relevant to a PRRTE developer):
 
   %s failed
   --> Returned value %s (%d) instead of PRTE_SUCCESS
@@ -74,3 +73,54 @@ libz library on the receiving node:
 
 Please ensure that the libz library is present on all
 compute nodes.
+#
+[bootstrap-not-found]
+Bootstrap startup was requested, but the required configuration
+file was not found on at least one node:
+
+  node: %s
+  file: %s
+
+Please ensure the file has been installed in the correct location
+on every node included in this PRRTE DVM.
+#
+[bootstrap-missing-field-name]
+Bootstrap startup was requested, but the required configuration
+file on at least one node is missing the field name on an entry:
+
+  node: %s
+  file: %s
+  line: %s
+
+Please correct the line.
+#
+[bootstrap-missing-value]
+Bootstrap startup was requested, but the required configuration
+file on at least one node is missing a value on an entry:
+
+  node: %s
+  file: %s
+  line: %s
+
+Please correct the line.
+#
+[bootstrap-missing-entry]
+Bootstrap startup was requested, but the required configuration
+file on at least one node is missing a required entry:
+
+  node:   %s
+  file:   %s
+  entry:  %s
+
+Please provide the missing information.
+#
+[bootstrap-bad-nodelist]
+Bootstrap startup was requested, but we were unable to parse
+the regex of participating nodes on at least one node:
+
+  node:   %s
+  file:   %s
+  regex:  %s
+  error:  %s
+
+Please fix the error and try again.
diff --git a/src/runtime/prte_globals.c b/src/runtime/prte_globals.c
index b3a88b4ad5..34c869a7f3 100644
--- a/src/runtime/prte_globals.c
+++ b/src/runtime/prte_globals.c
@@ -17,7 +17,7 @@
  * Copyright (c) 2014-2019 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2017-2020 IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -74,6 +74,7 @@ bool prte_add_pid_to_session_dirname = false;
 bool prte_allow_run_as_root = false;
 bool prte_fwd_environment = false;
 bool prte_show_launch_progress = false;
+bool prte_bootstrap_setup = false;
 
 /* PRTE OOB port flags */
 bool prte_static_ports = false;
diff --git a/src/runtime/prte_globals.h b/src/runtime/prte_globals.h
index c23553cad2..8037abc00b 100644
--- a/src/runtime/prte_globals.h
+++ b/src/runtime/prte_globals.h
@@ -73,6 +73,7 @@ PRTE_EXPORT extern char *prte_tool_actual;         // actual tool executable
 PRTE_EXPORT extern char *prte_progress_thread_cpus;
 PRTE_EXPORT extern bool prte_bind_progress_thread_reqd;
 PRTE_EXPORT extern bool prte_show_launch_progress;
+PRTE_EXPORT extern bool prte_bootstrap_setup;
 
 /**
  * Global indicating where this process was bound to at launch (will
diff --git a/src/runtime/prte_init.c b/src/runtime/prte_init.c
index ab05599860..649d8bf701 100644
--- a/src/runtime/prte_init.c
+++ b/src/runtime/prte_init.c
@@ -70,6 +70,7 @@
 #include "src/mca/odls/base/base.h"
 #include "src/mca/oob/base/base.h"
 #include "src/mca/plm/base/base.h"
+#include "src/mca/pmdl/base/base.h"
 #include "src/mca/prtebacktrace/base/base.h"
 #include "src/mca/prteinstalldirs/base/base.h"
 #include "src/mca/ras/base/base.h"
@@ -82,6 +83,7 @@
 #include "src/runtime/prte_globals.h"
 #include "src/runtime/prte_locks.h"
 #include "src/runtime/runtime.h"
+#include "src/runtime/runtime_internals.h"
 
 /*
  * Whether we have completed prte_init or we are in prte_finalize
@@ -115,8 +117,6 @@ static bool min_initialized = false;
 #endif
 const char prte_version_string[] = PRTE_IDENT_STRING;
 
-static void preload_default_mca_params(void);
-
 static bool check_exist(char *path)
 {
     struct stat buf;
@@ -221,7 +221,7 @@ int prte_init_util(prte_proc_type_t flags)
     }
 
     /* pre-load any default mca param files */
-    preload_default_mca_params();
+    prte_preload_default_mca_params();
 
     /* Register all MCA Params */
     if (PRTE_SUCCESS != (ret = prte_register_params())) {
@@ -390,7 +390,8 @@ static bool check_pmix_overlap(char *var, char *value)
         setenv(tmp, value, false);
         free(tmp);
         return true;
-    } else if (0 == strncmp(var, "oob_", 4)) {
+    } else if (0 == strncmp(var, "oob_", 4) &&
+               NULL == strstr(var, "verbose")) {
         pmix_asprintf(&tmp, "PMIX_MCA_ptl_%s", &var[4]);
         setenv(tmp, value, false);
         free(tmp);
@@ -415,7 +416,7 @@ static bool check_pmix_overlap(char *var, char *value)
     return false;
 }
 
-static void preload_default_mca_params(void)
+void prte_preload_default_mca_params(void)
 {
     char *file, *home, *tmp;
     pmix_list_t params, params2, pfinal;
@@ -468,9 +469,9 @@ static void preload_default_mca_params(void)
 
     /* now process the final list - but do not overwrite if the
      * user already has the param in our environment as their
-     * environment settings override all defaults*/
+     * environment settings override all defaults */
     PMIX_LIST_FOREACH(fv, &pfinal, pmix_mca_base_var_file_value_t) {
-        if (prte_schizo_base_check_prte_param(fv->mbvfv_var)) {
+        if (pmix_pmdl_base_check_prte_param(fv->mbvfv_var)) {
             pmix_asprintf(&tmp, "PRTE_MCA_%s", fv->mbvfv_var);
             // set it, but don't overwrite if they already
             // have a value in our environment
@@ -480,7 +481,7 @@ static void preload_default_mca_params(void)
             // or mca frameworks, then we also need to set
             // the equivalent PMIx value
             check_pmix_overlap(fv->mbvfv_var, fv->mbvfv_value);
-        } else if (prte_schizo_base_check_pmix_param(fv->mbvfv_var)) {
+        } else if (pmix_pmdl_base_check_pmix_param(fv->mbvfv_var)) {
             pmix_asprintf(&tmp, "PMIX_MCA_%s", fv->mbvfv_var);
             // set it, but don't overwrite if they already
             // have a value in our environment
@@ -489,27 +490,6 @@ static void preload_default_mca_params(void)
         }
     }
 
-    /* now process the results */
-    PMIX_LIST_FOREACH_SAFE(fv, fvnext, &pfinal, pmix_mca_base_var_file_value_t) {
-        // see if this param relates to PRRTE
-        if (prte_schizo_base_check_prte_param(fv->mbvfv_var)) {
-            pmix_asprintf(&tmp, "PRTE_MCA_%s", fv->mbvfv_var);
-            // set it, but don't overwrite if they already
-            // have a value in our environment
-            setenv(tmp, fv->mbvfv_value, false);
-            free(tmp);
-            // if this relates to the DL, OOB, HWLOC, IF, or
-            // REACHABLE frameworks, then we also need to set
-            // the equivalent PMIx value
-            check_pmix_overlap(fv->mbvfv_var, fv->mbvfv_value);
-        } else if (prte_schizo_base_check_pmix_param(fv->mbvfv_var)) {
-            pmix_asprintf(&tmp, "PMIX_MCA_%s", fv->mbvfv_var);
-            // set it, but don't overwrite if they already
-            // have a value in our environment
-            setenv(tmp, fv->mbvfv_value, false);
-            free(tmp);
-        }
-    }
     PMIX_LIST_DESTRUCT(&params);
     PMIX_LIST_DESTRUCT(&params2);
     PMIX_LIST_DESTRUCT(&pfinal);
diff --git a/src/runtime/prte_wait.c b/src/runtime/prte_wait.c
index 5f8006c935..000e139b0b 100644
--- a/src/runtime/prte_wait.c
+++ b/src/runtime/prte_wait.c
@@ -15,7 +15,7 @@
  *                         et Automatique. All rights reserved.
  * Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
  * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * Copyright (c) 2021      Amazon.com, Inc. or its affiliates.  All Rights
  *                         reserved.
  * $COPYRIGHT$
@@ -216,7 +216,7 @@ void prte_wait_cb_cancel(prte_proc_t *child)
     trk = PMIX_NEW(prte_wait_tracker_t);
     PMIX_RETAIN(child); // protect against race conditions
     trk->child = child;
-    PMIX_THREADSHIFT(trk, prte_event_base, cancel_callback, PRTE_SYS_PRI);
+    PRTE_PMIX_THREADSHIFT(trk, prte_event_base, cancel_callback, PRTE_SYS_PRI);
 }
 
 /* callback from the event library whenever a SIGCHLD is received */
diff --git a/src/runtime/runtime_internals.h b/src/runtime/runtime_internals.h
index 8433272392..d530c4aef3 100644
--- a/src/runtime/runtime_internals.h
+++ b/src/runtime/runtime_internals.h
@@ -12,7 +12,7 @@
  * Copyright (c) 2007-2008 Sun Microsystems, Inc.  All rights reserved.
  * Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -37,6 +37,8 @@ BEGIN_C_DECLS
  */
 PRTE_EXPORT int prte_dt_init(void);
 
+PRTE_EXPORT void prte_preload_default_mca_params(void);
+
 END_C_DECLS
 
 #endif /* PRTE_RUNTIME_INTERNALS_H */
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index ee7335ddb1..3a85a9d931 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -14,6 +14,7 @@
 # Copyright (c) 2011-2013 Los Alamos National Security, LLC.  All rights
 #                         reserved.
 # Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
+# Copyright (c) 2023      Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
diff --git a/src/tools/prte_info/components.c b/src/tools/prte_info/components.c
index 9381361dce..57ea13c6d0 100644
--- a/src/tools/prte_info/components.c
+++ b/src/tools/prte_info/components.c
@@ -16,7 +16,7 @@
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2018-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -42,7 +42,7 @@
 #include "src/util/pmix_printf.h"
 #include "src/util/pmix_show_help.h"
 
-#include "src/include/frameworks.h"
+#include "src/include/prte_frameworks.h"
 
 #include "src/mca/prteinstalldirs/prteinstalldirs.h"
 
diff --git a/src/tools/prte_info/prte_info.c b/src/tools/prte_info/prte_info.c
index 6b3a64d87b..6dfc0bdf8a 100644
--- a/src/tools/prte_info/prte_info.c
+++ b/src/tools/prte_info/prte_info.c
@@ -56,7 +56,7 @@
 #include "src/util/pmix_show_help.h"
 
 #include "constants.h"
-#include "src/include/frameworks.h"
+#include "src/include/prte_frameworks.h"
 #include "src/include/version.h"
 #include "src/runtime/prte_locks.h"
 
diff --git a/src/tools/prted/prted.c b/src/tools/prted/prted.c
index a6e345d25b..fd86b4e8ac 100644
--- a/src/tools/prted/prted.c
+++ b/src/tools/prted/prted.c
@@ -19,7 +19,7 @@
  * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015-2019 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting  All rights reserved.
  * Copyright (c) 2022      Triad National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
@@ -87,7 +87,7 @@
 #include "src/util/pmix_show_help.h"
 
 #include "src/mca/errmgr/errmgr.h"
-#include "src/mca/ess/ess.h"
+#include "src/mca/ess/base/base.h"
 #include "src/mca/grpcomm/base/base.h"
 #include "src/mca/grpcomm/grpcomm.h"
 #include "src/mca/odls/base/base.h"
@@ -255,9 +255,9 @@ int main(int argc, char *argv[])
     prte_init_util(PRTE_PROC_DAEMON);
 
     /* open the SCHIZO framework */
-    if (PRTE_SUCCESS
-        != (ret = pmix_mca_base_framework_open(&prte_schizo_base_framework,
-                                               PMIX_MCA_BASE_OPEN_DEFAULT))) {
+    ret = pmix_mca_base_framework_open(&prte_schizo_base_framework,
+                                       PMIX_MCA_BASE_OPEN_DEFAULT);
+    if (PRTE_SUCCESS != ret) {
         PRTE_ERROR_LOG(ret);
         return ret;
     }
@@ -343,6 +343,16 @@ int main(int argc, char *argv[])
     /* ensure we silence any compression warnings */
     PMIX_SETENV_COMPAT("PMIX_MCA_compress_base_silence_warning", "1", true, &environ);
 
+    /* check for bootstrap operation */
+    if (pmix_cmd_line_is_taken(&results, PRTE_CLI_BOOTSTRAP)) {
+        /* fill in our procID and other information
+         * from the configuration file */
+        ret = prte_ess_base_bootstrap();
+        if (PRTE_SUCCESS != ret) {
+            return ret;
+        }
+    }
+
     if (PRTE_SUCCESS != (ret = prte_init(&argc, &argv, PRTE_PROC_DAEMON))) {
         PRTE_ERROR_LOG(ret);
         return ret;
diff --git a/src/util/attr.c b/src/util/attr.c
index 249c258ea6..c3831fc68a 100644
--- a/src/util/attr.c
+++ b/src/util/attr.c
@@ -284,6 +284,8 @@ const char *prte_attr_key_to_str(prte_attribute_key_t key)
             return "NODE-HOSTID";
         case PRTE_NODE_SERIAL_NUMBER:
             return "NODE-SERIAL-NUM";
+        case PRTE_NODE_ADD_SLOTS:
+            return "NODE-ADD-SLOTS";
 
         case PRTE_JOB_LAUNCH_MSG_SENT:
             return "JOB-LAUNCH-MSG-SENT";
@@ -495,6 +497,8 @@ const char *prte_attr_key_to_str(prte_attribute_key_t key)
             return "DISPLAY PROCESSORS";
         case PRTE_JOB_DISPLAY_PARSEABLE_OUTPUT:
             return "DISPLAY PARSEABLE OUTPUT";
+        case PRTE_JOB_EXTEND_DVM:
+            return "EXTEND DVM";
 
         case PRTE_PROC_NOBARRIER:
             return "PROC-NOBARRIER";
diff --git a/src/util/attr.h b/src/util/attr.h
index 0cece23665..96e2b2aba1 100644
--- a/src/util/attr.h
+++ b/src/util/attr.h
@@ -83,6 +83,7 @@ typedef uint8_t prte_node_flags_t;
                                                           // we need to know the id of our "host" to help any procs on us to determine locality
 #define PRTE_NODE_SERIAL_NUMBER (PRTE_NODE_START_KEY + 5) // string - serial number: used if node is a coprocessor
 #define PRTE_NODE_PORT          (PRTE_NODE_START_KEY + 6) // int32 - Alternate port to be passed to plm
+#define PRTE_NODE_ADD_SLOTS     (PRTE_NODE_START_KEY + 7) // bool - slots are being added to existing node
 
 #define PRTE_NODE_MAX_KEY (PRTE_NODE_START_KEY + 100)
 
@@ -218,7 +219,7 @@ typedef uint16_t prte_job_flags_t;
 #define PRTE_JOB_DISPLAY_PROCESSORS         (PRTE_JOB_START_KEY + 109) // char* - string displaying nodes whose avail CPUs
                                                                        //         are to be displayed
 #define PRTE_JOB_DISPLAY_PARSEABLE_OUTPUT   (PRTE_JOB_START_KEY + 110) // bool - display output in machine parsable format
-
+#define PRTE_JOB_EXTEND_DVM                 (PRTE_JOB_START_KEY + 111) // bool - DVM is being extended
 
 #define PRTE_JOB_MAX_KEY (PRTE_JOB_START_KEY + 200)
 
diff --git a/src/util/dash_host/dash_host.c b/src/util/dash_host/dash_host.c
index ee8042ae3d..f34392745a 100644
--- a/src/util/dash_host/dash_host.c
+++ b/src/util/dash_host/dash_host.c
@@ -14,7 +14,7 @@
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016      IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -117,6 +117,7 @@ int prte_util_add_dash_host_nodes(pmix_list_t *nodes, char *hosts, bool allocati
     char *cptr;
     char *shortname;
     char *rawname;
+    bool add_slots = false;
 
     PMIX_OUTPUT_VERBOSE((1, prte_ras_base_framework.framework_output,
                          "%s dashhost: parsing args %s", PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
@@ -263,6 +264,10 @@ int prte_util_add_dash_host_nodes(pmix_list_t *nodes, char *hosts, bool allocati
                 slots_given = false;
             } else {
                 slots = strtol(cptr, NULL, 10);
+                if ('+' == *cptr || '-' == *cptr) {
+                    // mark that we are being asked to increase/decrease #slots
+                    add_slots = true;
+                }
                 slots_given = true;
             }
         }
@@ -295,6 +300,10 @@ int prte_util_add_dash_host_nodes(pmix_list_t *nodes, char *hosts, bool allocati
             if (slots_given) {
                 node->slots += slots;
                 PRTE_FLAG_SET(node, PRTE_NODE_FLAG_SLOTS_GIVEN);
+                if (add_slots) {
+                    prte_set_attribute(&node->attributes, PRTE_NODE_ADD_SLOTS,
+                                       PRTE_ATTR_GLOBAL, NULL, PMIX_BOOL);
+                }
             } else if (slots < 0) {
                 node->slots = 0;
                 PRTE_FLAG_UNSET(node, PRTE_NODE_FLAG_SLOTS_GIVEN);
@@ -344,6 +353,10 @@ int prte_util_add_dash_host_nodes(pmix_list_t *nodes, char *hosts, bool allocati
             if (slots_given) {
                 node->slots = slots;
                 PRTE_FLAG_SET(node, PRTE_NODE_FLAG_SLOTS_GIVEN);
+                if (add_slots) {
+                    prte_set_attribute(&node->attributes, PRTE_NODE_ADD_SLOTS,
+                                       PRTE_ATTR_GLOBAL, NULL, PMIX_BOOL);
+                }
             } else if (slots < 0) {
                 node->slots = 0;
                 PRTE_FLAG_UNSET(node, PRTE_NODE_FLAG_SLOTS_GIVEN);
diff --git a/src/util/prte_cmd_line.h b/src/util/prte_cmd_line.h
index c87995eb24..ffc179e2ef 100644
--- a/src/util/prte_cmd_line.h
+++ b/src/util/prte_cmd_line.h
@@ -86,6 +86,7 @@ BEGIN_C_DECLS
 #define PRTE_CLI_FWD_SIGNALS            "forward-signals"           // required
 #define PRTE_CLI_RUN_AS_ROOT            "allow-run-as-root"         // none
 #define PRTE_CLI_STREAM_BUF             "stream-buffering"          // required
+#define PRTE_CLI_BOOTSTRAP              "bootstrap"                 // none
 
 // Application options
 #define PRTE_CLI_NP                     "np"                        // required
@@ -94,7 +95,9 @@ BEGIN_C_DECLS
 #define PRTE_CLI_FWD_ENVAR              "x"                         // required
 #define PRTE_CLI_FWD_ENVIRON            "fwd-environment"           // optional
 #define PRTE_CLI_HOSTFILE               "hostfile"                  // required
+#define PRTE_CLI_ADDHOSTFILE            "add-hostfile"              // required
 #define PRTE_CLI_HOST                   "host"                      // required
+#define PRTE_CLI_ADDHOST                "add-host"                  // required
 #define PRTE_CLI_PATH                   "path"                      // required
 #define PRTE_CLI_PSET                   "pset"                      // required
 #define PRTE_CLI_PRELOAD_FILES          "preload-files"             // required
diff --git a/src/util/string_copy.c b/src/util/string_copy.c
deleted file mode 100644
index 98c393ab0f..0000000000
--- a/src/util/string_copy.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2018-2020 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#include "prte_config.h"
-
-#include <assert.h>
-
-#include "src/util/pmix_string_copy.h"
-
-void pmix_string_copy(char *dest, const char *src, size_t dest_len)
-{
-    size_t i;
-    char *new_dest = dest;
-
-    // PRTE does not do *giant* string copies.  Hence, we use the
-    // hueristic: if "dest_len" is too large, this is a programmer
-    // error.  We pseudo-arbitrarily pick a large value to be the max
-    // allowable dest_len: 128K.  If we ever need to increase this
-    // value someday (because something has a legit reason to
-    // pmix_string_copy() more than 128K), the core dumps that are
-    // generated by the assert() failure should make this fairly
-    // obvious.
-    assert(dest_len <= PMIX_MAX_SIZE_ALLOWED_BY_PMIX_STRING_COPY);
-
-    for (i = 0; i < dest_len; ++i, ++src, ++new_dest) {
-        *new_dest = *src;
-        if ('\0' == *src) {
-            return;
-        }
-    }
-
-    dest[i - 1] = '\0';
-}
diff --git a/src/util/string_copy.h b/src/util/string_copy.h
deleted file mode 100644
index 7a8e378d0d..0000000000
--- a/src/util/string_copy.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2006 The University of Tennessee and The University
- *                         of Tennessee Research Foundation.  All rights
- *                         reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
- *                         University of Stuttgart.  All rights reserved.
- * Copyright (c) 2004-2005 The Regents of the University of California.
- *                         All rights reserved.
- * Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#ifndef PRTE_STRING_COPY_H
-#define PRTE_STRING_COPY_H
-
-#include "prte_config.h"
-#ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#endif
-
-BEGIN_C_DECLS
-
-/**
- * Do a "safe" string copy (i.e., guarantee to \0-terminate the
- * destination string), and assert() fail if the copy length is too
- * large (because we assume it is a programmer error).
- *
- * @param dest Destination string buffer.
- * @param src Source string buffer.
- * @param dest_len Length of the destination string buffer.
- *
- * This function is similar to, but different than, strcpy() and
- * strncpy().
- *
- * It is invalid to pass NULL for either dest or src.
- *
- * If dest_len is larger than
- * PMIX_MAX_SIZE_ALLOWED_BY_PMIX_STRING_COPY, we assume that this is
- * a programmer error (because PRTE does not generally need to do
- * large string copies), and will assert() fail / abort.
- *
- * There is no return value.
- *
- * This function will essentially do the same thing as strncpy(),
- * except that a) it will guarantee to to terminate the destination
- * string with a \0, and b) it will not \0-pad to the right.
- * Specifically:
- *
- * - If the length of the source string is less than (len), the entire
- *   source string will be copied to the destination, including the
- *   \0.
- * - If the length of the source string is greater than (len), then
- *   (len-1) characters of the source string will be copied to the
- *   destination, and dest[len-1] will be set to '\0'.
- */
-PRTE_EXPORT void pmix_string_copy(char *dest, const char *src, size_t dest_len)
-    __prte_attribute_nonnull__(1) __prte_attribute_nonnull__(2);
-
-/**
- * Max dest_size allowed by pmix_string_copy().
- *
- * See the description of pmix_string_copy() for an explanation.
- */
-#define PMIX_MAX_SIZE_ALLOWED_BY_PMIX_STRING_COPY (128 * 1024)
-
-END_C_DECLS
-
-#endif /* PMIX_STRING_COPY_H */