Merge branch 'master' of https://github.com/singularityware/singularityware.github.io

Author: gmkurtzer

404.md

@@ -1,6 +1,7 @@
 ---
 title: "Page Not Found"
 search: exclude
+sidebar: main_sidebar
 ---  
 
 Sorry, but the page you were trying to view does not exist. Try searching for it or looking at the URL to see if it looks correct.

CNAME

@@ -0,0 +1 @@
+singularity.lbl.gov

_config.yml

@@ -66,7 +66,7 @@ defaults:
       layout: "page"
       comments: true
       search: true
-      sidebar: docs_sidebar
+      sidebar: main_sidebar
   -
     scope:
       path: ""
@@ -85,11 +85,10 @@ defaults:
       layout: "post"
       comments: true
       search: true
-      sidebar: docs_sidebar
+      sidebar: main_sidebar
 
 
 # these are defaults used for the frontmatter for these file types
 
 sidebars:
-- home_sidebar
-- docs_sidebar
+- main_sidebar

_data/sidebars/admin_docs.yml

@@ -0,0 +1,44 @@
+# This is your sidebar TOC. The sidebar code loops through sections here and provides the appropriate formatting.
+
+entries:
+
+- title: Admin Guide
+  levels: one
+  folders:
+
+  - title: Quick Start
+    output: web
+    folderitems:
+
+    - title: Administation QuickStart
+      output: web, pdf
+      url: /admin-guide
+
+    - title: Security
+      url: /docs-security
+      output: web, pdf
+
+    - title: The Singularity Config File
+      url: /docs-config
+      output: web, pdf
+
+    - title: Troubleshooting
+      url: /docs-troubleshooting
+      output: web, pdf
+
+
+  - title: Installation Environments
+    output: web
+    folderitems:
+
+    - title: Singularity on HPC
+      url: /docs-hpc
+      output: web, pdf
+
+    - title: Image Environment
+      url: /image-environment
+      output: web, pdf
+
+    - title: License
+      url: /docs-license
+      output: web, pdf

_data/sidebars/docs_sidebar.yml

@@ -1,49 +1,40 @@
-# This is the sidebar TOC (table of contents). The sidebar code loops through sections here and provides the appropriate formatting.
+# This is your sidebar TOC. The sidebar code loops through sections here and provides the appropriate formatting.
 
 entries:
-- title: sidebar
-  product: Base documentaiton
-  version: 6.0
+
+- title: Singularity
   folders:
 
-  - title:
-    output: pdf
-    type: frontmatter
-    folderitems:
-    - title:
-      url: /titlepage
-      output: pdf
-      type: frontmatter
-    - title:
-      url: /tocpage
-      output: pdf
-      type: frontmatter
-
-  - title: Overview
+
+  - title: Information
     output: web, pdf
     folderitems:
 
-    - title: Quick Start
-      url: /start
+    - title: News
+      url: /blog
       output: web, pdf
-      type: homepage
 
-    - title: About
+    - title: About Singularity
       url: /about
       output: web, pdf
 
-    - title: FAQ
-      url: /faq
+    - title: Presentations
+      url: /presentations
       output: web, pdf
 
-    - title: Support
-      url: /support
+    - title: "Registry: Citations and Installations"
+      url: /citation-registration
       output: web, pdf
 
-  - title: Installation
+
+  - title: Download / Installation
     output: web, pdf
     folderitems:
 
+    - title: All Releases
+      url: /all-releases
+      output: web, pdf
+
     - title: Install Singularity on Linux
       url: /install-linux
       output: web, pdf
@@ -52,52 +43,60 @@ entries:
       url: /install-mac
       output: web, pdf
 
-    - title: Install Singularity on Windows (Vagrant)
+    - title: Install Singularity on Windows
       url: /install-windows
       output: web, pdf
 
 
-  - title: Release Notes
+  - title: Contributing
     output: web, pdf
     folderitems:
 
-    - title: All Releases
-      url: /all-releases
+    - title: User Support
+      url: /contributing-support
+      output: web, pdf
+
+    - title: Code Development
+      url: /contributing-code
+      output: web, pdf
+
+    - title: Writing Documentation
+      url: /contributing-docs
       output: web, pdf
 
-  - title: Contributing
-    output: web, pdf
 
+  - title: Getting Help
+    output: web, pdf
     folderitems:
-    - title: Contributing to Singularity
-      url: /contributing-singularity
+
+    - title: FAQ
+      url: /faq
       output: web, pdf
 
-    - title: Contributing to Documentation
-      url: /contributing-docs
+    - title: Support
+      url: /support
       output: web, pdf
 
+
+
   - title: Documentation
     output: web, pdf
-
     folderitems:
-    - title: Overview
-      url: /docs-overview
+
+    - title: Quick Start
+      url: /quickstart
       output: web, pdf
 
     - title: Recipes and Tutorials
-      url: /recipes
+      url: /tutorials
       output: web, pdf
 
-    - title: Security
-      url: /docs-security
+    - title: User Documentation
+      url: /user-guide
       output: web, pdf
 
-    - title: Singularity on HPC
-      url: /docs-hpc
+    - title: Admin Documentation
+      url: /admin-guide
       output: web, pdf
 
-    - title: License
-      url: /docs-license
-      output: web, pdf