aboutsummaryrefslogtreecommitdiff
path: root/files/ru
diff options
context:
space:
mode:
Diffstat (limited to 'files/ru')
-rw-r--r--files/ru/_redirects.txt1
-rw-r--r--files/ru/_wikihistory.json12
-rw-r--r--files/ru/conflicting/web/api/file/name/index.html (renamed from files/ru/web/api/file/filename/index.html)3
3 files changed, 9 insertions, 7 deletions
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index e9d4e75587..b61407949d 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -323,6 +323,7 @@
/ru/docs/Web/API/Element.insertAdjacentHTML /ru/docs/Web/API/Element/insertAdjacentHTML
/ru/docs/Web/API/Element/accessKey /ru/docs/Web/API/HTMLElement/accessKey
/ru/docs/Web/API/EventTarget.addEventListener /ru/docs/Web/API/EventTarget/addEventListener
+/ru/docs/Web/API/File/fileName /ru/docs/conflicting/Web/API/File/name
/ru/docs/Web/API/File_and_Directory_Entries_API/Введение /ru/docs/Web/API/File_and_Directory_Entries_API/Introduction
/ru/docs/Web/API/Geolocation/Using_geolocation /ru/docs/Web/API/Geolocation_API
/ru/docs/Web/API/Geolocation/Using_geolocation/Using_the_Geolocation_API /ru/docs/Web/API/Geolocation_API/Using_the_Geolocation_API
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index 388b670bc8..d77429f430 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -7980,12 +7980,6 @@
"Lambrusco.pro"
]
},
- "Web/API/File/fileName": {
- "modified": "2019-03-23T22:09:17.877Z",
- "contributors": [
- "Ferguse"
- ]
- },
"Web/API/File/getAsDataURL": {
"modified": "2019-03-23T22:18:17.148Z",
"contributors": [
@@ -24190,6 +24184,12 @@
"paulvoloschuk"
]
},
+ "conflicting/Web/API/File/name": {
+ "modified": "2019-03-23T22:09:17.877Z",
+ "contributors": [
+ "Ferguse"
+ ]
+ },
"conflicting/Web/API/Geolocation": {
"modified": "2019-03-23T22:43:32.725Z",
"contributors": [
diff --git a/files/ru/web/api/file/filename/index.html b/files/ru/conflicting/web/api/file/name/index.html
index 6b236d1cf1..957bf8e41e 100644
--- a/files/ru/web/api/file/filename/index.html
+++ b/files/ru/conflicting/web/api/file/name/index.html
@@ -1,7 +1,8 @@
---
title: File.fileName
-slug: Web/API/File/fileName
+slug: conflicting/Web/API/File/name
translation_of: Web/API/File/fileName
+original_slug: Web/API/File/fileName
---
<p>{{APIRef("File API")}}{{non-standard_header}}</p>