From b2bb5c423a2779fd3158fc8d0ccce75e47588692 Mon Sep 17 00:00:00 2001 From: Mark Bonsack Date: Mon, 13 Jan 2020 14:46:08 -0800 Subject: [PATCH 1/2] Fix documentation navigation * Fix table navigation * Remove "single node" nomenclature; all are "single node" --- docs/gettingstarted/index.md | 10 +++++----- mkdocs.yml | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/gettingstarted/index.md b/docs/gettingstarted/index.md index b8258f6..8923b79 100644 --- a/docs/gettingstarted/index.md +++ b/docs/gettingstarted/index.md @@ -76,11 +76,11 @@ Splunk type. | Container and Orchestration | Notes | |-----------------------------|-------| -| [Podman + systemd single node](gettingstarted/podman-systemd-general) | First choice for RedHat 7.x/8.x and CentOS, second choice for Debian and Ubuntu (packages provided via PPA) | -| [Docker CE + systemd single node](gettingstarted/docker-systemd-general) | First choice for Debian and Ubuntu; second choice for CentOS for those with limited existing Docker experience | -| [Docker CE + Swarm single node](gettingstarted/docker-swarm-general) | Option for Debian, Ubuntu, CentOS, and Desktop Docker desiring Docker Compose or Swarm orchestration | -| [Docker CE + Swarm single node RHEL 7.7](gettingstarted/docker-swarm-rhel7) | Option for RedHat 7.7 desiring Docker Compose or Swarm orchestration | -| [Bring your own Envionment](gettingstarted/byoe-rhel7) | Option for RedHat 7.7 (centos 7) with SC4S configuration without containers | +| [Podman + systemd](podman-systemd-general.md) | First choice for RedHat 7.x/8.x and CentOS, second choice for Debian and Ubuntu (packages provided via PPA) | +| [Docker CE + systemd](docker-systemd-general.md) | First choice for Debian and Ubuntu; second choice for CentOS for those with limited existing Docker experience | +| [Docker CE + Swarm](docker-swarm-general.md) | Option for Debian, Ubuntu, CentOS, and Desktop Docker desiring Docker Compose or Swarm orchestration | +| [Docker CE + Swarm RHEL 7.7](docker-swarm-rhel7.md) | Option for RedHat 7.7 desiring Docker Compose or Swarm orchestration | +| [Bring your own Envionment](byoe-rhel7.md) | Option for RedHat 7.7 (centos 7) with SC4S configuration without containers | ### Offline Container Installation diff --git a/mkdocs.yml b/mkdocs.yml index 3848849..4032eae 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -4,9 +4,10 @@ nav: - Home: 'index.md' - Getting Started: - 'Read First': 'gettingstarted/index.md' - - 'Podman + systemd single node': 'gettingstarted/podman-systemd-general.md' - - 'Docker CE + systemd single node': 'gettingstarted/docker-systemd-general.md' - - 'Docker CE + Swarm single node': 'gettingstarted/docker-swarm-rhel7.md' + - 'Podman + systemd': 'gettingstarted/podman-systemd-general.md' + - 'Docker CE + systemd': 'gettingstarted/docker-systemd-general.md' + - 'Docker CE + Swarm RHEL 7.7': 'gettingstarted/docker-swarm-rhel7.md' + - 'Docker CE + Swarm general': 'gettingstarted/docker-swarm-general.md' - 'Bring your own Envionment': 'gettingstarted/byoe-rhel7.md' - Configuration: 'configuration.md' - Sources: From dff3e3ce9960dbffd697a910cf5f2cfa2e89b931 Mon Sep 17 00:00:00 2001 From: mbonsack Date: Mon, 13 Jan 2020 19:07:05 -0800 Subject: [PATCH 2/2] Update mkdocs.yml * Remove "general" for Docker CE + Swarm menu pick --- mkdocs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 4032eae..097b634 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -7,7 +7,7 @@ nav: - 'Podman + systemd': 'gettingstarted/podman-systemd-general.md' - 'Docker CE + systemd': 'gettingstarted/docker-systemd-general.md' - 'Docker CE + Swarm RHEL 7.7': 'gettingstarted/docker-swarm-rhel7.md' - - 'Docker CE + Swarm general': 'gettingstarted/docker-swarm-general.md' + - 'Docker CE + Swarm': 'gettingstarted/docker-swarm-general.md' - 'Bring your own Envionment': 'gettingstarted/byoe-rhel7.md' - Configuration: 'configuration.md' - Sources: @@ -43,4 +43,4 @@ theme: primary: 'black' accent: 'orange' favicon: 'logo.png' - logo: 'logo.png' \ No newline at end of file + logo: 'logo.png'