Merge pull request #6990 from acmetech/3.0.0-wip

Additional minor updates to the docs