From 238fe49cb598cf3ea4a7fe0450f508f981015123 Mon Sep 17 00:00:00 2001 From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com> Date: Mon, 27 Jun 2022 11:15:03 -0400 Subject: [PATCH] Update website/README.md --- website/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/README.md b/website/README.md index b0844e9fe0..24794cb636 100644 --- a/website/README.md +++ b/website/README.md @@ -52,4 +52,7 @@ Once your PR to `stable-website` is merged, open a PR bumping the submodule comm ### Deployment -New commits in `hashicorp/terraform` do not automatically deploy the site. To use the latest upstream content, you'll need to open a PR bumping the submodule commit. If your changes aren't being deployed, it's very likely that you need to open a PR to update the submodule commit. +New commits in `hashicorp/terraform` do not automatically deploy the site. Do the following for documentation pull requests: +- **Add a backport label to the PR.** This is the label corresponding to the latest Terraform patch release (e.g., `1.2-backport`). When you merge your PR to `main`, GitHub bot automatically generates a backport PR to merge your commits into the appropriate release branch. +- **Merge the backport PR.** When all tests pass successfully, merge the backport PR into the release branch. The new content will be added to the site during the next minor release. +- **Cherry-pick changes to `stable-website`.** If you want your changes to show up immediately, check out the latest version of the`stable-website` branch, cherry-pick your changes, and run `git push` to add your changes to the remote `stable-website` branch. Your changes will be live on the site within the hour.