aboutsummaryrefslogtreecommitdiff
path: root/files/ru
diff options
context:
space:
mode:
Diffstat (limited to 'files/ru')
-rw-r--r--files/ru/_redirects.txt2
-rw-r--r--files/ru/_wikihistory.json24
-rw-r--r--files/ru/conflicting/web/api/window/gamepadconnected_event/index.html (renamed from files/ru/web/api/window/ongamepadconnected/index.html)3
-rw-r--r--files/ru/conflicting/web/api/window/gamepaddisconnected_event/index.html (renamed from files/ru/web/api/window/ongamepaddisconnected/index.html)3
4 files changed, 18 insertions, 14 deletions
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index e7eb0f6a6e..2f010dde80 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -379,6 +379,8 @@
/ru/docs/Web/API/WebRTC_API/связь /ru/docs/Web/API/WebRTC_API/Connectivity
/ru/docs/Web/API/Window/crypto /ru/docs/Web/API/crypto_property
/ru/docs/Web/API/Window/mozAnimationStartTime /ru/docs/Web/API/Animation/startTime
+/ru/docs/Web/API/Window/ongamepadconnected /ru/docs/conflicting/Web/API/Window/gamepadconnected_event
+/ru/docs/Web/API/Window/ongamepaddisconnected /ru/docs/conflicting/Web/API/Window/gamepaddisconnected_event
/ru/docs/Web/API/Window/performance /ru/docs/Web/API/performance_property
/ru/docs/Web/API/WindowBase64/Base64_encoding_and_decoding /ru/docs/Glossary/Base64
/ru/docs/Web/API/WindowBase64/btoa /ru/docs/Web/API/btoa
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index fd690347f2..a46230ec2c 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -11321,18 +11321,6 @@
"timur-gilauri"
]
},
- "Web/API/Window/ongamepadconnected": {
- "modified": "2020-11-17T12:43:15.635Z",
- "contributors": [
- "venanen"
- ]
- },
- "Web/API/Window/ongamepaddisconnected": {
- "modified": "2020-11-17T12:45:18.585Z",
- "contributors": [
- "venanen"
- ]
- },
"Web/API/Window/onpaint": {
"modified": "2019-03-23T22:08:47.903Z",
"contributors": [
@@ -24241,6 +24229,18 @@
"akhabibullina"
]
},
+ "conflicting/Web/API/Window/gamepadconnected_event": {
+ "modified": "2020-11-17T12:43:15.635Z",
+ "contributors": [
+ "venanen"
+ ]
+ },
+ "conflicting/Web/API/Window/gamepaddisconnected_event": {
+ "modified": "2020-11-17T12:45:18.585Z",
+ "contributors": [
+ "venanen"
+ ]
+ },
"conflicting/Web/API/Window/localStorage": {
"modified": "2019-03-23T22:05:00.067Z",
"contributors": [
diff --git a/files/ru/web/api/window/ongamepadconnected/index.html b/files/ru/conflicting/web/api/window/gamepadconnected_event/index.html
index 758fed2d2d..f6ff1a3474 100644
--- a/files/ru/web/api/window/ongamepadconnected/index.html
+++ b/files/ru/conflicting/web/api/window/gamepadconnected_event/index.html
@@ -1,7 +1,8 @@
---
title: Window.ongamepadconnected
-slug: Web/API/Window/ongamepadconnected
+slug: conflicting/Web/API/Window/gamepadconnected_event
translation_of: Web/API/Window/ongamepadconnected
+original_slug: Web/API/Window/ongamepadconnected
---
<div>{{DefaultAPISidebar("Gamepad API")}}{{SeeCompatTable}}</div>
diff --git a/files/ru/web/api/window/ongamepaddisconnected/index.html b/files/ru/conflicting/web/api/window/gamepaddisconnected_event/index.html
index 26390e5430..411e9eea24 100644
--- a/files/ru/web/api/window/ongamepaddisconnected/index.html
+++ b/files/ru/conflicting/web/api/window/gamepaddisconnected_event/index.html
@@ -1,7 +1,8 @@
---
title: Window.ongamepaddisconnected
-slug: Web/API/Window/ongamepaddisconnected
+slug: conflicting/Web/API/Window/gamepaddisconnected_event
translation_of: Web/API/Window/ongamepaddisconnected
+original_slug: Web/API/Window/ongamepaddisconnected
---
<div>{{DefaultAPISidebar("Gamepad API")}}{{SeeCompatTable}}</div>