From ae45df913b066fd03d88fff0af54dc896a868d89 Mon Sep 17 00:00:00 2001 From: Nathan Byrd Date: Fri, 4 Feb 2022 11:11:00 -0600 Subject: [PATCH] Updated menus to more closely match current --- docs/_config.yml | 23 +++++++++++-------- docs/_data/sections.yml | 6 +++++ docs/_docs/installation/{ => hardware}/rpi.md | 0 .../installation/{ => hardware}/windows.md | 0 docs/_docs/installation/os-hardware.md | 14 ----------- .../servers/{ => contentservers}/gopher.md | 0 .../servers/{ => contentservers}/nntp.md | 0 .../{ => contentservers}/web-server.md | 0 docs/_docs/servers/{ => loginservers}/ssh.md | 0 .../servers/{ => loginservers}/telnet.md | 0 .../servers/{ => loginservers}/websocket.md | 0 docs/_includes/nav.html | 7 +++--- 12 files changed, 23 insertions(+), 27 deletions(-) rename docs/_docs/installation/{ => hardware}/rpi.md (100%) rename docs/_docs/installation/{ => hardware}/windows.md (100%) delete mode 100644 docs/_docs/installation/os-hardware.md rename docs/_docs/servers/{ => contentservers}/gopher.md (100%) rename docs/_docs/servers/{ => contentservers}/nntp.md (100%) rename docs/_docs/servers/{ => contentservers}/web-server.md (100%) rename docs/_docs/servers/{ => loginservers}/ssh.md (100%) rename docs/_docs/servers/{ => loginservers}/telnet.md (100%) rename docs/_docs/servers/{ => loginservers}/websocket.md (100%) diff --git a/docs/_config.yml b/docs/_config.yml index 5f7b35dd..171cbd0a 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -30,6 +30,12 @@ exclude: - .idea +# New documents that are not included below under order will display at the +# end of the list. Section names for directories and subdirectories are +# setup in _data/sections.yml. Change there in order to update the name of +# one of the subdirectories or to add a new one. + + collections: docs: output: true @@ -39,9 +45,8 @@ collections: - installation/install-script.md - installation/docker.md - installation/manual.md - - installation/os-hardware.md - - installation/rpi.md - - installation/windows.md + - installation/hardware/rpi.md + - installation/hardware/windows.md - installation/network.md - installation/testing.md - installation/production.md @@ -88,12 +93,12 @@ collections: - art/views/text_view.md - art/views/toggle_menu_view.md - art/views/vertical_menu_view.md - - servers/telnet.md - - servers/ssh.md - - servers/websocket.md - - servers/web-server.md - - servers/gopher.md - - servers/nntp.md + - servers/loginservers/telnet.md + - servers/loginservers/ssh.md + - servers/loginservers/websocket.md + - servers/contentservers/web-server.md + - servers/contentservers/gopher.md + - servers/contentservers/nntp.md - modding/local-doors.md - modding/door-servers.md - modding/telnet-bridge.md diff --git a/docs/_data/sections.yml b/docs/_data/sections.yml index 375bbb15..994698e9 100644 --- a/docs/_data/sections.yml +++ b/docs/_data/sections.yml @@ -20,3 +20,9 @@ misc: title: Miscellaneous views: title: Views +hardware: + title: OS / Hardware Specific +loginservers: + title: Login Servers +contentservers: + title: Content Servers diff --git a/docs/_docs/installation/rpi.md b/docs/_docs/installation/hardware/rpi.md similarity index 100% rename from docs/_docs/installation/rpi.md rename to docs/_docs/installation/hardware/rpi.md diff --git a/docs/_docs/installation/windows.md b/docs/_docs/installation/hardware/windows.md similarity index 100% rename from docs/_docs/installation/windows.md rename to docs/_docs/installation/hardware/windows.md diff --git a/docs/_docs/installation/os-hardware.md b/docs/_docs/installation/os-hardware.md deleted file mode 100644 index 6332ee82..00000000 --- a/docs/_docs/installation/os-hardware.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -layout: page -title: OS & Hardware Specific Information ---- -There are multiple ways of installing ENiGMA BBS, depending on your level of experience and desire to do things manually versus have it automated for you. - -In general, please see [Installation Methods](installation-methods.md) and [Install Script](install-script.md). - -Below are some special cases: - -| Method | Notes | -|--------|-------| -| [Raspberry Pi](rpi.md) | All Raspberry Pi models work great with ENiGMA½! | -| [Windows](windows.md) | Compatible with all Windows Operating Systems | diff --git a/docs/_docs/servers/gopher.md b/docs/_docs/servers/contentservers/gopher.md similarity index 100% rename from docs/_docs/servers/gopher.md rename to docs/_docs/servers/contentservers/gopher.md diff --git a/docs/_docs/servers/nntp.md b/docs/_docs/servers/contentservers/nntp.md similarity index 100% rename from docs/_docs/servers/nntp.md rename to docs/_docs/servers/contentservers/nntp.md diff --git a/docs/_docs/servers/web-server.md b/docs/_docs/servers/contentservers/web-server.md similarity index 100% rename from docs/_docs/servers/web-server.md rename to docs/_docs/servers/contentservers/web-server.md diff --git a/docs/_docs/servers/ssh.md b/docs/_docs/servers/loginservers/ssh.md similarity index 100% rename from docs/_docs/servers/ssh.md rename to docs/_docs/servers/loginservers/ssh.md diff --git a/docs/_docs/servers/telnet.md b/docs/_docs/servers/loginservers/telnet.md similarity index 100% rename from docs/_docs/servers/telnet.md rename to docs/_docs/servers/loginservers/telnet.md diff --git a/docs/_docs/servers/websocket.md b/docs/_docs/servers/loginservers/websocket.md similarity index 100% rename from docs/_docs/servers/websocket.md rename to docs/_docs/servers/loginservers/websocket.md diff --git a/docs/_includes/nav.html b/docs/_includes/nav.html index 8b0b91e6..e3272d9c 100644 --- a/docs/_includes/nav.html +++ b/docs/_includes/nav.html @@ -44,17 +44,16 @@
  • {{section}}