Merge branch '16441-user-merge-doc' refs #16441

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --combined doc/_config.yml
index 7d7101f4108ff2cb36af39cdce87cada14a4c979,fd7d1c3517f95992b4f896afba7cc1ee8cb91e97..be52a204c02d4e9548eeaa1139ff8126cff4f400
--- 1/doc/_config.yml
--- 2/doc/_config.yml
+++ b/doc/_config.yml
@@@ -153,8 -153,9 +153,9 @@@ navbar
        - admin/index.html.textile.liquid
      - Users and Groups:
        - admin/user-management.html.textile.liquid
-       - admin/reassign-ownership.html.textile.liquid
        - admin/user-management-cli.html.textile.liquid
+       - admin/reassign-ownership.html.textile.liquid
+       - admin/link-accounts.html.textile.liquid
        - admin/group-management.html.textile.liquid
        - admin/federation.html.textile.liquid
        - admin/merge-remote-account.html.textile.liquid
@@@ -217,7 -218,6 +218,7 @@@
        - install/install-ws.html.textile.liquid
        - install/install-arv-git-httpd.html.textile.liquid
        - install/install-shell-server.html.textile.liquid
 +      - install/install-webshell.html.textile.liquid
      - Containers API:
        - install/crunch2-slurm/install-compute-node.html.textile.liquid
        - install/install-jobs-image.html.textile.liquid