aboutsummaryrefslogtreecommitdiff
path: root/files/zh-cn
diff options
context:
space:
mode:
Diffstat (limited to 'files/zh-cn')
-rw-r--r--files/zh-cn/_redirects.txt8
-rw-r--r--files/zh-cn/_wikihistory.json66
-rw-r--r--files/zh-cn/conflicting/web/api/beacon_api/index.html (renamed from files/zh-cn/web/api/beacon_api/using_the_beacon_api/index.html)3
-rw-r--r--files/zh-cn/orphaned/learn/server-side/express_nodejs/installing_on_pws_cloud_foundry/index.html (renamed from files/zh-cn/learn/server-side/express_nodejs/installing_on_pws_cloud_foundry/index.html)3
-rw-r--r--files/zh-cn/web/api/document/getselection/index.html (renamed from files/zh-cn/web/api/documentorshadowroot/getselection/index.html)3
-rw-r--r--files/zh-cn/web/api/document/pointerlockelement/index.html (renamed from files/zh-cn/web/api/documentorshadowroot/pointerlockelement/index.html)4
-rw-r--r--files/zh-cn/web/api/document/stylesheets/index.html (renamed from files/zh-cn/web/api/documentorshadowroot/stylesheets/index.html)3
-rw-r--r--files/zh-cn/web/css/webkit_extensions/index.html2
8 files changed, 49 insertions, 43 deletions
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 47924845a6..3908924a1b 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1452,6 +1452,7 @@
/zh-CN/docs/Web/API/AudioContext/sampleRate /zh-CN/docs/Web/API/BaseAudioContext/sampleRate
/zh-CN/docs/Web/API/AudioContext/state /zh-CN/docs/Web/API/BaseAudioContext/state
/zh-CN/docs/Web/API/AudioNode/connect(AudioParam) /zh-CN/docs/orphaned/Web/API/AudioNode/connect(AudioParam)
+/zh-CN/docs/Web/API/Beacon_API/Using_the_Beacon_API /zh-CN/docs/conflicting/Web/API/Beacon_API
/zh-CN/docs/Web/API/Blob.size /zh-CN/docs/Web/API/Blob/size
/zh-CN/docs/Web/API/Blob.slice /zh-CN/docs/Web/API/Blob/slice
/zh-CN/docs/Web/API/Blob.type /zh-CN/docs/Web/API/Blob/type
@@ -1484,17 +1485,17 @@
/zh-CN/docs/Web/API/Document/domConfig /zh-CN/docs/Web/API/Document
/zh-CN/docs/Web/API/Document/elementFromPoint /zh-CN/docs/conflicting/Web/API/DocumentOrShadowRoot/elementFromPoint
/zh-CN/docs/Web/API/Document/elementsFromPoint /zh-CN/docs/conflicting/Web/API/DocumentOrShadowRoot/elementsFromPoint
-/zh-CN/docs/Web/API/Document/getSelection /zh-CN/docs/conflicting/Web/API/DocumentOrShadowRoot/getSelection
/zh-CN/docs/Web/API/Document/inputEncoding /zh-CN/docs/conflicting/Web/API/Document/characterSet
/zh-CN/docs/Web/API/Document/mozFullScreen /zh-CN/docs/Web/API/Document/fullscreen
/zh-CN/docs/Web/API/Document/mozFullScreenElement /zh-CN/docs/Web/API/Document/fullscreenElement
/zh-CN/docs/Web/API/Document/mozFullScreenEnabled /zh-CN/docs/Web/API/Document/fullscreenEnabled
/zh-CN/docs/Web/API/Document/onreadystatechange /en-US/docs/Web/API/Document/readystatechange_event
-/zh-CN/docs/Web/API/Document/pointerLockElement /zh-CN/docs/Web/API/DocumentOrShadowRoot/pointerLockElement
/zh-CN/docs/Web/API/Document/rouchmove_event /zh-CN/docs/Web/API/Document/touchmove_event
-/zh-CN/docs/Web/API/Document/styleSheets /zh-CN/docs/conflicting/Web/API/DocumentOrShadowRoot/styleSheets
/zh-CN/docs/Web/API/DocumentOrShadowRoot/activeElement /zh-CN/docs/Web/API/Document/activeElement
/zh-CN/docs/Web/API/DocumentOrShadowRoot/fullscreenElement /zh-CN/docs/Web/API/Document/fullscreenElement
+/zh-CN/docs/Web/API/DocumentOrShadowRoot/getSelection /zh-CN/docs/Web/API/Document/getSelection
+/zh-CN/docs/Web/API/DocumentOrShadowRoot/pointerLockElement /zh-CN/docs/Web/API/Document/pointerLockElement
+/zh-CN/docs/Web/API/DocumentOrShadowRoot/styleSheets /zh-CN/docs/Web/API/Document/styleSheets
/zh-CN/docs/Web/API/Document_Object_Model/Preface /zh-CN/docs/conflicting/Web/API/Document_Object_Model
/zh-CN/docs/Web/API/Element.classList /zh-CN/docs/Web/API/Element/classList
/zh-CN/docs/Web/API/Element.className /zh-CN/docs/Web/API/Element/className
@@ -2691,6 +2692,7 @@
/zh-CN/docs/learn/Server-side/Django/主页构建 /zh-CN/docs/Learn/Server-side/Django/Home_page
/zh-CN/docs/learn/Server-side/Django/开发环境 /zh-CN/docs/Learn/Server-side/Django/development_environment
/zh-CN/docs/learn/Server-side/Django/管理站点 /zh-CN/docs/Learn/Server-side/Django/Admin_site
+/zh-CN/docs/learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry /zh-CN/docs/orphaned/learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry
/zh-CN/docs/learn/WebGL/By_example /zh-CN/docs/Web/API/WebGL_API/By_example
/zh-CN/docs/learn/WebGL/By_example/Basic_scissoring /zh-CN/docs/Web/API/WebGL_API/By_example/Basic_scissoring
/zh-CN/docs/learn/WebGL/By_example/Boilerplate_1 /zh-CN/docs/Web/API/WebGL_API/By_example/Boilerplate_1
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index b214171611..524f81d1c5 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -6704,14 +6704,6 @@
"c1er"
]
},
- "Web/API/Beacon_API/Using_the_Beacon_API": {
- "modified": "2020-04-23T03:45:20.732Z",
- "contributors": [
- "biqing",
- "April421",
- "xgqfrms"
- ]
- },
"Web/API/BeforeInstallPromptEvent": {
"modified": "2020-08-04T05:58:35.403Z",
"contributors": [
@@ -10392,18 +10384,6 @@
"1Cr18Ni9"
]
},
- "Web/API/DocumentOrShadowRoot/getSelection": {
- "modified": "2020-10-15T22:12:59.602Z",
- "contributors": [
- "WuCongMan"
- ]
- },
- "Web/API/DocumentOrShadowRoot/styleSheets": {
- "modified": "2020-10-19T22:22:59.095Z",
- "contributors": [
- "lastVigo"
- ]
- },
"Web/API/DocumentTouch": {
"modified": "2019-03-23T22:57:10.414Z",
"contributors": [
@@ -45032,13 +45012,6 @@
"edgar-chen"
]
},
- "learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry": {
- "modified": "2020-09-24T11:45:05.090Z",
- "contributors": [
- "Mdreame",
- "edgar-chen"
- ]
- },
"learn/Server-side/Express_Nodejs/Introduction": {
"modified": "2020-07-16T22:38:13.912Z",
"contributors": [
@@ -47160,12 +47133,6 @@
"ziyunfei"
]
},
- "Web/API/DocumentOrShadowRoot/pointerLockElement": {
- "modified": "2019-03-23T22:20:46.971Z",
- "contributors": [
- "876843240"
- ]
- },
"Web/API/Document/touchmove_event": {
"modified": "2019-04-30T14:14:32.752Z",
"contributors": [
@@ -50798,5 +50765,38 @@
"contributors": [
"Arktische"
]
+ },
+ "orphaned/learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry": {
+ "modified": "2020-09-24T11:45:05.090Z",
+ "contributors": [
+ "Mdreame",
+ "edgar-chen"
+ ]
+ },
+ "conflicting/Web/API/Beacon_API": {
+ "modified": "2020-04-23T03:45:20.732Z",
+ "contributors": [
+ "biqing",
+ "April421",
+ "xgqfrms"
+ ]
+ },
+ "Web/API/Document/pointerLockElement": {
+ "modified": "2019-03-23T22:20:46.971Z",
+ "contributors": [
+ "876843240"
+ ]
+ },
+ "Web/API/Document/styleSheets": {
+ "modified": "2020-10-19T22:22:59.095Z",
+ "contributors": [
+ "lastVigo"
+ ]
+ },
+ "Web/API/Document/getSelection": {
+ "modified": "2020-10-15T22:12:59.602Z",
+ "contributors": [
+ "WuCongMan"
+ ]
}
} \ No newline at end of file
diff --git a/files/zh-cn/web/api/beacon_api/using_the_beacon_api/index.html b/files/zh-cn/conflicting/web/api/beacon_api/index.html
index c65861c7cd..c208786a53 100644
--- a/files/zh-cn/web/api/beacon_api/using_the_beacon_api/index.html
+++ b/files/zh-cn/conflicting/web/api/beacon_api/index.html
@@ -1,10 +1,11 @@
---
title: 使用 Beacon API
-slug: Web/API/Beacon_API/Using_the_Beacon_API
+slug: conflicting/Web/API/Beacon_API
tags:
- Web 性能
- 指南
translation_of: Web/API/Beacon_API/Using_the_Beacon_API
+original_slug: Web/API/Beacon_API/Using_the_Beacon_API
---
<div>{{DefaultAPISidebar("Beacon")}}{{SeeCompatTable}}</div>
diff --git a/files/zh-cn/learn/server-side/express_nodejs/installing_on_pws_cloud_foundry/index.html b/files/zh-cn/orphaned/learn/server-side/express_nodejs/installing_on_pws_cloud_foundry/index.html
index e3f321e83a..125d31931d 100644
--- a/files/zh-cn/learn/server-side/express_nodejs/installing_on_pws_cloud_foundry/index.html
+++ b/files/zh-cn/orphaned/learn/server-side/express_nodejs/installing_on_pws_cloud_foundry/index.html
@@ -1,7 +1,8 @@
---
title: 在 PWS/Cloud Foundry 上,安装 LocalLibrary
-slug: learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry
+slug: orphaned/learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry
translation_of: Learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry
+original_slug: learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry
---
<div>{{LearnSidebar}}</div>
diff --git a/files/zh-cn/web/api/documentorshadowroot/getselection/index.html b/files/zh-cn/web/api/document/getselection/index.html
index 7110d24d21..f3eca58f61 100644
--- a/files/zh-cn/web/api/documentorshadowroot/getselection/index.html
+++ b/files/zh-cn/web/api/document/getselection/index.html
@@ -1,7 +1,8 @@
---
title: DocumentOrShadowRoot.getSelection()
-slug: Web/API/DocumentOrShadowRoot/getSelection
+slug: Web/API/Document/getSelection
translation_of: Web/API/DocumentOrShadowRoot/getSelection
+original_slug: Web/API/DocumentOrShadowRoot/getSelection
---
<div>{{APIRef("DOM")}}{{SeeCompatTable}}</div>
diff --git a/files/zh-cn/web/api/documentorshadowroot/pointerlockelement/index.html b/files/zh-cn/web/api/document/pointerlockelement/index.html
index 38702632bd..50f2343da8 100644
--- a/files/zh-cn/web/api/documentorshadowroot/pointerlockelement/index.html
+++ b/files/zh-cn/web/api/document/pointerlockelement/index.html
@@ -1,8 +1,8 @@
---
title: Document.pointerLockElement
-slug: Web/API/DocumentOrShadowRoot/pointerLockElement
+slug: Web/API/Document/pointerLockElement
translation_of: Web/API/DocumentOrShadowRoot/pointerLockElement
-original_slug: Web/API/Document/pointerLockElement
+original_slug: Web/API/DocumentOrShadowRoot/pointerLockElement
---
<div>{{APIRef("DOM")}}</div>
diff --git a/files/zh-cn/web/api/documentorshadowroot/stylesheets/index.html b/files/zh-cn/web/api/document/stylesheets/index.html
index 1c9425a744..f94497ceeb 100644
--- a/files/zh-cn/web/api/documentorshadowroot/stylesheets/index.html
+++ b/files/zh-cn/web/api/document/stylesheets/index.html
@@ -1,7 +1,8 @@
---
title: DocumentOrShadowRoot.styleSheets
-slug: Web/API/DocumentOrShadowRoot/styleSheets
+slug: Web/API/Document/styleSheets
translation_of: Web/API/DocumentOrShadowRoot/styleSheets
+original_slug: Web/API/DocumentOrShadowRoot/styleSheets
---
<div>{{SeeCompatTable}}{{APIRef("Shadow DOM")}}</div>
diff --git a/files/zh-cn/web/css/webkit_extensions/index.html b/files/zh-cn/web/css/webkit_extensions/index.html
index 098594766a..4c2d226c94 100644
--- a/files/zh-cn/web/css/webkit_extensions/index.html
+++ b/files/zh-cn/web/css/webkit_extensions/index.html
@@ -99,7 +99,7 @@ translation_of: Web/CSS/WebKit_Extensions
<ul style="margin-left: 0; padding-left: 0; list-style-type: none;">
<li>{{ Cssxref("-webkit-aspect-ratio") }}</li>
<li><span style="font-family: Georgia, Times, 'Times New Roman', serif; font-size: 1.6em;">B</span></li>
- <li>{{ Cssxref("-webkit-bakground-composite") }}</li>
+ <li>{{ Cssxref("-webkit-background-composite") }}</li>
<li>{{ Cssxref("-webkit-border-after") }}</li>
<li>{{ Cssxref("-webkit-border-after-color") }}</li>
<li>{{ Cssxref("-webkit-border-after-style") }}</li>