port PR #298 changes to cf-docs to new docs