Update config stanza and documentation

Add back a config stanza lost in a merge, and while at it, update some related stanzas and documentation.