Database doc changes to address #2412 and #6451.
Merge pull request #6491 from esmail/patch-1

Database doc changes to address #2412 and #6451.