aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--files/ja/_redirects.txt1
-rw-r--r--files/ja/_wikihistory.json12
-rw-r--r--files/ja/conflicting/web/api/caches/index.html (renamed from files/ja/web/api/serviceworkerglobalscope/caches/index.html)3
-rw-r--r--files/ko/_redirects.txt1
-rw-r--r--files/ko/_wikihistory.json12
-rw-r--r--files/ko/conflicting/web/api/imagecapture/getphotocapabilities/index.html (renamed from files/ko/web/api/photocapabilities/index.html)3
-rw-r--r--files/zh-cn/_redirects.txt1
-rw-r--r--files/zh-cn/_wikihistory.json12
-rw-r--r--files/zh-cn/conflicting/web/api/caches/index.html (renamed from files/zh-cn/web/api/serviceworkerglobalscope/caches/index.html)3
9 files changed, 27 insertions, 21 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 1214001898..d969d0f561 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3248,6 +3248,7 @@
/ja/docs/Web/API/SVGTests /ja/docs/orphaned/Web/API/SVGTests
/ja/docs/Web/API/SVGTransformable /ja/docs/orphaned/Web/API/SVGTransformable
/ja/docs/Web/API/ScrollToOptions /ja/docs/conflicting/Web/API/Window/scroll
+/ja/docs/Web/API/ServiceWorkerGlobalScope/caches /ja/docs/conflicting/Web/API/caches
/ja/docs/Web/API/ServiceWorker_API /ja/docs/Web/API/Service_Worker_API
/ja/docs/Web/API/ServiceWorker_API/Using_Service_Workers /ja/docs/Web/API/Service_Worker_API/Using_Service_Workers
/ja/docs/Web/API/Slotable /ja/docs/Web/API/Element
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 98095b7958..022720a210 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -21470,12 +21470,6 @@
"Wind1808"
]
},
- "Web/API/ServiceWorkerGlobalScope/caches": {
- "modified": "2020-10-15T22:29:46.631Z",
- "contributors": [
- "Wind1808"
- ]
- },
"Web/API/ServiceWorkerGlobalScope/clients": {
"modified": "2019-03-23T22:21:03.744Z",
"contributors": [
@@ -48605,6 +48599,12 @@
"Wind1808"
]
},
+ "conflicting/Web/API/caches": {
+ "modified": "2020-10-15T22:29:46.631Z",
+ "contributors": [
+ "Wind1808"
+ ]
+ },
"conflicting/Web/CSS/Media_Queries/Using_media_queries": {
"modified": "2020-05-24T03:45:53.652Z",
"contributors": [
diff --git a/files/ja/web/api/serviceworkerglobalscope/caches/index.html b/files/ja/conflicting/web/api/caches/index.html
index 5d670ef2ec..4379e332cf 100644
--- a/files/ja/web/api/serviceworkerglobalscope/caches/index.html
+++ b/files/ja/conflicting/web/api/caches/index.html
@@ -1,6 +1,6 @@
---
title: ServiceWorkerGlobalScope.caches
-slug: Web/API/ServiceWorkerGlobalScope/caches
+slug: conflicting/Web/API/caches
tags:
- API
- Property
@@ -9,6 +9,7 @@ tags:
- ServiceWorker
- ServiceWorkerGlobalScope
translation_of: Web/API/ServiceWorkerGlobalScope/caches
+original_slug: Web/API/ServiceWorkerGlobalScope/caches
---
<p>{{APIRef("Service Workers API")}}</p>
diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt
index bd94f8f66a..0f1eac0004 100644
--- a/files/ko/_redirects.txt
+++ b/files/ko/_redirects.txt
@@ -472,6 +472,7 @@
/ko/docs/Web/API/Node/innerText /ko/docs/Web/API/HTMLElement/innerText
/ko/docs/Web/API/Notification.permission /ko/docs/Web/API/Notification/permission
/ko/docs/Web/API/ParentNode/childElementCount /ko/docs/Web/API/Element/childElementCount
+/ko/docs/Web/API/PhotoCapabilities /ko/docs/conflicting/Web/API/ImageCapture/getPhotoCapabilities
/ko/docs/Web/API/Position /ko/docs/Web/API/GeolocationPosition
/ko/docs/Web/API/PositionOptions /ko/docs/conflicting/Web/API/Geolocation/getCurrentPosition
/ko/docs/Web/API/RTCConfiguration /ko/docs/conflicting/Web/API/RTCPeerConnection/RTCPeerConnection
diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json
index 965b2534dc..28ff70b524 100644
--- a/files/ko/_wikihistory.json
+++ b/files/ko/_wikihistory.json
@@ -6073,12 +6073,6 @@
"ESnark"
]
},
- "Web/API/PhotoCapabilities": {
- "modified": "2020-10-15T22:27:09.730Z",
- "contributors": [
- "alattalatta"
- ]
- },
"Web/API/Plugin": {
"modified": "2019-03-23T22:11:26.376Z",
"contributors": [
@@ -17522,6 +17516,12 @@
"Saem"
]
},
+ "conflicting/Web/API/ImageCapture/getPhotoCapabilities": {
+ "modified": "2020-10-15T22:27:09.730Z",
+ "contributors": [
+ "alattalatta"
+ ]
+ },
"conflicting/Web/API/RTCPeerConnection/RTCPeerConnection": {
"modified": "2020-10-15T22:21:34.262Z",
"contributors": [
diff --git a/files/ko/web/api/photocapabilities/index.html b/files/ko/conflicting/web/api/imagecapture/getphotocapabilities/index.html
index 5cf3842b87..5115b82f65 100644
--- a/files/ko/web/api/photocapabilities/index.html
+++ b/files/ko/conflicting/web/api/imagecapture/getphotocapabilities/index.html
@@ -1,6 +1,6 @@
---
title: PhotoCapabilities
-slug: Web/API/PhotoCapabilities
+slug: conflicting/Web/API/ImageCapture/getPhotoCapabilities
tags:
- API
- Experimental
@@ -9,6 +9,7 @@ tags:
- PhotoCapabilities
- Reference
translation_of: Web/API/PhotoCapabilities
+original_slug: Web/API/PhotoCapabilities
---
<div>{{APIRef("MediaStream Image")}}</div>
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index bd9da62df6..8c20e77a7b 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1477,6 +1477,7 @@
/zh-CN/docs/Web/API/Selection.isCollapsed /zh-CN/docs/Web/API/Selection/isCollapsed
/zh-CN/docs/Web/API/Selection.removeRange /zh-CN/docs/Web/API/Selection/removeRange
/zh-CN/docs/Web/API/Selection/从Document中删除 /zh-CN/docs/Web/API/Selection/deleteFromDocument
+/zh-CN/docs/Web/API/ServiceWorkerGlobalScope/caches /zh-CN/docs/conflicting/Web/API/caches
/zh-CN/docs/Web/API/StorageEstimate /zh-CN/docs/conflicting/Web/API/StorageManager/estimate
/zh-CN/docs/Web/API/Streams_API/使用可读文件流 /zh-CN/docs/Web/API/Streams_API/Using_readable_streams
/zh-CN/docs/Web/API/Streams_API/概念 /zh-CN/docs/Web/API/Streams_API/Concepts
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 5aa50df6f9..d92c883026 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -19903,12 +19903,6 @@
"TimLuo465"
]
},
- "Web/API/ServiceWorkerGlobalScope/caches": {
- "modified": "2020-10-28T03:25:10.149Z",
- "contributors": [
- "peter006qi"
- ]
- },
"Web/API/ServiceWorkerRegistration": {
"modified": "2019-03-23T22:12:58.327Z",
"contributors": [
@@ -47333,6 +47327,12 @@
"AlexChao"
]
},
+ "conflicting/Web/API/caches": {
+ "modified": "2020-10-28T03:25:10.149Z",
+ "contributors": [
+ "peter006qi"
+ ]
+ },
"conflicting/Web/API_dd04ca1265cb79b990b8120e5f5070d3": {
"modified": "2019-03-18T20:42:39.198Z",
"contributors": [
diff --git a/files/zh-cn/web/api/serviceworkerglobalscope/caches/index.html b/files/zh-cn/conflicting/web/api/caches/index.html
index bead85ce7c..0da1e450bc 100644
--- a/files/zh-cn/web/api/serviceworkerglobalscope/caches/index.html
+++ b/files/zh-cn/conflicting/web/api/caches/index.html
@@ -1,7 +1,8 @@
---
title: ServiceWorkerGlobalScope.caches
-slug: Web/API/ServiceWorkerGlobalScope/caches
+slug: conflicting/Web/API/caches
translation_of: Web/API/ServiceWorkerGlobalScope/caches
+original_slug: Web/API/ServiceWorkerGlobalScope/caches
---
<p>{{APIRef("Service Workers API")}}</p>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 06:59:04 +0000