diff --git a/README.md b/README.md index 6e459588..58d73cec 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ This repository does not contain the documentation content. Documentation conten The following list describes the topic repositories that make up the Cloud Foundry documentation set * [Cloud Foundry Concepts](http://github.com/cloudfoundry/docs-cloudfoundry-concepts): Underlying concepts and architecture -* [Cloud Foundry Command-Line Interface (cf CLI)](https://github.com/cloudfoundry/docs-cf-cli): A guide to the cf CLI for Cloud Foundry developers and users +* [Cloud Foundry Command-Line Interface (cf CLI)](https://github.com/cloudfoundry/docs-cf-cli): A guide to the cf CLI for Cloud Foundry developers and users * [Developer Guide](http://github.com/cloudfoundry/docs-dev-guide): Step-by-step instructions and reference material for developers pushing applications to Cloud Foundry * [Deploying Cloud Foundry](http://github.com/cloudfoundry/docs-deploying-cf): Instructions for operators using BOSH to deploying Cloud Foundry on AWS, vSphere, vCloud, OpenStack, etc. * [Running Cloud Foundry](http://github.com/cloudfoundry/docs-running-cf): Information for operators running Cloud Foundry @@ -41,7 +41,7 @@ To submit a pull request to the documentation, follow this process: 1. Make sure you have a signed CLA. Even if you aren't contributing running code, we still need a Contributor License Agreement. 1. Fork the content repository you want to make a contribution to. See the following examples: - * For the Buildpacks Docs at http://docs.cloudfoundry.org/buildpacks/index.html, the content repo is: https://github.com/cloudfoundry/docs-buildpacks. + * For the Buildpacks Docs at http://docs.cloudfoundry.org/buildpacks/index.html, the content repo is: https://github.com/cloudfoundry/docs-buildpacks. * For the Developer Guide Docs at http://docs.cloudfoundry.org/devguide/services/, the content repo is: https://github.com/cloudfoundry/docs-dev-guide 1. Clone your fork of the content repository. Make sure to clone your fork of the topic repository to a directory that is a sibling to this book repository. So, for example, if you are contributing content to the Buildpack documentation, your folder structure would look like this: @@ -55,8 +55,8 @@ To submit a pull request to the documentation, follow this process: | -1. Make your changes. - +1. Make your changes. + 1. Run bookbinder on your local changes: 
@@ -66,15 +66,15 @@ To submit a pull request to the documentation, follow this process:
Bookbinder attempts to assemble the doc set from your local copies. - It skips any topic repositories that you do not have checked out. For more information on Bookbinder, see the Bookbinder README. + It skips any topic repositories that you do not have checked out. For more information on Bookbinder, see the Bookbinder README. -1. Point your browser at localhost:4567 to preview your changes. On save, your browser will reload with any additional changes you make. +1. Point your browser at localhost:4567 to preview your changes. On save, your browser will reload with any additional changes you make. 1. Commit your changes, rebase from upstream, and push to your fork. 1. Submit a pull request (PR) from your fork to the original repositories. -The CF Docs team will review and merge the PR. They may contact you with questions or edit the PR for formatting and style. +The CF Docs team will review and merge the PR. They may contact you with questions or edit the PR for formatting and style. **Note**: After your pull request is merged, your changes appear on [docs.cloudfoundry.org](http://docs.cloudfoundry.org) the next time the cf-docs team pushes updates to the production docs. Updates go live at least once a week. ## Determine Content Repos and Branches of a Book @@ -95,7 +95,7 @@ or on the branch corresponding to its version number. 3. Search for the name of the content repo, for example, `docs-cloudfoundry-concepts`. -4. Review the `repository` subsection for the content repo. If there is no `ref:` tag, then the repo uses the master branch. If there is a `ref` key-value pair, it specifies the branch name of the content repo. For example, +4. Review the `repository` subsection for the content repo. If there is no `ref:` tag, then the repo uses the `main` branch. If there is a `ref` key-value pair, it specifies the branch name of the content repo. For example, ``` - repository: @@ -104,4 +104,3 @@ or on the branch corresponding to its version number. ``` `ref: '225'` refers to the 225 branch of the docs-cloudfoundry-concepts repo. Cloud Foundry v225 is associated with the PCF v1.6 release. - diff --git a/config.yml b/config.yml index ff3798d6..9605dac1 100644 --- a/config.yml +++ b/config.yml @@ -60,6 +60,11 @@ sections: ref: master directory: loggregator subnav_template: cf-subnav.erb +- repository: + name: cloudfoundry/docs-routing + ref: master + directory: routing + subnav_template: cf-subnav.erb - repository: name: cloudfoundry/docs-running-cf ref: master diff --git a/config/template_variables.yml b/config/template_variables.yml index 4eb289be..7ae2a5a0 100644 --- a/config/template_variables.yml +++ b/config/template_variables.yml @@ -15,6 +15,8 @@ template_variables: support_link: Get Involved support_call_to_action: Get Involved support_url: https://www.cloudfoundry.org/contribute/ + + gtm_account_id: GTM-MW4LZHR add_volumes_link: See the Adding Volume Services to your Deployment topic for more information. admin_read_only_role: @@ -40,6 +42,7 @@ template_variables: buildpacks_php_dea: DEA release
$ cf files APP app/.bp/logs/bp.log
cc_logging_default:

Note: By default, Cloud Foundry does not enable Cloud Controller request logging. To enable this feature, you must set the cc.security_event_logging.enabled property in your Cloud Foundry manifest to true and redeploy.

cfdot_kb: When logged into a VM hosting an app, you can use tools like the [Cloud Foundry Diego Operator Toolkit (cfdot)](../../running/monitoring-test.html#cfdot) to run app status diagnostics. For more information, see the [cfdot repo](https://github.com/cloudfoundry/cfdot) on Github. + cipher_suites: You can override the default cipher suites by changing the `router.cipher_suites` BOSH manifest property. cli_download: https://github.com/cloudfoundry/cli#downloads cli_v6: Getting Started with the cf CLI Cloud Foundry has used two architectures for managing application containers: @@ -189,4 +192,6 @@ template_variables: isolation_segments_note:

Note: The isolation segment name used in the cf CLI command must match the value specified in the placement_tags section of the Diego manifest file. If the names do not match, then PCF fails to place apps in the isolation segment when apps are started or restarted in the space assigned to the isolation segment.

config_ssh_link: For more information, see Configuring SSH Access for Cloud Foundry. all_metrics_links: + enable_service_sharing_link: Enabling Service Instance Sharing + sharing_service_link: Sharing Service Instances diff --git a/redirects.rb b/redirects.rb index 3e1d42c3..0a15aad6 100644 --- a/redirects.rb +++ b/redirects.rb @@ -74,3 +74,5 @@ r301 '/loggregator/all_metrics.html', '/running/all_metrics.html' r301 '/loggregator/dea-metrics.html', '/running/dea-metrics.html' + +r301 '/running/troubleshooting/troubleshooting-diego-windows.html', '/running/troubleshooting/'