Merge branch '18947-githttpd'

[arvados.git] / doc / _config.yml

diff --git a/doc/_config.yml b/doc/_config.yml
index 31db9c41d54eb82fbb57c3fbc798f4cffeaa5e69..f3ab1a5af073735d3f3a3dc989c9b15477d8a950 100644 (file)
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -26,9 +26,10 @@ navbar:
       - user/getting_started/community.html.textile.liquid
     - Walkthough:
       - user/tutorials/wgs-tutorial.html.textile.liquid
-    - Run a workflow using Workbench:
+    - Using Workbench:
       - user/getting_started/workbench.html.textile.liquid
       - user/tutorials/tutorial-workflow-workbench.html.textile.liquid
+      - user/topics/workbench-migration.html.textile.liquid
     - Working at the Command Line:
       - user/getting_started/setup-cli.html.textile.liquid
       - user/reference/api-tokens.html.textile.liquid
@@ -49,6 +50,7 @@ navbar:
       - user/topics/storage-classes.html.textile.liquid
     - Data Analysis with Workflows:
       - user/cwl/arvados-vscode-training.html.md.liquid
+      - user/cwl/rnaseq-cwl-training.html.textile.liquid
       - user/cwl/cwl-runner.html.textile.liquid
       - user/cwl/cwl-run-options.html.textile.liquid
       - user/tutorials/writing-cwl-workflow.html.textile.liquid
@@ -100,9 +102,6 @@ navbar:
       - sdk/java-v2/index.html.textile.liquid
       - sdk/java-v2/example.html.textile.liquid
       - sdk/java-v2/javadoc.html.textile.liquid
-    - Java v1:
-      - sdk/java/index.html.textile.liquid
-      - sdk/java/example.html.textile.liquid
     - Perl:
       - sdk/perl/index.html.textile.liquid
       - sdk/perl/example.html.textile.liquid
@@ -194,7 +193,7 @@ navbar:
       - admin/keep-balance.html.textile.liquid
       - admin/controlling-container-reuse.html.textile.liquid
       - admin/logs-table-management.html.textile.liquid
-      - admin/workbench2-vocabulary.html.textile.liquid
+      - admin/metadata-vocabulary.html.textile.liquid
       - admin/storage-classes.html.textile.liquid
       - admin/keep-recovering-data.html.textile.liquid
       - admin/keep-measuring-deduplication.html.textile.liquid
@@ -221,11 +220,13 @@ navbar:
     - Manual installation:
       - install/install-manual-prerequisites.html.textile.liquid
       - install/packages.html.textile.liquid
-      - admin/upgrading.html.textile.liquid
     - Configuration:
       - install/config.html.textile.liquid
-      - admin/config-migration.html.textile.liquid
+      - admin/config-urls.html.textile.liquid
       - admin/config.html.textile.liquid
+    - Maintenance and upgrading:
+      - admin/upgrading.html.textile.liquid
+      - admin/maintenance-and-upgrading.html.textile.liquid
     - Core:
       - install/install-api-server.html.textile.liquid
     - Keep: