From e23bdb0fe323d421ccb0a38d00074b65e4b1d003 Mon Sep 17 00:00:00 2001
From: yammyxing <yammyxing@gmail.com>
Date: Thu, 21 Apr 2022 16:20:56 +0800
Subject: [PATCH 1/2] docs: fix the warning note

fix the warning note on rule conflicts between  vue/no-v-for-template-key and vue/no-v-for-template-key-on-child
---
 docs/rules/no-v-for-template-key.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/rules/no-v-for-template-key.md b/docs/rules/no-v-for-template-key.md
index bd4623dd0..12615183b 100644
--- a/docs/rules/no-v-for-template-key.md
+++ b/docs/rules/no-v-for-template-key.md
@@ -18,7 +18,7 @@ This rule reports the `<template v-for>` elements which have `key` attribute.
 In Vue.js 2.x, disallows `key` attribute on `<template>` elements.
 
 ::: warning Note
-Do not use with the [vue/no-v-for-template-key-on-child] rule for Vue.js 3.x.  
+Do not use with the [vue/no-v-for-template-key] rule for Vue.js 3.x.  
 This rule conflicts with the [vue/no-v-for-template-key-on-child] rule.
 :::
 

From b9e2de26f5519e59e09c3e340807d073b2bc839f Mon Sep 17 00:00:00 2001
From: Flo Edelmann <florian-edelmann@online.de>
Date: Fri, 22 Apr 2022 16:40:43 +0200
Subject: [PATCH 2/2] Update docs/rules/no-v-for-template-key.md

---
 docs/rules/no-v-for-template-key.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/rules/no-v-for-template-key.md b/docs/rules/no-v-for-template-key.md
index 12615183b..01e09734a 100644
--- a/docs/rules/no-v-for-template-key.md
+++ b/docs/rules/no-v-for-template-key.md
@@ -18,8 +18,8 @@ This rule reports the `<template v-for>` elements which have `key` attribute.
 In Vue.js 2.x, disallows `key` attribute on `<template>` elements.
 
 ::: warning Note
-Do not use with the [vue/no-v-for-template-key] rule for Vue.js 3.x.  
-This rule conflicts with the [vue/no-v-for-template-key-on-child] rule.
+This rule is targeted at Vue.js 2.x.
+If you are using Vue.js 3.x, enable the [vue/no-v-for-template-key-on-child] rule instead. Don't enable both rules together; they are conflicting.
 :::
 
 <eslint-code-block :rules="{'vue/no-v-for-template-key': ['error']}">