From 020482b349bf285ed726dbf05521b686be7daa2b Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Mon, 1 Feb 2021 14:02:28 -0500 Subject: [PATCH] Fix broken documentation links. refs #17245 Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- doc/admin/federation.html.textile.liquid | 2 +- doc/admin/user-management-cli.html.textile.liquid | 2 +- doc/admin/user-management.html.textile.liquid | 4 ++-- doc/api/methods/users.html.textile.liquid | 6 +++--- doc/api/tokens.html.textile.liquid | 2 +- .../install-manual-prerequisites.html.textile.liquid | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/admin/federation.html.textile.liquid b/doc/admin/federation.html.textile.liquid index eddd247e9a..c2e0e4442c 100644 --- a/doc/admin/federation.html.textile.liquid +++ b/doc/admin/federation.html.textile.liquid @@ -36,7 +36,7 @@ Clusters: Similar settings should be added to @clsr2@ & @clsr3@ hosts, so that all clusters in the federation can talk to each other. -The @ActivateUsers@ setting indicates whether users from a given cluster are automatically activated or they require manual activation. User activation is covered in more detail in the "user activation section":{{site.baseurl}}/admin/activation.html. In the current example, users from @clsr2@ would be automatically, activated, but users from @clsr3@ would require an admin to activate the account. +The @ActivateUsers@ setting indicates whether users from a given cluster are automatically activated or they require manual activation. User activation is covered in more detail in the "user activation section":{{site.baseurl}}/admin/user-management.html. In the current example, users from @clsr2@ would be automatically, activated, but users from @clsr3@ would require an admin to activate the account. h2(#LoginCluster). User management diff --git a/doc/admin/user-management-cli.html.textile.liquid b/doc/admin/user-management-cli.html.textile.liquid index d68529a226..9e0256c632 100644 --- a/doc/admin/user-management-cli.html.textile.liquid +++ b/doc/admin/user-management-cli.html.textile.liquid @@ -18,7 +18,7 @@ ARVADOS_API_TOKEN=1234567890qwertyuiopasdfghjklzxcvbnm1234567890zzzz In these examples, @zzzzz-tpzed-3kz0nwtjehhl0u4@ is the sample user account. Replace with the uuid of the user you wish to manipulate. -See "user management":{{site.baseurl}}/admin/activation.html for an overview of how to use these commands. +See "user management":{{site.baseurl}}/admin/user-management.html for an overview of how to use these commands. h3. Setup a user diff --git a/doc/admin/user-management.html.textile.liquid b/doc/admin/user-management.html.textile.liquid index 9e53775ed4..296660d01b 100644 --- a/doc/admin/user-management.html.textile.liquid +++ b/doc/admin/user-management.html.textile.liquid @@ -43,7 +43,7 @@ This section describes the different user account states. notextile.
# A new user record is not set up, and not active. An inactive user cannot create or update any object, but can read Arvados objects that the user account has permission to read (such as publicly available items readable by the "anonymous" user). -# Using Workbench or the "command line":{{site.baseurl}}/install/cheat_sheet.html , the admin invokes @setup@ on the user. The setup method adds the user to the "All users" group. +# Using Workbench or the "command line":{{site.baseurl}}/admin/user-management-cli.html , the admin invokes @setup@ on the user. The setup method adds the user to the "All users" group. - If "Users.AutoSetupNewUsers":config.html is true, this happens automatically during user creation, so in that case new users start at step (3). - If "Users.AutoSetupNewUsersWithRepository":config.html is true, a new git repo is created for the user. - If "Users.AutoSetupNewUsersWithVmUUID":config.html is set, the user is given login permission to the specified shell node @@ -58,7 +58,7 @@ Unsetup removes the user from the "All users" group and makes them inactive, pre notextile.
-User management can be performed through the web using Workbench or the command line. See "user management at the CLI":{{site.baseurl}}/install/cheat_sheet.html for specific examples. +User management can be performed through the web using Workbench or the command line. See "user management at the CLI":{{site.baseurl}}/admin/user-management-cli.html for specific examples. h2(#user_agreements). User agreements and self-activation diff --git a/doc/api/methods/users.html.textile.liquid b/doc/api/methods/users.html.textile.liquid index cde189d6ff..6db8d963e7 100644 --- a/doc/api/methods/users.html.textile.liquid +++ b/doc/api/methods/users.html.textile.liquid @@ -127,7 +127,7 @@ table(table table-bordered table-condensed). h3. setup -Set up a user. Adds the user to the "All users" group. Enables the user to invoke @activate@. See "user management":{{site.baseurl}}/admin/activation.html for details. +Set up a user. Adds the user to the "All users" group. Enables the user to invoke @activate@. See "user management":{{site.baseurl}}/admin/user-management.html for details. Arguments: @@ -137,7 +137,7 @@ table(table table-bordered table-condensed). h3. activate -Check that a user has is set up and has signed all the user agreements. If so, activate the user. Users can invoke this for themselves. See "user agreements":{{site.baseurl}}/admin/activation.html#user_agreements for details. +Check that a user has is set up and has signed all the user agreements. If so, activate the user. Users can invoke this for themselves. See "user agreements":{{site.baseurl}}/admin/user-management.html#user_agreements for details. Arguments: @@ -147,7 +147,7 @@ table(table table-bordered table-condensed). h3. unsetup -Remove the user from the "All users" group and deactivate the user. See "user management":{{site.baseurl}}/admin/activation.html for details. +Remove the user from the "All users" group and deactivate the user. See "user management":{{site.baseurl}}/admin/user-management.html for details. Arguments: diff --git a/doc/api/tokens.html.textile.liquid b/doc/api/tokens.html.textile.liquid index 67e66eecec..9d8f456509 100644 --- a/doc/api/tokens.html.textile.liquid +++ b/doc/api/tokens.html.textile.liquid @@ -27,7 +27,7 @@ The "browser authentication process is documented in detail on the Arvados wiki. h2. User activation -"Creation and activation of new users is described here.":{{site.baseurl}}/admin/activation.html +"Creation and activation of new users is described here.":{{site.baseurl}}/admin/user-management.html h2. Creating tokens via the API diff --git a/doc/install/install-manual-prerequisites.html.textile.liquid b/doc/install/install-manual-prerequisites.html.textile.liquid index e6f1ba8fdc..8f45b29a4f 100644 --- a/doc/install/install-manual-prerequisites.html.textile.liquid +++ b/doc/install/install-manual-prerequisites.html.textile.liquid @@ -63,7 +63,7 @@ table(table table-bordered table-condensed). |"Git server":install-arv-git-httpd.html |Arvados-hosted git repositories, with Arvados-token based authentication.|Optional, but required by Workflow Composer.| |\3=. *Crunch (running containers)*| |"arvados-dispatch-cloud":crunch2-cloud/install-dispatch-cloud.html |Allocate and free cloud VM instances on demand based on workload.|Optional, not needed for a static Slurm cluster such as on-premises HPC.| -|"crunch-dispatch-slurm":crunch2-slurm/install-prerequisites.html |Run analysis workflows using Docker containers distributed across a Slurm cluster.|Optional, not needed for a Cloud installation, or if you wish to use Arvados for data management only.| +|"crunch-dispatch-slurm":crunch2-slurm/install-dispatch.html |Run analysis workflows using Docker containers distributed across a Slurm cluster.|Optional, not needed for a Cloud installation, or if you wish to use Arvados for data management only.| h2(#identity). Identity provider -- 2.30.2