aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--files/ja/_redirects.txt1
-rw-r--r--files/ja/_wikihistory.json14
-rw-r--r--files/ja/conflicting/web/api_49b9a84475f11fffb8fc271a7df3c49a/index.html (renamed from files/ja/web/api/index/index.html)3
-rw-r--r--files/ko/_redirects.txt1
-rw-r--r--files/ko/_wikihistory.json16
-rw-r--r--files/ko/conflicting/web/api/index.html (renamed from files/ko/web/api/index/index.html)3
-rw-r--r--files/pt-br/_redirects.txt1
-rw-r--r--files/pt-br/_wikihistory.json14
-rw-r--r--files/pt-br/conflicting/web/api/animationevent/animationevent/index.html (renamed from files/pt-br/web/api/animationevent/initanimationevent/index.html)3
-rw-r--r--files/zh-cn/_redirects.txt3
-rw-r--r--files/zh-cn/_wikihistory.json14
-rw-r--r--files/zh-cn/conflicting/web/api/index.html (renamed from files/zh-cn/web/api/index/index.html)4
-rw-r--r--files/zh-tw/_redirects.txt1
-rw-r--r--files/zh-tw/_wikihistory.json2
-rw-r--r--files/zh-tw/web/api/animationevent/animationevent/index.html (renamed from files/zh-tw/web/api/animationevent/initanimationevent/index.html)3
15 files changed, 36 insertions, 47 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index e5327ca389..9199fabd2d 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3168,6 +3168,7 @@
/ja/docs/Web/API/IDBFactory.cmp /ja/docs/Web/API/IDBFactory/cmp
/ja/docs/Web/API/IDBFactory.deleteDatabase /ja/docs/Web/API/IDBFactory/deleteDatabase
/ja/docs/Web/API/IDBFactory.open /ja/docs/Web/API/IDBFactory/open
+/ja/docs/Web/API/Index /ja/docs/conflicting/Web/API_49b9a84475f11fffb8fc271a7df3c49a
/ja/docs/Web/API/IndexedDB_API/Basic_Concepts_Behind_IndexedDB /ja/docs/Web/API/IndexedDB_API/Basic_Terminology
/ja/docs/Web/API/MediaRecorder_API /ja/docs/Web/API/MediaStream_Recording_API
/ja/docs/Web/API/Navigator.getUserMedia /ja/docs/Web/API/Navigator/getUserMedia
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 60ddab41a9..39958cd1f6 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -17816,13 +17816,6 @@
"ethertank"
]
},
- "Web/API/Index": {
- "modified": "2019-01-16T21:57:23.880Z",
- "contributors": [
- "mfuji09",
- "Marsf"
- ]
- },
"Web/API/IndexedDB_API": {
"modified": "2019-11-01T12:27:47.658Z",
"contributors": [
@@ -48610,6 +48603,13 @@
"Wind1808"
]
},
+ "conflicting/Web/API_49b9a84475f11fffb8fc271a7df3c49a": {
+ "modified": "2019-01-16T21:57:23.880Z",
+ "contributors": [
+ "mfuji09",
+ "Marsf"
+ ]
+ },
"conflicting/Web/API_dd04ca1265cb79b990b8120e5f5070d3": {
"modified": "2019-03-23T23:32:13.721Z",
"contributors": [
diff --git a/files/ja/web/api/index/index.html b/files/ja/conflicting/web/api_49b9a84475f11fffb8fc271a7df3c49a/index.html
index e37c8080c2..cdd2b4c27d 100644
--- a/files/ja/web/api/index/index.html
+++ b/files/ja/conflicting/web/api_49b9a84475f11fffb8fc271a7df3c49a/index.html
@@ -1,10 +1,11 @@
---
title: 索引
-slug: Web/API/Index
+slug: conflicting/Web/API_49b9a84475f11fffb8fc271a7df3c49a
tags:
- API
- Index
- Landing
translation_of: Web/API/Index
+original_slug: Web/API/Index
---
<p>{{Index("/ja/docs/Web/API")}}</p>
diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt
index 472e365864..11da27c514 100644
--- a/files/ko/_redirects.txt
+++ b/files/ko/_redirects.txt
@@ -456,6 +456,7 @@
/ko/docs/Web/API/HTMLHyperlinkElementUtils/href /ko/docs/Web/API/HTMLAnchorElement/href
/ko/docs/Web/API/HTML_드래그_앤_드롭_API /ko/docs/Web/API/HTML_Drag_and_Drop_API
/ko/docs/Web/API/HTML_드래그_앤_드롭_API/Drag_operations /ko/docs/Web/API/HTML_Drag_and_Drop_API/Drag_operations
+/ko/docs/Web/API/Index /ko/docs/conflicting/Web/API
/ko/docs/Web/API/Navigator.battery /ko/docs/Web/API/Navigator/battery
/ko/docs/Web/API/Navigator.battery/window.navigator.battery /ko/docs/Web/API/Navigator/battery
/ko/docs/Web/API/Navigator.connection/window.navigator.connection /ko/docs/Web/API/Navigator/connection
diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json
index 9547a8024f..c666f061e0 100644
--- a/files/ko/_wikihistory.json
+++ b/files/ko/_wikihistory.json
@@ -5525,12 +5525,6 @@
"bsidesoft"
]
},
- "Web/API/Index": {
- "modified": "2019-03-06T12:18:21.576Z",
- "contributors": [
- "alattalatta"
- ]
- },
"Web/API/IndexedDB_API": {
"modified": "2020-02-21T12:46:53.785Z",
"contributors": [
@@ -17539,15 +17533,9 @@
]
},
"conflicting/Web/API": {
- "modified": "2019-03-23T23:30:26.179Z",
+ "modified": "2019-03-06T12:18:21.576Z",
"contributors": [
- "wbamberg",
- "fscholz",
- "oohii",
- "hyeonseok",
- "PillarLee",
- "junho85",
- "francisco.jordano"
+ "alattalatta"
]
},
"conflicting/Web/API/Document_Object_Model": {
diff --git a/files/ko/web/api/index/index.html b/files/ko/conflicting/web/api/index.html
index c06701815a..d74c755289 100644
--- a/files/ko/web/api/index/index.html
+++ b/files/ko/conflicting/web/api/index.html
@@ -1,10 +1,11 @@
---
title: Index
-slug: Web/API/Index
+slug: conflicting/Web/API
tags:
- API
- Index
- Landing
translation_of: Web/API/Index
+original_slug: Web/API/Index
---
<p>{{Index("/ko/docs/Web/API")}}</p>
diff --git a/files/pt-br/_redirects.txt b/files/pt-br/_redirects.txt
index 5a35fcaf0f..daca4b07f7 100644
--- a/files/pt-br/_redirects.txt
+++ b/files/pt-br/_redirects.txt
@@ -471,6 +471,7 @@
/pt-BR/docs/Web/API/API_Web_Audio /pt-BR/docs/Web/API/Web_Audio_API
/pt-BR/docs/Web/API/API_Web_Audio/Sintetizador_simples /pt-BR/docs/Web/API/Web_Audio_API/Simple_synth
/pt-BR/docs/Web/API/API_de_Desempenho /pt-BR/docs/Web/API/Performance_API
+/pt-BR/docs/Web/API/AnimationEvent/initAnimationEvent /pt-BR/docs/conflicting/Web/API/AnimationEvent/AnimationEvent
/pt-BR/docs/Web/API/ArrayBuffer /pt-BR/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer
/pt-BR/docs/Web/API/AudioContext/currentTime /pt-BR/docs/Web/API/BaseAudioContext/currentTime
/pt-BR/docs/Web/API/BatteryManager.charging /pt-BR/docs/Web/API/BatteryManager/charging
diff --git a/files/pt-br/_wikihistory.json b/files/pt-br/_wikihistory.json
index 83b7c2febe..42e4e9b280 100644
--- a/files/pt-br/_wikihistory.json
+++ b/files/pt-br/_wikihistory.json
@@ -3632,13 +3632,6 @@
"takahan"
]
},
- "Web/API/AnimationEvent/initAnimationEvent": {
- "modified": "2019-03-23T22:45:29.493Z",
- "contributors": [
- "teoli",
- "takahan"
- ]
- },
"Web/API/AnimationEvent/pseudoElement": {
"modified": "2019-03-23T22:45:35.200Z",
"contributors": [
@@ -16368,6 +16361,13 @@
"RafaelGiordanno"
]
},
+ "conflicting/Web/API/AnimationEvent/AnimationEvent": {
+ "modified": "2019-03-23T22:45:29.493Z",
+ "contributors": [
+ "teoli",
+ "takahan"
+ ]
+ },
"conflicting/Web/API/Crypto/getRandomValues": {
"modified": "2019-03-23T22:43:17.216Z",
"contributors": [
diff --git a/files/pt-br/web/api/animationevent/initanimationevent/index.html b/files/pt-br/conflicting/web/api/animationevent/animationevent/index.html
index 03ccaaa987..9227514b83 100644
--- a/files/pt-br/web/api/animationevent/initanimationevent/index.html
+++ b/files/pt-br/conflicting/web/api/animationevent/animationevent/index.html
@@ -1,6 +1,6 @@
---
title: AnimationEvent.initAnimationEvent()
-slug: Web/API/AnimationEvent/initAnimationEvent
+slug: conflicting/Web/API/AnimationEvent/AnimationEvent
tags:
- AnimationEvent
- Apps
@@ -10,6 +10,7 @@ tags:
- Obsolento
- Web Animations
translation_of: Web/API/AnimationEvent/initAnimationEvent
+original_slug: Web/API/AnimationEvent/initAnimationEvent
---
<p>{{obsolete_header}}{{non-standard_header}}{{ apiref("Web Animations API") }}</p>
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 83915af3b0..566a22782a 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1377,6 +1377,7 @@
/zh-CN/docs/Web/API/IDBCursor.direction /zh-CN/docs/Web/API/IDBCursor/direction
/zh-CN/docs/Web/API/IDBFactory.open /zh-CN/docs/Web/API/IDBFactory/open
/zh-CN/docs/Web/API/IDBObjectStore.openCursor /zh-CN/docs/Web/API/IDBObjectStore/openCursor
+/zh-CN/docs/Web/API/Index /zh-CN/docs/conflicting/Web/API
/zh-CN/docs/Web/API/IndexedDB_API/IDBObjectStore /zh-CN/docs/Web/API/IDBObjectStore
/zh-CN/docs/Web/API/Intersection_Observer_API/点观察者API的时序元素可见性 /zh-CN/docs/Web/API/Intersection_Observer_API/Timing_element_visibility
/zh-CN/docs/Web/API/Location.replace /zh-CN/docs/Web/API/Location/replace
@@ -1641,7 +1642,7 @@
/zh-CN/docs/Web/API/window.requestAnimationFrame /zh-CN/docs/Web/API/Window/requestAnimationFrame
/zh-CN/docs/Web/API/剪贴板_API /zh-CN/docs/Web/API/Clipboard_API
/zh-CN/docs/Web/API/开发式平台 /zh-CN/docs/Web/API/Push_API
-/zh-CN/docs/Web/API/指数 /zh-CN/docs/Web/API/Index
+/zh-CN/docs/Web/API/指数 /zh-CN/docs/conflicting/Web/API
/zh-CN/docs/Web/API/支付_请求_接口 /zh-CN/docs/Web/API/Payment_Request_API
/zh-CN/docs/Web/API/支付_请求_接口/Concepts /zh-CN/docs/Web/API/Payment_Request_API/Concepts
/zh-CN/docs/Web/API/消息事件 /zh-CN/docs/Web/API/MessageEvent
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 091b99d93b..c7337931f9 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -16296,13 +16296,6 @@
"ice-i-snow"
]
},
- "Web/API/Index": {
- "modified": "2020-09-07T03:42:22.980Z",
- "contributors": [
- "SphinxKnight",
- "hl7514576"
- ]
- },
"Web/API/IndexedDB_API": {
"modified": "2020-08-17T03:58:13.141Z",
"contributors": [
@@ -47010,11 +47003,10 @@
]
},
"conflicting/Web/API": {
- "modified": "2019-03-23T23:09:29.332Z",
+ "modified": "2020-09-07T03:42:22.980Z",
"contributors": [
- "mySoul",
- "teoli",
- "AlexChao"
+ "SphinxKnight",
+ "hl7514576"
]
},
"conflicting/Web/API/Beacon_API": {
diff --git a/files/zh-cn/web/api/index/index.html b/files/zh-cn/conflicting/web/api/index.html
index e910b907d2..70b70e7ec2 100644
--- a/files/zh-cn/web/api/index/index.html
+++ b/files/zh-cn/conflicting/web/api/index.html
@@ -1,7 +1,7 @@
---
title: 指数
-slug: Web/API/Index
+slug: conflicting/Web/API
translation_of: Web/API/Index
-original_slug: Web/API/指数
+original_slug: Web/API/Index
---
<p>{{Index("/zh-CN/docs/Web/API")}}</p>
diff --git a/files/zh-tw/_redirects.txt b/files/zh-tw/_redirects.txt
index b7266c16c2..a74261d6e4 100644
--- a/files/zh-tw/_redirects.txt
+++ b/files/zh-tw/_redirects.txt
@@ -512,6 +512,7 @@
/zh-TW/docs/Using_files_from_web_applications /zh-TW/docs/Web/API/File/Using_files_from_web_applications
/zh-TW/docs/Using_geolocation /zh-TW/docs/Web/API/Geolocation_API
/zh-TW/docs/Web/API/Ambient_Light_Events /zh-TW/docs/orphaned/Web/API/Ambient_Light_Events
+/zh-TW/docs/Web/API/AnimationEvent/initAnimationEvent /zh-TW/docs/Web/API/AnimationEvent/AnimationEvent
/zh-TW/docs/Web/API/Body /zh-TW/docs/orphaned/Web/API/Body
/zh-TW/docs/Web/API/Body/json /zh-TW/docs/orphaned/Web/API/Body/json
/zh-TW/docs/Web/API/Canvas_API/Drawing_graphics_with_canvas /zh-TW/docs/conflicting/Web/API/Canvas_API/Tutorial
diff --git a/files/zh-tw/_wikihistory.json b/files/zh-tw/_wikihistory.json
index d8927a29a7..74a41f5f01 100644
--- a/files/zh-tw/_wikihistory.json
+++ b/files/zh-tw/_wikihistory.json
@@ -2874,7 +2874,7 @@
"fscholz"
]
},
- "Web/API/AnimationEvent/initAnimationEvent": {
+ "Web/API/AnimationEvent/AnimationEvent": {
"modified": "2019-03-23T22:58:50.823Z",
"contributors": [
"teoli",
diff --git a/files/zh-tw/web/api/animationevent/initanimationevent/index.html b/files/zh-tw/web/api/animationevent/animationevent/index.html
index de5c7efe15..eebaac85f0 100644
--- a/files/zh-tw/web/api/animationevent/initanimationevent/index.html
+++ b/files/zh-tw/web/api/animationevent/animationevent/index.html
@@ -1,6 +1,6 @@
---
title: AnimationEvent.initAnimationEvent()
-slug: Web/API/AnimationEvent/initAnimationEvent
+slug: Web/API/AnimationEvent/AnimationEvent
tags:
- API
- AnimationEvent
@@ -9,6 +9,7 @@ tags:
- Obsolete
- Web Animations
translation_of: Web/API/AnimationEvent/initAnimationEvent
+original_slug: Web/API/AnimationEvent/initAnimationEvent
---
<p>{{obsolete_header}}{{non-standard_header}}{{ apiref("Web Animations API") }}</p>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-28 21:33:24 +0000