Merge pull request #7523 from juthilo/3.0.0-wip

Fully update docs to col-...-* schema