11065: Merge branch 'master' into 11065-optional-audit-logging

[arvados.git] / doc / admin / merge-remote-account.html.textile.liquid

diff --git a/doc/admin/merge-remote-account.html.textile.liquid b/doc/admin/merge-remote-account.html.textile.liquid
index 005332b724f63afa61d575d62f1343fad867e389..b69730c930e0d5ab50ecf57a3e5d285c3dde8fdb 100644 (file)
--- a/doc/admin/merge-remote-account.html.textile.liquid
+++ b/doc/admin/merge-remote-account.html.textile.liquid
@@ -1,7 +1,7 @@
 ---
 layout: default
-navsection: userguide
-title: "Merging a remote account"
+navsection: admin
+title: "Migrating a user to a federated account"
 ...
 {% comment %}
 Copyright (C) The Arvados Authors. All rights reserved.
@@ -43,3 +43,5 @@ arvados.api('v1').users().update_uuid(
     uuid="<span class="userinput">aaaaa-tpzed-abcdefghijklmno</span>",
     new_uuid="bbbbb-tpzed-"+random_chars).execute()
 </code></pre></notextile>
+
+After this is done and the migration is complete, the affected user should wait 5 minutes for the authorization cache to expire before using the remote cluster.