Merge pull request #5763 from garlick/doc_admin

doc: pull in admin guide

Author: mergify[bot]

doc/Makefile.am

@@ -454,8 +454,13 @@ EXTRA_DIST = \
 	guide/build.rst \
 	guide/support.rst \
 	guide/images/lgplv3-147x51.png \
+	guide/images/adminarch.dia \
+	guide/images/adminarch.png \
+	guide/images/fox-standing.svg \
+	guide/images/Frog-1.svg \
 	guide/start.rst \
 	guide/interact.rst \
+	guide/admin.rst \
 	guide/glossary.rst \
 	$(RST_FILES) \
 	man1/index.rst \

doc/conf.py

@@ -55,26 +55,39 @@
     'linux:man1': {
         'text': '%s(1)',
         'url': 'https://linux.die.net/man/1/%s',
+        'url': 'http://man7.org/linux/man-pages/man1/%s.1.html'
     },
     'linux:man2': {
         'text': '%s(2)',
-        'url': 'https://linux.die.net/man/2/%s',
+        'url': 'http://man7.org/linux/man-pages/man2/%s.2.html'
     },
     'linux:man3': {
         'text': '%s(3)',
-        'url': 'https://linux.die.net/man/3/%s',
+        'url': 'http://man7.org/linux/man-pages/man3/%s.3.html'
     },
     'linux:man5': {
         'text': '%s(5)',
-        'url': 'https://linux.die.net/man/5/%s',
+        'url': 'http://man7.org/linux/man-pages/man5/%s.5.html'
     },
     'linux:man7': {
         'text': '%s(7)',
-        'url': 'https://linux.die.net/man/7/%s',
+        'url': 'http://man7.org/linux/man-pages/man7/%s.7.html'
     },
     'linux:man8': {
         'text': '%s(8)',
-        'url': 'https://linux.die.net/man/8/%s',
+        'url': 'http://man7.org/linux/man-pages/man8/%s.8.html'
+    },
+    'security:man3': {
+        'text': '%s(3)',
+        'url': 'https://flux-framework.readthedocs.io/projects/flux-security/en/latest/man3/%s.html'
+    },
+    'security:man5': {
+        'text': '%s(5)',
+        'url': 'https://flux-framework.readthedocs.io/projects/flux-security/en/latest/man5/%s.html'
+    },
+    'security:man8': {
+        'text': '%s(8)',
+        'url': 'https://flux-framework.readthedocs.io/projects/flux-security/en/latest/man8/%s.html'
     },
 }
 

doc/guide/admin.rst

@@ -101,6 +101,7 @@ Table of Contents
    guide/support
    guide/start
    guide/interact
+   guide/admin
    guide/glossary
    index_man
    python/index

doc/guide/images/Frog-1.svg

@@ -830,3 +830,30 @@ VM
 fred
 unmapped
 kbd
+adminarch
+AiVi
+auth
+coredump
+coredumpctl
+fatnode
+fubar
+javascript
+journalctl
+jsonschema
+localuser
+munge
+mv
+myapp
+nproc
+pam
+PEERCRED
+perilog
+pluggable
+resolvers
+respawn
+Sj
+testprop
+ttl
+uncomment
+unsatisfiable
+validators