[ARVADOS] updated: 1.3.0-2744-gf95ac4c11

[Git user]

Summary of changes:
 doc/_config.yml                             |  3 +-
 doc/admin/link-accounts.html.textile.liquid | 48 +++++++++++++++++++++++++++++
 doc/api/methods/users.html.textile.liquid   | 18 +++++++++++
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 doc/admin/link-accounts.html.textile.liquid

       via  f95ac4c11b99daea342be0fba98e66c92d70e54c (commit)
       via  fe3fc9b1fab74cc494677ede67c8fa7444608364 (commit)
       via  3a6559843024bda72c9a7b0baed3578d8698223d (commit)
      from  f344802c8ec0d1e56151d69a25fa16da35788800 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f95ac4c11b99daea342be0fba98e66c92d70e54c
Merge: f344802c8 fe3fc9b1f
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Jun 29 17:09:39 2020 -0400

    Merge branch '16441-user-merge-doc' refs #16441
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>


commit fe3fc9b1fab74cc494677ede67c8fa7444608364
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Jun 29 17:06:51 2020 -0400

    16441: Typo fix, used 'zzzzz' in examples.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/doc/admin/link-accounts.html.textile.liquid b/doc/admin/link-accounts.html.textile.liquid
index 1b0c42531..19fbafd02 100644
--- a/doc/admin/link-accounts.html.textile.liquid
+++ b/doc/admin/link-accounts.html.textile.liquid
@@ -19,19 +19,19 @@ Account linking works by recording in the database that a log in to the "old" ac
 
 The "old" account is the Arvados account that will be redirected.
 
-The "new" account is the user that the "old" account is redirected to.  As part of account linking any Arvados records owned the "old" account is also transferred to the "new" account.
+The "new" account is the user that the "old" account is redirected to.  As part of account linking any Arvados records owned by the "old" account is also transferred to the "new" account.
 
 Counter-intuitively, if you do not want the account uuid of the user to change, the "new" account should be the pre-existing account, and the "old" account should be the redundant second account that was more recently created.  This means "old" and "new" are opposite from their expected chronological meaning.  In this case, the use of "old" and "new" reflect the direction of transfer of ownership -- the login was associated with the "old" user account, but will be associated with the "new" user account.
 
-In the example below, @x1u39-tpzed-3kz0nwtjehhl0u4@ is the "old" account (the pre-existing account we want to keep) and @x1u39-tpzed-fr97h9t4m5jffxs@ is the "new" account (the redundant account we want to merge into the existing account).
+In the example below, @zzzzz-tpzed-3kz0nwtjehhl0u4@ is the "old" account (the pre-existing account we want to keep) and @zzzzz-tpzed-fr97h9t4m5jffxs@ is the "new" account (the redundant account we want to merge into the existing account).
 
 h3. Step 2: Create a project
 
 Create a project owned by the "new" account that will hold any data owned by the "old" account.
 
 <pre>
-$ arv --format=uuid group create --group '{"group_class": "project", "name": "Data from old user", "owner_uuid": "x1u39-tpzed-fr97h9t4m5jffxs"}'
-x1u39-j7d0g-mczqiguhil13083
+$ arv --format=uuid group create --group '{"group_class": "project", "name": "Data from old user", "owner_uuid": "zzzzz-tpzed-fr97h9t4m5jffxs"}'
+zzzzz-j7d0g-mczqiguhil13083
 </pre>
 
 h3. Step 3: Merge "old" user to "new" user
@@ -40,9 +40,9 @@ The @user merge@ method redirects login and reassigns data from the "old" accoun
 
 <pre>
 $ arv user merge  --redirect-to-new-user \
-  --old-user-uuid=x1u39-tpzed-3kz0nwtjehhl0u4 \
-  --new-user-uuid=x1u39-tpzed-fr97h9t4m5jffxs \
-  --new-owner-uuid=x1u39-j7d0g-mczqiguhil13083 \
+  --old-user-uuid=zzzzz-tpzed-3kz0nwtjehhl0u4 \
+  --new-user-uuid=zzzzz-tpzed-fr97h9t4m5jffxs \
+  --new-owner-uuid=zzzzz-j7d0g-mczqiguhil13083 \
 </pre>
 
 Note that authorization credentials (API tokens, ssh keys) are also transferred to the "new" account, so credentials used to access the "old" account work with the "new" account.

-----------------------------------------------------------------------


hooks/post-receive
--