Merge pull request #3132 from grondo/flux-shell-doc

doc: add flux-shell(1) manpage
flux-framework · Aug 14, 2020 · e3a5996 · e3a5996
2 parents d3ba0f4 + 67217bc
commit e3a5996
Show file tree

Hide file tree

Showing 10 changed files with 520 additions and 15 deletions.
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -30,7 +30,8 @@ MAN1_FILES_PRIMARY = \
 	man1/flux-event.1 \
 	man1/flux-mini.1 \
 	man1/flux-version.1 \
-	man1/flux-jobs.1
+	man1/flux-jobs.1 \
+	man1/flux-shell.1
 
 # These files are generated as clones of a primary page.
 # Sphinx handles this automatically if declared in the conf.py

diff --git a/doc/conf.py b/doc/conf.py
@@ -94,6 +94,7 @@
     ('man1/flux-start', 'flux-start', 'bootstrap a local Flux instance', [author], 1),
     ('man1/flux-version', 'flux-version', 'Display flux version information', [author], 1),
     ('man1/flux', 'flux', 'the Flux resource management framework', [author], 1),
+    ('man1/flux-shell', 'flux-shell', 'the Flux job shell', [author], 1),
     ('man3/flux_attr_get', 'flux_attr_set', 'get/set Flux broker attributes', [author], 3),
     ('man3/flux_attr_get', 'flux_attr_get', 'get/set Flux broker attributes', [author], 3),
     ('man3/flux_aux_set', 'flux_aux_get', 'get/set auxiliary handle data', [author], 3),