Move/merge AJAX guide subpages

ref: mdn/content#27568
mdn · Jul 1, 2023 · c3d8f5f · c3d8f5f
1 parent cd5f42f
commit c3d8f5f
Show file tree

Hide file tree

Showing 10 changed files with 371 additions and 430 deletions.
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
@@ -6,10 +6,10 @@
 # FROM-URL	TO-URL
 /zh-CN/docs/2332	/zh-CN/docs/Web/API/Element/attributes
 /zh-CN/docs/AJAX	/zh-CN/docs/Web/Guide/AJAX
-/zh-CN/docs/AJAX/Getting_Started	/zh-CN/docs/conflicting/Web/Guide/AJAX
-/zh-CN/docs/AJAX/开始	/zh-CN/docs/conflicting/Web/Guide/AJAX
-/zh-CN/docs/AJAX:Getting_Started	/zh-CN/docs/conflicting/Web/Guide/AJAX
-/zh-CN/docs/AJAX:开始	/zh-CN/docs/conflicting/Web/Guide/AJAX
+/zh-CN/docs/AJAX/Getting_Started	/zh-CN/docs/Web/Guide/AJAX
+/zh-CN/docs/AJAX/开始	/zh-CN/docs/Web/Guide/AJAX
+/zh-CN/docs/AJAX:Getting_Started	/zh-CN/docs/Web/Guide/AJAX
+/zh-CN/docs/AJAX:开始	/zh-CN/docs/Web/Guide/AJAX
 /zh-CN/docs/API	/zh-CN/docs/Web/API
 /zh-CN/docs/API/Pointer_Lock_API	/zh-CN/docs/Web/API/Pointer_Lock_API
 /zh-CN/docs/A_re-introduction_to_JavaScript	/zh-CN/docs/Web/JavaScript/Language_overview
@@ -2280,7 +2280,7 @@
 /zh-CN/docs/Web/Events/提交	/zh-CN/docs/Web/API/HTMLFormElement/submit_event
 /zh-CN/docs/Web/Events/滚轮事件	/zh-CN/docs/Web/API/Element/wheel_event
 /zh-CN/docs/Web/Events/进度条	/zh-CN/docs/Web/API/XMLHttpRequest/progress_event
-/zh-CN/docs/Web/Guide/AJAX/Getting_Started	/zh-CN/docs/conflicting/Web/Guide/AJAX
+/zh-CN/docs/Web/Guide/AJAX/Getting_Started	/zh-CN/docs/Web/Guide/AJAX
 /zh-CN/docs/Web/Guide/API/DOM/The_structured_clone_algorithm	/zh-CN/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
 /zh-CN/docs/Web/Guide/API/DOM/Whitespace_in_the_DOM	/zh-CN/docs/Web/API/Document_Object_Model/Whitespace
 /zh-CN/docs/Web/Guide/CSS	/zh-CN/docs/Learn/CSS

diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
@@ -33490,21 +33490,5 @@
       "skyfore",
       "xgqfrms-GitHub"
     ]
-  },
-  "conflicting/Web/Guide/AJAX": {
-    "modified": "2020-05-09T09:42:30.390Z",
-    "contributors": [
-      "Mookiepiece",
-      "JiLiangLai",
-      "HCSkatana",
-      "realchoi",
-      "Mew_MDN",
-      "SalmonDaze",
-      "zazaliu",
-      "chrisdavidmills",
-      "shifengchen",
-      "tangc1",
-      "RogerShen"
-    ]
   }
 }
diff --git a/files/zh-cn/conflicting/web/guide/ajax/index.md b/files/zh-cn/conflicting/web/guide/ajax/index.md