15954: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --combined lib/config/config.default.yml
index 91bb8550ea64f246538e77119f164acf6216d92f,41af15073281b51d7a9087195a7ad9aacb9c0cc2..59dabbb26d6f6e093bc1ad94b0559771269c6ed5
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -623,7 -623,7 +623,7 @@@ Clusters
        # (experimental) cloud dispatcher for executing containers on
        # worker VMs. Begins with "-----BEGIN RSA PRIVATE KEY-----\n"
        # and ends with "\n-----END RSA PRIVATE KEY-----\n".
 -      DispatchPrivateKey: none
 +      DispatchPrivateKey: ""
  
        # Maximum time to wait for workers to come up before abandoning
        # stale locks from a previous dispatch process.
@@@ -1153,6 -1153,8 +1153,8 @@@
          identification, and does not retrieve any other personal
          information.</i>
  
+       # Workbench screen displayed to inactive users.  This is HTML
+       # text that will be incorporated directly onto the page.
        InactivePageHTML: |
          <img src="/arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
          <h3>Hi! You're logged in, but...</h3>
@@@ -1160,6 -1162,13 +1162,13 @@@
          <p>An administrator must activate your account before you can get
          any further.</p>
  
+       # Connecting to Arvados shell VMs tends to be site-specific.
+       # Put any special instructions here. This is HTML text that will
+       # be incorporated directly onto the Workbench page.
+       SSHHelpPageHTML: |
+         <a href="https://doc.arvados.org/user/getting_started/ssh-access-unix.html">Accessing an Arvados VM with SSH</a> (generic instructions).
+         Site configurations vary.  Contact your local cluster administrator if you have difficulty accessing an Arvados shell node.
+ 
      # Bypass new (Arvados 1.5) API implementations, and hand off
      # requests directly to Rails instead. This can provide a temporary
      # workaround for clients that are incompatible with the new API

diff --combined lib/config/generated_config.go
index eb5cc47f2d6cce3c02aacb8b4c96cbf82d0ecdfe,25fa89394a0ba9132b23a29126866c94f2d7bc08..2d8a487b7db2e8cd55f915404f2544351e909b1e
--- 1/lib/config/generated_config.go
--- 2/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@@ -629,7 -629,7 +629,7 @@@ Clusters
        # (experimental) cloud dispatcher for executing containers on
        # worker VMs. Begins with "-----BEGIN RSA PRIVATE KEY-----\n"
        # and ends with "\n-----END RSA PRIVATE KEY-----\n".
 -      DispatchPrivateKey: none
 +      DispatchPrivateKey: ""
  
        # Maximum time to wait for workers to come up before abandoning
        # stale locks from a previous dispatch process.
@@@ -1159,6 -1159,8 +1159,8 @@@
          identification, and does not retrieve any other personal
          information.</i>
  
+       # Workbench screen displayed to inactive users.  This is HTML
+       # text that will be incorporated directly onto the page.
        InactivePageHTML: |
          <img src="/arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
          <h3>Hi! You're logged in, but...</h3>
@@@ -1166,6 -1168,13 +1168,13 @@@
          <p>An administrator must activate your account before you can get
          any further.</p>
  
+       # Connecting to Arvados shell VMs tends to be site-specific.
+       # Put any special instructions here. This is HTML text that will
+       # be incorporated directly onto the Workbench page.
+       SSHHelpPageHTML: |
+         <a href="https://doc.arvados.org/user/getting_started/ssh-access-unix.html">Accessing an Arvados VM with SSH</a> (generic instructions).
+         Site configurations vary.  Contact your local cluster administrator if you have difficulty accessing an Arvados shell node.
+ 
      # Bypass new (Arvados 1.5) API implementations, and hand off
      # requests directly to Rails instead. This can provide a temporary
      # workaround for clients that are incompatible with the new API