diff options
-rw-r--r-- | files/ja/_redirects.txt | 1 | ||||
-rw-r--r-- | files/ja/_wikihistory.json | 12 | ||||
-rw-r--r-- | files/ja/conflicting/web/api/mediadevices/getusermedia/index.html (renamed from files/ja/web/api/mediastreamconstraints/index.html) | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt index 7cb0209911..6ff573ec10 100644 --- a/files/ja/_redirects.txt +++ b/files/ja/_redirects.txt @@ -3164,6 +3164,7 @@ /ja/docs/Web/API/IndexedDB_API/Basic_Concepts_Behind_IndexedDB /ja/docs/Web/API/IndexedDB_API/Basic_Terminology /ja/docs/Web/API/MediaCapabilitiesInfo /ja/docs/Web/API/MediaCapabilities/encodingInfo /ja/docs/Web/API/MediaRecorder_API /ja/docs/Web/API/MediaStream_Recording_API +/ja/docs/Web/API/MediaStreamConstraints /ja/docs/conflicting/Web/API/MediaDevices/getUserMedia /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/NavigatorID /ja/docs/Web/API/Navigator diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json index 3b3ca3532e..a93a32b39c 100644 --- a/files/ja/_wikihistory.json +++ b/files/ja/_wikihistory.json @@ -18340,12 +18340,6 @@ "e53e04ac" ] }, - "Web/API/MediaStreamConstraints": { - "modified": "2019-03-18T21:40:37.855Z", - "contributors": [ - "e53e04ac" - ] - }, "Web/API/MediaStreamTrack": { "modified": "2020-10-15T21:58:36.727Z", "contributors": [ @@ -48553,6 +48547,12 @@ "unarist" ] }, + "conflicting/Web/API/MediaDevices/getUserMedia": { + "modified": "2019-03-18T21:40:37.855Z", + "contributors": [ + "e53e04ac" + ] + }, "conflicting/Web/API/StorageManager/estimate": { "modified": "2020-10-15T22:20:05.823Z", "contributors": [ diff --git a/files/ja/web/api/mediastreamconstraints/index.html b/files/ja/conflicting/web/api/mediadevices/getusermedia/index.html index 7b57cf20ed..5e476b54b2 100644 --- a/files/ja/web/api/mediastreamconstraints/index.html +++ b/files/ja/conflicting/web/api/mediadevices/getusermedia/index.html @@ -1,7 +1,8 @@ --- title: MediaStreamConstraints -slug: Web/API/MediaStreamConstraints +slug: conflicting/Web/API/MediaDevices/getUserMedia translation_of: Web/API/MediaStreamConstraints +original_slug: Web/API/MediaStreamConstraints --- <div>{{APIRef("Media Capture and Streams")}}</div> |