Merge in some updates to the manual from trunk.
Authored by: david_costanzo 2020-06-08
Parent: [r5282]
Child: [r5284]