From 96a86da7c1ad5c12fabfab8a55f64d313a41e380 Mon Sep 17 00:00:00 2001 From: Arhell Date: Thu, 12 Nov 2020 01:02:31 +0200 Subject: [PATCH 1/3] fix branch name --- content/en/docs/contribute/new-content/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/contribute/new-content/overview.md b/content/en/docs/contribute/new-content/overview.md index b1f7e4f20a..ebed1f18f3 100644 --- a/content/en/docs/contribute/new-content/overview.md +++ b/content/en/docs/contribute/new-content/overview.md @@ -43,7 +43,7 @@ When opening a pull request, you need to know in advance which branch to base yo Scenario | Branch :---------|:------------ Existing or new English language content for the current release | `master` -Content for a feature change release | The branch which corresponds to the major and minor version the feature change is in, using the pattern `dev-release-`. For example, if a feature changes in the `{{< latest-version >}}` release, then add documentation changes to the ``dev-{{< release-branch >}}`` branch. +Content for a feature change release | The branch which corresponds to the major and minor version the feature change is in, using the pattern `dev-`. For example, if a feature changes in the `{{< latest-version >}}` release, then add documentation changes to the ``dev-{{< branch >}}`` branch. Content in other languages (localizations) | Use the localization's convention. See the [Localization branching strategy](/docs/contribute/localization/#branching-strategy) for more information. From 7c2f9590480b44f9b5cd2f6e22fb12a7364f5f84 Mon Sep 17 00:00:00 2001 From: Arhell Date: Thu, 12 Nov 2020 01:09:02 +0200 Subject: [PATCH 2/3] fix branch name --- content/en/docs/contribute/new-content/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/contribute/new-content/overview.md b/content/en/docs/contribute/new-content/overview.md index ebed1f18f3..d422cd7710 100644 --- a/content/en/docs/contribute/new-content/overview.md +++ b/content/en/docs/contribute/new-content/overview.md @@ -43,7 +43,7 @@ When opening a pull request, you need to know in advance which branch to base yo Scenario | Branch :---------|:------------ Existing or new English language content for the current release | `master` -Content for a feature change release | The branch which corresponds to the major and minor version the feature change is in, using the pattern `dev-`. For example, if a feature changes in the `{{< latest-version >}}` release, then add documentation changes to the ``dev-{{< branch >}}`` branch. +Content for a feature change release | The branch which corresponds to the major and minor version the feature change is in, using the pattern `dev-`. For example, if a feature changes in the `{{< latest-version >}}` release, then add documentation changes to the ``dev-{{< release-branch >}}`` branch. Content in other languages (localizations) | Use the localization's convention. See the [Localization branching strategy](/docs/contribute/localization/#branching-strategy) for more information. From f41b214818ec54f0ca2d8d0a61b19721eb1e3540 Mon Sep 17 00:00:00 2001 From: Arhell Date: Thu, 12 Nov 2020 01:24:31 +0200 Subject: [PATCH 3/3] fix branch name --- content/en/docs/contribute/new-content/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/contribute/new-content/overview.md b/content/en/docs/contribute/new-content/overview.md index d422cd7710..3cba9e434e 100644 --- a/content/en/docs/contribute/new-content/overview.md +++ b/content/en/docs/contribute/new-content/overview.md @@ -43,7 +43,7 @@ When opening a pull request, you need to know in advance which branch to base yo Scenario | Branch :---------|:------------ Existing or new English language content for the current release | `master` -Content for a feature change release | The branch which corresponds to the major and minor version the feature change is in, using the pattern `dev-`. For example, if a feature changes in the `{{< latest-version >}}` release, then add documentation changes to the ``dev-{{< release-branch >}}`` branch. +Content for a feature change release | The branch which corresponds to the major and minor version the feature change is in, using the pattern `dev-`. For example, if a feature changes in the `{{< latest-version >}}` release, then add documentation changes to the ``dev-{{< latest-version >}}`` branch. Content in other languages (localizations) | Use the localization's convention. See the [Localization branching strategy](/docs/contribute/localization/#branching-strategy) for more information.