[TIDOC-1894] Remove references to 'auto'
Merge pull request #6199 from bhatfield/tidoc-1894

[TIDOC-1894] Remove references to 'auto'