diff options
Diffstat (limited to 'files/ru/conflicting')
92 files changed, 197 insertions, 98 deletions
diff --git a/files/ru/conflicting/glossary/chrome/index.html b/files/ru/conflicting/glossary/chrome/index.html index e9f42b17a8..eedafb7f55 100644 --- a/files/ru/conflicting/glossary/chrome/index.html +++ b/files/ru/conflicting/glossary/chrome/index.html @@ -1,10 +1,11 @@ --- title: Chrome -slug: Chrome +slug: conflicting/Glossary/Chrome tags: - Toolkit API translation_of: Glossary/Chrome translation_of_original: Chrome +original_slug: Chrome --- <p><b>Chrome</b> применительно к Mozilla имеет несколько разных значений.</p> <h3 id="Браузерный_chrome_Chrome">Браузерный chrome / Chrome</h3> diff --git a/files/ru/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html b/files/ru/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html index a192eb1d28..346f30c01e 100644 --- a/files/ru/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html +++ b/files/ru/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html @@ -1,16 +1,17 @@ --- title: Каскадность и наследование -slug: Web/Guide/CSS/Getting_started/Cascading_and_inheritance +slug: conflicting/Learn/CSS/Building_blocks/Cascade_and_inheritance tags: - Beginner - CSS - - 'CSS:Getting_Started' + - CSS:Getting_Started - Guide - Web - Веб - Новичку translation_of: Learn/CSS/Building_blocks/Cascade_and_inheritance translation_of_original: Web/Guide/CSS/Getting_started/Cascading_and_inheritance +original_slug: Web/Guide/CSS/Getting_started/Cascading_and_inheritance --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/css/building_blocks/selectors/index.html b/files/ru/conflicting/learn/css/building_blocks/selectors/index.html index a6d9e5d116..f883db7b62 100644 --- a/files/ru/conflicting/learn/css/building_blocks/selectors/index.html +++ b/files/ru/conflicting/learn/css/building_blocks/selectors/index.html @@ -1,8 +1,9 @@ --- title: 'CSS properties: what they are and how to use them' -slug: Learn/CSS/CSS_properties +slug: conflicting/Learn/CSS/Building_blocks/Selectors translation_of: Learn/CSS/Building_blocks/Selectors translation_of_original: Learn/CSS/CSS_properties +original_slug: Learn/CSS/CSS_properties --- <div class="summary"> <p>{{Glossary("CSS")}} определяет как должна выглядеть вебстраница. Он использует предопределенные правила вместе с селекторами и свойствами для применения стилей к элементам HTML или группам элементов.</p> diff --git a/files/ru/conflicting/learn/css/building_blocks/selectors_918fb6c37a4d06789bc062c48d591992/index.html b/files/ru/conflicting/learn/css/building_blocks/selectors_918fb6c37a4d06789bc062c48d591992/index.html index 797aefefa3..f66eb23b48 100644 --- a/files/ru/conflicting/learn/css/building_blocks/selectors_918fb6c37a4d06789bc062c48d591992/index.html +++ b/files/ru/conflicting/learn/css/building_blocks/selectors_918fb6c37a4d06789bc062c48d591992/index.html @@ -1,8 +1,10 @@ --- title: Selectors -slug: Web/Guide/CSS/Getting_started/Selectors +slug: >- + conflicting/Learn/CSS/Building_blocks/Selectors_918fb6c37a4d06789bc062c48d591992 translation_of: Learn/CSS/Building_blocks/Selectors translation_of_original: Web/Guide/CSS/Getting_started/Selectors +original_slug: Web/Guide/CSS/Getting_started/Selectors --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/css/building_blocks/styling_tables/index.html b/files/ru/conflicting/learn/css/building_blocks/styling_tables/index.html index 82b7edae60..738d092cbe 100644 --- a/files/ru/conflicting/learn/css/building_blocks/styling_tables/index.html +++ b/files/ru/conflicting/learn/css/building_blocks/styling_tables/index.html @@ -1,12 +1,13 @@ --- title: Таблицы -slug: Web/Guide/CSS/Getting_started/Таблицы +slug: conflicting/Learn/CSS/Building_blocks/Styling_tables tags: - CSS - Веб - Руководство translation_of: Learn/CSS/Building_blocks/Styling_tables translation_of_original: Web/Guide/CSS/Getting_started/Tables +original_slug: Web/Guide/CSS/Getting_started/Таблицы --- <p>{{CSSTutorialTOC}}{{previousPage("/ru/docs/Web/Guide/CSS/Getting_Started/Layout", "Layout")}}</p> diff --git a/files/ru/conflicting/learn/css/building_blocks/values_and_units/index.html b/files/ru/conflicting/learn/css/building_blocks/values_and_units/index.html index 911a8010b6..504ee90832 100644 --- a/files/ru/conflicting/learn/css/building_blocks/values_and_units/index.html +++ b/files/ru/conflicting/learn/css/building_blocks/values_and_units/index.html @@ -1,8 +1,9 @@ --- title: Color -slug: Web/Guide/CSS/Getting_started/Color +slug: conflicting/Learn/CSS/Building_blocks/Values_and_units translation_of: Learn/CSS/Introduction_to_CSS/Values_and_units#Colors translation_of_original: Web/Guide/CSS/Getting_started/Color +original_slug: Web/Guide/CSS/Getting_started/Color --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/css/first_steps/how_css_is_structured/index.html b/files/ru/conflicting/learn/css/first_steps/how_css_is_structured/index.html index 9e9a4231a9..5f825e836d 100644 --- a/files/ru/conflicting/learn/css/first_steps/how_css_is_structured/index.html +++ b/files/ru/conflicting/learn/css/first_steps/how_css_is_structured/index.html @@ -1,8 +1,9 @@ --- title: Чистый СSS код -slug: Web/Guide/CSS/Getting_started/Readable_CSS +slug: conflicting/Learn/CSS/First_steps/How_CSS_is_structured translation_of: Learn/CSS/Introduction_to_CSS/Syntax#Beyond_syntax_make_CSS_readable translation_of_original: Web/Guide/CSS/Getting_started/Readable_CSS +original_slug: Web/Guide/CSS/Getting_started/Readable_CSS --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/css/first_steps/how_css_works/index.html b/files/ru/conflicting/learn/css/first_steps/how_css_works/index.html index 9edeb9fe1f..8e7fae4eb2 100644 --- a/files/ru/conflicting/learn/css/first_steps/how_css_works/index.html +++ b/files/ru/conflicting/learn/css/first_steps/how_css_works/index.html @@ -1,8 +1,9 @@ --- title: Как работает CSS -slug: Web/Guide/CSS/Getting_started/How_CSS_works +slug: conflicting/Learn/CSS/First_steps/How_CSS_works translation_of: Learn/CSS/First_steps/How_CSS_works translation_of_original: Web/Guide/CSS/Getting_started/How_CSS_works +original_slug: Web/Guide/CSS/Getting_started/How_CSS_works --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html b/files/ru/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html index 3041d28920..05b7c9e54c 100644 --- a/files/ru/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html +++ b/files/ru/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html @@ -1,10 +1,11 @@ --- title: Зачем нужен CSS? -slug: Web/Guide/CSS/Getting_started/Why_use_CSS +slug: >- + conflicting/Learn/CSS/First_steps/How_CSS_works_64ba4331a7a5f4319c6e06b06ccdd521 tags: - Beginner - CSS - - 'CSS:Getting_Started' + - CSS:Getting_Started - Example - Guide - Web @@ -13,6 +14,7 @@ tags: - Руководство translation_of: Learn/CSS/First_steps/How_CSS_works translation_of_original: Web/Guide/CSS/Getting_started/Why_use_CSS +original_slug: Web/Guide/CSS/Getting_started/Why_use_CSS --- <p><span style="line-height: 1.5;">{{ CSSTutorialTOC() }}</span></p> diff --git a/files/ru/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html b/files/ru/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html index 95df2fe915..b97a4ef068 100644 --- a/files/ru/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html +++ b/files/ru/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html @@ -1,16 +1,18 @@ --- title: Что такое CSS? -slug: Web/Guide/CSS/Getting_started/What_is_CSS +slug: >- + conflicting/Learn/CSS/First_steps/How_CSS_works_b66915031fb62b5fee1201086144e209 tags: - Beginner - CSS - - 'CSS:Getting_Started' + - CSS:Getting_Started - Example - Guide - Веб - Новичку translation_of: Learn/CSS/First_steps/How_CSS_works translation_of_original: Web/Guide/CSS/Getting_started/What_is_CSS +original_slug: Web/Guide/CSS/Getting_started/What_is_CSS --- <div>{{ CSSTutorialTOC() }}</div> diff --git a/files/ru/conflicting/learn/css/first_steps/index.html b/files/ru/conflicting/learn/css/first_steps/index.html index b2f6ebed77..e7f3f73dce 100644 --- a/files/ru/conflicting/learn/css/first_steps/index.html +++ b/files/ru/conflicting/learn/css/first_steps/index.html @@ -1,10 +1,10 @@ --- title: CSS для начинающих -slug: Web/Guide/CSS/Getting_started +slug: conflicting/Learn/CSS/First_steps tags: - Beginner - CSS - - 'CSS:Getting_Started' + - CSS:Getting_Started - Guide - Needs - NeedsBeginnerUpdate @@ -16,6 +16,7 @@ tags: - Руководство translation_of: Learn/CSS/First_steps translation_of_original: Web/Guide/CSS/Getting_started +original_slug: Web/Guide/CSS/Getting_started --- <p><span class="seoSummary">Это руководство (самоучитель) познакомит вас с базовыми возможностями и языком (синтаксом) <a href="/ru/docs/Web/Guide/CSS" title="/ru/docs/Web/Guide/CSS"><strong>Каскадных таблиц стилей</strong></a> (CSS). CSS используется для изменения внешнего вида структурированного документа, такого как веб-страница. Руководство также включает простые упражнения, которые вы сможете выполнить на своем компьютере и увидеть, как работает CSS, а также его возможности в современных браузерах. </span></p> diff --git a/files/ru/conflicting/learn/css/index.html b/files/ru/conflicting/learn/css/index.html index 7529234ef5..2a639c4b61 100644 --- a/files/ru/conflicting/learn/css/index.html +++ b/files/ru/conflicting/learn/css/index.html @@ -1,6 +1,6 @@ --- title: Руководство разработчика CSS -slug: Web/Guide/CSS +slug: conflicting/Learn/CSS tags: - CSS - Landing @@ -8,5 +8,6 @@ tags: - TopicStub translation_of: Learn/CSS translation_of_original: Web/Guide/CSS +original_slug: Web/Guide/CSS --- prepare for redirect diff --git a/files/ru/conflicting/learn/css/styling_text/fundamentals/index.html b/files/ru/conflicting/learn/css/styling_text/fundamentals/index.html index a25565cf79..f61ad3b65e 100644 --- a/files/ru/conflicting/learn/css/styling_text/fundamentals/index.html +++ b/files/ru/conflicting/learn/css/styling_text/fundamentals/index.html @@ -1,8 +1,9 @@ --- title: Text styles -slug: Web/Guide/CSS/Getting_started/Text_styles +slug: conflicting/Learn/CSS/Styling_text/Fundamentals translation_of: Learn/CSS/Styling_text/Fundamentals translation_of_original: Web/Guide/CSS/Getting_started/Text_styles +original_slug: Web/Guide/CSS/Getting_started/Text_styles --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/javascript/objects/index.html b/files/ru/conflicting/learn/javascript/objects/index.html index d07cf043cc..1fe76e2806 100644 --- a/files/ru/conflicting/learn/javascript/objects/index.html +++ b/files/ru/conflicting/learn/javascript/objects/index.html @@ -1,8 +1,9 @@ --- title: Вступление в Объектно-ориентированный JavaScript -slug: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript +slug: conflicting/Learn/JavaScript/Objects translation_of: Learn/JavaScript/Objects translation_of_original: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript +original_slug: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript --- <p>Объектно-ориентированный до основания, JavaScript предоставляет мощные и гибкие {{Glossary("OOP")}} возможности. Эта статья начинается с введения в объектно-ориентированное программирование, затем рассматривает модель объекта JavaScript и, наконец, демонстрирует концепции объектно-ориентированного программирования в JavaScript.</p> diff --git a/files/ru/conflicting/mdn/contribute/index.html b/files/ru/conflicting/mdn/contribute/index.html index a8227dafed..d5989bfd3c 100644 --- a/files/ru/conflicting/mdn/contribute/index.html +++ b/files/ru/conflicting/mdn/contribute/index.html @@ -1,11 +1,12 @@ --- title: Участие в MDN -slug: MDN_at_ten/Contributing_to_MDN +slug: conflicting/MDN/Contribute tags: - MDN Мета - Mozilla - Участие translation_of: MDN_at_ten/Contributing_to_MDN +original_slug: MDN_at_ten/Contributing_to_MDN --- <div class="column-container"> <div class="column-8"> diff --git a/files/ru/conflicting/mdn/tools/index.html b/files/ru/conflicting/mdn/tools/index.html index 88a0659232..ba40675886 100644 --- a/files/ru/conflicting/mdn/tools/index.html +++ b/files/ru/conflicting/mdn/tools/index.html @@ -1,12 +1,13 @@ --- title: Руководство пользователя MDN -slug: MDN/User_guide +slug: conflicting/MDN/Tools tags: - Documentation - Landing - MDN translation_of: MDN/Tools translation_of_original: MDN/User_guide +original_slug: MDN/User_guide --- <div>{{MDNSidebar}}</div><p>Сайт сети разработчиков Mozilla является продвинутой системой для поиска, чтения и внесения документации и примеров исходного кода для веб-разработчиков (а также для разработчиков под браузер Firefox и ОС Firefox). Руководство пользователя MDN предоставляет статьи, в подробностях описывающие, как использовать MDN для поиска нужной вам документации и, если вы желаете, как помочь сделать материалы лучше: более полными и обширными.</p> <div> diff --git a/files/ru/conflicting/mozilla/add-ons/index.html b/files/ru/conflicting/mozilla/add-ons/index.html index f147f764bb..de1f3416a5 100644 --- a/files/ru/conflicting/mozilla/add-ons/index.html +++ b/files/ru/conflicting/mozilla/add-ons/index.html @@ -1,9 +1,10 @@ --- title: Создание расширения -slug: Building_an_Extension +slug: conflicting/Mozilla/Add-ons tags: - Расширение - Создание +original_slug: Building_an_Extension --- <h2 id="Introduction" name="Introduction">Введение</h2> <p>Этот урок по шагам покажет Вам как создать простое <a href="/en/Extensions" title="en/Extensions">Расширение</a> – сутью которого является добавление в панель статуса Firefox блока со строкой "Hello, World!"</p> diff --git a/files/ru/conflicting/mozilla/firefox/releases/index.html b/files/ru/conflicting/mozilla/firefox/releases/index.html index ba7f7887f2..7fbfd3fe07 100644 --- a/files/ru/conflicting/mozilla/firefox/releases/index.html +++ b/files/ru/conflicting/mozilla/firefox/releases/index.html @@ -1,8 +1,9 @@ --- title: Замечания к релизу -slug: Tools/Release_notes +slug: conflicting/Mozilla/Firefox/Releases translation_of: Mozilla/Firefox/Releases translation_of_original: Tools/Release_notes +original_slug: Tools/Release_notes --- <div>{{ToolsSidebar}}</div><h2 id="Firefox_48">Firefox 48</h2> diff --git a/files/ru/conflicting/tools/performance/index.html b/files/ru/conflicting/tools/performance/index.html index 10e4254907..6bf96a6c91 100644 --- a/files/ru/conflicting/tools/performance/index.html +++ b/files/ru/conflicting/tools/performance/index.html @@ -1,6 +1,6 @@ --- title: Профилирование JavaScript -slug: Tools/Profiler +slug: conflicting/Tools/Performance tags: - Firefox - Отладка @@ -10,6 +10,7 @@ tags: - инструменты translation_of: Tools/Performance translation_of_original: Tools/Profiler +original_slug: Tools/Profiler --- <div>{{ToolsSidebar}}</div><p>Используйте средства профилирования, чтобы находить узкие места в своём JavaScript коде. Профайлер периодически проверяет состояние стека вызовов JavaScript и составляет статистику на основе полученных в результате измерения величин.</p> diff --git a/files/ru/conflicting/web/accessibility/index.html b/files/ru/conflicting/web/accessibility/index.html index ce48a75de2..93cd4b80cb 100644 --- a/files/ru/conflicting/web/accessibility/index.html +++ b/files/ru/conflicting/web/accessibility/index.html @@ -1,6 +1,6 @@ --- title: Веб-разработка -slug: Web/Accessibility/Веб-разработка +slug: conflicting/Web/Accessibility tags: - ARIA - Web Development @@ -8,6 +8,7 @@ tags: - доступность translation_of: Web/Accessibility translation_of_original: Web/Accessibility/Web_Development +original_slug: Web/Accessibility/Веб-разработка --- <p class="summary"><span class="seoSummary">Здесь ссылки на более подробную информацию для разработчиков о доступности (<span lang="en">accessibility</span>) в Веб и в XUL.</span></p> diff --git a/files/ru/conflicting/web/api/canvas_api/a_basic_ray-caster/index.html b/files/ru/conflicting/web/api/canvas_api/a_basic_ray-caster/index.html index 23b14adb7c..b96f0a95a3 100644 --- a/files/ru/conflicting/web/api/canvas_api/a_basic_ray-caster/index.html +++ b/files/ru/conflicting/web/api/canvas_api/a_basic_ray-caster/index.html @@ -1,8 +1,9 @@ --- title: A Basic RayCaster -slug: A_Basic_RayCaster +slug: conflicting/Web/API/Canvas_API/A_basic_ray-caster tags: - Canvas_examples +original_slug: A_Basic_RayCaster --- <p> </p> diff --git a/files/ru/conflicting/web/api/crypto/getrandomvalues/index.html b/files/ru/conflicting/web/api/crypto/getrandomvalues/index.html index d56506a90a..0193cc0447 100644 --- a/files/ru/conflicting/web/api/crypto/getrandomvalues/index.html +++ b/files/ru/conflicting/web/api/crypto/getrandomvalues/index.html @@ -1,6 +1,6 @@ --- title: RandomSource -slug: Web/API/RandomSource +slug: conflicting/Web/API/Crypto/getRandomValues tags: - API - Interface @@ -11,6 +11,7 @@ tags: - Web Crypto API translation_of: Web/API/Crypto/getRandomValues translation_of_original: Web/API/RandomSource +original_slug: Web/API/RandomSource --- <p>{{APIRef("Web Crypto API")}}</p> diff --git a/files/ru/conflicting/web/api/document_object_model/index.html b/files/ru/conflicting/web/api/document_object_model/index.html index 3acab80018..def3b15b61 100644 --- a/files/ru/conflicting/web/api/document_object_model/index.html +++ b/files/ru/conflicting/web/api/document_object_model/index.html @@ -1,10 +1,11 @@ --- title: DOM -slug: DOM +slug: conflicting/Web/API/Document_Object_Model tags: - DOM translation_of: Web/API/Document_Object_Model translation_of_original: DOM +original_slug: DOM --- <div> <p><b>Объектная модель документа</b> (<b>DOM</b>) — это API для <a href="/ru/docs/HTML">HTML</a> и <a href="/ru/docs/XML">XML</a> документов. Она предоставляет структуру документа, что позволяет изменять его содержимое и внешний вид. По сути, она связывает веб-страницы со скриптами или языками программирования.</p> diff --git a/files/ru/conflicting/web/api/document_object_model_5521049528397035462607d58539e0cc/index.html b/files/ru/conflicting/web/api/document_object_model_5521049528397035462607d58539e0cc/index.html index ab6a5c0435..ba7d7d07d8 100644 --- a/files/ru/conflicting/web/api/document_object_model_5521049528397035462607d58539e0cc/index.html +++ b/files/ru/conflicting/web/api/document_object_model_5521049528397035462607d58539e0cc/index.html @@ -1,10 +1,11 @@ --- title: Об объектной модели документа -slug: Об_объектной_модели_документа +slug: conflicting/Web/API/Document_Object_Model_5521049528397035462607d58539e0cc tags: - DOM translation_of: Web/API/Document_Object_Model translation_of_original: DOM/About_the_Document_Object_Model +original_slug: Об_объектной_модели_документа --- <h3 id=".D0.A7.D1.82.D0.BE_.D1.82.D0.B0.D0.BA.D0.BE.D0.B5_DOM.3F" name=".D0.A7.D1.82.D0.BE_.D1.82.D0.B0.D0.BA.D0.BE.D0.B5_DOM.3F">Что такое DOM?</h3> diff --git a/files/ru/conflicting/web/api/document_object_model_dd00a71ceceac547ab464128db6bd8ef/index.html b/files/ru/conflicting/web/api/document_object_model_dd00a71ceceac547ab464128db6bd8ef/index.html index 1671813170..4d8706e804 100644 --- a/files/ru/conflicting/web/api/document_object_model_dd00a71ceceac547ab464128db6bd8ef/index.html +++ b/files/ru/conflicting/web/api/document_object_model_dd00a71ceceac547ab464128db6bd8ef/index.html @@ -1,6 +1,6 @@ --- title: DOM developer guide -slug: Web/Guide/API/DOM +slug: conflicting/Web/API/Document_Object_Model_dd00a71ceceac547ab464128db6bd8ef tags: - API - DOM @@ -10,6 +10,7 @@ tags: - TopicStub translation_of: Web/API/Document_Object_Model translation_of_original: Web/Guide/API/DOM +original_slug: Web/Guide/API/DOM --- <p>{{draft}}</p> diff --git a/files/ru/conflicting/web/api/element/index.html b/files/ru/conflicting/web/api/element/index.html index af6ec4765c..8656365064 100644 --- a/files/ru/conflicting/web/api/element/index.html +++ b/files/ru/conflicting/web/api/element/index.html @@ -1,10 +1,11 @@ --- title: Slotable -slug: Web/API/Slotable +slug: conflicting/Web/API/Element tags: - миксины translation_of: Web/API/Slottable translation_of_original: Web/API/Slotable +original_slug: Web/API/Slotable --- <p>{{APIRef("Shadow DOM")}}</p> diff --git a/files/ru/conflicting/web/api/eventtarget/addeventlistener/index.html b/files/ru/conflicting/web/api/eventtarget/addeventlistener/index.html index a428f9724c..ce515d9e4f 100644 --- a/files/ru/conflicting/web/api/eventtarget/addeventlistener/index.html +++ b/files/ru/conflicting/web/api/eventtarget/addeventlistener/index.html @@ -1,9 +1,10 @@ --- title: EventTarget.attachEvent() -slug: Web/API/EventTarget/attachEvent +slug: conflicting/Web/API/EventTarget/addEventListener tags: - Junk translation_of: Web/API/EventTarget/addEventListener translation_of_original: Web/API/EventTarget/attachEvent +original_slug: Web/API/EventTarget/attachEvent --- <p>{{DOMxRef("EventTarget.addEventListener","EventTarget.addEventListener()")}}</p> diff --git a/files/ru/conflicting/web/api/eventtarget/removeeventlistener/index.html b/files/ru/conflicting/web/api/eventtarget/removeeventlistener/index.html index 9a62ecb63c..c83a135fd4 100644 --- a/files/ru/conflicting/web/api/eventtarget/removeeventlistener/index.html +++ b/files/ru/conflicting/web/api/eventtarget/removeeventlistener/index.html @@ -1,8 +1,9 @@ --- title: EventTarget.detachEvent() -slug: Web/API/EventTarget/detachEvent +slug: conflicting/Web/API/EventTarget/removeEventListener translation_of: Web/API/EventTarget/removeEventListener translation_of_original: Web/API/EventTarget/detachEvent +original_slug: Web/API/EventTarget/detachEvent --- <p>{{APIRef("DOM Events")}}</p> diff --git a/files/ru/conflicting/web/api/geolocation/index.html b/files/ru/conflicting/web/api/geolocation/index.html index 7287eee669..9a15927312 100644 --- a/files/ru/conflicting/web/api/geolocation/index.html +++ b/files/ru/conflicting/web/api/geolocation/index.html @@ -1,8 +1,9 @@ --- title: NavigatorGeolocation -slug: Web/API/NavigatorGeolocation +slug: conflicting/Web/API/Geolocation translation_of: Web/API/Geolocation translation_of_original: Web/API/NavigatorGeolocation +original_slug: Web/API/NavigatorGeolocation --- <div>{{APIRef("Geolocation API")}}</div> diff --git a/files/ru/conflicting/web/api/htmlmediaelement/abort_event/index.html b/files/ru/conflicting/web/api/htmlmediaelement/abort_event/index.html index d8029e2378..22fadfb200 100644 --- a/files/ru/conflicting/web/api/htmlmediaelement/abort_event/index.html +++ b/files/ru/conflicting/web/api/htmlmediaelement/abort_event/index.html @@ -1,10 +1,11 @@ --- title: abort -slug: Web/Events/abort +slug: conflicting/Web/API/HTMLMediaElement/abort_event tags: - Событие translation_of: Web/API/HTMLMediaElement/abort_event translation_of_original: Web/Events/abort +original_slug: Web/Events/abort --- <p>Событие "abort" вызывается когда загрузка какого-либо ресурса была прервана.</p> diff --git a/files/ru/conflicting/web/api/index.html b/files/ru/conflicting/web/api/index.html index 9ffb624bc7..325f2ca52b 100644 --- a/files/ru/conflicting/web/api/index.html +++ b/files/ru/conflicting/web/api/index.html @@ -1,10 +1,11 @@ --- title: WebAPI -slug: Web/WebAPI +slug: conflicting/Web/API tags: - API translation_of: Web/API translation_of_original: WebAPI +original_slug: Web/WebAPI --- <p><strong>WebAPI</strong> is a term used to refer to a suite of device compatibility and access APIs that allow Web apps and content to access device hardware (such as battery status or the device vibration hardware), as well as access to data stored on the device (such as the calendar or contacts list). By adding these APIs, we hope to expand what the Web can do today to also include what only proprietary platforms were able to do in the past.</p> diff --git a/files/ru/conflicting/web/api/node/index.html b/files/ru/conflicting/web/api/node/index.html index 7f7dbfb782..867810d345 100644 --- a/files/ru/conflicting/web/api/node/index.html +++ b/files/ru/conflicting/web/api/node/index.html @@ -1,8 +1,9 @@ --- title: Node.baseURIObject -slug: Web/API/Node/baseURIObject +slug: conflicting/Web/API/Node translation_of: Web/API/Node translation_of_original: Web/API/Node/baseURIObject +original_slug: Web/API/Node/baseURIObject --- <div>{{APIRef("DOM")}} {{Non-standard_header}}</div> diff --git a/files/ru/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html b/files/ru/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html index 11b342e6c3..8de371b4cf 100644 --- a/files/ru/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html +++ b/files/ru/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html @@ -1,8 +1,9 @@ --- title: Node.nodePrincipal -slug: Web/API/Node/nodePrincipal +slug: conflicting/Web/API/Node_378aed5ed6869e50853edbc988cf9556 translation_of: Web/API/Node translation_of_original: Web/API/Node/nodePrincipal +original_slug: Web/API/Node/nodePrincipal --- <div> <div>{{APIRef("DOM")}}</div> diff --git a/files/ru/conflicting/web/api/push_api/index.html b/files/ru/conflicting/web/api/push_api/index.html index 40086e4e91..1a1de71329 100644 --- a/files/ru/conflicting/web/api/push_api/index.html +++ b/files/ru/conflicting/web/api/push_api/index.html @@ -1,8 +1,9 @@ --- title: Использование Push API -slug: Web/API/Push_API/Using_the_Push_API +slug: conflicting/Web/API/Push_API translation_of: Web/API/Push_API translation_of_original: Web/API/Push_API/Using_the_Push_API +original_slug: Web/API/Push_API/Using_the_Push_API --- <p class="summary"><span class="seoSummary">W3C <a href="/en-US/docs/Web/API/Push_API">Push API</a> предоставляет некоторый захватывающий новый функционал для разработчиков для использования в web-приложениях: эта статья предлагает вводную информацию о том, как настроить Push-уведомления и управлять ими, с помощью простого демо.</span></p> diff --git a/files/ru/conflicting/web/api/svgaelement/target/index.html b/files/ru/conflicting/web/api/svgaelement/target/index.html index dcd76310d4..376099e1f3 100644 --- a/files/ru/conflicting/web/api/svgaelement/target/index.html +++ b/files/ru/conflicting/web/api/svgaelement/target/index.html @@ -1,8 +1,9 @@ --- title: SVGAElement.target -slug: Web/API/SVGAElement/SVGAlement.target +slug: conflicting/Web/API/SVGAElement/target translation_of: Web/API/SVGAElement/target translation_of_original: Web/API/SVGAElement/SVGAlement.target +original_slug: Web/API/SVGAElement/SVGAlement.target --- <p>{{APIRef("SVGAElement")}}</p> diff --git a/files/ru/conflicting/web/api/web_storage_api/index.html b/files/ru/conflicting/web/api/web_storage_api/index.html index b63a374c8c..b6e37422a6 100644 --- a/files/ru/conflicting/web/api/web_storage_api/index.html +++ b/files/ru/conflicting/web/api/web_storage_api/index.html @@ -1,8 +1,9 @@ --- title: DOM Storage guide -slug: Web/Guide/API/DOM/Storage +slug: conflicting/Web/API/Web_Storage_API translation_of: Web/API/Web_Storage_API translation_of_original: Web/Guide/API/DOM/Storage +original_slug: Web/Guide/API/DOM/Storage --- <h2 id="sect1"> </h2> diff --git a/files/ru/conflicting/web/api/webrtc_api/index.html b/files/ru/conflicting/web/api/webrtc_api/index.html index d8fbf01983..59ab196363 100644 --- a/files/ru/conflicting/web/api/webrtc_api/index.html +++ b/files/ru/conflicting/web/api/webrtc_api/index.html @@ -1,8 +1,9 @@ --- title: WebRTC -slug: Web/Guide/API/WebRTC +slug: conflicting/Web/API/WebRTC_API translation_of: Web/API/WebRTC_API translation_of_original: Web/Guide/API/WebRTC +original_slug: Web/Guide/API/WebRTC --- <p><strong>WebRTC</strong> (где RTC расшифровывается как Real-Time Communications) - это технология, которая позволяет передавать данные и потоковое аудио/видео между браузерами. Как набор стандартов в целом, WebRTC предоставляет любым поддерживающим этот стандарт, браузерам обмениваться данными и устраивать сеансы телеконференций в режиме точка-точка, без необходимости устанавливать какие-либо плагины и стороннее програмное обеспечение.</p> diff --git a/files/ru/conflicting/web/api/webrtc_api/signaling_and_video_calling/index.html b/files/ru/conflicting/web/api/webrtc_api/signaling_and_video_calling/index.html index 863dde7e14..b8473336af 100644 --- a/files/ru/conflicting/web/api/webrtc_api/signaling_and_video_calling/index.html +++ b/files/ru/conflicting/web/api/webrtc_api/signaling_and_video_calling/index.html @@ -1,8 +1,9 @@ --- title: Основы WebRTC -slug: Web/API/WebRTC_API/WebRTC_basics +slug: conflicting/Web/API/WebRTC_API/Signaling_and_video_calling translation_of: Web/API/WebRTC_API/Signaling_and_video_calling translation_of_original: Web/API/WebRTC_API/WebRTC_basics +original_slug: Web/API/WebRTC_API/WebRTC_basics --- <p>{{WebRTCSidebar}}</p> diff --git a/files/ru/conflicting/web/api/window/localstorage/index.html b/files/ru/conflicting/web/api/window/localstorage/index.html index f0fab82609..7e9f60bb88 100644 --- a/files/ru/conflicting/web/api/window/localstorage/index.html +++ b/files/ru/conflicting/web/api/window/localstorage/index.html @@ -1,8 +1,9 @@ --- title: LocalStorage -slug: Web/API/Storage/LocalStorage +slug: conflicting/Web/API/Window/localStorage translation_of: Web/API/Window/localStorage translation_of_original: Web/API/Web_Storage_API/Local_storage +original_slug: Web/API/Storage/LocalStorage --- <p><code>localStorage</code> это аналог <code><a href="/en-US/docs/Web/API/sessionStorage">sessionStorage</a></code>, с некоторыми same-origin правилами, но значения хранятся постоянно (в отличии от sessions). <code>localStorage</code> появился в Firefox 3.5.</p> diff --git a/files/ru/conflicting/web/api/windoworworkerglobalscope/index.html b/files/ru/conflicting/web/api/windoworworkerglobalscope/index.html index f51b72c102..69bc73a64f 100644 --- a/files/ru/conflicting/web/api/windoworworkerglobalscope/index.html +++ b/files/ru/conflicting/web/api/windoworworkerglobalscope/index.html @@ -1,6 +1,6 @@ --- title: WindowBase64 -slug: Web/API/WindowBase64 +slug: conflicting/Web/API/WindowOrWorkerGlobalScope tags: - API - HTML-DOM @@ -10,6 +10,7 @@ tags: - WindowBase64 translation_of: Web/API/WindowOrWorkerGlobalScope translation_of_original: Web/API/WindowBase64 +original_slug: Web/API/WindowBase64 --- <p>{{APIRef("HTML DOM")}}</p> diff --git a/files/ru/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html b/files/ru/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html index ac80f42b5f..21a473532e 100644 --- a/files/ru/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html +++ b/files/ru/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html @@ -1,11 +1,12 @@ --- title: WindowTimers -slug: Web/API/WindowTimers +slug: conflicting/Web/API/WindowOrWorkerGlobalScope_e2691f7ad05781a30c5fc5bb3b3f633a tags: - API - HTML DOM translation_of: Web/API/WindowOrWorkerGlobalScope translation_of_original: Web/API/WindowTimers +original_slug: Web/API/WindowTimers --- <div>{{APIRef("HTML DOM")}}</div> diff --git a/files/ru/conflicting/web/api/xmlhttprequest/index.html b/files/ru/conflicting/web/api/xmlhttprequest/index.html index 0de9dfed9d..0d2e6c16e7 100644 --- a/files/ru/conflicting/web/api/xmlhttprequest/index.html +++ b/files/ru/conflicting/web/api/xmlhttprequest/index.html @@ -1,9 +1,10 @@ --- title: XMLHttpRequest -slug: XMLHttpRequest +slug: conflicting/Web/API/XMLHttpRequest tags: - AJAX - XMLHttpRequest +original_slug: XMLHttpRequest --- <p><code>XMLHttpRequest</code> — это объект <a href="/ru/JavaScript" title="ru/JavaScript">JavaScript</a>, созданный Microsoft и адаптированный Mozilla. Вы можете использовать его для простой передачи данных через HTTP. Несмотря на свое название, он может быть использован не только для XML документов, но и, например, для <a href="/ru/JSON" title="ru/JSON">JSON</a>.</p> diff --git a/files/ru/conflicting/web/css/@viewport/index.html b/files/ru/conflicting/web/css/@viewport/index.html index 3cb5768532..6778691ba7 100644 --- a/files/ru/conflicting/web/css/@viewport/index.html +++ b/files/ru/conflicting/web/css/@viewport/index.html @@ -1,8 +1,9 @@ --- title: user-zoom -slug: Web/CSS/@viewport/user-zoom +slug: conflicting/Web/CSS/@viewport translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/user-zoom +original_slug: Web/CSS/@viewport/user-zoom --- <div>{{ CSSRef }}</div> diff --git a/files/ru/conflicting/web/css/_colon_is/index.html b/files/ru/conflicting/web/css/_colon_is/index.html index 6a9dab56ac..d2ed013366 100644 --- a/files/ru/conflicting/web/css/_colon_is/index.html +++ b/files/ru/conflicting/web/css/_colon_is/index.html @@ -1,14 +1,15 @@ --- title: ':any' -slug: 'Web/CSS/:any' +slug: conflicting/Web/CSS/:is tags: - CSS - Experimental - Псевдоклассы - Руководство - Экспериментальное -translation_of: 'Web/CSS/:is' -translation_of_original: 'Web/CSS/:any' +translation_of: Web/CSS/:is +translation_of_original: Web/CSS/:any +original_slug: Web/CSS/:any --- <div>{{CSSRef}}{{SeeCompatTable}}</div> diff --git a/files/ru/conflicting/web/css/css_basic_user_interface/index.html b/files/ru/conflicting/web/css/css_basic_user_interface/index.html index 2a4028644d..3a739dcff4 100644 --- a/files/ru/conflicting/web/css/css_basic_user_interface/index.html +++ b/files/ru/conflicting/web/css/css_basic_user_interface/index.html @@ -1,6 +1,6 @@ --- title: CSS Basic User Interface -slug: Web/CSS/CSS_User_Interface +slug: conflicting/Web/CSS/CSS_Basic_User_Interface tags: - CSS - CSS Basic User Interface @@ -10,6 +10,7 @@ tags: - TopicStub translation_of: Web/CSS/CSS_Basic_User_Interface translation_of_original: Web/CSS/CSS_User_Interface +original_slug: Web/CSS/CSS_User_Interface --- <div>{{CSSRef}}</div> diff --git a/files/ru/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html b/files/ru/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html index 3f0b229d20..e40fb04a90 100644 --- a/files/ru/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html +++ b/files/ru/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html @@ -1,8 +1,9 @@ --- title: Используем CSS Flexible Boxes -slug: Web/CSS/CSS_Flexible_Box_Layout/Using_CSS_flexible_boxes +slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox translation_of: Web/CSS/CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox translation_of_original: Web/CSS/CSS_Flexible_Box_Layout/Using_CSS_flexible_boxes +original_slug: Web/CSS/CSS_Flexible_Box_Layout/Using_CSS_flexible_boxes --- <div>Эта статья устарела и удалена из английской версии. Вместо неё идёт перенаправление на статью: <h1 id="Основные_понятия_Flexbox"><a href="https://developer.mozilla.org/ru/docs/Web/CSS/CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox">Основные понятия Flexbox</a></h1> diff --git a/files/ru/conflicting/web/css/gap/index.html b/files/ru/conflicting/web/css/gap/index.html index 90daa7c0ea..bc37f159e8 100644 --- a/files/ru/conflicting/web/css/gap/index.html +++ b/files/ru/conflicting/web/css/gap/index.html @@ -1,8 +1,9 @@ --- title: grid-gap -slug: Web/CSS/grid-gap +slug: conflicting/Web/CSS/gap translation_of: Web/CSS/gap translation_of_original: Web/CSS/grid-gap +original_slug: Web/CSS/grid-gap --- <p>{{Deprecated_Header}}</p> diff --git a/files/ru/conflicting/web/css/url()/index.html b/files/ru/conflicting/web/css/url()/index.html index 755d1adfe4..abbc8af65a 100644 --- a/files/ru/conflicting/web/css/url()/index.html +++ b/files/ru/conflicting/web/css/url()/index.html @@ -1,6 +1,6 @@ --- title: url() -slug: Web/CSS/filter-function/url +slug: conflicting/Web/CSS/url() tags: - CSS - Начинающий @@ -8,6 +8,7 @@ tags: - Функция translation_of: Web/CSS/url() translation_of_original: Web/CSS/filter-function/url +original_slug: Web/CSS/filter-function/url --- <div>{{cssref}}</div> diff --git a/files/ru/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html b/files/ru/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html index 82965bf827..c3184e46fa 100644 --- a/files/ru/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html +++ b/files/ru/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html @@ -1,12 +1,13 @@ --- title: <url> -slug: Web/CSS/url +slug: conflicting/Web/CSS/url()_168028c4e5edd9e19c061adb4b604d4f tags: - Адрес - Типы данных - относительный адрес translation_of: Web/CSS/url() translation_of_original: Web/CSS/url +original_slug: Web/CSS/url --- <div>{{CssRef}}</div> diff --git a/files/ru/conflicting/web/guide/index.html b/files/ru/conflicting/web/guide/index.html index 3dd0b4cbcc..2ea0c7199a 100644 --- a/files/ru/conflicting/web/guide/index.html +++ b/files/ru/conflicting/web/guide/index.html @@ -1,8 +1,9 @@ --- title: Веб-разработка -slug: Веб-разработка +slug: conflicting/Web/Guide translation_of: Web/Guide translation_of_original: Web_Development +original_slug: Веб-разработка --- <p><strong>Веб-разработка</strong> включает в себя все аспекты разработки веб-сайта или веб-приложения. Статьи этого раздела освещают создание как простых веб-сайтов, так и сложных, интерактивных веб-приложений с использованием новейших технологий разработки для веб.</p> <table class="mainpage-table"> <tbody> <tr> <td colspan="2"> <h2 id="Разделы_документации">Разделы документации</h2> </td> </tr> <tr> <td style="width: 50%;"> <dl> <dt><a class="internal" href="/en/Web_Development/Introduction_to_Web_development" title="Введение в веб-разработку">Введение в веб-разработку</a></dt> <dd>Руководство, обучающее разработке для веб.</dd> <dt><a class="internal" href="/ru/HTML" rel="internal" title="HTML">HTML</a></dt> <dd>HyperText Markup Language — основной язык, используемый для создания веб-страниц и других документов, пригодных для просмотра в браузере.</dd> <dt><a class="internal" href="/ru/JavaScript" rel="internal" title="JavaScript">JavaScript</a></dt> <dd>JavaScript — наиболее широко используемый для разработки веб-приложений скриптовый язык; он также используется и при разработке программного обеспечения основанного на Mozilla.</dd> <dt><a class="internal" href="/ru/CSS" rel="internal" title="CSS">CSS</a></dt> <dd>Cascading Style Sheets — таблицы стилей позволяющие создать make it possible to do advanced layout and page design on the Web.</dd> <dt><a class="internal" href="/ru/AJAX" rel="internal" title="AJAX">AJAX</a></dt> <dd>Asynchronous JavaScript and XML — не столько технология, сколько подход к сочетанию имеющихся технологий; JavaScript и другие современные веб-технологии используются совместно при создании динамических веб-приложений.</dd> </dl> </td> <td> <dl> <dt><a class="internal" href="/en/Web_Standards" title="Веб-стандарты">Веб-стандарты</a></dt> <dd>Learn how to make your Web site or application reach the largest number of users through compatibility with the open Web.</dd> <dt><a class="internal" href="/en/DOM" rel="internal" title="DOM">DOM</a></dt> <dd>Document Object Model — API для HTML- и XML-документов, providing a structural representation of the document that you can modify in order to alter its visual presentation.</dd> <dt><a class="internal" href="/en/XHTML" title="XHTML">XHTML</a></dt> <dd>Extensible HyperText Markup Language is an XML-based HTML-like language that offers a stricter syntax than HTML.</dd> <dt><a class="internal" href="/en/SVG" rel="internal" title="SVG">SVG</a></dt> <dd>Scalable Vector Graphics — язык разметки, основанный на XML, для описания двухмерной векторной графики.</dd> <dt><a class="internal" href="/en/Mozilla_Web_Developer_FAQ" title="Mozilla Web Developer FAQ">Mozilla Web developer FAQ</a></dt> <dd>Наиболее часто задаваемые веб-разработчиками вопросы. С ответами!</dd> </dl> <p><span class="alllinks"><a href="/Special:Tags?tag=Web_Development&language=en" title="Special:Tags?tag=Web_Development&language=en">View All...</a></span></p> </td> </tr> <tr> <td> <h2 id="Сообщество">Сообщество</h2> <ul> <li>Форумы Mozilla<span class="mw-headline">…</span> <ul> <li><a class=" link-https" href="https://lists.mozilla.org/listinfo/dev-web-development" rel="external nofollow" title="https://lists.mozilla.org/listinfo/dev-web-development">как список рассылки</a></li> <li><a class=" link-news" href="news://news.mozilla.org/mozilla.dev.web-development" rel="external nofollow" title="news://news.mozilla.org/mozilla.dev.web-development">как новостная группа</a></li> <li><a class=" external" href="http://groups.google.com/group/mozilla.dev.web-development" rel="external nofollow" title="http://groups.google.com/group/mozilla.dev.web-development">как Google Group</a></li> <li><a class=" external" href="http://groups.google.com/group/mozilla.dev.web-development/feeds" rel="external nofollow" title="http://groups.google.com/group/mozilla.dev.web-development/feeds">как новостная лента</a></li> </ul> </li> <li><a class="external" href="/web-tech" title="https://developer.mozilla.org/editor/fckeditor/core/editor/web-tech/">Блог Mozilla Web-tech</a></li> <li><a class="external" href="http://www.whatwg.org/" rel="external nofollow" title="http://www.whatwg.org/">Рабочая группа WHAT WG</a></li> <li><a class="external" href="http://webdevfeedhouse.com/" rel="external nofollow" title="http://webdevfeedhouse.com/">WebDev FeedHouse</a></li> </ul> </td> <td> <h2 id="Инструменты">Инструменты</h2> <ul> <li><a class="link-https" href="https://addons.mozilla.org/en-US/firefox/addon/1843" rel="external nofollow" title="Дополнение Firebug">Дополнение Firebug</a></li> <li><a class="link-https" href="https://addons.mozilla.org/en-US/firefox/addon/60" rel="external nofollow" title="Дополнение Web Developer">Дополнение Web Developer</a></li> <li><a href="/en/Venkman" rel="internal" title="Venkman">Venkman</a>, отладчик JavaScript</li> <li><a href="/en/DOM_Inspector" rel="internal" title="DOM Inspector">DOM Inspector</a> <p><span class="alllinks"><a href="/Special:Tags?tag=Web_Development:Tools&language=en" title="Special:Tags?tag=Web_Development:Tools&language=en">View All...</a></span></p> </li> </ul> </td> </tr> </tbody> diff --git a/files/ru/conflicting/web/guide/mobile/index.html b/files/ru/conflicting/web/guide/mobile/index.html index cc288a9c45..028d0c71ed 100644 --- a/files/ru/conflicting/web/guide/mobile/index.html +++ b/files/ru/conflicting/web/guide/mobile/index.html @@ -1,6 +1,6 @@ --- title: Mobile Web development -slug: Web_Development/Mobile +slug: conflicting/Web/Guide/Mobile tags: - Mobile - NeedsTranslation @@ -8,6 +8,7 @@ tags: - Web Development translation_of: Web/Guide/Mobile translation_of_original: Web_Development/Mobile +original_slug: Web_Development/Mobile --- <p>Developing web sites to be viewed on mobile devices requires approaches that ensure a web site works as well on mobile devices as it does on desktop browsers. The following articles describe some of these approaches.</p> <ul> diff --git a/files/ru/conflicting/web/http/cors/index.html b/files/ru/conflicting/web/http/cors/index.html index c3d53cb730..0d44c873b3 100644 --- a/files/ru/conflicting/web/http/cors/index.html +++ b/files/ru/conflicting/web/http/cors/index.html @@ -1,8 +1,9 @@ --- title: Server-Side Access Control (CORS) -slug: Web/HTTP/Server-Side_Access_Control +slug: conflicting/Web/HTTP/CORS translation_of: Web/HTTP/CORS translation_of_original: Web/HTTP/Server-Side_Access_Control +original_slug: Web/HTTP/Server-Side_Access_Control --- <p>Системы контроля доступа производят идентификацию <a href="http://searchsoftwarequality.techtarget.com/definition/authorization">авторизации</a>, <a href="http://searchsecurity.techtarget.com/definition/authentication">аутентификацию</a>, подтверждение доступа и подотчетность сущностей с помощью учетных данных для входа, включая <a href="http://searchsecurity.techtarget.com/definition/password">пароль</a>, личный идентификационный номер (PINs), <a href="http://searchsecurity.techtarget.com/definition/biometrics">биометрическое</a> сканирование и физический или электронный ключ.</p> diff --git a/files/ru/conflicting/web/http/csp/index.html b/files/ru/conflicting/web/http/csp/index.html index 5a3bfeae33..df563abc30 100644 --- a/files/ru/conflicting/web/http/csp/index.html +++ b/files/ru/conflicting/web/http/csp/index.html @@ -1,11 +1,12 @@ --- title: CSP (Политика Защиты Контента) -slug: Web/Security/CSP +slug: conflicting/Web/HTTP/CSP tags: - CSP - Landing translation_of: Web/HTTP/CSP translation_of_original: Web/Security/CSP +original_slug: Web/Security/CSP --- <div>{{gecko_minversion_header("2.0")}}</div> diff --git a/files/ru/conflicting/web/javascript/guide/index.html b/files/ru/conflicting/web/javascript/guide/index.html index a0f5770315..3e4633d7b3 100644 --- a/files/ru/conflicting/web/javascript/guide/index.html +++ b/files/ru/conflicting/web/javascript/guide/index.html @@ -1,8 +1,9 @@ --- title: Predefined Core Objects -slug: Web/JavaScript/Guide/Predefined_Core_Objects +slug: conflicting/Web/JavaScript/Guide translation_of: Web/JavaScript/Guide translation_of_original: Web/JavaScript/Guide/Predefined_Core_Objects +original_slug: Web/JavaScript/Guide/Predefined_Core_Objects --- <p>Эта глава описывает предопределённые объекты в стандартном JavaScript: <code>Array</code>, <code>Boolean</code>, <code>Date</code>, <code>Function</code>, <code>Math</code>, <code>Number</code>, <code>RegExp</code>, и <code>String</code>.</p> diff --git a/files/ru/conflicting/web/javascript/guide/introduction/index.html b/files/ru/conflicting/web/javascript/guide/introduction/index.html index 6d58fafb80..c8132f92df 100644 --- a/files/ru/conflicting/web/javascript/guide/introduction/index.html +++ b/files/ru/conflicting/web/javascript/guide/introduction/index.html @@ -1,8 +1,9 @@ --- title: Об этом учебнике -slug: Web/JavaScript/Guide/About +slug: conflicting/Web/JavaScript/Guide/Introduction translation_of: Web/JavaScript/Guide/Introduction translation_of_original: Web/JavaScript/Guide/About +original_slug: Web/JavaScript/Guide/About --- <p>JavaScript это кросс-платформенный, объектно-ориентированный интерпретируемый язык программирования. В этом учебнике описано все, что вам нужно знать для того, чтобы начать ипользовать JavaScript.</p> diff --git a/files/ru/conflicting/web/javascript/guide/introduction_6f341ba6db4b060ccbd8dce4a0d5214b/index.html b/files/ru/conflicting/web/javascript/guide/introduction_6f341ba6db4b060ccbd8dce4a0d5214b/index.html index 5db1f95ca4..2cea75700e 100644 --- a/files/ru/conflicting/web/javascript/guide/introduction_6f341ba6db4b060ccbd8dce4a0d5214b/index.html +++ b/files/ru/conflicting/web/javascript/guide/introduction_6f341ba6db4b060ccbd8dce4a0d5214b/index.html @@ -1,8 +1,9 @@ --- title: Обзор JavaScript -slug: Web/JavaScript/Guide/JavaScript_Overview +slug: conflicting/Web/JavaScript/Guide/Introduction_6f341ba6db4b060ccbd8dce4a0d5214b translation_of: Web/JavaScript/Guide/Introduction translation_of_original: Web/JavaScript/Guide/JavaScript_Overview +original_slug: Web/JavaScript/Guide/JavaScript_Overview --- <p>Эта глава является введением в JavaScript и описывает некоторые из базовых понятий.</p> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/boolean/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/boolean/index.html index f0188080f1..83fb169e1e 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/boolean/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/boolean/index.html @@ -1,6 +1,6 @@ --- title: Boolean.prototype -slug: Web/JavaScript/Reference/Global_Objects/Boolean/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Boolean tags: - Boolean - JavaScript @@ -8,6 +8,7 @@ tags: - Prototype translation_of: Web/JavaScript/Reference/Global_Objects/Boolean translation_of_original: Web/JavaScript/Reference/Global_Objects/Boolean/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Boolean/prototype --- <div>{{JSRef("Global_Objects", "Boolean")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/date/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/date/index.html index 956a7555a1..bb3a1eb411 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/date/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/date/index.html @@ -1,6 +1,6 @@ --- title: Date.prototype -slug: Web/JavaScript/Reference/Global_Objects/Date/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Date tags: - Date - JavaScript @@ -10,6 +10,7 @@ tags: - Référence(2) translation_of: Web/JavaScript/Reference/Global_Objects/Date translation_of_original: Web/JavaScript/Reference/Global_Objects/Date/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Date/prototype --- <div>{{JSRef("Global_Objects", "Date")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/error/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/error/index.html index 668277c4e0..d92653c075 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/error/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/error/index.html @@ -1,12 +1,13 @@ --- title: Error.prototype -slug: Web/JavaScript/Reference/Global_Objects/Error/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Error tags: - Error - JavaScript - Property translation_of: Web/JavaScript/Reference/Global_Objects/Error translation_of_original: Web/JavaScript/Reference/Global_Objects/Error/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Error/prototype --- <div>{{JSRef("Global_Objects", "Error", "EvalError,InternalError,RangeError,ReferenceError,SyntaxError,TypeError,URIError")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/evalerror/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/evalerror/index.html index e7de1a018e..94204588e2 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/evalerror/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/evalerror/index.html @@ -1,6 +1,6 @@ --- title: EvalError.prototype -slug: Web/JavaScript/Reference/Global_Objects/EvalError/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/EvalError tags: - Error - EvalError @@ -8,6 +8,7 @@ tags: - Property translation_of: Web/JavaScript/Reference/Global_Objects/EvalError translation_of_original: Web/JavaScript/Reference/Global_Objects/EvalError/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/EvalError/prototype --- <div>{{JSRef("Global_Objects", "Error", "EvalError,InternalError,RangeError,ReferenceError,SyntaxError,TypeError,URIError")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/function/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/function/index.html index acf9fc5c6e..40db9c03d2 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/function/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/function/index.html @@ -1,6 +1,6 @@ --- title: Function.prototype -slug: Web/JavaScript/Reference/Global_Objects/Function/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Function tags: - Function - JavaScript @@ -10,6 +10,7 @@ tags: - Référence(2) translation_of: Web/JavaScript/Reference/Global_Objects/Function translation_of_original: Web/JavaScript/Reference/Global_Objects/Function/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Function/prototype --- <div>{{JSRef("Global_Objects", "Function")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/generatorfunction/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/generatorfunction/index.html index b9974a46a3..7821c0d48c 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/generatorfunction/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/generatorfunction/index.html @@ -1,8 +1,9 @@ --- title: GeneratorFunction.prototype -slug: Web/JavaScript/Reference/Global_Objects/GeneratorFunction/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/GeneratorFunction translation_of: Web/JavaScript/Reference/Global_Objects/GeneratorFunction translation_of_original: Web/JavaScript/Reference/Global_Objects/GeneratorFunction/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/GeneratorFunction/prototype --- <div>{{JSRef}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/internalerror/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/internalerror/index.html index 633ffbf9fb..0aa65612d3 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/internalerror/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/internalerror/index.html @@ -1,6 +1,6 @@ --- title: InternalError.prototype -slug: Web/JavaScript/Reference/Global_Objects/InternalError/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/InternalError tags: - Error - InternalError @@ -9,6 +9,7 @@ tags: - Property translation_of: Web/JavaScript/Reference/Global_Objects/InternalError translation_of_original: Web/JavaScript/Reference/Global_Objects/InternalError/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/InternalError/prototype --- <div>{{JSRef("Global_Objects", "Error", "EvalError,InternalError,RangeError,ReferenceError,SyntaxError,TypeError,URIError")}} {{non-standard_header}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/intl/collator/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/intl/collator/index.html index eb708cca36..8c3e037a3f 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/intl/collator/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/intl/collator/index.html @@ -1,6 +1,6 @@ --- title: Intl.Collator.prototype -slug: Web/JavaScript/Reference/Global_Objects/Intl/Collator/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Intl/Collator tags: - Collator - Internationalization @@ -9,6 +9,7 @@ tags: - Prototype translation_of: Web/JavaScript/Reference/Global_Objects/Intl/Collator translation_of_original: Web/JavaScript/Reference/Global_Objects/Intl/Collator/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Intl/Collator/prototype --- <div>{{JSRef("Global_Objects", "Collator", "Intl,DateTimeFormat,NumberFormat")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html index a22ec7aeaa..7338c53fd2 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html @@ -1,6 +1,6 @@ --- title: Intl.DateTimeFormat.prototype -slug: Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat tags: - DateTimeFormat - Internationalization @@ -9,6 +9,7 @@ tags: - Prototype translation_of: Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat translation_of_original: Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/prototype --- <div>{{JSRef("Global_Objects", "DateTimeFormat", "Intl,Collator,NumberFormat")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/intl/numberformat/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/intl/numberformat/index.html index fd9fbeeac8..3f5329e5fc 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/intl/numberformat/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/intl/numberformat/index.html @@ -1,6 +1,6 @@ --- title: Intl.NumberFormat.prototype -slug: Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat tags: - Internationalization - JavaScript @@ -9,6 +9,7 @@ tags: - Prototype translation_of: Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat translation_of_original: Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/prototype --- <div>{{JSRef("Global_Objects", "NumberFormat", "Intl,Collator,DateTimeFormat")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/map/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/map/index.html index a3af6a0c61..2cdca5b3b0 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/map/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/map/index.html @@ -1,8 +1,9 @@ --- title: Map.prototype -slug: Web/JavaScript/Reference/Global_Objects/Map/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Map translation_of: Web/JavaScript/Reference/Global_Objects/Map translation_of_original: Web/JavaScript/Reference/Global_Objects/Map/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Map/prototype --- <div>{{JSRef}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/number/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/number/index.html index 259d8a3fb3..251386b750 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/number/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/number/index.html @@ -1,6 +1,6 @@ --- title: Number.prototype -slug: Web/JavaScript/Reference/Global_Objects/Number/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Number tags: - JavaScript - Number @@ -9,6 +9,7 @@ tags: - Reference translation_of: Web/JavaScript/Reference/Global_Objects/Number translation_of_original: Web/JavaScript/Reference/Global_Objects/Number/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Number/prototype --- <div>{{JSRef("Global_Objects", "Number")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/object/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/object/index.html index aaa398171d..27b29f5934 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/object/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/object/index.html @@ -1,6 +1,6 @@ --- title: Object.prototype -slug: Web/JavaScript/Reference/Global_Objects/Object/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Object tags: - JavaScript - Object @@ -8,6 +8,7 @@ tags: - Reference translation_of: Web/JavaScript/Reference/Global_Objects/Object translation_of_original: Web/JavaScript/Reference/Global_Objects/Object/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Object/prototype --- <div>{{JSRef("Global_Objects", "Object")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/promise/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/promise/index.html index 65384e8346..517ac975fc 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/promise/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/promise/index.html @@ -1,12 +1,13 @@ --- title: Promise.prototype -slug: Web/JavaScript/Reference/Global_Objects/Promise/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Promise tags: - JavaScript - Обещание - Свойство translation_of: Web/JavaScript/Reference/Global_Objects/Promise translation_of_original: Web/JavaScript/Reference/Global_Objects/Promise/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Promise/prototype --- <div>{{JSRef}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/proxy/proxy/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/proxy/proxy/index.html index 472e9d4735..6690f5b5bf 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/proxy/proxy/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/proxy/proxy/index.html @@ -1,6 +1,6 @@ --- title: Proxy handler -slug: Web/JavaScript/Reference/Global_Objects/Proxy/handler +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Proxy/Proxy tags: - ECMAScript 2015 - JavaScript @@ -12,6 +12,7 @@ tags: - ловушки translation_of: Web/JavaScript/Reference/Global_Objects/Proxy/Proxy translation_of_original: Web/JavaScript/Reference/Global_Objects/Proxy/handler +original_slug: Web/JavaScript/Reference/Global_Objects/Proxy/handler --- <div>{{JSRef}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/rangeerror/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/rangeerror/index.html index 0e1df7fb7c..9f3a393d34 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/rangeerror/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/rangeerror/index.html @@ -1,6 +1,6 @@ --- title: RangeError.prototype -slug: Web/JavaScript/Reference/Global_Objects/RangeError/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/RangeError tags: - Error - JavaScript @@ -9,6 +9,7 @@ tags: - RangeError translation_of: Web/JavaScript/Reference/Global_Objects/RangeError translation_of_original: Web/JavaScript/Reference/Global_Objects/RangeError/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/RangeError/prototype --- <div>{{JSRef("Global_Objects", "Error", "EvalError,InternalError,RangeError,ReferenceError,SyntaxError,TypeError,URIError")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/referenceerror/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/referenceerror/index.html index 1c73b6cb4e..541fdaf0a1 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/referenceerror/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/referenceerror/index.html @@ -1,6 +1,6 @@ --- title: ReferenceError.prototype -slug: Web/JavaScript/Reference/Global_Objects/ReferenceError/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/ReferenceError tags: - Error - JavaScript @@ -9,6 +9,7 @@ tags: - ReferenceError translation_of: Web/JavaScript/Reference/Global_Objects/ReferenceError translation_of_original: Web/JavaScript/Reference/Global_Objects/ReferenceError/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/ReferenceError/prototype --- <div>{{JSRef("Global_Objects", "Error", "EvalError,InternalError,RangeError,ReferenceError,SyntaxError,TypeError,URIError")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/regexp/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/regexp/index.html index b0a655760c..8162ff726f 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/regexp/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/regexp/index.html @@ -1,6 +1,6 @@ --- title: RegExp.prototype -slug: Web/JavaScript/Reference/Global_Objects/RegExp/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/RegExp tags: - JavaScript - Property @@ -10,6 +10,7 @@ tags: - регулярные выражения translation_of: Web/JavaScript/Reference/Global_Objects/RegExp translation_of_original: Web/JavaScript/Reference/Global_Objects/RegExp/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/RegExp/prototype --- <div>{{JSRef("Global_Objects", "RegExp")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/set/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/set/index.html index a09b758046..6609e026ae 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/set/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/set/index.html @@ -1,8 +1,9 @@ --- title: Set.prototype -slug: Web/JavaScript/Reference/Global_Objects/Set/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Set translation_of: Web/JavaScript/Reference/Global_Objects/Set translation_of_original: Web/JavaScript/Reference/Global_Objects/Set/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Set/prototype --- <div>{{JSRef}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/string/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/string/index.html index 66537d9ae8..8a2b8f4d63 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/string/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/string/index.html @@ -1,6 +1,6 @@ --- title: String.prototype -slug: Web/JavaScript/Reference/Global_Objects/String/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/String tags: - JavaScript - Property @@ -9,6 +9,7 @@ tags: - String translation_of: Web/JavaScript/Reference/Global_Objects/String translation_of_original: Web/JavaScript/Reference/Global_Objects/String/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/String/prototype --- <div>{{JSRef("Global_Objects", "String")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/symbol/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/symbol/index.html index b9ce5254e6..9da7ee5440 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/symbol/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/symbol/index.html @@ -1,6 +1,6 @@ --- title: Symbol.prototype -slug: Web/JavaScript/Reference/Global_Objects/Symbol/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/Symbol tags: - ECMAScript6 - JavaScript @@ -8,6 +8,7 @@ tags: - Символы translation_of: Web/JavaScript/Reference/Global_Objects/Symbol translation_of_original: Web/JavaScript/Reference/Global_Objects/Symbol/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/Symbol/prototype --- <div>{{JSRef}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html index 840ac61f2b..20340178e9 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html @@ -1,6 +1,6 @@ --- title: SyntaxError.prototype -slug: Web/JavaScript/Reference/Global_Objects/SyntaxError/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/SyntaxError tags: - Error - JavaScript @@ -9,6 +9,7 @@ tags: - SyntaxError translation_of: Web/JavaScript/Reference/Global_Objects/SyntaxError translation_of_original: Web/JavaScript/Reference/Global_Objects/SyntaxError/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/SyntaxError/prototype --- <div>{{JSRef("Global_Objects", "Error", "EvalError,InternalError,RangeError,ReferenceError,SyntaxError,TypeError,URIError")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/typedarray/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/typedarray/index.html index 1b79a06ad9..76b18ce93b 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/typedarray/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/typedarray/index.html @@ -1,11 +1,12 @@ --- title: TypedArray.prototype -slug: Web/JavaScript/Reference/Global_Objects/TypedArray/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/TypedArray tags: - TypedArray - Типизированный массив translation_of: Web/JavaScript/Reference/Global_Objects/TypedArray translation_of_original: Web/JavaScript/Reference/Global_Objects/TypedArray/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/TypedArray/prototype --- <div>{{JSRef}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/typeerror/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/typeerror/index.html index 87a22a4a94..0c83655781 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/typeerror/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/typeerror/index.html @@ -1,6 +1,6 @@ --- title: TypeError.prototype -slug: Web/JavaScript/Reference/Global_Objects/TypeError/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/TypeError tags: - Error - JavaScript @@ -9,6 +9,7 @@ tags: - TypeError translation_of: Web/JavaScript/Reference/Global_Objects/TypeError translation_of_original: Web/JavaScript/Reference/Global_Objects/TypeError/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/TypeError/prototype --- <div>{{JSRef("Global_Objects", "Error", "EvalError,InternalError,RangeError,ReferenceError,SyntaxError,TypeError,URIError")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/urierror/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/urierror/index.html index 9998443521..65bae4f674 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/urierror/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/urierror/index.html @@ -1,6 +1,6 @@ --- title: URIError.prototype -slug: Web/JavaScript/Reference/Global_Objects/URIError/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/URIError tags: - Error - JavaScript @@ -9,6 +9,7 @@ tags: - URIError translation_of: Web/JavaScript/Reference/Global_Objects/URIError translation_of_original: Web/JavaScript/Reference/Global_Objects/URIError/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/URIError/prototype --- <div>{{JSRef("Global_Objects", "Error", "EvalError,InternalError,RangeError,ReferenceError,SyntaxError,TypeError,URIError")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/weakmap/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/weakmap/index.html index 56e1cf2fd8..aa72a7f092 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/weakmap/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/weakmap/index.html @@ -1,8 +1,9 @@ --- title: WeakMap.prototype -slug: Web/JavaScript/Reference/Global_Objects/WeakMap/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/WeakMap translation_of: Web/JavaScript/Reference/Global_Objects/WeakMap translation_of_original: Web/JavaScript/Reference/Global_Objects/WeakMap/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/WeakMap/prototype --- <div>{{JSRef}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/global_objects/weakset/index.html b/files/ru/conflicting/web/javascript/reference/global_objects/weakset/index.html index 00725e2331..fe31196afe 100644 --- a/files/ru/conflicting/web/javascript/reference/global_objects/weakset/index.html +++ b/files/ru/conflicting/web/javascript/reference/global_objects/weakset/index.html @@ -1,6 +1,6 @@ --- title: WeakSet.prototype -slug: Web/JavaScript/Reference/Global_Objects/WeakSet/prototype +slug: conflicting/Web/JavaScript/Reference/Global_Objects/WeakSet tags: - ECMAScript6 - JavaScript @@ -8,6 +8,7 @@ tags: - WeakSet translation_of: Web/JavaScript/Reference/Global_Objects/WeakSet translation_of_original: Web/JavaScript/Reference/Global_Objects/WeakSet/prototype +original_slug: Web/JavaScript/Reference/Global_Objects/WeakSet/prototype --- <div>{{JSRef("Global_Objects", "WeakSet")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/operators/index.html b/files/ru/conflicting/web/javascript/reference/operators/index.html index f1091e3706..85a37e17a8 100644 --- a/files/ru/conflicting/web/javascript/reference/operators/index.html +++ b/files/ru/conflicting/web/javascript/reference/operators/index.html @@ -1,11 +1,12 @@ --- title: Арифметические операции -slug: Web/JavaScript/Reference/Operators/Arithmetic_Operators +slug: conflicting/Web/JavaScript/Reference/Operators tags: - JavaScript - Операторы translation_of: Web/JavaScript/Reference/Operators translation_of_original: Web/JavaScript/Reference/Operators/Arithmetic_Operators +original_slug: Web/JavaScript/Reference/Operators/Arithmetic_Operators --- <div> <div>{{jsSidebar("Operators")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/operators_69135a8d5772f8b6e45265523df05d89/index.html b/files/ru/conflicting/web/javascript/reference/operators_69135a8d5772f8b6e45265523df05d89/index.html index ee0565dc94..a08c948525 100644 --- a/files/ru/conflicting/web/javascript/reference/operators_69135a8d5772f8b6e45265523df05d89/index.html +++ b/files/ru/conflicting/web/javascript/reference/operators_69135a8d5772f8b6e45265523df05d89/index.html @@ -1,11 +1,13 @@ --- title: Операторы сравнения -slug: Web/JavaScript/Reference/Operators/Операторы_сравнения +slug: >- + conflicting/Web/JavaScript/Reference/Operators_69135a8d5772f8b6e45265523df05d89 tags: - JavaScript - Операторы translation_of: Web/JavaScript/Reference/Operators translation_of_original: Web/JavaScript/Reference/Operators/Comparison_Operators +original_slug: Web/JavaScript/Reference/Operators/Операторы_сравнения --- <div>{{jsSidebar("Operators")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/operators_7c8eb9475d97a4a734c5991857698560/index.html b/files/ru/conflicting/web/javascript/reference/operators_7c8eb9475d97a4a734c5991857698560/index.html index ba4703c2c3..11aea9ec89 100644 --- a/files/ru/conflicting/web/javascript/reference/operators_7c8eb9475d97a4a734c5991857698560/index.html +++ b/files/ru/conflicting/web/javascript/reference/operators_7c8eb9475d97a4a734c5991857698560/index.html @@ -1,11 +1,13 @@ --- title: Битовые операции -slug: Web/JavaScript/Reference/Operators/Bitwise_Operators +slug: >- + conflicting/Web/JavaScript/Reference/Operators_7c8eb9475d97a4a734c5991857698560 tags: - JavaScript - Оператор translation_of: Web/JavaScript/Reference/Operators translation_of_original: Web/JavaScript/Reference/Operators/Bitwise_Operators +original_slug: Web/JavaScript/Reference/Operators/Bitwise_Operators --- <div>{{jsSidebar("Operators")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/operators_843c998343f0cdaa5699874c806d4cea/index.html b/files/ru/conflicting/web/javascript/reference/operators_843c998343f0cdaa5699874c806d4cea/index.html index b840f1e584..eeb43a5072 100644 --- a/files/ru/conflicting/web/javascript/reference/operators_843c998343f0cdaa5699874c806d4cea/index.html +++ b/files/ru/conflicting/web/javascript/reference/operators_843c998343f0cdaa5699874c806d4cea/index.html @@ -1,8 +1,10 @@ --- title: Логические операторы -slug: Web/JavaScript/Reference/Operators/Логические_операторы +slug: >- + conflicting/Web/JavaScript/Reference/Operators_843c998343f0cdaa5699874c806d4cea translation_of: Web/JavaScript/Reference/Operators translation_of_original: Web/JavaScript/Reference/Operators/Logical_Operators +original_slug: Web/JavaScript/Reference/Operators/Логические_операторы --- <div>{{jsSidebar("Operators")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/operators_8d54701de06af40a7c984517cbe87b3e/index.html b/files/ru/conflicting/web/javascript/reference/operators_8d54701de06af40a7c984517cbe87b3e/index.html index 5399324df0..a084333733 100644 --- a/files/ru/conflicting/web/javascript/reference/operators_8d54701de06af40a7c984517cbe87b3e/index.html +++ b/files/ru/conflicting/web/javascript/reference/operators_8d54701de06af40a7c984517cbe87b3e/index.html @@ -1,11 +1,13 @@ --- title: Операторы присваивания -slug: Web/JavaScript/Reference/Operators/Assignment_Operators +slug: >- + conflicting/Web/JavaScript/Reference/Operators_8d54701de06af40a7c984517cbe87b3e tags: - JavaScript - Оператор translation_of: Web/JavaScript/Reference/Operators#Assignment_operators translation_of_original: Web/JavaScript/Reference/Operators/Assignment_Operators +original_slug: Web/JavaScript/Reference/Operators/Assignment_Operators --- <div>{{jsSidebar("Operators")}}</div> diff --git a/files/ru/conflicting/web/javascript/reference/statements/switch/index.html b/files/ru/conflicting/web/javascript/reference/statements/switch/index.html index c1f3f6b923..373d7c8a17 100644 --- a/files/ru/conflicting/web/javascript/reference/statements/switch/index.html +++ b/files/ru/conflicting/web/javascript/reference/statements/switch/index.html @@ -1,6 +1,6 @@ --- title: default -slug: Web/JavaScript/Reference/Statements/default +slug: conflicting/Web/JavaScript/Reference/Statements/switch tags: - JavaScript - Keyword @@ -8,6 +8,7 @@ tags: - export translation_of: Web/JavaScript/Reference/Statements/switch translation_of_original: Web/JavaScript/Reference/Statements/default +original_slug: Web/JavaScript/Reference/Statements/default --- <div>{{jsSidebar("Statements")}}</div> diff --git a/files/ru/conflicting/web/media/formats/index.html b/files/ru/conflicting/web/media/formats/index.html index 9f86b15ff2..a6ae3f4e38 100644 --- a/files/ru/conflicting/web/media/formats/index.html +++ b/files/ru/conflicting/web/media/formats/index.html @@ -1,8 +1,9 @@ --- title: Форматы медиа поддерживаемые HTML audio и video элементами -slug: Web/HTML/Поддерживаемые_медиа_форматы +slug: conflicting/Web/Media/Formats translation_of: Web/Media/Formats translation_of_original: Web/HTML/Supported_media_formats +original_slug: Web/HTML/Поддерживаемые_медиа_форматы --- <p><span class="seoSummary">{{ HTMLElement("audio") }} и {{ HTMLElement("video") }} элементы предоставляют поддержку для проигрывания аудио и видео медиа без нужды в плагинах. </span>Формат медиафайла состоит из контейнера, содержащего один или несколько потоков данных, закодированных с использованием формата сжатия, называемого кодеком. Контейнер идентифицируется по расширению файла. Потоки внутри контейнера имеют несколько типов, которые могут включать в себя видео, аудио, данные или титры. Один контейнер (т. е. медиафайл) может содержать несколько потоков одного типа. В аудио- и видео- потоках находятся кодеки. Кодек — сокращенние слов "кодера-декодер" — является алгоритмом сжатия данных в файле. Каждый тип контейнера имеет только определенные кодеки, которые он поддерживает.</p> diff --git a/files/ru/conflicting/web/progressive_web_apps/index.html b/files/ru/conflicting/web/progressive_web_apps/index.html index 8d8c8ba678..ff8150db65 100644 --- a/files/ru/conflicting/web/progressive_web_apps/index.html +++ b/files/ru/conflicting/web/progressive_web_apps/index.html @@ -1,8 +1,9 @@ --- title: Адаптивный дизайн -slug: Web_Development/Mobile/Responsive_design +slug: conflicting/Web/Progressive_web_apps translation_of: Web/Progressive_web_apps translation_of_original: Web/Guide/Responsive_design +original_slug: Web_Development/Mobile/Responsive_design --- <p>As a reaction to the problems associated with the <a href="/en-US/docs/Web_Development/Mobile/Separate_sites" title="Web development/Mobile/Separate sites">separate sites</a> approach to developing Web sites for both mobile and desktop, a relatively new idea (which is actually <a href="http://www.alistapart.com/articles/dao/">quite old</a>) is growing in popularity: ditch user-agent detection, and instead make your page respond on the client-side to the browser’s capabilities. This approach, introduced by Ethan Marcotte in his article for <a href="http://alistapart.com" title="http://alistapart.com">A List Apart</a>, came to be known as <a href="http://www.alistapart.com/articles/responsive-web-design/" style="line-height: 1.572;">Responsive Web Design</a>. Like the separate sites approach, responsive Web design has positive and negative aspects.</p> <h2 id="The_Advantages">The Advantages</h2> diff --git a/files/ru/conflicting/web/progressive_web_apps_628955cdadd77b10ec99de034fc76374/index.html b/files/ru/conflicting/web/progressive_web_apps_628955cdadd77b10ec99de034fc76374/index.html index 1ed152b1e8..26b2ec685c 100644 --- a/files/ru/conflicting/web/progressive_web_apps_628955cdadd77b10ec99de034fc76374/index.html +++ b/files/ru/conflicting/web/progressive_web_apps_628955cdadd77b10ec99de034fc76374/index.html @@ -1,6 +1,6 @@ --- title: Заметный -slug: Web/Progressive_web_apps/Заметный +slug: conflicting/Web/Progressive_web_apps_628955cdadd77b10ec99de034fc76374 tags: - Веб-манифест - Видимый @@ -10,6 +10,7 @@ tags: - Современные веб-приложения translation_of: Web/Progressive_web_apps translation_of_original: Web/Progressive_web_apps/Discoverable +original_slug: Web/Progressive_web_apps/Заметный --- <div class="column-container summary"> <div class="column-11">Как только вы опубликуете новое веб-приложение, вы захотите, чтобы мир узнал об этом. Поисковые системы, конечно, помогают, но, обычно, большее внимание уделяется тому, как Ваши приложения представлены на результатах поиска. Новый манифест W3C для веб-приложений может помочь с этим и предоставить дополнительные возможности.</div> |