aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/fr/_redirects.txt4
-rw-r--r--files/fr/_wikihistory.json54
-rw-r--r--files/fr/conflicting/web/api/dedicatedworkerglobalscope/close/index.html (renamed from files/fr/web/api/workerglobalscope/close/index.html)3
-rw-r--r--files/fr/conflicting/web/api/dedicatedworkerglobalscope/close_ad209d73ce2abfe0e3fe136acf40e5b4/index.html (renamed from files/fr/web/api/workerglobalscope/onclose/index.html)4
-rw-r--r--files/fr/conflicting/web/api/mediatrackconstraints/index.html (renamed from files/fr/web/api/ulongrange/index.html)3
-rw-r--r--files/fr/web/api/mediatrackconstraints/index.html (renamed from files/fr/web/api/doublerange/index.html)3
-rw-r--r--files/ja/_redirects.txt6
-rw-r--r--files/ja/_wikihistory.json68
-rw-r--r--files/ja/conflicting/web/api/xrinputsource/handedness/index.html (renamed from files/ja/web/api/xrhandedness/index.html)3
-rw-r--r--files/ja/conflicting/web/api/xrinputsource/targetraymode/index.html (renamed from files/ja/web/api/xrtargetraymode/index.html)3
-rw-r--r--files/ja/conflicting/web/api/xrreferencespaceevent/xrreferencespaceevent/index.html (renamed from files/ja/web/api/xrreferencespaceeventinit/index.html)3
-rw-r--r--files/ja/conflicting/web/api/xrreferencespaceevent/xrreferencespaceevent_0f733d39fd3094010931f093b9045686/index.html (renamed from files/ja/web/api/xrreferencespaceeventinit/referencespace/index.html)4
-rw-r--r--files/ja/conflicting/web/api/xrreferencespaceevent/xrreferencespaceevent_7dfb381c892055a0c91980d537a86c6b/index.html (renamed from files/ja/web/api/xrreferencespaceeventinit/transform/index.html)4
-rw-r--r--files/ja/web/api/xrsession/requestreferencespace/index.html (renamed from files/ja/web/api/xrreferencespacetype/index.html)3
14 files changed, 94 insertions, 71 deletions
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index f172346bee..b03c1a3e37 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -3565,6 +3565,7 @@
/fr/docs/Web/API/Document_Object_Model/window /fr/docs/Web/API/Window
/fr/docs/Web/API/Document_object_model/Utilisation_du_DOM_Level_1_Core_du_W3C /fr/docs/Web/API/Document_object_model/Using_the_W3C_DOM_Level_1_Core
/fr/docs/Web/API/Document_object_model/Utilisation_du_DOM_Level_1_Core_du_W3C/Exemple /fr/docs/Web/API/Document_object_model/Using_the_W3C_DOM_Level_1_Core/Example
+/fr/docs/Web/API/DoubleRange /fr/docs/Web/API/MediaTrackConstraints
/fr/docs/Web/API/Element.activeElement /fr/docs/Web/API/Document/activeElement
/fr/docs/Web/API/Element.addEventListener /fr/docs/Web/API/EventTarget/addEventListener
/fr/docs/Web/API/Element.appendChild /fr/docs/Web/API/Node/appendChild
@@ -3742,6 +3743,7 @@
/fr/docs/Web/API/Selection_API /fr/docs/conflicting/Web/API/Selection
/fr/docs/Web/API/ServiceWorkerState /fr/docs/orphaned/Web/API/ServiceWorkerState
/fr/docs/Web/API/Storage/LocalStorage /fr/docs/conflicting/Web/API/Window/localStorage
+/fr/docs/Web/API/ULongRange /fr/docs/conflicting/Web/API/MediaTrackConstraints
/fr/docs/Web/API/URL.createObjectURL /fr/docs/Web/API/URL/createObjectURL
/fr/docs/Web/API/URLUtilsReadOnly /fr/docs/orphaned/Web/API/URLUtilsReadOnly
/fr/docs/Web/API/WebGLRenderingContext/activer /fr/docs/Web/API/WebGLRenderingContext/enable
@@ -3819,6 +3821,8 @@
/fr/docs/Web/API/Worker.postMessage /fr/docs/Web/API/Worker/postMessage
/fr/docs/Web/API/Worker.terminate /fr/docs/Web/API/Worker/terminate
/fr/docs/Web/API/Worker/Functions_and_classes_available_to_workers /fr/docs/Web/API/Web_Workers_API/Functions_and_classes_available_to_workers
+/fr/docs/Web/API/WorkerGlobalScope/close /fr/docs/conflicting/Web/API/DedicatedWorkerGlobalScope/close
+/fr/docs/Web/API/WorkerGlobalScope/onclose /fr/docs/conflicting/Web/API/DedicatedWorkerGlobalScope/close_ad209d73ce2abfe0e3fe136acf40e5b4
/fr/docs/Web/API/XMLHttpRequest/Utiliser_XMLHttpRequest /fr/docs/Web/API/XMLHttpRequest/Using_XMLHttpRequest
/fr/docs/Web/API/console.log /fr/docs/Web/API/Console/log
/fr/docs/Web/API/console.time /fr/docs/Web/API/Console/time
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index 18200fd6de..a3d8df0d51 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -14910,13 +14910,6 @@
"loella16"
]
},
- "Web/API/DoubleRange": {
- "modified": "2020-11-11T19:01:25.656Z",
- "contributors": [
- "JNa0",
- "Voulto"
- ]
- },
"Web/API/EffectTiming": {
"modified": "2019-03-23T22:28:24.754Z",
"contributors": [
@@ -18354,6 +18347,13 @@
"Voulto"
]
},
+ "Web/API/MediaTrackConstraints": {
+ "modified": "2020-11-11T19:01:25.656Z",
+ "contributors": [
+ "JNa0",
+ "Voulto"
+ ]
+ },
"Web/API/Media_Streams_API": {
"modified": "2020-10-15T21:25:08.658Z",
"contributors": [
@@ -20048,12 +20048,6 @@
"Feugy"
]
},
- "Web/API/ULongRange": {
- "modified": "2020-10-15T22:35:00.304Z",
- "contributors": [
- "Voulto"
- ]
- },
"Web/API/URL": {
"modified": "2019-04-05T15:11:45.608Z",
"contributors": [
@@ -22019,13 +22013,6 @@
"chrisdavidmills"
]
},
- "Web/API/WorkerGlobalScope/close": {
- "modified": "2020-10-15T21:36:58.427Z",
- "contributors": [
- "Arzak656",
- "jean-pierre.gay"
- ]
- },
"Web/API/WorkerGlobalScope/console": {
"modified": "2020-10-15T22:26:34.613Z",
"contributors": [
@@ -22059,13 +22046,6 @@
"jean-pierre.gay"
]
},
- "Web/API/WorkerGlobalScope/onclose": {
- "modified": "2020-10-15T21:33:54.728Z",
- "contributors": [
- "Arzak656",
- "jean-pierre.gay"
- ]
- },
"Web/API/WorkerGlobalScope/onerror": {
"modified": "2020-10-15T21:33:56.757Z",
"contributors": [
@@ -43394,6 +43374,20 @@
"Pitux"
]
},
+ "conflicting/Web/API/DedicatedWorkerGlobalScope/close": {
+ "modified": "2020-10-15T21:36:58.427Z",
+ "contributors": [
+ "Arzak656",
+ "jean-pierre.gay"
+ ]
+ },
+ "conflicting/Web/API/DedicatedWorkerGlobalScope/close_ad209d73ce2abfe0e3fe136acf40e5b4": {
+ "modified": "2020-10-15T21:33:54.728Z",
+ "contributors": [
+ "Arzak656",
+ "jean-pierre.gay"
+ ]
+ },
"conflicting/Web/API/Document/createEvent": {
"modified": "2020-10-15T21:37:47.725Z",
"contributors": [
@@ -43490,6 +43484,12 @@
"Kalwyn"
]
},
+ "conflicting/Web/API/MediaTrackConstraints": {
+ "modified": "2020-10-15T22:35:00.304Z",
+ "contributors": [
+ "Voulto"
+ ]
+ },
"conflicting/Web/API/Node": {
"modified": "2020-10-15T22:02:08.284Z",
"contributors": [
diff --git a/files/fr/web/api/workerglobalscope/close/index.html b/files/fr/conflicting/web/api/dedicatedworkerglobalscope/close/index.html
index 4d02224a9d..8e6e03142e 100644
--- a/files/fr/web/api/workerglobalscope/close/index.html
+++ b/files/fr/conflicting/web/api/dedicatedworkerglobalscope/close/index.html
@@ -1,7 +1,8 @@
---
title: WorkerGlobalScope.close()
-slug: Web/API/WorkerGlobalScope/close
+slug: conflicting/Web/API/DedicatedWorkerGlobalScope/close
translation_of: Web/API/WorkerGlobalScope/close
+original_slug: Web/API/WorkerGlobalScope/close
---
<p>{{APIRef("Web Workers API")}}{{obsolete_header}}</p>
diff --git a/files/fr/web/api/workerglobalscope/onclose/index.html b/files/fr/conflicting/web/api/dedicatedworkerglobalscope/close_ad209d73ce2abfe0e3fe136acf40e5b4/index.html
index d2dbda3026..afbab46c4a 100644
--- a/files/fr/web/api/workerglobalscope/onclose/index.html
+++ b/files/fr/conflicting/web/api/dedicatedworkerglobalscope/close_ad209d73ce2abfe0e3fe136acf40e5b4/index.html
@@ -1,7 +1,9 @@
---
title: WorkerGlobalScope.onclose
-slug: Web/API/WorkerGlobalScope/onclose
+slug: >-
+ conflicting/Web/API/DedicatedWorkerGlobalScope/close_ad209d73ce2abfe0e3fe136acf40e5b4
translation_of: Web/API/WorkerGlobalScope/onclose
+original_slug: Web/API/WorkerGlobalScope/onclose
---
<p>{{APIRef("Web Workers API")}}{{obsolete_header}}</p>
diff --git a/files/fr/web/api/ulongrange/index.html b/files/fr/conflicting/web/api/mediatrackconstraints/index.html
index 9b37295c23..342716be8a 100644
--- a/files/fr/web/api/ulongrange/index.html
+++ b/files/fr/conflicting/web/api/mediatrackconstraints/index.html
@@ -1,6 +1,6 @@
---
title: ULongRange
-slug: Web/API/ULongRange
+slug: conflicting/Web/API/MediaTrackConstraints
tags:
- API
- API Media Streams
@@ -13,6 +13,7 @@ tags:
- Reference
- WebRTC
translation_of: Web/API/ULongRange
+original_slug: Web/API/ULongRange
---
<div>{{APIRef("Media Capture and Streams")}}</div>
diff --git a/files/fr/web/api/doublerange/index.html b/files/fr/web/api/mediatrackconstraints/index.html
index a117c5f9c6..f0991f5277 100644
--- a/files/fr/web/api/doublerange/index.html
+++ b/files/fr/web/api/mediatrackconstraints/index.html
@@ -1,6 +1,6 @@
---
title: DoubleRange
-slug: Web/API/DoubleRange
+slug: Web/API/MediaTrackConstraints
tags:
- API
- API Media Streams
@@ -13,6 +13,7 @@ tags:
- Reference
- WebRTC
translation_of: Web/API/DoubleRange
+original_slug: Web/API/DoubleRange
---
<div>{{APIRef("Media Capture and Streams")}}</div>
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 837f55542d..ee094e5983 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3833,7 +3833,13 @@
/ja/docs/Web/API/WindowTimers/setTimeout /ja/docs/Web/API/WindowOrWorkerGlobalScope/setTimeout
/ja/docs/Web/API/WorkerGlobalScope/caches /ja/docs/Web/API/WindowOrWorkerGlobalScope/caches
/ja/docs/Web/API/XMLHttpRequest/openRequest /ja/docs/orphaned/Web/API/XMLHttpRequest/openRequest
+/ja/docs/Web/API/XRHandedness /ja/docs/conflicting/Web/API/XRInputSource/handedness
+/ja/docs/Web/API/XRReferenceSpaceEventInit /ja/docs/conflicting/Web/API/XRReferenceSpaceEvent/XRReferenceSpaceEvent
+/ja/docs/Web/API/XRReferenceSpaceEventInit/referenceSpace /ja/docs/conflicting/Web/API/XRReferenceSpaceEvent/XRReferenceSpaceEvent_0f733d39fd3094010931f093b9045686
+/ja/docs/Web/API/XRReferenceSpaceEventInit/transform /ja/docs/conflicting/Web/API/XRReferenceSpaceEvent/XRReferenceSpaceEvent_7dfb381c892055a0c91980d537a86c6b
+/ja/docs/Web/API/XRReferenceSpaceType /ja/docs/Web/API/XRSession/requestReferenceSpace
/ja/docs/Web/API/XRSessionMode /ja/docs/orphaned/Web/API/XRSessionMode
+/ja/docs/Web/API/XRTargetRayMode /ja/docs/conflicting/Web/API/XRInputSource/targetRayMode
/ja/docs/Web/API/console.dir /ja/docs/Web/API/Console/dir
/ja/docs/Web/API/console.log /ja/docs/Web/API/Console/log
/ja/docs/Web/API/console.time /ja/docs/Web/API/Console/time
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index b194ac59b6..765b170fe3 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -25818,12 +25818,6 @@
"Wind1808"
]
},
- "Web/API/XRHandedness": {
- "modified": "2020-12-06T13:23:10.937Z",
- "contributors": [
- "Wind1808"
- ]
- },
"Web/API/XRInputSource": {
"modified": "2020-12-06T11:35:46.714Z",
"contributors": [
@@ -25896,30 +25890,6 @@
"Wind1808"
]
},
- "Web/API/XRReferenceSpaceEventInit": {
- "modified": "2020-11-08T02:10:47.628Z",
- "contributors": [
- "Wind1808"
- ]
- },
- "Web/API/XRReferenceSpaceEventInit/referenceSpace": {
- "modified": "2020-11-08T19:13:54.683Z",
- "contributors": [
- "Wind1808"
- ]
- },
- "Web/API/XRReferenceSpaceEventInit/transform": {
- "modified": "2020-11-08T19:23:29.842Z",
- "contributors": [
- "Wind1808"
- ]
- },
- "Web/API/XRReferenceSpaceType": {
- "modified": "2020-12-09T00:45:16.481Z",
- "contributors": [
- "Wind1808"
- ]
- },
"Web/API/XRRigidTransform": {
"modified": "2020-12-09T01:29:36.634Z",
"contributors": [
@@ -25956,14 +25926,14 @@
"Wind1808"
]
},
- "Web/API/XRSystem": {
- "modified": "2020-10-23T14:29:58.403Z",
+ "Web/API/XRSession/requestReferenceSpace": {
+ "modified": "2020-12-09T00:45:16.481Z",
"contributors": [
"Wind1808"
]
},
- "Web/API/XRTargetRayMode": {
- "modified": "2020-12-08T09:23:22.538Z",
+ "Web/API/XRSystem": {
+ "modified": "2020-10-23T14:29:58.403Z",
"contributors": [
"Wind1808"
]
@@ -48354,6 +48324,36 @@
"dreissig.jahrhundert"
]
},
+ "conflicting/Web/API/XRInputSource/handedness": {
+ "modified": "2020-12-06T13:23:10.937Z",
+ "contributors": [
+ "Wind1808"
+ ]
+ },
+ "conflicting/Web/API/XRInputSource/targetRayMode": {
+ "modified": "2020-12-08T09:23:22.538Z",
+ "contributors": [
+ "Wind1808"
+ ]
+ },
+ "conflicting/Web/API/XRReferenceSpaceEvent/XRReferenceSpaceEvent": {
+ "modified": "2020-11-08T02:10:47.628Z",
+ "contributors": [
+ "Wind1808"
+ ]
+ },
+ "conflicting/Web/API/XRReferenceSpaceEvent/XRReferenceSpaceEvent_0f733d39fd3094010931f093b9045686": {
+ "modified": "2020-11-08T19:13:54.683Z",
+ "contributors": [
+ "Wind1808"
+ ]
+ },
+ "conflicting/Web/API/XRReferenceSpaceEvent/XRReferenceSpaceEvent_7dfb381c892055a0c91980d537a86c6b": {
+ "modified": "2020-11-08T19:23:29.842Z",
+ "contributors": [
+ "Wind1808"
+ ]
+ },
"conflicting/Web/API_dd04ca1265cb79b990b8120e5f5070d3": {
"modified": "2019-03-23T23:32:13.721Z",
"contributors": [
diff --git a/files/ja/web/api/xrhandedness/index.html b/files/ja/conflicting/web/api/xrinputsource/handedness/index.html
index c66cb6f7c6..ea3db01eec 100644
--- a/files/ja/web/api/xrhandedness/index.html
+++ b/files/ja/conflicting/web/api/xrinputsource/handedness/index.html
@@ -1,6 +1,6 @@
---
title: XRHandedness
-slug: Web/API/XRHandedness
+slug: conflicting/Web/API/XRInputSource/handedness
tags:
- API
- AR
@@ -17,6 +17,7 @@ tags:
- left
- right
translation_of: Web/API/XRHandedness
+original_slug: Web/API/XRHandedness
---
<p>{{APIRef("WebXR")}}</p>
diff --git a/files/ja/web/api/xrtargetraymode/index.html b/files/ja/conflicting/web/api/xrinputsource/targetraymode/index.html
index 7c9848eca4..e787a3e7be 100644
--- a/files/ja/web/api/xrtargetraymode/index.html
+++ b/files/ja/conflicting/web/api/xrinputsource/targetraymode/index.html
@@ -1,6 +1,6 @@
---
title: XRTargetRayMode
-slug: Web/API/XRTargetRayMode
+slug: conflicting/Web/API/XRInputSource/targetRayMode
tags:
- 3D
- API
@@ -22,6 +22,7 @@ tags:
- source
- target
translation_of: Web/API/XRTargetRayMode
+original_slug: Web/API/XRTargetRayMode
---
<p>{{APIRef("WebXR")}}</p>
diff --git a/files/ja/web/api/xrreferencespaceeventinit/index.html b/files/ja/conflicting/web/api/xrreferencespaceevent/xrreferencespaceevent/index.html
index ea25a23ca2..2ee7e3df6a 100644
--- a/files/ja/web/api/xrreferencespaceeventinit/index.html
+++ b/files/ja/conflicting/web/api/xrreferencespaceevent/xrreferencespaceevent/index.html
@@ -1,6 +1,6 @@
---
title: XRReferenceSpaceEventInit
-slug: Web/API/XRReferenceSpaceEventInit
+slug: conflicting/Web/API/XRReferenceSpaceEvent/XRReferenceSpaceEvent
tags:
- API
- AR
@@ -20,6 +20,7 @@ tags:
- XRReferenceSpaceEventInit
- augmented
translation_of: Web/API/XRReferenceSpaceEventInit
+original_slug: Web/API/XRReferenceSpaceEventInit
---
<p>{{APIRef("WebXR Device API")}}{{SecureContext_header}}</p>
diff --git a/files/ja/web/api/xrreferencespaceeventinit/referencespace/index.html b/files/ja/conflicting/web/api/xrreferencespaceevent/xrreferencespaceevent_0f733d39fd3094010931f093b9045686/index.html
index 35f67ce332..2523b17ea1 100644
--- a/files/ja/web/api/xrreferencespaceeventinit/referencespace/index.html
+++ b/files/ja/conflicting/web/api/xrreferencespaceevent/xrreferencespaceevent_0f733d39fd3094010931f093b9045686/index.html
@@ -1,6 +1,7 @@
---
title: XRReferenceSpaceEventInit.referenceSpace
-slug: Web/API/XRReferenceSpaceEventInit/referenceSpace
+slug: >-
+ conflicting/Web/API/XRReferenceSpaceEvent/XRReferenceSpaceEvent_0f733d39fd3094010931f093b9045686
tags:
- API
- AR
@@ -18,6 +19,7 @@ tags:
- augmented
- referenceSpace
translation_of: Web/API/XRReferenceSpaceEventInit/referenceSpace
+original_slug: Web/API/XRReferenceSpaceEventInit/referenceSpace
---
<p>{{APIRef("WebXR Device API")}}{{SecureContext_header}}</p>
diff --git a/files/ja/web/api/xrreferencespaceeventinit/transform/index.html b/files/ja/conflicting/web/api/xrreferencespaceevent/xrreferencespaceevent_7dfb381c892055a0c91980d537a86c6b/index.html
index 41e4df083b..96da5a1fa1 100644
--- a/files/ja/web/api/xrreferencespaceeventinit/transform/index.html
+++ b/files/ja/conflicting/web/api/xrreferencespaceevent/xrreferencespaceevent_7dfb381c892055a0c91980d537a86c6b/index.html
@@ -1,6 +1,7 @@
---
title: XRReferenceSpaceEventInit.transform
-slug: Web/API/XRReferenceSpaceEventInit/transform
+slug: >-
+ conflicting/Web/API/XRReferenceSpaceEvent/XRReferenceSpaceEvent_7dfb381c892055a0c91980d537a86c6b
tags:
- API
- AR
@@ -18,6 +19,7 @@ tags:
- augmented
- transform
translation_of: Web/API/XRReferenceSpaceEventInit/transform
+original_slug: Web/API/XRReferenceSpaceEventInit/transform
---
<p>{{APIRef("WebXR Device API")}}{{SecureContext_header}}</p>
diff --git a/files/ja/web/api/xrreferencespacetype/index.html b/files/ja/web/api/xrsession/requestreferencespace/index.html
index 3f55c590b3..00c32951b3 100644
--- a/files/ja/web/api/xrreferencespacetype/index.html
+++ b/files/ja/web/api/xrsession/requestreferencespace/index.html
@@ -1,6 +1,6 @@
---
title: XRReferenceSpaceType
-slug: Web/API/XRReferenceSpaceType
+slug: Web/API/XRSession/requestReferenceSpace
tags:
- API
- AR
@@ -21,6 +21,7 @@ tags:
- space
- tracking
translation_of: Web/API/XRReferenceSpaceType
+original_slug: Web/API/XRReferenceSpaceType
---
<p>{{APIRef("WebXR Device API")}}</p>