aboutsummaryrefslogtreecommitdiff
path: root/files/ja
diff options
context:
space:
mode:
Diffstat (limited to 'files/ja')
-rw-r--r--files/ja/_redirects.txt6
-rw-r--r--files/ja/_wikihistory.json54
-rw-r--r--files/ja/conflicting/web/api/mediastreamtrack/mute_event/index.html (renamed from files/ja/web/api/mediastreamtrack/onmute/index.html)3
-rw-r--r--files/ja/conflicting/web/api/mediastreamtrack/unmute_event/index.html (renamed from files/ja/web/api/mediastreamtrack/onunmute/index.html)3
-rw-r--r--files/ja/conflicting/web/api/window/devicemotion_event/index.html (renamed from files/ja/web/api/window/ondevicemotion/index.html)3
-rw-r--r--files/ja/learn/css/first_steps/styling_a_biography_page/index.html (renamed from files/ja/learn/css/first_steps/using_your_new_knowledge/index.html)3
-rw-r--r--files/ja/web/api/mediastreamtrack/ended_event/index.html (renamed from files/ja/web/api/mediastreamtrack/onended/index.html)3
-rw-r--r--files/ja/web/api/mediastreamtrack/overconstrained_event/index.html (renamed from files/ja/web/api/mediastreamtrack/onoverconstrained/index.html)3
8 files changed, 45 insertions, 33 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 2af45584f1..59f25a6bab 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -2633,6 +2633,7 @@
/ja/docs/JavaScript_技術概説 /ja/docs/Web/JavaScript/JavaScript_technologies_overview
/ja/docs/Key-navigable_custom_DHTML_widgets /ja/docs/orphaned/Key-navigable_custom_DHTML_widgets
/ja/docs/Learn/CSS/Building_blocks/セレクタ /ja/docs/Learn/CSS/Building_blocks/Selectors
+/ja/docs/Learn/CSS/First_steps/Using_your_new_knowledge /ja/docs/Learn/CSS/First_steps/Styling_a_biography_page
/ja/docs/Learn/CSS/Introduction_to_CSS /ja/docs/Learn/CSS/First_steps
/ja/docs/Learn/CSS/Introduction_to_CSS/Attribute_selectors /ja/docs/Learn/CSS/Building_blocks/Selectors/Attribute_selectors
/ja/docs/Learn/CSS/Introduction_to_CSS/Box_model /ja/docs/Learn/CSS/Building_blocks/The_box_model
@@ -3199,6 +3200,10 @@
/ja/docs/Web/API/MediaRecorder_API /ja/docs/Web/API/MediaStream_Recording_API
/ja/docs/Web/API/MediaStream/onaddtrack /ja/docs/Web/API/MediaStream/addtrack_event
/ja/docs/Web/API/MediaStreamConstraints /ja/docs/conflicting/Web/API/MediaDevices/getUserMedia
+/ja/docs/Web/API/MediaStreamTrack/onended /ja/docs/Web/API/MediaStreamTrack/ended_event
+/ja/docs/Web/API/MediaStreamTrack/onmute /ja/docs/conflicting/Web/API/MediaStreamTrack/mute_event
+/ja/docs/Web/API/MediaStreamTrack/onoverconstrained /ja/docs/Web/API/MediaStreamTrack/overconstrained_event
+/ja/docs/Web/API/MediaStreamTrack/onunmute /ja/docs/conflicting/Web/API/MediaStreamTrack/unmute_event
/ja/docs/Web/API/MouseEvent/which /ja/docs/Web/API/UIEvent/which
/ja/docs/Web/API/Navigator.getUserMedia /ja/docs/Web/API/Navigator/getUserMedia
/ja/docs/Web/API/Navigator/Online_and_offline_events /ja/docs/conflicting/Web/API/Navigator/onLine
@@ -3364,6 +3369,7 @@
/ja/docs/Web/API/Window/onblur /ja/docs/Web/API/GlobalEventHandlers/onblur
/ja/docs/Web/API/Window/onchange /ja/docs/Web/API/GlobalEventHandlers/onchange
/ja/docs/Web/API/Window/onclick /ja/docs/Web/API/GlobalEventHandlers/onclick
+/ja/docs/Web/API/Window/ondevicemotion /ja/docs/conflicting/Web/API/Window/devicemotion_event
/ja/docs/Web/API/Window/ondeviceproximity /ja/docs/orphaned/Web/API/Window/ondeviceproximity
/ja/docs/Web/API/Window/onfocus /ja/docs/Web/API/GlobalEventHandlers/onfocus
/ja/docs/Web/API/Window/ongamepadconnected /ja/docs/conflicting/Web/API/Window/gamepadconnected_event
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 7c0aa15437..3062576ebe 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -4231,7 +4231,7 @@
"snakada"
]
},
- "Learn/CSS/First_steps/Using_your_new_knowledge": {
+ "Learn/CSS/First_steps/Styling_a_biography_page": {
"modified": "2020-07-16T22:28:04.164Z",
"contributors": [
"Uemmra3",
@@ -18215,6 +18215,12 @@
"e53e04ac"
]
},
+ "Web/API/MediaStreamTrack/ended_event": {
+ "modified": "2019-03-18T21:45:14.196Z",
+ "contributors": [
+ "e53e04ac"
+ ]
+ },
"Web/API/MediaStreamTrack/id": {
"modified": "2020-10-15T22:00:11.011Z",
"contributors": [
@@ -18247,31 +18253,12 @@
"e53e04ac"
]
},
- "Web/API/MediaStreamTrack/onended": {
- "modified": "2019-03-18T21:45:14.196Z",
- "contributors": [
- "e53e04ac"
- ]
- },
- "Web/API/MediaStreamTrack/onmute": {
- "modified": "2020-10-15T22:00:10.968Z",
- "contributors": [
- "YujiSoftware",
- "e53e04ac"
- ]
- },
- "Web/API/MediaStreamTrack/onoverconstrained": {
+ "Web/API/MediaStreamTrack/overconstrained_event": {
"modified": "2019-03-18T21:45:17.038Z",
"contributors": [
"e53e04ac"
]
},
- "Web/API/MediaStreamTrack/onunmute": {
- "modified": "2019-03-18T21:45:15.060Z",
- "contributors": [
- "e53e04ac"
- ]
- },
"Web/API/MediaStreamTrack/readyState": {
"modified": "2019-03-18T21:44:58.979Z",
"contributors": [
@@ -24377,12 +24364,6 @@
"Potappo"
]
},
- "Web/API/Window/ondevicemotion": {
- "modified": "2020-10-15T22:28:07.002Z",
- "contributors": [
- "mfuji09"
- ]
- },
"Web/API/Window/open": {
"modified": "2020-10-25T23:26:28.860Z",
"contributors": [
@@ -48327,6 +48308,19 @@
"Wind1808"
]
},
+ "conflicting/Web/API/MediaStreamTrack/mute_event": {
+ "modified": "2020-10-15T22:00:10.968Z",
+ "contributors": [
+ "YujiSoftware",
+ "e53e04ac"
+ ]
+ },
+ "conflicting/Web/API/MediaStreamTrack/unmute_event": {
+ "modified": "2019-03-18T21:45:15.060Z",
+ "contributors": [
+ "e53e04ac"
+ ]
+ },
"conflicting/Web/API/Navigator/onLine": {
"modified": "2019-03-23T23:53:08.504Z",
"contributors": [
@@ -48429,6 +48423,12 @@
"YuichiNukiyama"
]
},
+ "conflicting/Web/API/Window/devicemotion_event": {
+ "modified": "2020-10-15T22:28:07.002Z",
+ "contributors": [
+ "mfuji09"
+ ]
+ },
"conflicting/Web/API/Window/gamepadconnected_event": {
"modified": "2020-10-15T22:12:53.034Z",
"contributors": [
diff --git a/files/ja/web/api/mediastreamtrack/onmute/index.html b/files/ja/conflicting/web/api/mediastreamtrack/mute_event/index.html
index 0707c39193..42f6afd740 100644
--- a/files/ja/web/api/mediastreamtrack/onmute/index.html
+++ b/files/ja/conflicting/web/api/mediastreamtrack/mute_event/index.html
@@ -1,7 +1,8 @@
---
title: MediaStreamTrack.onmute
-slug: Web/API/MediaStreamTrack/onmute
+slug: conflicting/Web/API/MediaStreamTrack/mute_event
translation_of: Web/API/MediaStreamTrack/onmute
+original_slug: Web/API/MediaStreamTrack/onmute
---
<p>{{ APIRef("Media Capture and Streams") }}</p>
diff --git a/files/ja/web/api/mediastreamtrack/onunmute/index.html b/files/ja/conflicting/web/api/mediastreamtrack/unmute_event/index.html
index 9b3e5b7d6d..9735d8bf34 100644
--- a/files/ja/web/api/mediastreamtrack/onunmute/index.html
+++ b/files/ja/conflicting/web/api/mediastreamtrack/unmute_event/index.html
@@ -1,7 +1,8 @@
---
title: MediaStreamTrack.onunmute
-slug: Web/API/MediaStreamTrack/onunmute
+slug: conflicting/Web/API/MediaStreamTrack/unmute_event
translation_of: Web/API/MediaStreamTrack/onunmute
+original_slug: Web/API/MediaStreamTrack/onunmute
---
<p>{{ APIRef("Media Capture and Streams") }}</p>
diff --git a/files/ja/web/api/window/ondevicemotion/index.html b/files/ja/conflicting/web/api/window/devicemotion_event/index.html
index aefd927e24..7c0b782d06 100644
--- a/files/ja/web/api/window/ondevicemotion/index.html
+++ b/files/ja/conflicting/web/api/window/devicemotion_event/index.html
@@ -1,6 +1,6 @@
---
title: Window.ondevicemotion
-slug: Web/API/Window/ondevicemotion
+slug: conflicting/Web/API/Window/devicemotion_event
tags:
- API
- Device Orientation
@@ -16,6 +16,7 @@ tags:
- 向き
- 端末の向き
translation_of: Web/API/Window/ondevicemotion
+original_slug: Web/API/Window/ondevicemotion
---
<div>{{APIRef("Device Orientation Events")}}</div>
diff --git a/files/ja/learn/css/first_steps/using_your_new_knowledge/index.html b/files/ja/learn/css/first_steps/styling_a_biography_page/index.html
index c1b3a1c889..b03174d271 100644
--- a/files/ja/learn/css/first_steps/using_your_new_knowledge/index.html
+++ b/files/ja/learn/css/first_steps/styling_a_biography_page/index.html
@@ -1,12 +1,13 @@
---
title: 新しい知識を使う
-slug: Learn/CSS/First_steps/Using_your_new_knowledge
+slug: Learn/CSS/First_steps/Styling_a_biography_page
tags:
- Beginner
- CSS
- Learn
- Playground
translation_of: Learn/CSS/First_steps/Using_your_new_knowledge
+original_slug: Learn/CSS/First_steps/Using_your_new_knowledge
---
<p>{{LearnSidebar}}{{PreviousMenu("Learn/CSS/First_steps/How_CSS_works", "Learn/CSS/First_steps")}}</p>
diff --git a/files/ja/web/api/mediastreamtrack/onended/index.html b/files/ja/web/api/mediastreamtrack/ended_event/index.html
index b41beb67cb..b5a1bb7a2a 100644
--- a/files/ja/web/api/mediastreamtrack/onended/index.html
+++ b/files/ja/web/api/mediastreamtrack/ended_event/index.html
@@ -1,7 +1,8 @@
---
title: MediaStreamTrack.onended
-slug: Web/API/MediaStreamTrack/onended
+slug: Web/API/MediaStreamTrack/ended_event
translation_of: Web/API/MediaStreamTrack/onended
+original_slug: Web/API/MediaStreamTrack/onended
---
<p>{{ APIRef("Media Capture and Streams") }}</p>
diff --git a/files/ja/web/api/mediastreamtrack/onoverconstrained/index.html b/files/ja/web/api/mediastreamtrack/overconstrained_event/index.html
index d6c1333cac..e141ad3ac9 100644
--- a/files/ja/web/api/mediastreamtrack/onoverconstrained/index.html
+++ b/files/ja/web/api/mediastreamtrack/overconstrained_event/index.html
@@ -1,7 +1,8 @@
---
title: MediaStreamTrack.onoverconstrained
-slug: Web/API/MediaStreamTrack/onoverconstrained
+slug: Web/API/MediaStreamTrack/overconstrained_event
translation_of: Web/API/MediaStreamTrack/onoverconstrained
+original_slug: Web/API/MediaStreamTrack/onoverconstrained
---
<p>{{ APIRef("Media Capture and Streams") }}</p>