13650: Merge branch 'master' into 13650-document-arvados-kubernetes

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

diff --combined doc/_config.yml
index 6bfaea090ed1069e60d74d2000acdc5e90fb190f,9d917095296e71f8d0a7ff72a12e8be40c59ed26..959eff5390ce43ce544e18e9519a396889a2adad
--- 1/doc/_config.yml
--- 2/doc/_config.yml
+++ b/doc/_config.yml
@@@ -151,6 -151,7 +151,7 @@@ navbar
        - install/cheat_sheet.html.textile.liquid
        - user/topics/arvados-sync-groups.html.textile.liquid
        - admin/storage-classes.html.textile.liquid
+       - admin/activation.html.textile.liquid
        - admin/migrating-providers.html.textile.liquid
        - admin/merge-remote-account.html.textile.liquid
        - install/migrate-docker19.html.textile.liquid
@@@ -159,8 -160,6 +160,8 @@@
        - install/index.html.textile.liquid
      - Docker quick start:
        - install/arvbox.html.textile.liquid
 +    - Arvados on Kubernetes:
 +      - install/arvados-on-kubernetes.html.textile.liquid
      - Manual installation:
        - install/install-manual-prerequisites.html.textile.liquid
        - install/install-postgresql.html.textile.liquid