Skip to content

Commit

Permalink
Merge pull request #5763 from garlick/doc_admin
Browse files Browse the repository at this point in the history
doc: pull in admin guide
  • Loading branch information
mergify[bot] committed Mar 1, 2024
2 parents bdd6aec + 91127ff commit d70a67a
Show file tree
Hide file tree
Showing 9 changed files with 1,504 additions and 5 deletions.
5 changes: 5 additions & 0 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
23 changes: 18 additions & 5 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
},
}

Expand Down
1,282 changes: 1,282 additions & 0 deletions doc/guide/admin.rst

Large diffs are not rendered by default.

91 changes: 91 additions & 0 deletions doc/guide/images/Frog-1.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/guide/images/adminarch.dia
Binary file not shown.
Binary file added doc/guide/images/adminarch.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
80 changes: 80 additions & 0 deletions doc/guide/images/fox-standing.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ Table of Contents
guide/support
guide/start
guide/interact
guide/admin
guide/glossary
index_man
python/index
27 changes: 27 additions & 0 deletions doc/test/spell.en.pws
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit d70a67a

Please sign in to comment.