17151: Merge branch 'master'

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

diff --cc doc/install/install-api-server.html.textile.liquid
index 2893111e3517402af06366978585b8be082b6436,c7303bbba28914ca3ab8be9d5a9e151afa8f83a3..ca55be53e332f12196b359b17a711e5b13c495fc
--- 1/doc/install/install-api-server.html.textile.liquid
--- 2/doc/install/install-api-server.html.textile.liquid
+++ b/doc/install/install-api-server.html.textile.liquid
@@@ -48,21 -48,23 +48,20 @@@ h3. Token
  <notextile>
  <pre><code>    SystemRootToken: <span class="userinput">"$system_root_token"</span>
      ManagementToken: <span class="userinput">"$management_token"</span>
 -    API:
 -      RailsSessionSecretToken: <span class="userinput">"$rails_secret_token"</span>
      Collections:
-       BlobSigningKey: <span class="userinput">"blob_signing_key"</span>
+       BlobSigningKey: <span class="userinput">"$blob_signing_key"</span>
  </code></pre>
  </notextile>
  
- @SystemRootToken@ is used by Arvados system services to authenticate as the system (root) user when communicating with the API server.
+ These secret tokens are used to authenticate messages between Arvados components.
+ * @SystemRootToken@ is used by Arvados system services to authenticate as the system (root) user when communicating with the API server.
+ * @ManagementToken@ is used to authenticate access to system metrics.
 -* @API.RailsSessionSecretToken@ is used to sign session cookies.
+ * @Collections.BlobSigningKey@ is used to control access to Keep blocks.
  
- @ManagementToken@ is used to authenticate access to system metrics.
- 
- @Collections.BlobSigningKey@ is used to control access to Keep blocks.
- 
- You can generate a random token for each of these items at the command line like this:
+ Each token should be a string of at least 50 alphanumeric characters. You can generate a suitable token with the following command:
  
  <notextile>
- <pre><code>~$ <span class="userinput">tr -dc 0-9a-zA-Z &lt;/dev/urandom | head -c50; echo</span>
+ <pre><code>~$ <span class="userinput">tr -dc 0-9a-zA-Z &lt;/dev/urandom | head -c50 ; echo</span>
  </code></pre>
  </notextile>
  

diff --cc lib/config/config.default.yml
Simple merge

diff --cc lib/config/generated_config.go
Simple merge