new naming
Merge branch 'master' of https://github.com/cloudfoundry/cf-docs