Merge pull request #2209 from danmcp/master

Doc updates
Bug 835778