16306: Merge branch 'master'

[arvados.git] / doc / _config.yml

diff --git a/doc/_config.yml b/doc/_config.yml
index ef9d1d771a490f8f6e6e8eda94b26d21f082a42c..5386e8797a2b2680b5804a322f4b6c966496ee32 100644 (file)
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -173,6 +173,7 @@ navbar:
       - user/topics/arvados-sync-groups.html.textile.liquid
       - admin/scoped-tokens.html.textile.liquid
       - admin/token-expiration-policy.html.textile.liquid
+      - admin/user-activity.html.textile.liquid
     - Monitoring:
       - admin/logging.html.textile.liquid
       - admin/metrics.html.textile.liquid
@@ -198,10 +199,17 @@ navbar:
       - install/index.html.textile.liquid
     - Docker quick start:
       - install/arvbox.html.textile.liquid
+    - Installation with Salt:
+      - install/salt.html.textile.liquid
+      - install/salt-vagrant.html.textile.liquid
+      - install/salt-single-host.html.textile.liquid
+      - install/salt-multi-host.html.textile.liquid
     - Arvados on Kubernetes:
       - install/arvados-on-kubernetes.html.textile.liquid
       - install/arvados-on-kubernetes-minikube.html.textile.liquid
       - install/arvados-on-kubernetes-GKE.html.textile.liquid
+    - Automatic installation:
+      - install/automatic.html.textile.liquid
     - Manual installation:
       - install/install-manual-prerequisites.html.textile.liquid
       - install/packages.html.textile.liquid