aboutsummaryrefslogtreecommitdiff
path: root/files/zh-cn/conflicting/web/api
diff options
context:
space:
mode:
Diffstat (limited to 'files/zh-cn/conflicting/web/api')
-rw-r--r--files/zh-cn/conflicting/web/api/canvas_api/tutorial/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/crypto/getrandomvalues/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/document/characterset/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/document/createevent/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/document/hasfocus/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/document_object_model/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/document_object_model_dd00a71ceceac547ab464128db6bd8ef/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/documentorshadowroot/elementfrompoint/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/documentorshadowroot/elementsfrompoint/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/documentorshadowroot/getselection/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/documentorshadowroot/stylesheets/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/dommatrix/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/element/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/event/composedpath/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/eventtarget/addeventlistener/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/eventtarget/dispatchevent/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/eventtarget/removeeventlistener/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/file_and_directory_entries_api/introduction/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/geolocation/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/globaleventhandlers/ongotpointercapture/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/globaleventhandlers/onmouseup/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/globaleventhandlers/onscroll/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/globaleventhandlers/ontouchmove/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/htmlelement/outertext/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/htmlinputelement/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/htmlmediaelement/abort_event/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/mouseevent/altkey/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/mouseevent/button/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/mouseevent/relatedtarget/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/mouseevent/shiftkey/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/node/getrootnode/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/node/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/push_api/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/url/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/web_storage_api/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/webrtc_api/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/webrtc_api/protocols/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/webrtc_api/signaling_and_video_calling/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/webrtc_api_d8621144cbc61520339c3b10c61731f0/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/window/localstorage/index.html3
-rw-r--r--files/zh-cn/conflicting/web/api/window/moveto/index.html3
43 files changed, 86 insertions, 43 deletions
diff --git a/files/zh-cn/conflicting/web/api/canvas_api/tutorial/index.html b/files/zh-cn/conflicting/web/api/canvas_api/tutorial/index.html
index 3cef2b94e8..f81a2be43c 100644
--- a/files/zh-cn/conflicting/web/api/canvas_api/tutorial/index.html
+++ b/files/zh-cn/conflicting/web/api/canvas_api/tutorial/index.html
@@ -1,8 +1,9 @@
---
title: Drawing graphics with canvas
-slug: Web/API/Canvas_API/Drawing_graphics_with_canvas
+slug: conflicting/Web/API/Canvas_API/Tutorial
translation_of: Web/API/Canvas_API/Tutorial
translation_of_original: Web/API/Canvas_API/Drawing_graphics_with_canvas
+original_slug: Web/API/Canvas_API/Drawing_graphics_with_canvas
---
<div class="note">
<p>本文大部分(但不包括关于绘制窗体部分的文档)已经被包含到更详尽的Canvas教程中,该页面因为现在已经显得多余可能会被链接到那里,但是某些信息可能仍然是十分有用的。</p>
diff --git a/files/zh-cn/conflicting/web/api/crypto/getrandomvalues/index.html b/files/zh-cn/conflicting/web/api/crypto/getrandomvalues/index.html
index 1366009032..3fd5c0018d 100644
--- a/files/zh-cn/conflicting/web/api/crypto/getrandomvalues/index.html
+++ b/files/zh-cn/conflicting/web/api/crypto/getrandomvalues/index.html
@@ -1,8 +1,9 @@
---
title: RandomSource
-slug: Web/API/RandomSource
+slug: conflicting/Web/API/Crypto/getRandomValues
translation_of: Web/API/Crypto/getRandomValues
translation_of_original: Web/API/RandomSource
+original_slug: Web/API/RandomSource
---
<p>{{APIRef("Web Crypto API")}}</p>
diff --git a/files/zh-cn/conflicting/web/api/document/characterset/index.html b/files/zh-cn/conflicting/web/api/document/characterset/index.html
index 00701e8acf..ce06fbc644 100644
--- a/files/zh-cn/conflicting/web/api/document/characterset/index.html
+++ b/files/zh-cn/conflicting/web/api/document/characterset/index.html
@@ -1,8 +1,9 @@
---
title: document.inputEncoding
-slug: Web/API/Document/inputEncoding
+slug: conflicting/Web/API/Document/characterSet
translation_of: Web/API/Document/characterSet
translation_of_original: Web/API/Document/inputEncoding
+original_slug: Web/API/Document/inputEncoding
---
<p>{{ ApiRef() }} {{ deprecated_header() }}</p>
<h3 id="概述">概述</h3>
diff --git a/files/zh-cn/conflicting/web/api/document/createevent/index.html b/files/zh-cn/conflicting/web/api/document/createevent/index.html
index 8b9c249c71..84d91c4dec 100644
--- a/files/zh-cn/conflicting/web/api/document/createevent/index.html
+++ b/files/zh-cn/conflicting/web/api/document/createevent/index.html
@@ -1,6 +1,6 @@
---
title: Event.createEvent()
-slug: Web/API/Event/createEvent
+slug: conflicting/Web/API/Document/createEvent
tags:
- DOM
- Event
@@ -8,6 +8,7 @@ tags:
- Method
translation_of: Web/API/Document/createEvent
translation_of_original: Web/API/Event/createEvent
+original_slug: Web/API/Event/createEvent
---
<p>{{APIRef("DOM")}}</p>
diff --git a/files/zh-cn/conflicting/web/api/document/hasfocus/index.html b/files/zh-cn/conflicting/web/api/document/hasfocus/index.html
index df29adde76..db40737695 100644
--- a/files/zh-cn/conflicting/web/api/document/hasfocus/index.html
+++ b/files/zh-cn/conflicting/web/api/document/hasfocus/index.html
@@ -1,6 +1,6 @@
---
title: HTML 焦点管理
-slug: Web/HTML/Focus_management_in_HTML
+slug: conflicting/Web/API/Document/hasFocus
tags:
- DOM
- HTML
@@ -8,6 +8,7 @@ tags:
- 焦点
translation_of: Web/API/Document/hasFocus
translation_of_original: Web/HTML/Focus_management_in_HTML
+original_slug: Web/HTML/Focus_management_in_HTML
---
<p>重定向 <a href="https://developer.mozilla.org/en-US/docs/Web/API/Document/hasFocus">Document.hasFocus()</a></p>
diff --git a/files/zh-cn/conflicting/web/api/document_object_model/index.html b/files/zh-cn/conflicting/web/api/document_object_model/index.html
index 80f115abfd..d7a4164ee9 100644
--- a/files/zh-cn/conflicting/web/api/document_object_model/index.html
+++ b/files/zh-cn/conflicting/web/api/document_object_model/index.html
@@ -1,8 +1,9 @@
---
title: 前言
-slug: Web/API/Document_Object_Model/Preface
+slug: conflicting/Web/API/Document_Object_Model
translation_of: Web/API/Document_Object_Model
translation_of_original: Web/API/Document_Object_Model/Preface
+original_slug: Web/API/Document_Object_Model/Preface
---
<p>{{ ApiRef() }}</p>
<h3 id="About_This_Reference" name="About_This_Reference">关于此参考文档</h3>
diff --git a/files/zh-cn/conflicting/web/api/document_object_model_dd00a71ceceac547ab464128db6bd8ef/index.html b/files/zh-cn/conflicting/web/api/document_object_model_dd00a71ceceac547ab464128db6bd8ef/index.html
index e09b7ab597..285ced6f96 100644
--- a/files/zh-cn/conflicting/web/api/document_object_model_dd00a71ceceac547ab464128db6bd8ef/index.html
+++ b/files/zh-cn/conflicting/web/api/document_object_model_dd00a71ceceac547ab464128db6bd8ef/index.html
@@ -1,6 +1,6 @@
---
title: DOM 开发者指南
-slug: Web/Guide/API/DOM
+slug: conflicting/Web/API/Document_Object_Model_dd00a71ceceac547ab464128db6bd8ef
tags:
- API
- DOM
@@ -9,6 +9,7 @@ tags:
- TopicStub
translation_of: Web/API/Document_Object_Model
translation_of_original: Web/Guide/API/DOM
+original_slug: Web/Guide/API/DOM
---
<p>{{draft}}</p>
diff --git a/files/zh-cn/conflicting/web/api/documentorshadowroot/elementfrompoint/index.html b/files/zh-cn/conflicting/web/api/documentorshadowroot/elementfrompoint/index.html
index 6fb591e1da..83bcafb45b 100644
--- a/files/zh-cn/conflicting/web/api/documentorshadowroot/elementfrompoint/index.html
+++ b/files/zh-cn/conflicting/web/api/documentorshadowroot/elementfrompoint/index.html
@@ -1,8 +1,9 @@
---
title: Document.elementFromPoint()
-slug: Web/API/Document/elementFromPoint
+slug: conflicting/Web/API/DocumentOrShadowRoot/elementFromPoint
translation_of: Web/API/DocumentOrShadowRoot/elementFromPoint
translation_of_original: Web/API/Document/elementFromPoint
+original_slug: Web/API/Document/elementFromPoint
---
<div>
{{APIRef()}} {{Fx_minversion_header(3)}}</div>
diff --git a/files/zh-cn/conflicting/web/api/documentorshadowroot/elementsfrompoint/index.html b/files/zh-cn/conflicting/web/api/documentorshadowroot/elementsfrompoint/index.html
index 9a7ee01503..3b1043f630 100644
--- a/files/zh-cn/conflicting/web/api/documentorshadowroot/elementsfrompoint/index.html
+++ b/files/zh-cn/conflicting/web/api/documentorshadowroot/elementsfrompoint/index.html
@@ -1,8 +1,9 @@
---
title: Document.elementsFromPoint()
-slug: Web/API/Document/elementsFromPoint
+slug: conflicting/Web/API/DocumentOrShadowRoot/elementsFromPoint
translation_of: Web/API/DocumentOrShadowRoot/elementsFromPoint
translation_of_original: Web/API/Document/elementsFromPoint
+original_slug: Web/API/Document/elementsFromPoint
---
<div>{{APIRef("DOM")}}{{SeeCompatTable}}</div>
diff --git a/files/zh-cn/conflicting/web/api/documentorshadowroot/getselection/index.html b/files/zh-cn/conflicting/web/api/documentorshadowroot/getselection/index.html
index 73b3a4ce6b..dce4bc9c58 100644
--- a/files/zh-cn/conflicting/web/api/documentorshadowroot/getselection/index.html
+++ b/files/zh-cn/conflicting/web/api/documentorshadowroot/getselection/index.html
@@ -1,8 +1,9 @@
---
title: document.getSelection
-slug: Web/API/Document/getSelection
+slug: conflicting/Web/API/DocumentOrShadowRoot/getSelection
translation_of: Web/API/DocumentOrShadowRoot/getSelection
translation_of_original: Web/API/Document/getSelection
+original_slug: Web/API/Document/getSelection
---
<article class="approved text-content" style="padding-right: 10px; width: 652px; float: left;">
<div class="boxed translate-rendered" style="">
diff --git a/files/zh-cn/conflicting/web/api/documentorshadowroot/stylesheets/index.html b/files/zh-cn/conflicting/web/api/documentorshadowroot/stylesheets/index.html
index de44c8537b..088be5bd6b 100644
--- a/files/zh-cn/conflicting/web/api/documentorshadowroot/stylesheets/index.html
+++ b/files/zh-cn/conflicting/web/api/documentorshadowroot/stylesheets/index.html
@@ -1,8 +1,9 @@
---
title: Document.styleSheets
-slug: Web/API/Document/styleSheets
+slug: conflicting/Web/API/DocumentOrShadowRoot/styleSheets
translation_of: Web/API/DocumentOrShadowRoot/styleSheets
translation_of_original: Web/API/Document/styleSheets
+original_slug: Web/API/Document/styleSheets
---
<div>{{APIRef}}</div>
diff --git a/files/zh-cn/conflicting/web/api/dommatrix/index.html b/files/zh-cn/conflicting/web/api/dommatrix/index.html
index 16fe55276d..364ba0709c 100644
--- a/files/zh-cn/conflicting/web/api/dommatrix/index.html
+++ b/files/zh-cn/conflicting/web/api/dommatrix/index.html
@@ -1,8 +1,9 @@
---
title: CSSMatrix
-slug: Web/API/CSSMatrix
+slug: conflicting/Web/API/DOMMatrix
translation_of: Web/API/DOMMatrix
translation_of_original: Web/API/CSSMatrix
+original_slug: Web/API/CSSMatrix
---
<div>{{APIRef("CSSOM")}}{{Non-standard_header}}</div>
diff --git a/files/zh-cn/conflicting/web/api/element/index.html b/files/zh-cn/conflicting/web/api/element/index.html
index 2a489d3b22..51c660e9ce 100644
--- a/files/zh-cn/conflicting/web/api/element/index.html
+++ b/files/zh-cn/conflicting/web/api/element/index.html
@@ -1,6 +1,6 @@
---
title: Slotable
-slug: Web/API/Slotable
+slug: conflicting/Web/API/Element
tags:
- API
- Web Components
@@ -8,6 +8,7 @@ tags:
- 接口
translation_of: Web/API/Slottable
translation_of_original: Web/API/Slotable
+original_slug: Web/API/Slotable
---
<p>{{APIRef("Shadow DOM")}}</p>
diff --git a/files/zh-cn/conflicting/web/api/event/composedpath/index.html b/files/zh-cn/conflicting/web/api/event/composedpath/index.html
index 61bfdf1366..525b27f4b8 100644
--- a/files/zh-cn/conflicting/web/api/event/composedpath/index.html
+++ b/files/zh-cn/conflicting/web/api/event/composedpath/index.html
@@ -1,8 +1,9 @@
---
title: Event.deepPath
-slug: Web/API/Event/deepPath
+slug: conflicting/Web/API/Event/composedPath
translation_of: Web/API/Event/composedPath
translation_of_original: Web/API/Event/deepPath
+original_slug: Web/API/Event/deepPath
---
<p>{{SeeCompatTable}}{{APIRef("Shadow DOM")}}</p>
diff --git a/files/zh-cn/conflicting/web/api/eventtarget/addeventlistener/index.html b/files/zh-cn/conflicting/web/api/eventtarget/addeventlistener/index.html
index f637813381..0d43c26ea1 100644
--- a/files/zh-cn/conflicting/web/api/eventtarget/addeventlistener/index.html
+++ b/files/zh-cn/conflicting/web/api/eventtarget/addeventlistener/index.html
@@ -1,9 +1,10 @@
---
title: 为这个EventTarget附加事件.
-slug: Web/API/EventTarget/attachEvent
+slug: conflicting/Web/API/EventTarget/addEventListener
tags:
- Junk
translation_of: Web/API/EventTarget/addEventListener
translation_of_original: Web/API/EventTarget/attachEvent
+original_slug: Web/API/EventTarget/attachEvent
---
<p>{{DOMxRef("EventTarget.addEventListener","EventTarget.addEventListener()")}}</p>
diff --git a/files/zh-cn/conflicting/web/api/eventtarget/dispatchevent/index.html b/files/zh-cn/conflicting/web/api/eventtarget/dispatchevent/index.html
index edc74b2306..f28ce6bc9a 100644
--- a/files/zh-cn/conflicting/web/api/eventtarget/dispatchevent/index.html
+++ b/files/zh-cn/conflicting/web/api/eventtarget/dispatchevent/index.html
@@ -1,8 +1,9 @@
---
title: EventTarget.fireEvent()
-slug: Web/API/EventTarget/fireEvent
+slug: conflicting/Web/API/EventTarget/dispatchEvent
translation_of: Web/API/EventTarget/dispatchEvent
translation_of_original: Web/API/EventTarget/fireEvent
+original_slug: Web/API/EventTarget/fireEvent
---
<p>{{APIRef("DOM Events")}}</p>
diff --git a/files/zh-cn/conflicting/web/api/eventtarget/removeeventlistener/index.html b/files/zh-cn/conflicting/web/api/eventtarget/removeeventlistener/index.html
index 3b4cbcfd90..4331abb35c 100644
--- a/files/zh-cn/conflicting/web/api/eventtarget/removeeventlistener/index.html
+++ b/files/zh-cn/conflicting/web/api/eventtarget/removeeventlistener/index.html
@@ -1,6 +1,6 @@
---
title: EventTarget.detachEvent()
-slug: Web/API/EventTarget/detachEvent
+slug: conflicting/Web/API/EventTarget/removeEventListener
tags:
- API
- DOM
@@ -8,6 +8,7 @@ tags:
- Non-standard
translation_of: Web/API/EventTarget/removeEventListener
translation_of_original: Web/API/EventTarget/detachEvent
+original_slug: Web/API/EventTarget/detachEvent
---
<p>{{APIRef("DOM Events")}}</p>
diff --git a/files/zh-cn/conflicting/web/api/file_and_directory_entries_api/introduction/index.html b/files/zh-cn/conflicting/web/api/file_and_directory_entries_api/introduction/index.html
index 90ace79b50..8322c91998 100644
--- a/files/zh-cn/conflicting/web/api/file_and_directory_entries_api/introduction/index.html
+++ b/files/zh-cn/conflicting/web/api/file_and_directory_entries_api/introduction/index.html
@@ -1,8 +1,9 @@
---
title: File System API guide
-slug: WebGuide/API/File_System
+slug: conflicting/Web/API/File_and_Directory_Entries_API/Introduction
translation_of: Web/API/File_and_Directory_Entries_API/Introduction
translation_of_original: WebGuide/API/File_System
+original_slug: WebGuide/API/File_System
---
<p>{{ SeeCompatTable() }}</p>
<p>The File System API simulates a local file system that web apps can navigate around. You can develop apps that can read, write, and create files and directories in a virtual, sandboxed file system.</p>
diff --git a/files/zh-cn/conflicting/web/api/geolocation/index.html b/files/zh-cn/conflicting/web/api/geolocation/index.html
index f5432039ba..e38bc3e6b7 100644
--- a/files/zh-cn/conflicting/web/api/geolocation/index.html
+++ b/files/zh-cn/conflicting/web/api/geolocation/index.html
@@ -1,8 +1,9 @@
---
title: NavigatorGeolocation
-slug: Web/API/NavigatorGeolocation
+slug: conflicting/Web/API/Geolocation
translation_of: Web/API/Geolocation
translation_of_original: Web/API/NavigatorGeolocation
+original_slug: Web/API/NavigatorGeolocation
---
<p>{{APIRef("Geolocation API")}}</p>
diff --git a/files/zh-cn/conflicting/web/api/globaleventhandlers/ongotpointercapture/index.html b/files/zh-cn/conflicting/web/api/globaleventhandlers/ongotpointercapture/index.html
index 2ff983926f..a792bdd45d 100644
--- a/files/zh-cn/conflicting/web/api/globaleventhandlers/ongotpointercapture/index.html
+++ b/files/zh-cn/conflicting/web/api/globaleventhandlers/ongotpointercapture/index.html
@@ -1,6 +1,6 @@
---
title: Element.ongotpointercapture
-slug: Web/API/Element/ongotpointercapture
+slug: conflicting/Web/API/GlobalEventHandlers/ongotpointercapture
tags:
- API
- DOM
@@ -16,6 +16,7 @@ tags:
- 指针事件
translation_of: Web/API/GlobalEventHandlers/ongotpointercapture
translation_of_original: Web/API/Element/ongotpointercapture
+original_slug: Web/API/Element/ongotpointercapture
---
<p>{{ ApiRef("DOM") }}</p>
diff --git a/files/zh-cn/conflicting/web/api/globaleventhandlers/onmouseup/index.html b/files/zh-cn/conflicting/web/api/globaleventhandlers/onmouseup/index.html
index 03a4b116b8..2a1afdf2ac 100644
--- a/files/zh-cn/conflicting/web/api/globaleventhandlers/onmouseup/index.html
+++ b/files/zh-cn/conflicting/web/api/globaleventhandlers/onmouseup/index.html
@@ -1,8 +1,9 @@
---
title: window.onmouseup
-slug: Web/API/Window/onmouseup
+slug: conflicting/Web/API/GlobalEventHandlers/onmouseup
translation_of: Web/API/GlobalEventHandlers/onmouseup
translation_of_original: Web/API/Window/onmouseup
+original_slug: Web/API/Window/onmouseup
---
<p>{{ ApiRef() }}</p>
<h3 id="Summary" name="Summary">概述</h3>
diff --git a/files/zh-cn/conflicting/web/api/globaleventhandlers/onscroll/index.html b/files/zh-cn/conflicting/web/api/globaleventhandlers/onscroll/index.html
index af48e1575f..9bd58ff3f5 100644
--- a/files/zh-cn/conflicting/web/api/globaleventhandlers/onscroll/index.html
+++ b/files/zh-cn/conflicting/web/api/globaleventhandlers/onscroll/index.html
@@ -1,8 +1,9 @@
---
title: window.onscroll
-slug: Web/API/Window/onscroll
+slug: conflicting/Web/API/GlobalEventHandlers/onscroll
translation_of: Web/API/GlobalEventHandlers/onscroll
translation_of_original: Web/API/Window/onscroll
+original_slug: Web/API/Window/onscroll
---
<p>{{ ApiRef() }}</p>
<h3 id="Summary" name="Summary">概述</h3>
diff --git a/files/zh-cn/conflicting/web/api/globaleventhandlers/ontouchmove/index.html b/files/zh-cn/conflicting/web/api/globaleventhandlers/ontouchmove/index.html
index 3bbf3d5ce4..7579ce0d36 100644
--- a/files/zh-cn/conflicting/web/api/globaleventhandlers/ontouchmove/index.html
+++ b/files/zh-cn/conflicting/web/api/globaleventhandlers/ontouchmove/index.html
@@ -1,8 +1,9 @@
---
title: GlobalEventHandlers.ontouchmove
-slug: Web/API/GlobalEventHandlers/GlobalEventHanders.ontouchmove
+slug: conflicting/Web/API/GlobalEventHandlers/ontouchmove
translation_of: Web/API/GlobalEventHandlers/ontouchmove
translation_of_original: Web/API/GlobalEventHandlers/GlobalEventHanders.ontouchmove
+original_slug: Web/API/GlobalEventHandlers/GlobalEventHanders.ontouchmove
---
<div>{{ApiRef("HTML DOM")}}</div>
diff --git a/files/zh-cn/conflicting/web/api/htmlelement/outertext/index.html b/files/zh-cn/conflicting/web/api/htmlelement/outertext/index.html
index 01de770af7..54458e93a2 100644
--- a/files/zh-cn/conflicting/web/api/htmlelement/outertext/index.html
+++ b/files/zh-cn/conflicting/web/api/htmlelement/outertext/index.html
@@ -1,9 +1,10 @@
---
title: Node.outerText
-slug: Web/API/Node/outerText
+slug: conflicting/Web/API/HTMLElement/outerText
tags:
- Node.outerText
translation_of: Web/API/HTMLElement/outerText
translation_of_original: Web/API/Node/outerText
+original_slug: Web/API/Node/outerText
---
<p>请参阅 {{domxref("HTMLElement.outerText")}}</p>
diff --git a/files/zh-cn/conflicting/web/api/htmlinputelement/index.html b/files/zh-cn/conflicting/web/api/htmlinputelement/index.html
index 0cccf89889..82a91a1271 100644
--- a/files/zh-cn/conflicting/web/api/htmlinputelement/index.html
+++ b/files/zh-cn/conflicting/web/api/htmlinputelement/index.html
@@ -1,8 +1,9 @@
---
title: HTMLInputElement.mozSetFileNameArray
-slug: Web/API/HTMLInputElement/mozSetFileNameArray
+slug: conflicting/Web/API/HTMLInputElement
translation_of: Web/API/HTMLInputElement
translation_of_original: Web/API/HTMLInputElement/mozSetFileNameArray
+original_slug: Web/API/HTMLInputElement/mozSetFileNameArray
---
<div>
<div>
diff --git a/files/zh-cn/conflicting/web/api/htmlmediaelement/abort_event/index.html b/files/zh-cn/conflicting/web/api/htmlmediaelement/abort_event/index.html
index 9a233b4d80..1b77441e5e 100644
--- a/files/zh-cn/conflicting/web/api/htmlmediaelement/abort_event/index.html
+++ b/files/zh-cn/conflicting/web/api/htmlmediaelement/abort_event/index.html
@@ -1,10 +1,11 @@
---
title: abort
-slug: Web/Events/abort
+slug: conflicting/Web/API/HTMLMediaElement/abort_event
tags:
- abort
translation_of: Web/API/HTMLMediaElement/abort_event
translation_of_original: Web/Events/abort
+original_slug: Web/Events/abort
---
<p>当一个资源的加载已中止时,将触发 <strong>abort</strong>事件。</p>
diff --git a/files/zh-cn/conflicting/web/api/index.html b/files/zh-cn/conflicting/web/api/index.html
index f1a247fd70..333f98f0a4 100644
--- a/files/zh-cn/conflicting/web/api/index.html
+++ b/files/zh-cn/conflicting/web/api/index.html
@@ -1,8 +1,9 @@
---
title: Element.name
-slug: Web/API/Element/name
+slug: conflicting/Web/API
translation_of: Web/API
translation_of_original: Web/API/Element/name
+original_slug: Web/API/Element/name
---
<p>{{ APIRef() }}</p>
diff --git a/files/zh-cn/conflicting/web/api/mouseevent/altkey/index.html b/files/zh-cn/conflicting/web/api/mouseevent/altkey/index.html
index fb69717e99..382f62201d 100644
--- a/files/zh-cn/conflicting/web/api/mouseevent/altkey/index.html
+++ b/files/zh-cn/conflicting/web/api/mouseevent/altkey/index.html
@@ -1,8 +1,9 @@
---
title: event.altKey
-slug: Web/API/event.altKey
+slug: conflicting/Web/API/MouseEvent/altKey
translation_of: Web/API/MouseEvent/altKey
translation_of_original: Web/API/event.altKey
+original_slug: Web/API/event.altKey
---
<p>{{ ApiRef() }}</p>
<h3 id="Summary" name="Summary">概述</h3>
diff --git a/files/zh-cn/conflicting/web/api/mouseevent/button/index.html b/files/zh-cn/conflicting/web/api/mouseevent/button/index.html
index c75916a287..1a3142e74e 100644
--- a/files/zh-cn/conflicting/web/api/mouseevent/button/index.html
+++ b/files/zh-cn/conflicting/web/api/mouseevent/button/index.html
@@ -1,8 +1,9 @@
---
title: event.button
-slug: Web/API/event.button
+slug: conflicting/Web/API/MouseEvent/button
translation_of: Web/API/MouseEvent/button
translation_of_original: Web/API/event.button
+original_slug: Web/API/event.button
---
<p>{{ ApiRef() }}</p>
<h3 id="Summary" name="Summary">概述</h3>
diff --git a/files/zh-cn/conflicting/web/api/mouseevent/relatedtarget/index.html b/files/zh-cn/conflicting/web/api/mouseevent/relatedtarget/index.html
index a334f4b2eb..aed477e044 100644
--- a/files/zh-cn/conflicting/web/api/mouseevent/relatedtarget/index.html
+++ b/files/zh-cn/conflicting/web/api/mouseevent/relatedtarget/index.html
@@ -1,8 +1,9 @@
---
title: event.relatedTarget
-slug: Web/API/event.relatedTarget
+slug: conflicting/Web/API/MouseEvent/relatedTarget
translation_of: Web/API/MouseEvent/relatedTarget
translation_of_original: Web/API/event.relatedTarget
+original_slug: Web/API/event.relatedTarget
---
<h2 id="Summary" name="Summary"> </h2>
diff --git a/files/zh-cn/conflicting/web/api/mouseevent/shiftkey/index.html b/files/zh-cn/conflicting/web/api/mouseevent/shiftkey/index.html
index e01246caca..d61d354b15 100644
--- a/files/zh-cn/conflicting/web/api/mouseevent/shiftkey/index.html
+++ b/files/zh-cn/conflicting/web/api/mouseevent/shiftkey/index.html
@@ -1,8 +1,9 @@
---
title: event.shiftKey
-slug: Web/API/event.shiftKey
+slug: conflicting/Web/API/MouseEvent/shiftKey
translation_of: Web/API/MouseEvent/shiftKey
translation_of_original: Web/API/event.shiftKey
+original_slug: Web/API/event.shiftKey
---
<p>{{ ApiRef() }}</p>
<h3 id="Summary" name="Summary">概述</h3>
diff --git a/files/zh-cn/conflicting/web/api/node/getrootnode/index.html b/files/zh-cn/conflicting/web/api/node/getrootnode/index.html
index 6291ef7fd6..ea5deb0b98 100644
--- a/files/zh-cn/conflicting/web/api/node/getrootnode/index.html
+++ b/files/zh-cn/conflicting/web/api/node/getrootnode/index.html
@@ -1,6 +1,6 @@
---
title: Node.rootNode
-slug: Web/API/Node/rootNode
+slug: conflicting/Web/API/Node/getRootNode
tags:
- API
- DOM
@@ -10,6 +10,7 @@ tags:
- rootNode
translation_of: Web/API/Node/getRootNode
translation_of_original: Web/API/Node/rootNode
+original_slug: Web/API/Node/rootNode
---
<p>{{deprecated_header}}{{APIRef("DOM")}}{{SeeCompatTable}}</p>
diff --git a/files/zh-cn/conflicting/web/api/node/index.html b/files/zh-cn/conflicting/web/api/node/index.html
index ad04356656..08e2664f32 100644
--- a/files/zh-cn/conflicting/web/api/node/index.html
+++ b/files/zh-cn/conflicting/web/api/node/index.html
@@ -1,8 +1,9 @@
---
title: Node.baseURIObject
-slug: Web/API/Node/baseURIObject
+slug: conflicting/Web/API/Node
translation_of: Web/API/Node
translation_of_original: Web/API/Node/baseURIObject
+original_slug: Web/API/Node/baseURIObject
---
<div>
{{ApiRef}} {{Fx_minversion_header("3")}} {{Non-standard_header}}</div>
diff --git a/files/zh-cn/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html b/files/zh-cn/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html
index 58844aef2e..03f557b347 100644
--- a/files/zh-cn/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html
+++ b/files/zh-cn/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html
@@ -1,8 +1,9 @@
---
title: Node.nodePrincipal
-slug: Web/API/Node/nodePrincipal
+slug: conflicting/Web/API/Node_378aed5ed6869e50853edbc988cf9556
translation_of: Web/API/Node
translation_of_original: Web/API/Node/nodePrincipal
+original_slug: Web/API/Node/nodePrincipal
---
<div>
{{APIRef}}{{Fx_minversion_header(3)}}{{Non-standard_header}}
diff --git a/files/zh-cn/conflicting/web/api/push_api/index.html b/files/zh-cn/conflicting/web/api/push_api/index.html
index e616d4e12d..76526ed4ce 100644
--- a/files/zh-cn/conflicting/web/api/push_api/index.html
+++ b/files/zh-cn/conflicting/web/api/push_api/index.html
@@ -1,6 +1,6 @@
---
title: Using the Push API
-slug: Web/API/Push_API/Using_the_Push_API
+slug: conflicting/Web/API/Push_API
tags:
- Push
- Push API
@@ -8,6 +8,7 @@ tags:
- Using the Push API
translation_of: Web/API/Push_API
translation_of_original: Web/API/Push_API/Using_the_Push_API
+original_slug: Web/API/Push_API/Using_the_Push_API
---
<p class="summary"><span>W3C <a href="/en-US/docs/Web/API/Push_API">Push API</a> </span>为开发人员在Web应用程序中提供了一些令人兴奋的新功能:本文提供了一个简单的演示,以获取Push通知的设置和运行。</p>
diff --git a/files/zh-cn/conflicting/web/api/url/index.html b/files/zh-cn/conflicting/web/api/url/index.html
index 3ca38bbd39..3245250d9c 100644
--- a/files/zh-cn/conflicting/web/api/url/index.html
+++ b/files/zh-cn/conflicting/web/api/url/index.html
@@ -1,10 +1,11 @@
---
title: Window.URL
-slug: Web/API/Window/URL
+slug: conflicting/Web/API/URL
tags:
- Window.URL
translation_of: Web/API/URL
translation_of_original: Web/API/Window/URL
+original_slug: Web/API/Window/URL
---
<p>{{ApiRef("Window")}}{{SeeCompatTable}}</p>
diff --git a/files/zh-cn/conflicting/web/api/web_storage_api/index.html b/files/zh-cn/conflicting/web/api/web_storage_api/index.html
index 194b71a94a..c5bde57455 100644
--- a/files/zh-cn/conflicting/web/api/web_storage_api/index.html
+++ b/files/zh-cn/conflicting/web/api/web_storage_api/index.html
@@ -1,8 +1,9 @@
---
title: Storage
-slug: Web/Guide/API/DOM/Storage
+slug: conflicting/Web/API/Web_Storage_API
translation_of: Web/API/Web_Storage_API
translation_of_original: Web/Guide/API/DOM/Storage
+original_slug: Web/Guide/API/DOM/Storage
---
<h3 id="概述">
概述</h3>
diff --git a/files/zh-cn/conflicting/web/api/webrtc_api/index.html b/files/zh-cn/conflicting/web/api/webrtc_api/index.html
index da693553b8..bfc9b851dc 100644
--- a/files/zh-cn/conflicting/web/api/webrtc_api/index.html
+++ b/files/zh-cn/conflicting/web/api/webrtc_api/index.html
@@ -1,8 +1,9 @@
---
title: WebRTC API overview
-slug: Web/API/WebRTC_API/Overview
+slug: conflicting/Web/API/WebRTC_API
translation_of: Web/API/WebRTC_API#WebRTC_concepts_and_usage
translation_of_original: Web/API/WebRTC_API/Overview
+original_slug: Web/API/WebRTC_API/Overview
---
<p>{{WebRTCSidebar}}</p>
diff --git a/files/zh-cn/conflicting/web/api/webrtc_api/protocols/index.html b/files/zh-cn/conflicting/web/api/webrtc_api/protocols/index.html
index 5f37d83529..7aa818b5d5 100644
--- a/files/zh-cn/conflicting/web/api/webrtc_api/protocols/index.html
+++ b/files/zh-cn/conflicting/web/api/webrtc_api/protocols/index.html
@@ -1,10 +1,11 @@
---
title: WebRTC 架构概览
-slug: Web/API/WebRTC_API/Architecture
+slug: conflicting/Web/API/WebRTC_API/Protocols
tags:
- WebRTC 架构概览
translation_of: Web/API/WebRTC_API/Protocols
translation_of_original: Web/API/WebRTC_API/Architecture
+original_slug: Web/API/WebRTC_API/Architecture
---
<p>{{WebRTCSidebar}}</p>
diff --git a/files/zh-cn/conflicting/web/api/webrtc_api/signaling_and_video_calling/index.html b/files/zh-cn/conflicting/web/api/webrtc_api/signaling_and_video_calling/index.html
index 67464bdbd1..d3ca2eb29c 100644
--- a/files/zh-cn/conflicting/web/api/webrtc_api/signaling_and_video_calling/index.html
+++ b/files/zh-cn/conflicting/web/api/webrtc_api/signaling_and_video_calling/index.html
@@ -1,8 +1,9 @@
---
title: WebRTC basics
-slug: Web/API/WebRTC_API/WebRTC_basics
+slug: conflicting/Web/API/WebRTC_API/Signaling_and_video_calling
translation_of: Web/API/WebRTC_API/Signaling_and_video_calling
translation_of_original: Web/API/WebRTC_API/WebRTC_basics
+original_slug: Web/API/WebRTC_API/WebRTC_basics
---
<p>{{WebRTCSidebar}}</p>
diff --git a/files/zh-cn/conflicting/web/api/webrtc_api_d8621144cbc61520339c3b10c61731f0/index.html b/files/zh-cn/conflicting/web/api/webrtc_api_d8621144cbc61520339c3b10c61731f0/index.html
index 75330b8894..4f15dae53e 100644
--- a/files/zh-cn/conflicting/web/api/webrtc_api_d8621144cbc61520339c3b10c61731f0/index.html
+++ b/files/zh-cn/conflicting/web/api/webrtc_api_d8621144cbc61520339c3b10c61731f0/index.html
@@ -1,8 +1,9 @@
---
title: WebRTC
-slug: WebRTC
+slug: conflicting/Web/API/WebRTC_API_d8621144cbc61520339c3b10c61731f0
translation_of: Web/API/WebRTC_API
translation_of_original: WebRTC
+original_slug: WebRTC
---
<p>WebRTC中的RTC是实时通信的简称,这是一种支持在浏览器客户端之间语音/视频交流和数据分享的技术。WebRTC作为一项标准,使得所有浏览器无需安装插件或第三方软件,就可以点对点地分享应用数据和进行电话会议。</p>
diff --git a/files/zh-cn/conflicting/web/api/window/localstorage/index.html b/files/zh-cn/conflicting/web/api/window/localstorage/index.html
index 46384c660e..eab3bf85fe 100644
--- a/files/zh-cn/conflicting/web/api/window/localstorage/index.html
+++ b/files/zh-cn/conflicting/web/api/window/localstorage/index.html
@@ -1,11 +1,12 @@
---
title: LocalStorage
-slug: Web/API/Storage/LocalStorage
+slug: conflicting/Web/API/Window/localStorage
tags:
- 存储API
- 离线
translation_of: Web/API/Window/localStorage
translation_of_original: Web/API/Web_Storage_API/Local_storage
+original_slug: Web/API/Storage/LocalStorage
---
<p><code>localStorage</code> 与<code> <a href="/en-US/docs/Web/API/sessionStorage">sessionStorage</a></code> 一样,都遵循同源策略,但是它是持续存在的。<code>localStorage</code> 首次出现于 Firefox 3.5。</p>
diff --git a/files/zh-cn/conflicting/web/api/window/moveto/index.html b/files/zh-cn/conflicting/web/api/window/moveto/index.html
index 140827ddb9..066314234c 100644
--- a/files/zh-cn/conflicting/web/api/window/moveto/index.html
+++ b/files/zh-cn/conflicting/web/api/window/moveto/index.html
@@ -1,8 +1,9 @@
---
title: Window.restore()
-slug: Web/API/Window/restore
+slug: conflicting/Web/API/Window/moveTo
translation_of: Web/API/Window/moveTo
translation_of_original: Web/API/Window/restore
+original_slug: Web/API/Window/restore
---
<p>{{APIRef}}</p>