Reorganize merlin6 pages to follow navigation menu

The folders are only used for source organization; URLs remain flat.
2019-07-29 15:18:22 +02:00
parent b3f62ee51f
commit 95f511a203
23 changed files with 11 additions and 22 deletions
--- a/pages/merlin6/code-of-conduct.md
+++ b/pages/merlin6/code-of-conduct.md
--- a/pages/merlin6/hardware-and-software-description.md
+++ b/pages/merlin6/hardware-and-software-description.md
--- a/pages/merlin6/introduction.md
+++ b/pages/merlin6/introduction.md
--- a/pages/merlin6/accessing-merlin6/accessing-interactive-nodes.md
+++ b/pages/merlin6/accessing-merlin6/accessing-interactive-nodes.md
--- a/pages/merlin6/accessing-merlin6/accessing-slurm.md
+++ b/pages/merlin6/accessing-merlin6/accessing-slurm.md
--- a/pages/merlin6/accessing-merlin6/merlin6-directories.md
+++ b/pages/merlin6/accessing-merlin6/merlin6-directories.md
--- a/pages/merlin6/accessing-merlin6/nomachine.md
+++ b/pages/merlin6/accessing-merlin6/nomachine.md
--- a/pages/merlin6/accessing-merlin6/requesting-accounts.md
+++ b/pages/merlin6/accessing-merlin6/requesting-accounts.md
--- a/pages/merlin6/accessing-merlin6/requesting-projects.md
+++ b/pages/merlin6/accessing-merlin6/requesting-projects.md
--- a/pages/merlin6/accessing-merlin6/transfer-data.md
+++ b/pages/merlin6/accessing-merlin6/transfer-data.md
--- a/pages/merlin6/merlin6-slurm/running-jobs.md
+++ b/pages/merlin6/merlin6-slurm/running-jobs.md
--- a/pages/merlin6/merlin6-slurm/slurm-basic-commands.md
+++ b/pages/merlin6/merlin6-slurm/slurm-basic-commands.md
--- a/pages/merlin6/merlin6-slurm/slurm-configuration.md
+++ b/pages/merlin6/merlin6-slurm/slurm-configuration.md
--- a/pages/merlin6/merlin6-slurm/slurm-examples.md
+++ b/pages/merlin6/merlin6-slurm/slurm-examples.md
--- a/pages/merlin6/merlin6-slurm/using-modules.md
+++ b/pages/merlin6/merlin6-slurm/using-modules.md
--- a/pages/merlin6/jupyterhub/jupyterhub.md
+++ b/pages/merlin6/jupyterhub/jupyterhub.md
--- a/pages/merlin6/announcements/downtimes.md
+++ b/pages/merlin6/announcements/downtimes.md
--- a/pages/merlin6/contact.md
+++ b/pages/merlin6/contact.md
--- a/pages/merlin6/known-problems.md
+++ b/pages/merlin6/known-problems.md
--- a/pages/merlin6/migration-from-merlin5.md
+++ b/pages/merlin6/migration-from-merlin5.md
--- a/pages/merlin6/troubleshooting.md
+++ b/pages/merlin6/troubleshooting.md
--- a/pages/merlin6/merlin6-user-guide.md
+++ b/pages/merlin6/merlin6-user-guide.md
@ -1,13 +0,0 @@
---
-title: Merlin6 User Guide
-#tags:
-#keywords:
-last_updated: 13 June 2019
-#summary: "Merlin 6 cluster overview"
-sidebar: merlin6_sidebar
-permalink: /merlin6/user-guide.html
---
-
-# Merlin6 User Guide
-
-Wellcome to the PSI Merlin6 Cluster.