[ARVADOS] updated: 2.1.0-65-g44f874d9e

[Git user]

Summary of changes:
 doc/Rakefile                                                 | 9 +++++++++
 doc/install/install-manual-prerequisites.html.textile.liquid | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

       via  44f874d9e93095eae65390097df4d292c24bc706 (commit)
       via  7d8375df0087e665b3fa308efd6af6a874f57ae8 (commit)
      from  f949cc3c0441b25866ee021af647010622c1c694 (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 44f874d9e93095eae65390097df4d292c24bc706
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Feb 9 09:18:03 2021 -0500

    17335: documentation: fix broken link.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/doc/install/install-manual-prerequisites.html.textile.liquid b/doc/install/install-manual-prerequisites.html.textile.liquid
index 534309a7e..50a0a6c4e 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
 

commit 7d8375df0087e665b3fa308efd6af6a874f57ae8
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Feb 1 14:03:01 2021 -0500

    Documentation: add a default base_url to the Rakefile to simplify
    running linkchecker.
    
    refs #17245
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/doc/Rakefile b/doc/Rakefile
index f7050dc41..3717f9f5f 100644
--- a/doc/Rakefile
+++ b/doc/Rakefile
@@ -20,6 +20,15 @@ end
 
 task :generate => [ :realclean, 'sdk/python/arvados/index.html', 'sdk/R/arvados/index.html', 'sdk/java-v2/javadoc/index.html' ] do
   vars = ['baseurl', 'arvados_cluster_uuid', 'arvados_api_host', 'arvados_workbench_host']
+  if ! ENV.key?('baseurl') || ENV['baseurl'] == ""
+    if !ENV.key?('WORKSPACE') || ENV['WORKSPACE'] == ""
+      puts "The `baseurl` variable was not specified and the `WORKSPACE` environment variable is not set. Defaulting `baseurl` to file://#{pwd}/.site"
+      ENV['baseurl'] = "file://#{pwd}/.site/"
+    else
+      puts "The `baseurl` variable was not specified, defaulting to a value derived from the `WORKSPACE` environment variable"
+      ENV['baseurl'] = "file://#{ENV['WORKSPACE']}/doc/.site/"
+    end
+  end
   vars.each do |v|
     if ENV[v]
       website.config.h[v] = ENV[v]

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


hooks/post-receive
--