From 5ad520a6ab45481dcb42c215ae8a4aa23b5c320c Mon Sep 17 00:00:00 2001 From: robotjellyzone Date: Wed, 20 Oct 2021 11:46:52 +0530 Subject: [PATCH 1/3] Fixing Skew localization doc --- content/en/docs/contribute/localization.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/content/en/docs/contribute/localization.md b/content/en/docs/contribute/localization.md index c9cd5a5385..6d072fea41 100644 --- a/content/en/docs/contribute/localization.md +++ b/content/en/docs/contribute/localization.md @@ -346,7 +346,7 @@ Teams must merge localized content into the same branch from which the content w For example: - a localization branch sourced from `main` must be merged into `main`. -- a localization branch sourced from `release-{{ skew "prevMinorVersion" }}` must be merged into `release-{{ skew "prevMinorVersion" }}`. +- a localization branch sourced from `release-{{% skew "prevMinorVersion" %}}` must be merged into `release-{{% skew "prevMinorVersion" %}}`. {{< note >}} If your localization branch was created from `main` branch but it is not merged into `main` before new release branch `{{< release-branch >}}` created, merge it into both `main` and new release branch `{{< release-branch >}}`. To merge your localization branch into new release branch `{{< release-branch >}}`, you need to switch upstream branch of your localization branch to `{{< release-branch >}}`. @@ -361,5 +361,3 @@ For more information about working from forks or directly from the repository, s ## Upstream contributions SIG Docs welcomes upstream contributions and corrections to the English source. - - From 5f2dd40003db3b8130c48e8e3ae3e8eb1c4aa83d Mon Sep 17 00:00:00 2001 From: robotjellyzone Date: Wed, 20 Oct 2021 14:16:37 +0530 Subject: [PATCH 2/3] added two spaces at end --- content/en/docs/contribute/localization.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/en/docs/contribute/localization.md b/content/en/docs/contribute/localization.md index 6d072fea41..c840ed06ad 100644 --- a/content/en/docs/contribute/localization.md +++ b/content/en/docs/contribute/localization.md @@ -361,3 +361,5 @@ For more information about working from forks or directly from the repository, s ## Upstream contributions SIG Docs welcomes upstream contributions and corrections to the English source. + + From 2fbb74478311dea60fee52bcbe74aa0d1cdc62fa Mon Sep 17 00:00:00 2001 From: robotjellyzone Date: Wed, 20 Oct 2021 17:48:49 +0530 Subject: [PATCH 3/3] added one space at end --- content/en/docs/contribute/localization.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/en/docs/contribute/localization.md b/content/en/docs/contribute/localization.md index c840ed06ad..592b59ded9 100644 --- a/content/en/docs/contribute/localization.md +++ b/content/en/docs/contribute/localization.md @@ -361,5 +361,4 @@ For more information about working from forks or directly from the repository, s ## Upstream contributions SIG Docs welcomes upstream contributions and corrections to the English source. - - +