From 0918169f788acf2ef0348b60a884dc27221ae045 Mon Sep 17 00:00:00 2001 From: George Jenkins Date: Mon, 29 May 2023 00:41:43 -0500 Subject: [PATCH] Link FAQ to newer doc --- content/en/docs/faq/changes_since_helm2.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/en/docs/faq/changes_since_helm2.md b/content/en/docs/faq/changes_since_helm2.md index 53cd7e2c2..ee3a73f20 100644 --- a/content/en/docs/faq/changes_since_helm2.md +++ b/content/en/docs/faq/changes_since_helm2.md @@ -43,6 +43,8 @@ functionality remains. ### Improved Upgrade Strategy: 3-way Strategic Merge Patches +_Note: Details on 3-way Strategic Merge Patches is now maintained in [Resource Upgrades](../topics/resource_upgrades.md)_ + Helm 2 used a two-way strategic merge patch. During an upgrade, it compared the most recent chart's manifest against the proposed chart's manifest (the one supplied during `helm upgrade`). It compared the differences between these two