16580: Merge branch 'master' into 16580-remove-python2-packages

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --combined doc/admin/upgrading.html.textile.liquid
index 3df69145a35c99390ff59c5c84a93e10c2eade33,84ef780faa09354037151f054fdb15daf9ba937f..061b68fa5d27b766e7d45bd0c08750fed210f5dd
--- 1/doc/admin/upgrading.html.textile.liquid
--- 2/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@@ -10,14 -10,14 +10,14 @@@ Copyright (C) The Arvados Authors. All 
  SPDX-License-Identifier: CC-BY-SA-3.0
  {% endcomment %}
  
- What you need to know and do in order to upgrade your Arvados installation.
+ For Arvados administrators, this page will cover what you need to know and do in order to ensure a smooth upgrade of your Arvados installation.  For general release notes covering features added and bugs fixed, see "Arvados releases":https://arvados.org/releases .
  
  h2. General process
  
  # Consult upgrade notes below to see if any manual configuration updates are necessary.
  # Wait for the cluster to be idle and stop Arvados services.
  # Install new packages using @apt-get upgrade@ or @yum upgrade@.
- # Package installation scripts will perform any necessary data migrations.
+ # Wait for package installation scripts as they perform any necessary data migrations.
  # Restart Arvados services.
  
  h2. Upgrade notes
@@@ -38,10 -38,6 +38,10 @@@ h2(#master). development master (as of 
  
  "Upgrading from 2.0.0":#v2_0_0
  
 +h3. Removing libpam-arvados, replaced with libpam-arvados-go
 +
 +The Python-based PAM package has been replaced with a version written in Go. See "using PAM for authentication":{{site.baseurl}}/install/setup-login.html#pam for details.
 +
  h3. Removing sso-provider
  
  The SSO (single sign-on) component is deprecated and will not be supported in future releases. Existing configurations will continue to work in this release, but you should switch to one of the built-in authentication mechanisms as soon as possible. See "setting up web based login":{{site.baseurl}}/install/setup-login.html for details.
@@@ -573,7 -569,7 +573,7 @@@ As part of story "#11349":https://dev.a
  
  * To enable it, add to your configuration file: <pre>[Manage]
    address = 127.0.0.1
 -  port = 8989</pre> (see example configuration files in source:services/nodemanager/doc or https://doc.arvados.org/install/install-nodemanager.html for more info)
 +  port = 8989</pre>
  * The server responds to @http://{address}:{port}/status.json@ with a summary of how many nodes are in each state (booting, busy, shutdown, etc.)
  
  h3. New websockets component (2017-03-23)