DOC-1466 part 2/2

This is linked with https://github.com/puppetlabs/puppet-docs/pull/423. 

Please don't merge this yet; I need to get approval from support first.