Issue #16884: Updated docs to use 'note' directives in a couple of places missed earlier.
Issue #16884: Merged doc fix from 3.2.
Issue #16884: Merged doc fix from 3.3.