From cd5f42f785369bf2fa01ff3331361dffa4eaa901 Mon Sep 17 00:00:00 2001 From: mdn-bot <108879845+mdn-bot@users.noreply.github.com> Date: Sat, 1 Jul 2023 00:20:11 +0000 Subject: [PATCH] zh-cn: sync translated content --- files/zh-cn/_redirects.txt | 10 +++-- files/zh-cn/_wikihistory.json | 40 +++++++++---------- .../web/guide/ajax}/index.md | 3 +- .../prefetch}/index.md | 3 +- 4 files changed, 30 insertions(+), 26 deletions(-) rename files/zh-cn/{web/guide/ajax/getting_started => conflicting/web/guide/ajax}/index.md (99%) rename files/zh-cn/{web/http/link_prefetching_faq => glossary/prefetch}/index.md (99%) diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt index 02d18146926b88..d7ca4b3db1d94e 100644 --- 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/Web/Guide/AJAX/Getting_Started -/zh-CN/docs/AJAX/开始 /zh-CN/docs/Web/Guide/AJAX/Getting_Started -/zh-CN/docs/AJAX:Getting_Started /zh-CN/docs/Web/Guide/AJAX/Getting_Started -/zh-CN/docs/AJAX:开始 /zh-CN/docs/Web/Guide/AJAX/Getting_Started +/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/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,6 +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/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 @@ -2415,6 +2416,7 @@ /zh-CN/docs/Web/HTTP/Headers/Public-Key-Pins-Report-Only /zh-CN/docs/Web/HTTP/Headers/Expect-CT /zh-CN/docs/Web/HTTP/Headers/Set-Cookie/SameSite /zh-CN/docs/Web/HTTP/Headers/Set-Cookie#samesitesamesite-value /zh-CN/docs/Web/HTTP/Headers/Set-Cookie2 /zh-CN/docs/Web/HTTP/Headers/Set-Cookie +/zh-CN/docs/Web/HTTP/Link_prefetching_FAQ /zh-CN/docs/Glossary/Prefetch /zh-CN/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_(PAC)_file /zh-CN/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_PAC_file /zh-CN/docs/Web/HTTP/Public_Key_Pinning /zh-CN/docs/Web/Security/Certificate_Transparency /zh-CN/docs/Web/HTTP/Response_codes /zh-CN/docs/Web/HTTP/Status diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json index f698d7c7cbcd0c..0950b3dd1a4498 100644 --- a/files/zh-cn/_wikihistory.json +++ b/files/zh-cn/_wikihistory.json @@ -1237,6 +1237,10 @@ "modified": "2019-03-18T21:26:23.322Z", "contributors": ["zsxeee"] }, + "Glossary/Prefetch": { + "modified": "2019-10-09T13:08:42.395Z", + "contributors": ["Yayure", "vivaxy", "iamyy", "xgqfrms-GitHub"] + }, "Glossary/Preflight_request": { "modified": "2019-03-18T21:47:05.943Z", "contributors": ["daixinye"] @@ -21536,22 +21540,6 @@ "Noly1990" ] }, - "Web/Guide/AJAX/Getting_Started": { - "modified": "2020-05-09T09:42:30.390Z", - "contributors": [ - "Mookiepiece", - "JiLiangLai", - "HCSkatana", - "realchoi", - "Mew_MDN", - "SalmonDaze", - "zazaliu", - "chrisdavidmills", - "shifengchen", - "tangc1", - "RogerShen" - ] - }, "Web/Guide/API": { "modified": "2019-03-23T23:17:06.067Z", "contributors": ["RainSlide", "Sheppy"] @@ -24111,10 +24099,6 @@ "xgqfrms-GitHub" ] }, - "Web/HTTP/Link_prefetching_FAQ": { - "modified": "2019-10-09T13:08:42.395Z", - "contributors": ["Yayure", "vivaxy", "iamyy", "xgqfrms-GitHub"] - }, "Web/HTTP/Messages": { "modified": "2020-04-19T05:44:17.609Z", "contributors": [ @@ -33506,5 +33490,21 @@ "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/web/guide/ajax/getting_started/index.md b/files/zh-cn/conflicting/web/guide/ajax/index.md similarity index 99% rename from files/zh-cn/web/guide/ajax/getting_started/index.md rename to files/zh-cn/conflicting/web/guide/ajax/index.md index 40c944a2f502b9..7a39e75e03553e 100644 --- a/files/zh-cn/web/guide/ajax/getting_started/index.md +++ b/files/zh-cn/conflicting/web/guide/ajax/index.md @@ -1,6 +1,7 @@ --- title: 开始使用 -slug: Web/Guide/AJAX/Getting_Started +slug: conflicting/Web/Guide/AJAX +original_slug: Web/Guide/AJAX/Getting_Started --- {{QuickLinksWithSubpages("/zh-CN/docs/Web/Guide/AJAX")}} diff --git a/files/zh-cn/web/http/link_prefetching_faq/index.md b/files/zh-cn/glossary/prefetch/index.md similarity index 99% rename from files/zh-cn/web/http/link_prefetching_faq/index.md rename to files/zh-cn/glossary/prefetch/index.md index 09df08bea70439..a65322870c2bf5 100644 --- a/files/zh-cn/web/http/link_prefetching_faq/index.md +++ b/files/zh-cn/glossary/prefetch/index.md @@ -1,6 +1,7 @@ --- title: Link prefetching FAQ -slug: Web/HTTP/Link_prefetching_FAQ +slug: Glossary/Prefetch +original_slug: Web/HTTP/Link_prefetching_FAQ --- ### 什么是链接预取？