diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt index 3d7f7e146b5eac..a5d67c5d0a01ce 100644 --- a/files/ru/_redirects.txt +++ b/files/ru/_redirects.txt @@ -682,11 +682,14 @@ /ru/docs/Web/HTML/Общие_атрибуты/style /ru/docs/Web/HTML/Global_attributes/style /ru/docs/Web/HTML/Общие_атрибуты/tabindex /ru/docs/Web/HTML/Global_attributes/tabindex /ru/docs/Web/HTML/Ссылки /ru/docs/Web/HTML/Reference +/ru/docs/Web/HTTP/Basics_of_HTTP /ru/docs/conflicting/Web/HTTP /ru/docs/Web/HTTP/Basics_of_HTTP/Data_URIs /ru/docs/Web/URI/Schemes/data /ru/docs/Web/HTTP/Basics_of_HTTP/Data_URLs /ru/docs/Web/URI/Schemes/data /ru/docs/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web /ru/docs/orphaned/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web /ru/docs/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web_RU /ru/docs/orphaned/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web -/ru/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Полный_список_типов_MIME /ru/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types +/ru/docs/Web/HTTP/Basics_of_HTTP/MIME_types /ru/docs/Web/HTTP/MIME_types +/ru/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types /ru/docs/Web/HTTP/MIME_types/Common_types +/ru/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Полный_список_типов_MIME /ru/docs/Web/HTTP/MIME_types/Common_types /ru/docs/Web/HTTP/Feature_Policy /ru/docs/Web/HTTP/Permissions_Policy /ru/docs/Web/HTTP/Response_codes /ru/docs/Web/HTTP/Status /ru/docs/Web/HTTP/Авторизация /ru/docs/Web/HTTP/Authentication diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json index 8e11f1df59e2f7..701eb2b01ca0ca 100644 --- a/files/ru/_wikihistory.json +++ b/files/ru/_wikihistory.json @@ -10549,31 +10549,6 @@ "deniskoronets" ] }, - "Web/HTTP/Basics_of_HTTP": { - "modified": "2020-07-14T17:05:38.093Z", - "contributors": ["vladimir.i.kuropatka", "enonotugh", "cissoid"] - }, - "Web/HTTP/Basics_of_HTTP/MIME_types": { - "modified": "2019-10-21T06:21:06.123Z", - "contributors": [ - "ismorozs", - "dartraiden", - "wcoder", - "vfr5cv", - "dawsonbotsford" - ] - }, - "Web/HTTP/Basics_of_HTTP/MIME_types/Common_types": { - "modified": "2020-02-28T13:11:18.234Z", - "contributors": [ - "chrisdavidmills", - "SphinxKnight", - "nickvoronin", - "MineDen", - "vladkras", - "david.orbelian" - ] - }, "Web/HTTP/CORS": { "modified": "2020-10-21T11:45:01.641Z", "contributors": [ @@ -10850,6 +10825,27 @@ "modified": "2020-10-15T22:01:31.139Z", "contributors": ["n00b"] }, + "Web/HTTP/MIME_types": { + "modified": "2019-10-21T06:21:06.123Z", + "contributors": [ + "ismorozs", + "dartraiden", + "wcoder", + "vfr5cv", + "dawsonbotsford" + ] + }, + "Web/HTTP/MIME_types/Common_types": { + "modified": "2020-02-28T13:11:18.234Z", + "contributors": [ + "chrisdavidmills", + "SphinxKnight", + "nickvoronin", + "MineDen", + "vladkras", + "david.orbelian" + ] + }, "Web/HTTP/Messages": { "modified": "2020-05-02T15:29:40.125Z", "contributors": ["Excent163", "Sarox", "registoo", "mariag"] @@ -15942,6 +15938,10 @@ "modified": "2019-06-12T07:08:20.267Z", "contributors": ["deadblackclover", "vkorniiko"] }, + "conflicting/Web/HTTP": { + "modified": "2020-07-14T17:05:38.093Z", + "contributors": ["vladimir.i.kuropatka", "enonotugh", "cissoid"] + }, "orphaned/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web": { "modified": "2020-01-09T21:04:16.499Z", "contributors": ["rshmelev"] diff --git a/files/ru/web/http/basics_of_http/index.md b/files/ru/conflicting/web/http/index.md similarity index 98% rename from files/ru/web/http/basics_of_http/index.md rename to files/ru/conflicting/web/http/index.md index 26fb583f654e84..cf64c61c5038f5 100644 --- a/files/ru/web/http/basics_of_http/index.md +++ b/files/ru/conflicting/web/http/index.md @@ -1,6 +1,7 @@ --- title: Basics of HTTP -slug: Web/HTTP/Basics_of_HTTP +slug: conflicting/Web/HTTP +original_slug: Web/HTTP/Basics_of_HTTP --- {{HTTPSidebar}} diff --git a/files/ru/web/http/basics_of_http/mime_types/common_types/index.md b/files/ru/web/http/mime_types/common_types/index.md similarity index 99% rename from files/ru/web/http/basics_of_http/mime_types/common_types/index.md rename to files/ru/web/http/mime_types/common_types/index.md index 5d19b8f4c4c671..7b2591a39726f9 100644 --- a/files/ru/web/http/basics_of_http/mime_types/common_types/index.md +++ b/files/ru/web/http/mime_types/common_types/index.md @@ -1,6 +1,6 @@ --- title: Неполный список типов MIME -slug: Web/HTTP/Basics_of_HTTP/MIME_types/Common_types +slug: Web/HTTP/MIME_types/Common_types --- {{HTTPSidebar}}Здесь представлен исчерпывающий список типов MIME, соотнесённых с типами документов и отсортированных по расширению.Два ключевых типа MIME, использующихся в качестве типов по умолчанию: diff --git a/files/ru/web/http/basics_of_http/mime_types/index.md b/files/ru/web/http/mime_types/index.md similarity index 99% rename from files/ru/web/http/basics_of_http/mime_types/index.md rename to files/ru/web/http/mime_types/index.md index 6921d156c682f9..1e0f22d235748d 100644 --- a/files/ru/web/http/basics_of_http/mime_types/index.md +++ b/files/ru/web/http/mime_types/index.md @@ -1,6 +1,6 @@ --- title: MIME types -slug: Web/HTTP/Basics_of_HTTP/MIME_types +slug: Web/HTTP/MIME_types --- {{HTTPSidebar}}