aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/ja/_redirects.txt2
-rw-r--r--files/ja/_wikihistory.json24
-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
4 files changed, 18 insertions, 14 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 8ab903d28b..f93dba235d 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3462,11 +3462,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 55233bef27..704868c28d 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -25974,12 +25974,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": [
@@ -26100,12 +26094,6 @@
"Wind1808"
]
},
- "Web/API/XRTargetRayMode": {
- "modified": "2020-12-08T09:23:22.538Z",
- "contributors": [
- "Wind1808"
- ]
- },
"Web/API/XSLTProcessor": {
"modified": "2020-10-15T21:59:36.911Z",
"contributors": [
@@ -48495,6 +48483,18 @@
"ethertank"
]
},
+ "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": [
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>