aboutsummaryrefslogtreecommitdiff
path: root/files/es/conflicting
diff options
context:
space:
mode:
Diffstat (limited to 'files/es/conflicting')
-rw-r--r--files/es/conflicting/glossary/doctype/index.html3
-rw-r--r--files/es/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html3
-rw-r--r--files/es/conflicting/learn/css/building_blocks/index.html3
-rw-r--r--files/es/conflicting/learn/css/building_blocks/selectors/index.html3
-rw-r--r--files/es/conflicting/learn/css/building_blocks/values_and_units/index.html3
-rw-r--r--files/es/conflicting/learn/css/css_layout/index.html3
-rw-r--r--files/es/conflicting/learn/css/first_steps/how_css_works/index.html3
-rw-r--r--files/es/conflicting/learn/css/first_steps/how_css_works_194e34e451d4ace023d98021c00b3cfd/index.html6
-rw-r--r--files/es/conflicting/learn/css/first_steps/how_css_works_a460b5a76c3c2e7fc9b8da464dfd0c22/index.html4
-rw-r--r--files/es/conflicting/learn/css/first_steps/index.html5
-rw-r--r--files/es/conflicting/learn/css/styling_text/fundamentals/index.html3
-rw-r--r--files/es/conflicting/learn/forms/index.html3
-rw-r--r--files/es/conflicting/learn/html/introduction_to_html/getting_started/index.html3
-rw-r--r--files/es/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html3
-rw-r--r--files/es/conflicting/learn/index.html3
-rw-r--r--files/es/conflicting/learn/javascript/objects/index.html3
-rw-r--r--files/es/conflicting/mdn/contribute/getting_started/index.html3
-rw-r--r--files/es/conflicting/mdn/tools/index.html3
-rw-r--r--files/es/conflicting/mdn/yari/index.html3
-rw-r--r--files/es/conflicting/mdn/yari_13d770b50d5ab9ce747962b2552e0eef/index.html3
-rw-r--r--files/es/conflicting/mozilla/add-ons/index.html3
-rw-r--r--files/es/conflicting/tools/about_colon_debugging/index.html5
-rw-r--r--files/es/conflicting/tools/performance/index.html3
-rw-r--r--files/es/conflicting/web/api/canvas_api/tutorial/index.html3
-rw-r--r--files/es/conflicting/web/api/crypto/getrandomvalues/index.html3
-rw-r--r--files/es/conflicting/web/api/document_object_model/index.html3
-rw-r--r--files/es/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html3
-rw-r--r--files/es/conflicting/web/api/document_object_model_7d961b8030c6099ee907f4f4b5fe6b3d/index.html3
-rw-r--r--files/es/conflicting/web/api/document_object_model_9f3a59543838705de7e9b080fde3cc14/index.html3
-rw-r--r--files/es/conflicting/web/api/geolocation/index.html3
-rw-r--r--files/es/conflicting/web/api/html_drag_and_drop_api/index.html3
-rw-r--r--files/es/conflicting/web/api/index.html3
-rw-r--r--files/es/conflicting/web/api/indexeddb_api/index.html3
-rw-r--r--files/es/conflicting/web/api/node/index.html3
-rw-r--r--files/es/conflicting/web/api/push_api/index.html3
-rw-r--r--files/es/conflicting/web/api/url/index.html3
-rw-r--r--files/es/conflicting/web/api/web_storage_api/index.html3
-rw-r--r--files/es/conflicting/web/api/webrtc_api/index.html3
-rw-r--r--files/es/conflicting/web/api/websockets_api/index.html3
-rw-r--r--files/es/conflicting/web/api/window/localstorage/index.html3
-rw-r--r--files/es/conflicting/web/api/windoworworkerglobalscope/index.html3
-rw-r--r--files/es/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html3
-rw-r--r--files/es/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html3
-rw-r--r--files/es/conflicting/web/css/@viewport/index.html3
-rw-r--r--files/es/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html3
-rw-r--r--files/es/conflicting/web/css/_colon_placeholder-shown/index.html7
-rw-r--r--files/es/conflicting/web/css/_colon_placeholder-shown_f20b6cc785f9fd133a0f9fb582f36891/index.html7
-rw-r--r--files/es/conflicting/web/css/_doublecolon_placeholder/index.html7
-rw-r--r--files/es/conflicting/web/css/_doublecolon_placeholder_70bda352bb504ebdd6cd3362879e2479/index.html7
-rw-r--r--files/es/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html3
-rw-r--r--files/es/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html3
-rw-r--r--files/es/conflicting/web/css/cursor/index.html3
-rw-r--r--files/es/conflicting/web/css/font-variant/index.html3
-rw-r--r--files/es/conflicting/web/css/width/index.html5
-rw-r--r--files/es/conflicting/web/guide/index.html3
-rw-r--r--files/es/conflicting/web/guide/mobile/index.html3
-rw-r--r--files/es/conflicting/web/html/element/index.html3
-rw-r--r--files/es/conflicting/web/html/global_attributes/index.html3
-rw-r--r--files/es/conflicting/web/html/global_attributes/spellcheck/index.html3
-rw-r--r--files/es/conflicting/web/http/basics_of_http/mime_types/index.html3
-rw-r--r--files/es/conflicting/web/http/csp/index.html3
-rw-r--r--files/es/conflicting/web/http/csp_aeae68a149c6fbe64e541cbdcd6ed5c5/index.html3
-rw-r--r--files/es/conflicting/web/http/headers/content-security-policy/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/arraybuffer/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/date/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/error/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/function/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/map/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/number/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/object/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/promise/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/rangeerror/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/string/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/global_objects/weakmap/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/lexical_grammar/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/operators/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/operators/spread_syntax/index.html3
-rw-r--r--files/es/conflicting/web/javascript/reference/operators_5a0acbbb60ea37d0fdc52e3bd4c3fae8/index.html4
-rw-r--r--files/es/conflicting/web/javascript/reference/operators_5c44e7d07c463ff1a5a63654f4bda87b/index.html4
-rw-r--r--files/es/conflicting/web/javascript/reference/operators_d3958587a3d3dd644852ad397eb5951b/index.html4
-rw-r--r--files/es/conflicting/web/javascript/reference/operators_e72d8790e25513408a18a5826660f704/index.html4
-rw-r--r--files/es/conflicting/web/javascript/reference/statements/switch/index.html3
-rw-r--r--files/es/conflicting/web/media/formats/index.html3
-rw-r--r--files/es/conflicting/web/opensearch/index.html3
-rw-r--r--files/es/conflicting/web/progressive_web_apps/index.html3
-rw-r--r--files/es/conflicting/web/progressive_web_apps/introduction/index.html3
-rw-r--r--files/es/conflicting/web/web_components/using_custom_elements/index.html3
88 files changed, 194 insertions, 100 deletions
diff --git a/files/es/conflicting/glossary/doctype/index.html b/files/es/conflicting/glossary/doctype/index.html
index d59af84200..f0f6e18715 100644
--- a/files/es/conflicting/glossary/doctype/index.html
+++ b/files/es/conflicting/glossary/doctype/index.html
@@ -1,7 +1,8 @@
---
title: DTD
-slug: Glossary/DTD
+slug: conflicting/Glossary/Doctype
translation_of: Glossary/Doctype
translation_of_original: Glossary/DTD
+original_slug: Glossary/DTD
---
<p>{{page("/en-US/docs/Glossary/Doctype")}}</p>
diff --git a/files/es/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html b/files/es/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
index b47218eb7a..d927df50e1 100644
--- a/files/es/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
+++ b/files/es/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
@@ -1,8 +1,9 @@
---
title: Cascada y herencia
-slug: Web/CSS/Introducción/Cascading_and_inheritance
+slug: conflicting/Learn/CSS/Building_blocks/Cascade_and_inheritance
translation_of: Learn/CSS/Building_blocks/Cascade_and_inheritance
translation_of_original: Web/Guide/CSS/Getting_started/Cascading_and_inheritance
+original_slug: Web/CSS/Introducción/Cascading_and_inheritance
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/building_blocks/index.html b/files/es/conflicting/learn/css/building_blocks/index.html
index caccdd80b2..6c07d85ec3 100644
--- a/files/es/conflicting/learn/css/building_blocks/index.html
+++ b/files/es/conflicting/learn/css/building_blocks/index.html
@@ -1,8 +1,9 @@
---
title: Boxes
-slug: Web/CSS/Introducción/Boxes
+slug: conflicting/Learn/CSS/Building_blocks
translation_of: Learn/CSS/Building_blocks
translation_of_original: Web/Guide/CSS/Getting_started/Boxes
+original_slug: Web/CSS/Introducción/Boxes
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/building_blocks/selectors/index.html b/files/es/conflicting/learn/css/building_blocks/selectors/index.html
index 9ebe3573e8..c15b94b415 100644
--- a/files/es/conflicting/learn/css/building_blocks/selectors/index.html
+++ b/files/es/conflicting/learn/css/building_blocks/selectors/index.html
@@ -1,8 +1,9 @@
---
title: Selectores
-slug: Web/CSS/Introducción/Selectors
+slug: conflicting/Learn/CSS/Building_blocks/Selectors
translation_of: Learn/CSS/Building_blocks/Selectors
translation_of_original: Web/Guide/CSS/Getting_started/Selectors
+original_slug: Web/CSS/Introducción/Selectors
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/building_blocks/values_and_units/index.html b/files/es/conflicting/learn/css/building_blocks/values_and_units/index.html
index 030fa9d692..79b7ac23cb 100644
--- a/files/es/conflicting/learn/css/building_blocks/values_and_units/index.html
+++ b/files/es/conflicting/learn/css/building_blocks/values_and_units/index.html
@@ -1,8 +1,9 @@
---
title: Color
-slug: Web/CSS/Introducción/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/CSS/Introducción/Color
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/css_layout/index.html b/files/es/conflicting/learn/css/css_layout/index.html
index f71d3a82e6..86364b84fa 100644
--- a/files/es/conflicting/learn/css/css_layout/index.html
+++ b/files/es/conflicting/learn/css/css_layout/index.html
@@ -1,8 +1,9 @@
---
title: Layout
-slug: Web/CSS/Introducción/Layout
+slug: conflicting/Learn/CSS/CSS_layout
translation_of: Learn/CSS/CSS_layout
translation_of_original: Web/Guide/CSS/Getting_started/Layout
+original_slug: Web/CSS/Introducción/Layout
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/first_steps/how_css_works/index.html b/files/es/conflicting/learn/css/first_steps/how_css_works/index.html
index 941f96a0e5..831a835c72 100644
--- a/files/es/conflicting/learn/css/first_steps/how_css_works/index.html
+++ b/files/es/conflicting/learn/css/first_steps/how_css_works/index.html
@@ -1,8 +1,9 @@
---
title: Por que usar CSS
-slug: Web/CSS/Como_iniciar/Por_que_usar_CSS
+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/Why_use_CSS
+original_slug: Web/CSS/Como_iniciar/Por_que_usar_CSS
---
<p> </p>
<p>Esta página explica por qué los documentos usan CSS. Usas CSS para añadir una hoja de estilos a tu documento de prueba.</p>
diff --git a/files/es/conflicting/learn/css/first_steps/how_css_works_194e34e451d4ace023d98021c00b3cfd/index.html b/files/es/conflicting/learn/css/first_steps/how_css_works_194e34e451d4ace023d98021c00b3cfd/index.html
index f4beb05519..6db03d40c8 100644
--- a/files/es/conflicting/learn/css/first_steps/how_css_works_194e34e451d4ace023d98021c00b3cfd/index.html
+++ b/files/es/conflicting/learn/css/first_steps/how_css_works_194e34e451d4ace023d98021c00b3cfd/index.html
@@ -1,16 +1,18 @@
---
title: Cómo funciona el CSS
-slug: Web/CSS/Introducción/How_CSS_works
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_194e34e451d4ace023d98021c00b3cfd
tags:
- CSS
- 'CSS:'
- - 'CSS:Empezando'
+ - CSS:Empezando
- Diseño
- Guía
- Inicio
- Web
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/How_CSS_works
+original_slug: Web/CSS/Introducción/How_CSS_works
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/first_steps/how_css_works_a460b5a76c3c2e7fc9b8da464dfd0c22/index.html b/files/es/conflicting/learn/css/first_steps/how_css_works_a460b5a76c3c2e7fc9b8da464dfd0c22/index.html
index 18852f2439..a46c22f85e 100644
--- a/files/es/conflicting/learn/css/first_steps/how_css_works_a460b5a76c3c2e7fc9b8da464dfd0c22/index.html
+++ b/files/es/conflicting/learn/css/first_steps/how_css_works_a460b5a76c3c2e7fc9b8da464dfd0c22/index.html
@@ -1,10 +1,12 @@
---
title: Que es CSS
-slug: Web/CSS/Como_iniciar/Que_es_CSS
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_a460b5a76c3c2e7fc9b8da464dfd0c22
tags:
- para_revisar
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/What_is_CSS
+original_slug: Web/CSS/Como_iniciar/Que_es_CSS
---
<p>En esta página se explica que es CSS. Usted creará un documento simple con el cual trabajará en las próximas páginas del tutorial.</p>
diff --git a/files/es/conflicting/learn/css/first_steps/index.html b/files/es/conflicting/learn/css/first_steps/index.html
index 09177572fa..ffcef61e68 100644
--- a/files/es/conflicting/learn/css/first_steps/index.html
+++ b/files/es/conflicting/learn/css/first_steps/index.html
@@ -1,12 +1,13 @@
---
title: Introducción
-slug: Web/CSS/Introducción
+slug: conflicting/Learn/CSS/First_steps
tags:
- CSS
- - 'CSS:Introducción'
+ - CSS:Introducción
- para_revisar
translation_of: Learn/CSS/First_steps
translation_of_original: Web/Guide/CSS/Getting_started
+original_slug: Web/CSS/Introducción
---
<h2 id="Presentación"><span class="goog-gtc-unit" id="goog-gtc-unit-2"><span class="goog-gtc-from-human goog-gtc-translatable" dir="ltr">Presentación</span></span></h2>
diff --git a/files/es/conflicting/learn/css/styling_text/fundamentals/index.html b/files/es/conflicting/learn/css/styling_text/fundamentals/index.html
index 1788c8c0ee..19c967bb6c 100644
--- a/files/es/conflicting/learn/css/styling_text/fundamentals/index.html
+++ b/files/es/conflicting/learn/css/styling_text/fundamentals/index.html
@@ -1,8 +1,9 @@
---
title: Los estilos de texto
-slug: 'Web/CSS/Introducción/Los:estilos_de_texto'
+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/CSS/Introducción/Los:estilos_de_texto
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/forms/index.html b/files/es/conflicting/learn/forms/index.html
index c607c7993a..03824f9932 100644
--- a/files/es/conflicting/learn/forms/index.html
+++ b/files/es/conflicting/learn/forms/index.html
@@ -1,6 +1,6 @@
---
title: Formularios HTML
-slug: Learn/HTML/Forms
+slug: conflicting/Learn/Forms
tags:
- Featured
- Forms
@@ -12,6 +12,7 @@ tags:
- TopicStub
- Web
translation_of: Learn/Forms
+original_slug: Learn/HTML/Forms
---
<p><span class="seoSummary">Esta guía está constituida por una serie de artículos que te ayudarán a dominar los formularios en HTML.   </span>El formulario HTML  es una herramienta  cuya finalidad es interactuar con el usuario; sin embargo, debido a razones históricas y técnicas, no siempre resulta obvio como explotar su enorme potencial. En esta guía, cubriremos todos los aspectos de los formularios HTML, desde su estructura hasta su estilo, desde la manipulación de sus datos hasta los <em>widgets</em> personalizados. ¡Aprenderás a disfrutar de las grandes prestaciones que nos brindan!</p>
diff --git a/files/es/conflicting/learn/html/introduction_to_html/getting_started/index.html b/files/es/conflicting/learn/html/introduction_to_html/getting_started/index.html
index f110fc9851..e6cd3db57d 100644
--- a/files/es/conflicting/learn/html/introduction_to_html/getting_started/index.html
+++ b/files/es/conflicting/learn/html/introduction_to_html/getting_started/index.html
@@ -1,6 +1,6 @@
---
title: La importancia de comentar correctamente
-slug: Web/HTML/La_importancia_de_comentar_correctamente
+slug: conflicting/Learn/HTML/Introduction_to_HTML/Getting_started
tags:
- HTML
- Todas_las_Categorías
@@ -8,6 +8,7 @@ tags:
- XML
translation_of: Learn/HTML/Introduction_to_HTML/Getting_started#HTML_comments
translation_of_original: Web/Guide/HTML/The_Importance_of_Correct_HTML_Commenting
+original_slug: Web/HTML/La_importancia_de_comentar_correctamente
---
<p> </p>
<p><br>
diff --git a/files/es/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html b/files/es/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
index 77810a8e65..5598eb90bd 100644
--- a/files/es/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
+++ b/files/es/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
@@ -1,6 +1,6 @@
---
title: Usando audio y video con HTML5
-slug: Web/HTML/Usando_audio_y_video_con_HTML5
+slug: conflicting/Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
tags:
- Flash
- Ogg
@@ -14,6 +14,7 @@ tags:
- reserva
translation_of: Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
translation_of_original: Web/Guide/HTML/Using_HTML5_audio_and_video
+original_slug: Web/HTML/Usando_audio_y_video_con_HTML5
---
<p>HTML5 introduce soporte integrado para el contenido multimedia gracias a los elementos {{ HTMLElement("audio") }} y {{ HTMLElement("video") }}, ofreciendo la posibilidad de insertar contenido multimedia en documentos HTML.</p>
diff --git a/files/es/conflicting/learn/index.html b/files/es/conflicting/learn/index.html
index 0092ba899e..066950ce62 100644
--- a/files/es/conflicting/learn/index.html
+++ b/files/es/conflicting/learn/index.html
@@ -1,11 +1,12 @@
---
title: Codificación-Scripting
-slug: Learn/codificacion-scripting
+slug: conflicting/Learn
tags:
- Codificación
- Principiante
- Scripting
translation_of: Learn
translation_of_original: Learn/Coding-Scripting
+original_slug: Learn/codificacion-scripting
---
<p>REDIRIGE <a href="/es/docs/Learn">Aprende</a></p>
diff --git a/files/es/conflicting/learn/javascript/objects/index.html b/files/es/conflicting/learn/javascript/objects/index.html
index 83c8f0a7c9..ae0f3827d1 100644
--- a/files/es/conflicting/learn/javascript/objects/index.html
+++ b/files/es/conflicting/learn/javascript/objects/index.html
@@ -1,6 +1,6 @@
---
title: Introducción a JavaScript orientado a objetos
-slug: Web/JavaScript/Introducción_a_JavaScript_orientado_a_objetos
+slug: conflicting/Learn/JavaScript/Objects
tags:
- Constructor
- Herencia
@@ -11,6 +11,7 @@ tags:
- espacio de nombres
translation_of: Learn/JavaScript/Objects
translation_of_original: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript
+original_slug: Web/JavaScript/Introducción_a_JavaScript_orientado_a_objetos
---
<p>{{jsSidebar("Introductory")}}</p>
diff --git a/files/es/conflicting/mdn/contribute/getting_started/index.html b/files/es/conflicting/mdn/contribute/getting_started/index.html
index 225d69bf1d..71bd6b4624 100644
--- a/files/es/conflicting/mdn/contribute/getting_started/index.html
+++ b/files/es/conflicting/mdn/contribute/getting_started/index.html
@@ -1,8 +1,9 @@
---
title: Cosas para hacer en MDN
-slug: MDN/Contribute/Tareas
+slug: conflicting/MDN/Contribute/Getting_started
translation_of: MDN/Contribute/Getting_started
translation_of_original: MDN/Contribute/Tasks
+original_slug: MDN/Contribute/Tareas
---
<div>{{MDNSidebar}}</div><p>¿Estás buscando formas de ayudar a mejorar MDN? Hay muchas formas de ayudar: desde corregir errores tipográficos hasta escribir nuevo contenido, o incluso ayudar a desarrollar la plataforma <a href="/en-US/docs/Project:MDN/Kuma">Kuma</a> en la que se construye el sitio web. La <a href="/en-US/docs/Project:MDN/Contributing">guía para el contribuyente de MDN</a> cubre todas las formas en las que puedes ayudar y cómo hacerlo. Más abajo, encontrarás listas de tareas más específicas que faltan hacer.</p>
<p>Hay un montón de cosas que puedes hacer para ayudar en MDN. Tenemos una guía para las tareas que puedes llevar a cabo como parte de nuestro artículo <a href="/en-US/docs/MDN/Getting_started#Possible_task_types">Comenzando en MDN</a>. Entre las posibles formas de ayudar se encuentran:</p>
diff --git a/files/es/conflicting/mdn/tools/index.html b/files/es/conflicting/mdn/tools/index.html
index 7703e98dd1..98db2920e8 100644
--- a/files/es/conflicting/mdn/tools/index.html
+++ b/files/es/conflicting/mdn/tools/index.html
@@ -1,6 +1,6 @@
---
title: MDN user guide
-slug: MDN/User_guide
+slug: conflicting/MDN/Tools
tags:
- Documentation
- Landing
@@ -9,6 +9,7 @@ tags:
- TopicStub
translation_of: MDN/Tools
translation_of_original: MDN/User_guide
+original_slug: MDN/User_guide
---
<div>{{MDNSidebar}}</div><p>The Mozilla Developer Network site is an advanced system for finding, reading, and contributing to documentation and sample code for Web developers (as well as for Firefox and Firefox OS developers). The MDN user guide provides articles detailing how to use MDN to find the documentation you need, and, if you wish, how to help make the material better, more expansive, and more complete.</p>
<p>{{SubpagesWithSummaries}}</p>
diff --git a/files/es/conflicting/mdn/yari/index.html b/files/es/conflicting/mdn/yari/index.html
index afe0ce3b5a..9517a30f30 100644
--- a/files/es/conflicting/mdn/yari/index.html
+++ b/files/es/conflicting/mdn/yari/index.html
@@ -1,8 +1,9 @@
---
title: Primeros pasos
-slug: MDN/Kuma/Contributing/Getting_started
+slug: conflicting/MDN/Yari
translation_of: MDN/Kuma
translation_of_original: MDN/Kuma/Contributing/Getting_started
+original_slug: MDN/Kuma/Contributing/Getting_started
---
<div>{{MDNSidebar}}</div><p>Por favor, consulte los <a href="https://github.com/mozilla/kuma/blob/master/docs/installation-vagrant.rst" title="https://github.com/mozilla/kuma/blob/master/docs/installation-vagrant.rst">Documentos de Instalacion de Kuma en GitHub</a> hasta que podamos redactar una mejor guía de "Primeros pasos".</p>
<h2 id="Solución_de_problemas">Solución de problemas</h2>
diff --git a/files/es/conflicting/mdn/yari_13d770b50d5ab9ce747962b2552e0eef/index.html b/files/es/conflicting/mdn/yari_13d770b50d5ab9ce747962b2552e0eef/index.html
index 9fc477a01b..bdedd4aff0 100644
--- a/files/es/conflicting/mdn/yari_13d770b50d5ab9ce747962b2552e0eef/index.html
+++ b/files/es/conflicting/mdn/yari_13d770b50d5ab9ce747962b2552e0eef/index.html
@@ -1,8 +1,9 @@
---
title: Contribuir a Kuma
-slug: MDN/Kuma/Contributing
+slug: conflicting/MDN/Yari_13d770b50d5ab9ce747962b2552e0eef
translation_of: MDN/Kuma
translation_of_original: MDN/Kuma/Contributing
+original_slug: MDN/Kuma/Contributing
---
<div>{{MDNSidebar}}</div><p>Si desea contribuir al proyecto de Kuma para ayudarnos a construir una gran plataforma wiki y para hacer que el sitio de Mozilla Developer Network aun mejor, los documentos aquí deberían ayudarle a unirse en el esfuerzo.</p>
<div class="row topicpage-table">
diff --git a/files/es/conflicting/mozilla/add-ons/index.html b/files/es/conflicting/mozilla/add-ons/index.html
index 615116edaf..43ecbe517c 100644
--- a/files/es/conflicting/mozilla/add-ons/index.html
+++ b/files/es/conflicting/mozilla/add-ons/index.html
@@ -1,8 +1,9 @@
---
title: Construyendo una extensión
-slug: Building_an_Extension
+slug: conflicting/Mozilla/Add-ons
translation_of: Mozilla/Add-ons
translation_of_original: Building_an_Extension
+original_slug: Building_an_Extension
---
<h2 id="Introducción">Introducción</h2>
diff --git a/files/es/conflicting/tools/about_colon_debugging/index.html b/files/es/conflicting/tools/about_colon_debugging/index.html
index a827b255cb..2fb0a75710 100644
--- a/files/es/conflicting/tools/about_colon_debugging/index.html
+++ b/files/es/conflicting/tools/about_colon_debugging/index.html
@@ -1,8 +1,9 @@
---
title: Debugging over a network
-slug: Tools/Remote_Debugging/Debugging_over_a_network
-translation_of: 'Tools/about:debugging#Connecting_over_the_Network'
+slug: conflicting/Tools/about:debugging
+translation_of: Tools/about:debugging#Connecting_over_the_Network
translation_of_original: Tools/Remote_Debugging/Debugging_over_a_network
+original_slug: Tools/Remote_Debugging/Debugging_over_a_network
---
<blockquote>
<h3 id="draft">{{draft}}</h3>
diff --git a/files/es/conflicting/tools/performance/index.html b/files/es/conflicting/tools/performance/index.html
index 23fa9e1e34..66dc76c6a1 100644
--- a/files/es/conflicting/tools/performance/index.html
+++ b/files/es/conflicting/tools/performance/index.html
@@ -1,8 +1,9 @@
---
title: JavaScript Profiler
-slug: Tools/Profiler
+slug: conflicting/Tools/Performance
translation_of: Tools/Performance
translation_of_original: Tools/Profiler
+original_slug: Tools/Profiler
---
<div>
Utilice la herramienta de perfiles para encontrar los cuellos de botella en el código JavaScript. El Profiler muestras periódicamente la pila actual de llamadas JavaScript y compila información sobre las muestras. </div>
diff --git a/files/es/conflicting/web/api/canvas_api/tutorial/index.html b/files/es/conflicting/web/api/canvas_api/tutorial/index.html
index 7271aabfb7..31bdbfc942 100644
--- a/files/es/conflicting/web/api/canvas_api/tutorial/index.html
+++ b/files/es/conflicting/web/api/canvas_api/tutorial/index.html
@@ -1,8 +1,9 @@
---
title: Dibujando gráficos con canvas
-slug: Web/HTML/Canvas/Drawing_graphics_with_canvas
+slug: conflicting/Web/API/Canvas_API/Tutorial
translation_of: Web/API/Canvas_API/Tutorial
translation_of_original: Web/API/Canvas_API/Drawing_graphics_with_canvas
+original_slug: Web/HTML/Canvas/Drawing_graphics_with_canvas
---
<div class="note">
<p>Most of this content (but not the documentation on drawWindow) has been rolled into the more expansive <a href="/en-US/docs/HTML/Canvas/Tutorial" title="HTML/Canvas/tutorial">Canvas tutorial</a>, this page should probably be redirected there as it's now redundant but some information may still be relevant.</p>
diff --git a/files/es/conflicting/web/api/crypto/getrandomvalues/index.html b/files/es/conflicting/web/api/crypto/getrandomvalues/index.html
index 76e8d7fdc2..7764d268c4 100644
--- a/files/es/conflicting/web/api/crypto/getrandomvalues/index.html
+++ b/files/es/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/es/conflicting/web/api/document_object_model/index.html b/files/es/conflicting/web/api/document_object_model/index.html
index 8123441661..f318f65508 100644
--- a/files/es/conflicting/web/api/document_object_model/index.html
+++ b/files/es/conflicting/web/api/document_object_model/index.html
@@ -1,11 +1,12 @@
---
title: Acerca del Modelo de Objetos del Documento
-slug: Acerca_del_Modelo_de_Objetos_del_Documento
+slug: conflicting/Web/API/Document_Object_Model
tags:
- DOM
- Todas_las_Categorías
translation_of: Web/API/Document_Object_Model
translation_of_original: DOM/About_the_Document_Object_Model
+original_slug: Acerca_del_Modelo_de_Objetos_del_Documento
---
<h3 id=".C2.BFQu.C3.A9_es_DOM.3F" name=".C2.BFQu.C3.A9_es_DOM.3F">¿Qué es DOM?</h3>
diff --git a/files/es/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html b/files/es/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html
index fc26bc0bee..9e3c7c7c46 100644
--- a/files/es/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html
+++ b/files/es/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html
@@ -1,6 +1,6 @@
---
title: DOM developer guide
-slug: Web/Guide/DOM
+slug: conflicting/Web/API/Document_Object_Model_656f0e51418b39c498011268be9b3a10
tags:
- API
- DOM
@@ -9,6 +9,7 @@ tags:
- TopicStub
translation_of: Web/API/Document_Object_Model
translation_of_original: Web/Guide/API/DOM
+original_slug: Web/Guide/DOM
---
<p>{{draft}}</p>
<p>The <a href="/docs/DOM">Document Object Model</a> is an API for <a href="/en-US/docs/HTML">HTML</a> and <a href="/en-US/docs/XML">XML</a> documents. It provides a structural representation of the document, enabling the developer to modify its content and visual presentation. Essentially, it connects web pages to scripts or programming languages.</p>
diff --git a/files/es/conflicting/web/api/document_object_model_7d961b8030c6099ee907f4f4b5fe6b3d/index.html b/files/es/conflicting/web/api/document_object_model_7d961b8030c6099ee907f4f4b5fe6b3d/index.html
index 26d372847a..ae8c384e87 100644
--- a/files/es/conflicting/web/api/document_object_model_7d961b8030c6099ee907f4f4b5fe6b3d/index.html
+++ b/files/es/conflicting/web/api/document_object_model_7d961b8030c6099ee907f4f4b5fe6b3d/index.html
@@ -1,11 +1,12 @@
---
title: DOM
-slug: DOM
+slug: conflicting/Web/API/Document_Object_Model_7d961b8030c6099ee907f4f4b5fe6b3d
tags:
- DOM
- Todas_las_Categorías
translation_of: Web/API/Document_Object_Model
translation_of_original: DOM
+original_slug: DOM
---
<div class="callout-box">
<strong><a href="/es/Acerca_del_Modelo_de_Objetos_del_Documento" title="es/Acerca_del_Modelo_de_Objetos_del_Documento">Acerca del Modelo de Objetos del Documento</a></strong><br>
diff --git a/files/es/conflicting/web/api/document_object_model_9f3a59543838705de7e9b080fde3cc14/index.html b/files/es/conflicting/web/api/document_object_model_9f3a59543838705de7e9b080fde3cc14/index.html
index 7759932552..bd1c67c343 100644
--- a/files/es/conflicting/web/api/document_object_model_9f3a59543838705de7e9b080fde3cc14/index.html
+++ b/files/es/conflicting/web/api/document_object_model_9f3a59543838705de7e9b080fde3cc14/index.html
@@ -1,11 +1,12 @@
---
title: Prefacio
-slug: Referencia_DOM_de_Gecko/Prefacio
+slug: conflicting/Web/API/Document_Object_Model_9f3a59543838705de7e9b080fde3cc14
tags:
- DOM
- Todas_las_Categorías
translation_of: Web/API/Document_Object_Model
translation_of_original: Web/API/Document_Object_Model/Preface
+original_slug: Referencia_DOM_de_Gecko/Prefacio
---
<p>« <a href="es/Referencia_DOM_de_Gecko">Referencia DOM de Gecko</a></p>
diff --git a/files/es/conflicting/web/api/geolocation/index.html b/files/es/conflicting/web/api/geolocation/index.html
index 0f8895b7b8..bd9d8f78d6 100644
--- a/files/es/conflicting/web/api/geolocation/index.html
+++ b/files/es/conflicting/web/api/geolocation/index.html
@@ -1,10 +1,11 @@
---
title: NavigatorGeolocation
-slug: Web/API/NavigatorGeolocation
+slug: conflicting/Web/API/Geolocation
tags:
- API
translation_of: Web/API/Geolocation
translation_of_original: Web/API/NavigatorGeolocation
+original_slug: Web/API/NavigatorGeolocation
---
<p>{{APIRef("Geolocation API")}}</p>
diff --git a/files/es/conflicting/web/api/html_drag_and_drop_api/index.html b/files/es/conflicting/web/api/html_drag_and_drop_api/index.html
index 292b860888..e8dd96166b 100644
--- a/files/es/conflicting/web/api/html_drag_and_drop_api/index.html
+++ b/files/es/conflicting/web/api/html_drag_and_drop_api/index.html
@@ -1,11 +1,12 @@
---
title: DragDrop
-slug: DragDrop
+slug: conflicting/Web/API/HTML_Drag_and_Drop_API
tags:
- NeedsTranslation
- TopicStub
translation_of: Web/API/HTML_Drag_and_Drop_API
translation_of_original: DragDrop
+original_slug: DragDrop
---
<p> </p>
<p>See <a href="https://developer.mozilla.org/en-US/docs/DragDrop/Drag_and_Drop">https://developer.mozilla.org/en-US/docs/DragDrop/Drag_and_Drop</a></p>
diff --git a/files/es/conflicting/web/api/index.html b/files/es/conflicting/web/api/index.html
index c970ea8947..66f2f46da6 100644
--- a/files/es/conflicting/web/api/index.html
+++ b/files/es/conflicting/web/api/index.html
@@ -1,6 +1,6 @@
---
title: Element.name
-slug: Web/API/Element/name
+slug: conflicting/Web/API
tags:
- API
- Compatibilidad de los navegadores
@@ -12,6 +12,7 @@ tags:
- actualizacion
translation_of: Web/API
translation_of_original: Web/API/Element/name
+original_slug: Web/API/Element/name
---
<p>{{ APIRef("DOM") }}</p>
diff --git a/files/es/conflicting/web/api/indexeddb_api/index.html b/files/es/conflicting/web/api/indexeddb_api/index.html
index 91e216833a..cdcd58724c 100644
--- a/files/es/conflicting/web/api/indexeddb_api/index.html
+++ b/files/es/conflicting/web/api/indexeddb_api/index.html
@@ -1,8 +1,9 @@
---
title: IndexedDB
-slug: IndexedDB
+slug: conflicting/Web/API/IndexedDB_API
tags:
- páginas_a_traducir
+original_slug: IndexedDB
---
<p>{{ SeeCompatTable() }}</p>
diff --git a/files/es/conflicting/web/api/node/index.html b/files/es/conflicting/web/api/node/index.html
index f6faf58631..2204a75c59 100644
--- a/files/es/conflicting/web/api/node/index.html
+++ b/files/es/conflicting/web/api/node/index.html
@@ -1,6 +1,6 @@
---
title: Nodo.nodoPrincipal
-slug: Web/API/Node/nodoPrincipal
+slug: conflicting/Web/API/Node
tags:
- API
- DOM
@@ -8,6 +8,7 @@ tags:
- Propiedad
translation_of: Web/API/Node
translation_of_original: Web/API/Node/nodePrincipal
+original_slug: Web/API/Node/nodoPrincipal
---
<div>
<div>{{APIRef("DOM")}}</div>
diff --git a/files/es/conflicting/web/api/push_api/index.html b/files/es/conflicting/web/api/push_api/index.html
index 05d101e5fa..016e0abcaa 100644
--- a/files/es/conflicting/web/api/push_api/index.html
+++ b/files/es/conflicting/web/api/push_api/index.html
@@ -1,8 +1,9 @@
---
title: Usando la API Push
-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">La W3C <a href="/en-US/docs/Web/API/Push_API">Push API</a> offers some exciting new functionality for developers to use in web applications: this article provides an introduction to getting Push notifications setup and running, with a simple demo.</span></p>
diff --git a/files/es/conflicting/web/api/url/index.html b/files/es/conflicting/web/api/url/index.html
index 6ca15914a4..61ab76466d 100644
--- a/files/es/conflicting/web/api/url/index.html
+++ b/files/es/conflicting/web/api/url/index.html
@@ -1,6 +1,6 @@
---
title: Window.URL
-slug: Web/API/Window/URL
+slug: conflicting/Web/API/URL
tags:
- API
- DOM
@@ -10,6 +10,7 @@ tags:
- WebAPI
translation_of: Web/API/URL
translation_of_original: Web/API/Window/URL
+original_slug: Web/API/Window/URL
---
<p>{{ApiRef("Window")}}{{SeeCompatTable}}</p>
diff --git a/files/es/conflicting/web/api/web_storage_api/index.html b/files/es/conflicting/web/api/web_storage_api/index.html
index 6889022c7a..551f98f92d 100644
--- a/files/es/conflicting/web/api/web_storage_api/index.html
+++ b/files/es/conflicting/web/api/web_storage_api/index.html
@@ -1,6 +1,6 @@
---
title: Almacenamiento
-slug: DOM/Almacenamiento
+slug: conflicting/Web/API/Web_Storage_API
tags:
- DOM
- JavaScript
@@ -9,6 +9,7 @@ tags:
- para_revisar
translation_of: Web/API/Web_Storage_API
translation_of_original: Web/Guide/API/DOM/Storage
+original_slug: DOM/Almacenamiento
---
<p>{{ ApiRef() }}</p>
<h3 id="Introducci.C3.B3n" name="Introducci.C3.B3n">Introducción</h3>
diff --git a/files/es/conflicting/web/api/webrtc_api/index.html b/files/es/conflicting/web/api/webrtc_api/index.html
index b8eb318529..41554256cd 100644
--- a/files/es/conflicting/web/api/webrtc_api/index.html
+++ b/files/es/conflicting/web/api/webrtc_api/index.html
@@ -1,8 +1,9 @@
---
title: WebRTC
-slug: WebRTC
+slug: conflicting/Web/API/WebRTC_API
translation_of: Web/API/WebRTC_API
translation_of_original: WebRTC
+original_slug: WebRTC
---
<p>El RTC en WebRTC significa <em>Real-Time Communications</em>, o comunicaciones en tiempo real, en español. WebRTC es una tecnología que permite compartir en tiempo real datos de audio y video entre navegadores (pares). Como conjunto de estándares, WebRTC provee a cualquier navegador de la capacidad de compartir datos de aplicación y realizar teleconferencias de par a par, sin la necesidad de instalar complementos o Software de terceros.</p>
<p>Los componentes de WebRTC son utilizados a través de interfaces avanzadaz de programación en JavaScript (APIs). Actualmente se están desarrollando la API de streaming a través de la red, que representa los flujos de datos de audio y vídeo, y la API PeerConnection, que permite a dos o más usuarios realizar conexiones navegador a navegador. Igualmente en desarrollo se encuentra la API DataChannel, que permite la transmisión de otros tipos de datos para juegos en tiempo real, mensajería instantánea, transferencia de archivos, y otros.</p>
diff --git a/files/es/conflicting/web/api/websockets_api/index.html b/files/es/conflicting/web/api/websockets_api/index.html
index f7ac10a94d..6250ba53c0 100644
--- a/files/es/conflicting/web/api/websockets_api/index.html
+++ b/files/es/conflicting/web/api/websockets_api/index.html
@@ -1,9 +1,10 @@
---
title: WebSockets
-slug: WebSockets
+slug: conflicting/Web/API/WebSockets_API
tags:
- WebSockets
- para_revisar
+original_slug: WebSockets
---
<p><span><span style="">{{ SeeCompatTable () }}</span></span></p>
<p><span><span style="">WebSockets es una tecnología que hace posible abrir una sesión de comunicación interactiva entre el navegador del usuario y un servidor.</span></span> <span><span style="">Con esta API, puedes enviar mensajes a un servidor y recibir respuestas por eventos sin tener que consultar al servidor.</span></span></p>
diff --git a/files/es/conflicting/web/api/window/localstorage/index.html b/files/es/conflicting/web/api/window/localstorage/index.html
index 5c46cb9559..d4307e30a4 100644
--- a/files/es/conflicting/web/api/window/localstorage/index.html
+++ b/files/es/conflicting/web/api/window/localstorage/index.html
@@ -1,11 +1,12 @@
---
title: LocalStorage
-slug: Web/API/Storage/LocalStorage
+slug: conflicting/Web/API/Window/localStorage
tags:
- Almacenamiento en Navegador
- Almacenamiento local
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> (almacenamiento local) es lo mismo que<code> <a href="/en-US/docs/Web/API/sessionStorage">sessionStorage</a> </code>(almacenamiento de sesión), con las mismas reglas de mismo-origen aplicadas, pero es persistente a través de diferentes sesiones. <code>localStorage</code> se introdujo en la version Firefox 3.5.</p>
diff --git a/files/es/conflicting/web/api/windoworworkerglobalscope/index.html b/files/es/conflicting/web/api/windoworworkerglobalscope/index.html
index 2607e635fa..881424841a 100644
--- a/files/es/conflicting/web/api/windoworworkerglobalscope/index.html
+++ b/files/es/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}}</p>
<p>The <code><strong>WindowBase64</strong></code> helper contains utility methods to convert data to and from base64, a binary-to-text encoding scheme. For example it is used in <a href="/en-US/docs/data_URIs">data URIs</a>.</p>
diff --git a/files/es/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html b/files/es/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html
index 549969232f..bede3a0c57 100644
--- a/files/es/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html
+++ b/files/es/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html
@@ -1,10 +1,11 @@
---
title: WindowTimers
-slug: Web/API/WindowTimers
+slug: conflicting/Web/API/WindowOrWorkerGlobalScope_e2691f7ad05781a30c5fc5bb3b3f633a
tags:
- API
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/es/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html b/files/es/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html
index 0c189b625d..7630d77e37 100644
--- a/files/es/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html
+++ b/files/es/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html
@@ -1,6 +1,6 @@
---
title: WebAPI
-slug: WebAPI
+slug: conflicting/Web/API_dd04ca1265cb79b990b8120e5f5070d3
tags:
- Apps
- DOM
@@ -10,6 +10,7 @@ tags:
- TopicStub
translation_of: Web/API
translation_of_original: WebAPI
+original_slug: WebAPI
---
<p><strong>WebAPI</strong> es un termino usado para referirse al conjunto de APIs compatibles y de acceso a los dispositivos que permite a las Web apps y contenido acceder al hardware del dispositivo (como el estado de la batería o la vibración de hardware), al igual que acceso a información almacenada en el dispositivo (como el calendario o la lista de contactos). Agregando estas APIs, esperamos expandir lo que la Web puede hacer hoy y solo plataformas propietarias fueron capaces de hacer en el pasado.</p>
diff --git a/files/es/conflicting/web/css/@viewport/index.html b/files/es/conflicting/web/css/@viewport/index.html
index bb9c54b069..613ae5a285 100644
--- a/files/es/conflicting/web/css/@viewport/index.html
+++ b/files/es/conflicting/web/css/@viewport/index.html
@@ -1,11 +1,12 @@
---
title: height
-slug: Web/CSS/@viewport/height
+slug: conflicting/Web/CSS/@viewport
tags:
- Descriptor CSS
- Referencia
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/height
+original_slug: Web/CSS/@viewport/height
---
<div>{{CSSRef}}</div>
diff --git a/files/es/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html b/files/es/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html
index 2c550153bc..1c89eeec84 100644
--- a/files/es/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html
+++ b/files/es/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html
@@ -1,8 +1,9 @@
---
title: width
-slug: Web/CSS/@viewport/width
+slug: conflicting/Web/CSS/@viewport_c925ec0506b352ea1185248b874f7848
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/width
+original_slug: Web/CSS/@viewport/width
---
<div>{{CSSRef}}</div>
diff --git a/files/es/conflicting/web/css/_colon_placeholder-shown/index.html b/files/es/conflicting/web/css/_colon_placeholder-shown/index.html
index c7f84a0273..a29af2de30 100644
--- a/files/es/conflicting/web/css/_colon_placeholder-shown/index.html
+++ b/files/es/conflicting/web/css/_colon_placeholder-shown/index.html
@@ -1,6 +1,6 @@
---
title: ':-moz-placeholder'
-slug: 'Web/CSS/:-moz-placeholder'
+slug: conflicting/Web/CSS/:placeholder-shown
tags:
- CSS
- Marcador de Posición INPUT
@@ -9,8 +9,9 @@ tags:
- Placeholder
- Pseudo-Clase CSS
- Referencia CSS
-translation_of: 'Web/CSS/:placeholder-shown'
-translation_of_original: 'Web/CSS/:-moz-placeholder'
+translation_of: Web/CSS/:placeholder-shown
+translation_of_original: Web/CSS/:-moz-placeholder
+original_slug: Web/CSS/:-moz-placeholder
---
<div class="note"><strong>Nota:</strong> La pseudo-clase CSS <code>:-moz-placeholder</code> está depreciada desde la versión Firefox 19 siendo desde entonces sustituida por el pseudo-elemento {{cssxref('::-moz-placeholder')}}.</div>
diff --git a/files/es/conflicting/web/css/_colon_placeholder-shown_f20b6cc785f9fd133a0f9fb582f36891/index.html b/files/es/conflicting/web/css/_colon_placeholder-shown_f20b6cc785f9fd133a0f9fb582f36891/index.html
index b83b72db1a..41ba68e25e 100644
--- a/files/es/conflicting/web/css/_colon_placeholder-shown_f20b6cc785f9fd133a0f9fb582f36891/index.html
+++ b/files/es/conflicting/web/css/_colon_placeholder-shown_f20b6cc785f9fd133a0f9fb582f36891/index.html
@@ -1,13 +1,14 @@
---
title: ':-ms-input-placeholder'
-slug: 'Web/CSS/:-ms-input-placeholder'
+slug: conflicting/Web/CSS/:placeholder-shown_f20b6cc785f9fd133a0f9fb582f36891
tags:
- CSS
- No estándar(2)
- Pseudo clase CSS
- Referencia
-translation_of: 'Web/CSS/:placeholder-shown'
-translation_of_original: 'Web/CSS/:-ms-input-placeholder'
+translation_of: Web/CSS/:placeholder-shown
+translation_of_original: Web/CSS/:-ms-input-placeholder
+original_slug: Web/CSS/:-ms-input-placeholder
---
<div>{{Non-standard_header}}{{CSSRef}}</div>
diff --git a/files/es/conflicting/web/css/_doublecolon_placeholder/index.html b/files/es/conflicting/web/css/_doublecolon_placeholder/index.html
index 3c8fbb8c3a..99c5ec97ee 100644
--- a/files/es/conflicting/web/css/_doublecolon_placeholder/index.html
+++ b/files/es/conflicting/web/css/_doublecolon_placeholder/index.html
@@ -1,13 +1,14 @@
---
title: '::-moz-placeholder'
-slug: 'Web/CSS/::-moz-placeholder'
+slug: conflicting/Web/CSS/::placeholder
tags:
- CSS
- No estándar(2)
- Pseudo-elemento CSS
- Referencia CSS
-translation_of: 'Web/CSS/::placeholder'
-translation_of_original: 'Web/CSS/::-moz-placeholder'
+translation_of: Web/CSS/::placeholder
+translation_of_original: Web/CSS/::-moz-placeholder
+original_slug: Web/CSS/::-moz-placeholder
---
<div>{{Non-standard_header}}{{CSSRef}}</div>
diff --git a/files/es/conflicting/web/css/_doublecolon_placeholder_70bda352bb504ebdd6cd3362879e2479/index.html b/files/es/conflicting/web/css/_doublecolon_placeholder_70bda352bb504ebdd6cd3362879e2479/index.html
index 181f0a966c..54824a3934 100644
--- a/files/es/conflicting/web/css/_doublecolon_placeholder_70bda352bb504ebdd6cd3362879e2479/index.html
+++ b/files/es/conflicting/web/css/_doublecolon_placeholder_70bda352bb504ebdd6cd3362879e2479/index.html
@@ -1,6 +1,6 @@
---
title: '::-webkit-input-placeholder'
-slug: 'Web/CSS/::-webkit-input-placeholder'
+slug: conflicting/Web/CSS/::placeholder_70bda352bb504ebdd6cd3362879e2479
tags:
- CSS
- NeedsExample
@@ -9,8 +9,9 @@ tags:
- Pseudo-elemento CSS
- Referencia
- Referencia CSS
-translation_of: 'Web/CSS/::placeholder'
-translation_of_original: 'Web/CSS/::-webkit-input-placeholder'
+translation_of: Web/CSS/::placeholder
+translation_of_original: Web/CSS/::-webkit-input-placeholder
+original_slug: Web/CSS/::-webkit-input-placeholder
---
<div>{{Non-standard_header}}{{CSSRef}}</div>
diff --git a/files/es/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html b/files/es/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html
index dd39986ed4..c2fb316660 100644
--- a/files/es/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html
+++ b/files/es/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html
@@ -1,8 +1,9 @@
---
title: Usando las cajas flexibles CSS
-slug: Web/CSS/CSS_Flexible_Box_Layout/Usando_las_cajas_flexibles_CSS
+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/Usando_las_cajas_flexibles_CSS
---
<div>{{CSSRef}}</div>
diff --git a/files/es/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html b/files/es/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html
index e42553fe97..e28553d037 100644
--- a/files/es/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html
+++ b/files/es/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html
@@ -1,6 +1,6 @@
---
title: Usando flexbox para componer aplicaciones web
-slug: Web/CSS/CSS_Flexible_Box_Layout/Usando_flexbox_para_componer_aplicaciones_web
+slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Typical_Use_Cases_of_Flexbox
tags:
- Avanzado
- CSS
@@ -10,6 +10,7 @@ tags:
- Web
translation_of: Web/CSS/CSS_Flexible_Box_Layout/Typical_Use_Cases_of_Flexbox
translation_of_original: Web/CSS/CSS_Flexible_Box_Layout/Using_flexbox_to_lay_out_web_applications
+original_slug: Web/CSS/CSS_Flexible_Box_Layout/Usando_flexbox_para_componer_aplicaciones_web
---
<p>{{CSSRef}}</p>
diff --git a/files/es/conflicting/web/css/cursor/index.html b/files/es/conflicting/web/css/cursor/index.html
index 213b3607c0..a1b674c1c7 100644
--- a/files/es/conflicting/web/css/cursor/index.html
+++ b/files/es/conflicting/web/css/cursor/index.html
@@ -1,10 +1,11 @@
---
title: '-moz-cell'
-slug: Web/CSS/-moz-cell
+slug: conflicting/Web/CSS/cursor
tags:
- CSS
translation_of: Web/CSS/cursor
translation_of_original: Web/CSS/-moz-cell
+original_slug: Web/CSS/-moz-cell
---
<div>{{CSSRef}}{{obsolete_header}}</div>
diff --git a/files/es/conflicting/web/css/font-variant/index.html b/files/es/conflicting/web/css/font-variant/index.html
index 332e284385..09f79f2844 100644
--- a/files/es/conflicting/web/css/font-variant/index.html
+++ b/files/es/conflicting/web/css/font-variant/index.html
@@ -1,8 +1,9 @@
---
title: normal
-slug: Web/CSS/normal
+slug: conflicting/Web/CSS/font-variant
translation_of: Web/CSS/font-variant
translation_of_original: Web/CSS/normal
+original_slug: Web/CSS/normal
---
<h2 id="Sumario" name="Sumario">Sumario</h2>
<p>El valor <i>normal</i> en una propiedad CSS, es normalmente el valor medio de entre los posibles valores que puede tomar. Es el valor por defecto, es decir, el que tiene la propiedad si no establecemos uno distinto.</p>
diff --git a/files/es/conflicting/web/css/width/index.html b/files/es/conflicting/web/css/width/index.html
index c380b1b891..ade93e4cf9 100644
--- a/files/es/conflicting/web/css/width/index.html
+++ b/files/es/conflicting/web/css/width/index.html
@@ -1,12 +1,13 @@
---
title: auto
-slug: Web/CSS/auto
+slug: conflicting/Web/CSS/width
tags:
- CSS
- - 'CSS:Referencias'
+ - CSS:Referencias
- Todas_las_Categorías
translation_of: Web/CSS/width
translation_of_original: Web/CSS/auto
+original_slug: Web/CSS/auto
---
<p>
</p><p>&lt;&lt; <a href="es/Gu%c3%ada_de_referencia_de_CSS">Volver</a>
diff --git a/files/es/conflicting/web/guide/index.html b/files/es/conflicting/web/guide/index.html
index d6d72dfef3..e1fb2513bd 100644
--- a/files/es/conflicting/web/guide/index.html
+++ b/files/es/conflicting/web/guide/index.html
@@ -1,11 +1,12 @@
---
title: Desarrollo Web
-slug: Desarrollo_Web
+slug: conflicting/Web/Guide
tags:
- Desarrollo_Web
- Todas_las_Categorías
translation_of: Web/Guide
translation_of_original: Web_Development
+original_slug: Desarrollo_Web
---
<p>
</p>
diff --git a/files/es/conflicting/web/guide/mobile/index.html b/files/es/conflicting/web/guide/mobile/index.html
index cc288a9c45..028d0c71ed 100644
--- a/files/es/conflicting/web/guide/mobile/index.html
+++ b/files/es/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/es/conflicting/web/html/element/index.html b/files/es/conflicting/web/html/element/index.html
index 64595418c8..ebde8fbff4 100644
--- a/files/es/conflicting/web/html/element/index.html
+++ b/files/es/conflicting/web/html/element/index.html
@@ -1,8 +1,9 @@
---
title: Lista de Elementos HTML5
-slug: HTML/HTML5/HTML5_lista_elementos
+slug: conflicting/Web/HTML/Element
translation_of: Web/HTML/Element
translation_of_original: Web/Guide/HTML/HTML5/HTML5_element_list
+original_slug: HTML/HTML5/HTML5_lista_elementos
---
<p>Todos los <strong>elementos del estandar HTML5</strong> están listados aquí, descritos por su etiqueta de apertura y agrupados por su función. Contrariamente al <a href="/en-US/docs/HTML/Element" title="HTML/Element">indice de elementos HTML</a> el cual lista todas las posibles etiquetas, estandar, no-estandar, válidas, obsoletas o aquellas en desuso, esta lista solamente los elementos válidos de HTML5. Solamente aquellos elementos listados aquí son los que deberían ser usados en nuevos sitios Web.</p>
diff --git a/files/es/conflicting/web/html/global_attributes/index.html b/files/es/conflicting/web/html/global_attributes/index.html
index 64afaf64ff..5c1df0adc7 100644
--- a/files/es/conflicting/web/html/global_attributes/index.html
+++ b/files/es/conflicting/web/html/global_attributes/index.html
@@ -1,6 +1,6 @@
---
title: Atributo global
-slug: Glossary/Atributo_global
+slug: conflicting/Web/HTML/Global_attributes
tags:
- CodingScripting
- Glosario
@@ -8,6 +8,7 @@ tags:
- atributo
translation_of: Web/HTML/Global_attributes
translation_of_original: Glossary/Global_attribute
+original_slug: Glossary/Atributo_global
---
<p>Los<strong> Atributos Globales</strong> son {{glossary("attribute","atributos")}} que pueden ser usados en todos los {{glossary("element","elementos")}} (aunque a veces no tienen efecto en algunos de ellos).</p>
diff --git a/files/es/conflicting/web/html/global_attributes/spellcheck/index.html b/files/es/conflicting/web/html/global_attributes/spellcheck/index.html
index 0f409bb10e..7d8b76554b 100644
--- a/files/es/conflicting/web/html/global_attributes/spellcheck/index.html
+++ b/files/es/conflicting/web/html/global_attributes/spellcheck/index.html
@@ -1,6 +1,6 @@
---
title: Control de la corrección ortográfica en formularios HTML
-slug: Control_de_la_corrección_ortográfica_en_formularios_HTML
+slug: conflicting/Web/HTML/Global_attributes/spellcheck
tags:
- Desarrollo_Web
- Gestión de configuración
@@ -10,6 +10,7 @@ tags:
- XHTML
translation_of: Web/HTML/Global_attributes/spellcheck
translation_of_original: Web/HTML/Controlling_spell_checking_in_HTML_forms
+original_slug: Control_de_la_corrección_ortográfica_en_formularios_HTML
---
<p><span class="seoSummary">{{ gecko_minversion_header("1.8.1") }} Firefox 2 incorpora un corrector ortográfico para las áreas y los campos de texto de los formularios web.</span> Usando la interfaz "about:config" el usuario puede activar o desactivar el corrector, además, puede indicar si desea o no habilitar la corrección ortográfica y si debe habilitarse para áreas y campos de texto o sólo en áreas de texto.</p>
diff --git a/files/es/conflicting/web/http/basics_of_http/mime_types/index.html b/files/es/conflicting/web/http/basics_of_http/mime_types/index.html
index fbd15d6764..7e325a7d49 100644
--- a/files/es/conflicting/web/http/basics_of_http/mime_types/index.html
+++ b/files/es/conflicting/web/http/basics_of_http/mime_types/index.html
@@ -1,11 +1,12 @@
---
title: Tipo MIME incorrecto en archivos CSS
-slug: Tipo_MIME_incorrecto_en_archivos_CSS
+slug: conflicting/Web/HTTP/Basics_of_HTTP/MIME_types
tags:
- CSS
- Todas_las_Categorías
translation_of: Web/HTTP/Basics_of_HTTP/MIME_types
translation_of_original: Incorrect_MIME_Type_for_CSS_Files
+original_slug: Tipo_MIME_incorrecto_en_archivos_CSS
---
<h3 id=".C2.BFCu.C3.A1l_es_el_problema.3F"> ¿Cuál es el problema? </h3>
<p>Quizás encuentres una web que use CSS con un diseño pobre en Netscape 7.x o cualquier navegador basado en Gecko como Mozilla, mientras que en Internet Explorer se muestra correctamente. Una de las razones más comunes para que esto suceda es una configuración inapropiada del servidor que tiene almacenado el archivo CSS. Algunos servidores Apache e iPlanet asocian archivos con extensión .CSS con un tipo incorrecto MIME como el "text/plain" o "application/x-pointplus". En algunos casos, Netscape 7.x y Mozilla ignoran el archivo CSS porque tiene un tipo MIME incorrecto y usan una hoja de estilo por defecto que causa que el diseño sea diferente del que se pretendía por parte del desarrollador web.
diff --git a/files/es/conflicting/web/http/csp/index.html b/files/es/conflicting/web/http/csp/index.html
index 6fcf1a2ff3..bb9d56164f 100644
--- a/files/es/conflicting/web/http/csp/index.html
+++ b/files/es/conflicting/web/http/csp/index.html
@@ -1,11 +1,12 @@
---
title: CSP (Políticas de Seguridad de Contenido)
-slug: Web/Security/CSP
+slug: conflicting/Web/HTTP/CSP
tags:
- Documento
- Referencia
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/es/conflicting/web/http/csp_aeae68a149c6fbe64e541cbdcd6ed5c5/index.html b/files/es/conflicting/web/http/csp_aeae68a149c6fbe64e541cbdcd6ed5c5/index.html
index 58960c7798..96a5cf6d8d 100644
--- a/files/es/conflicting/web/http/csp_aeae68a149c6fbe64e541cbdcd6ed5c5/index.html
+++ b/files/es/conflicting/web/http/csp_aeae68a149c6fbe64e541cbdcd6ed5c5/index.html
@@ -1,6 +1,6 @@
---
title: Introducción a Políticas de Seguridad de Contenido
-slug: Web/Security/CSP/Introducing_Content_Security_Policy
+slug: conflicting/Web/HTTP/CSP_aeae68a149c6fbe64e541cbdcd6ed5c5
tags:
- Documento
- Políticas de Seguridad de Contenido
@@ -8,6 +8,7 @@ tags:
- Seguridad
translation_of: Web/HTTP/CSP
translation_of_original: Web/Security/CSP/Introducing_Content_Security_Policy
+original_slug: Web/Security/CSP/Introducing_Content_Security_Policy
---
<p>{{ gecko_minversion_header("2") }}</p>
diff --git a/files/es/conflicting/web/http/headers/content-security-policy/index.html b/files/es/conflicting/web/http/headers/content-security-policy/index.html
index c2f9c5a628..dd1cb8d720 100644
--- a/files/es/conflicting/web/http/headers/content-security-policy/index.html
+++ b/files/es/conflicting/web/http/headers/content-security-policy/index.html
@@ -1,8 +1,9 @@
---
title: Políticas Directivas CSP
-slug: Web/Security/CSP/CSP_policy_directives
+slug: conflicting/Web/HTTP/Headers/Content-Security-Policy
translation_of: Web/HTTP/Headers/Content-Security-Policy
translation_of_original: Web/Security/CSP/CSP_policy_directives
+original_slug: Web/Security/CSP/CSP_policy_directives
---
<p> </p>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/arraybuffer/index.html b/files/es/conflicting/web/javascript/reference/global_objects/arraybuffer/index.html
index fef80071de..48a3db323c 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/arraybuffer/index.html
+++ b/files/es/conflicting/web/javascript/reference/global_objects/arraybuffer/index.html
@@ -1,12 +1,13 @@
---
title: ArrayBuffer.prototype
-slug: Web/JavaScript/Referencia/Objetos_globales/ArrayBuffer/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/ArrayBuffer
tags:
- ArrayBuffer
- JavaScript
- Propiedad
translation_of: Web/JavaScript/Reference/Global_Objects/ArrayBuffer
translation_of_original: Web/JavaScript/Reference/Global_Objects/ArrayBuffer/prototype
+original_slug: Web/JavaScript/Referencia/Objetos_globales/ArrayBuffer/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/date/index.html b/files/es/conflicting/web/javascript/reference/global_objects/date/index.html
index de92c8ee02..362876f5af 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/date/index.html
+++ b/files/es/conflicting/web/javascript/reference/global_objects/date/index.html
@@ -1,12 +1,13 @@
---
title: Date.prototype
-slug: Web/JavaScript/Referencia/Objetos_globales/Date/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Date
tags:
- Date
- JavaScript
- Property
translation_of: Web/JavaScript/Reference/Global_Objects/Date
translation_of_original: Web/JavaScript/Reference/Global_Objects/Date/prototype
+original_slug: Web/JavaScript/Referencia/Objetos_globales/Date/prototype
---
<div>
{{JSRef("Objetos_globales", "Date")}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/error/index.html b/files/es/conflicting/web/javascript/reference/global_objects/error/index.html
index aac1516fc2..5540880b03 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/error/index.html
+++ b/files/es/conflicting/web/javascript/reference/global_objects/error/index.html
@@ -1,8 +1,9 @@
---
title: Error.prototype
-slug: Web/JavaScript/Referencia/Objetos_globales/Error/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Error
translation_of: Web/JavaScript/Reference/Global_Objects/Error
translation_of_original: Web/JavaScript/Reference/Global_Objects/Error/prototype
+original_slug: Web/JavaScript/Referencia/Objetos_globales/Error/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/function/index.html b/files/es/conflicting/web/javascript/reference/global_objects/function/index.html
index 9d8671c534..20de74f338 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/function/index.html
+++ b/files/es/conflicting/web/javascript/reference/global_objects/function/index.html
@@ -1,12 +1,13 @@
---
title: Function.prototype
-slug: Web/JavaScript/Referencia/Objetos_globales/Function/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Function
tags:
- Function
- JavaScript
- Property
translation_of: Web/JavaScript/Reference/Global_Objects/Function
translation_of_original: Web/JavaScript/Reference/Global_Objects/Function/prototype
+original_slug: Web/JavaScript/Referencia/Objetos_globales/Function/prototype
---
<div>{{JSRef("Objetos_globales", "Function")}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/map/index.html b/files/es/conflicting/web/javascript/reference/global_objects/map/index.html
index b255e65b69..557a561e76 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/map/index.html
+++ b/files/es/conflicting/web/javascript/reference/global_objects/map/index.html
@@ -1,8 +1,9 @@
---
title: Map.prototype
-slug: Web/JavaScript/Referencia/Objetos_globales/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/Referencia/Objetos_globales/Map/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/number/index.html b/files/es/conflicting/web/javascript/reference/global_objects/number/index.html
index c15b5b5fcb..2f9f0a8e4e 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/number/index.html
+++ b/files/es/conflicting/web/javascript/reference/global_objects/number/index.html
@@ -1,12 +1,13 @@
---
title: Number.prototype
-slug: Web/JavaScript/Referencia/Objetos_globales/Number/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Number
tags:
- JavaScript
- Number
- Property
translation_of: Web/JavaScript/Reference/Global_Objects/Number
translation_of_original: Web/JavaScript/Reference/Global_Objects/Number/prototype
+original_slug: Web/JavaScript/Referencia/Objetos_globales/Number/prototype
---
<div>
{{JSRef("Objetos_globales", "Number")}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/object/index.html b/files/es/conflicting/web/javascript/reference/global_objects/object/index.html
index 9b55c9cccc..805aa55cf9 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/object/index.html
+++ b/files/es/conflicting/web/javascript/reference/global_objects/object/index.html
@@ -1,12 +1,13 @@
---
title: Object.prototype
-slug: Web/JavaScript/Referencia/Objetos_globales/Object/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Object
tags:
- JavaScript
- Objeto
- Propiedad
translation_of: Web/JavaScript/Reference/Global_Objects/Object
translation_of_original: Web/JavaScript/Reference/Global_Objects/Object/prototype
+original_slug: Web/JavaScript/Referencia/Objetos_globales/Object/prototype
---
<div>{{JSRef("Objetos_globales", "Object")}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/promise/index.html b/files/es/conflicting/web/javascript/reference/global_objects/promise/index.html
index c15107912a..99fe5cfd8d 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/promise/index.html
+++ b/files/es/conflicting/web/javascript/reference/global_objects/promise/index.html
@@ -1,12 +1,13 @@
---
title: Promise.prototype
-slug: Web/JavaScript/Referencia/Objetos_globales/Promise/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Promise
tags:
- JavaScript
- Promesa
- Propiedad
translation_of: Web/JavaScript/Reference/Global_Objects/Promise
translation_of_original: Web/JavaScript/Reference/Global_Objects/Promise/prototype
+original_slug: Web/JavaScript/Referencia/Objetos_globales/Promise/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/rangeerror/index.html b/files/es/conflicting/web/javascript/reference/global_objects/rangeerror/index.html
index fa75157c9d..0f4dc1fde3 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/rangeerror/index.html
+++ b/files/es/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
@@ -10,6 +10,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}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/string/index.html b/files/es/conflicting/web/javascript/reference/global_objects/string/index.html
index 89519b08d2..5f13679c36 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/string/index.html
+++ b/files/es/conflicting/web/javascript/reference/global_objects/string/index.html
@@ -1,6 +1,6 @@
---
title: String.prototype
-slug: Web/JavaScript/Referencia/Objetos_globales/String/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/String
tags:
- JavaScript
- Property
@@ -8,6 +8,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/Referencia/Objetos_globales/String/prototype
---
<p>{{JSRef("Objetos_globales", "String")}}</p>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html b/files/es/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html
index 2de491bc21..8fbdac1a8d 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html
+++ b/files/es/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html
@@ -1,6 +1,6 @@
---
title: SyntaxError.prototype
-slug: Web/JavaScript/Referencia/Objetos_globales/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/Referencia/Objetos_globales/SyntaxError/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/global_objects/weakmap/index.html b/files/es/conflicting/web/javascript/reference/global_objects/weakmap/index.html
index 41d501135d..fd84aa6280 100644
--- a/files/es/conflicting/web/javascript/reference/global_objects/weakmap/index.html
+++ b/files/es/conflicting/web/javascript/reference/global_objects/weakmap/index.html
@@ -1,6 +1,6 @@
---
title: WeakMap.prototype
-slug: Web/JavaScript/Referencia/Objetos_globales/WeakMap/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WeakMap
tags:
- ECMAScript6
- JavaScript
@@ -8,6 +8,7 @@ tags:
- WeakMap
translation_of: Web/JavaScript/Reference/Global_Objects/WeakMap
translation_of_original: Web/JavaScript/Reference/Global_Objects/WeakMap/prototype
+original_slug: Web/JavaScript/Referencia/Objetos_globales/WeakMap/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/lexical_grammar/index.html b/files/es/conflicting/web/javascript/reference/lexical_grammar/index.html
index 14010f37e3..0f36de5c58 100644
--- a/files/es/conflicting/web/javascript/reference/lexical_grammar/index.html
+++ b/files/es/conflicting/web/javascript/reference/lexical_grammar/index.html
@@ -1,11 +1,12 @@
---
title: Palabras Reservadas
-slug: Web/JavaScript/Referencia/Palabras_Reservadas
+slug: conflicting/Web/JavaScript/Reference/Lexical_grammar
tags:
- JavaScript
- palabras reservadas
translation_of: Web/JavaScript/Reference/Lexical_grammar#Keywords
translation_of_original: Web/JavaScript/Reference/Reserved_Words
+original_slug: Web/JavaScript/Referencia/Palabras_Reservadas
---
<p> </p>
diff --git a/files/es/conflicting/web/javascript/reference/operators/index.html b/files/es/conflicting/web/javascript/reference/operators/index.html
index 71968fda85..ef6c162b92 100644
--- a/files/es/conflicting/web/javascript/reference/operators/index.html
+++ b/files/es/conflicting/web/javascript/reference/operators/index.html
@@ -1,11 +1,12 @@
---
title: Operadores Aritméticos
-slug: Web/JavaScript/Referencia/Operadores/Aritméticos
+slug: conflicting/Web/JavaScript/Reference/Operators
tags:
- JavaScript
- Operador
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Arithmetic_Operators
+original_slug: Web/JavaScript/Referencia/Operadores/Aritméticos
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/operators/spread_syntax/index.html b/files/es/conflicting/web/javascript/reference/operators/spread_syntax/index.html
index 050a2026f6..f8d23e4eaa 100644
--- a/files/es/conflicting/web/javascript/reference/operators/spread_syntax/index.html
+++ b/files/es/conflicting/web/javascript/reference/operators/spread_syntax/index.html
@@ -1,6 +1,6 @@
---
title: Operador de propagación
-slug: Web/JavaScript/Referencia/Operadores/Spread_operator
+slug: conflicting/Web/JavaScript/Reference/Operators/Spread_syntax
tags:
- Experimental
- Expérimental(2)
@@ -8,6 +8,7 @@ tags:
- Operador
translation_of: Web/JavaScript/Reference/Operators/Spread_syntax
translation_of_original: Web/JavaScript/Reference/Operators/Spread_operator
+original_slug: Web/JavaScript/Referencia/Operadores/Spread_operator
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/operators_5a0acbbb60ea37d0fdc52e3bd4c3fae8/index.html b/files/es/conflicting/web/javascript/reference/operators_5a0acbbb60ea37d0fdc52e3bd4c3fae8/index.html
index 8685790d2c..9c2a7a8c40 100644
--- a/files/es/conflicting/web/javascript/reference/operators_5a0acbbb60ea37d0fdc52e3bd4c3fae8/index.html
+++ b/files/es/conflicting/web/javascript/reference/operators_5a0acbbb60ea37d0fdc52e3bd4c3fae8/index.html
@@ -1,12 +1,14 @@
---
title: Operadores de Comparación
-slug: Web/JavaScript/Referencia/Operadores/Comparison_Operators
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_5a0acbbb60ea37d0fdc52e3bd4c3fae8
tags:
- JavaScript
- Operador
- Referencia
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Comparison_Operators
+original_slug: Web/JavaScript/Referencia/Operadores/Comparison_Operators
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/operators_5c44e7d07c463ff1a5a63654f4bda87b/index.html b/files/es/conflicting/web/javascript/reference/operators_5c44e7d07c463ff1a5a63654f4bda87b/index.html
index c4276c1c95..7d80f90f12 100644
--- a/files/es/conflicting/web/javascript/reference/operators_5c44e7d07c463ff1a5a63654f4bda87b/index.html
+++ b/files/es/conflicting/web/javascript/reference/operators_5c44e7d07c463ff1a5a63654f4bda87b/index.html
@@ -1,11 +1,13 @@
---
title: Operadores a nivel de bit
-slug: Web/JavaScript/Referencia/Operadores/Bitwise_Operators
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_5c44e7d07c463ff1a5a63654f4bda87b
tags:
- JavaScript
- Operador
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Bitwise_Operators
+original_slug: Web/JavaScript/Referencia/Operadores/Bitwise_Operators
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/operators_d3958587a3d3dd644852ad397eb5951b/index.html b/files/es/conflicting/web/javascript/reference/operators_d3958587a3d3dd644852ad397eb5951b/index.html
index 979eff63f2..90a97a1033 100644
--- a/files/es/conflicting/web/javascript/reference/operators_d3958587a3d3dd644852ad397eb5951b/index.html
+++ b/files/es/conflicting/web/javascript/reference/operators_d3958587a3d3dd644852ad397eb5951b/index.html
@@ -1,11 +1,13 @@
---
title: Operadores de asignación
-slug: Web/JavaScript/Referencia/Operadores/Assignment_Operators
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_d3958587a3d3dd644852ad397eb5951b
tags:
- JavaScript
- Operador
translation_of: Web/JavaScript/Reference/Operators#Assignment_operators
translation_of_original: Web/JavaScript/Reference/Operators/Assignment_Operators
+original_slug: Web/JavaScript/Referencia/Operadores/Assignment_Operators
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/operators_e72d8790e25513408a18a5826660f704/index.html b/files/es/conflicting/web/javascript/reference/operators_e72d8790e25513408a18a5826660f704/index.html
index 4c9cb860a9..a2a2ca8de7 100644
--- a/files/es/conflicting/web/javascript/reference/operators_e72d8790e25513408a18a5826660f704/index.html
+++ b/files/es/conflicting/web/javascript/reference/operators_e72d8790e25513408a18a5826660f704/index.html
@@ -1,8 +1,10 @@
---
title: Operadores lógicos
-slug: Web/JavaScript/Referencia/Operadores/Operadores_lógicos
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_e72d8790e25513408a18a5826660f704
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Logical_Operators
+original_slug: Web/JavaScript/Referencia/Operadores/Operadores_lógicos
---
<div>{{jsSidebar("Operadores_lógicos")}}</div>
diff --git a/files/es/conflicting/web/javascript/reference/statements/switch/index.html b/files/es/conflicting/web/javascript/reference/statements/switch/index.html
index a25a5a5369..c70e5eec5d 100644
--- a/files/es/conflicting/web/javascript/reference/statements/switch/index.html
+++ b/files/es/conflicting/web/javascript/reference/statements/switch/index.html
@@ -1,11 +1,12 @@
---
title: default
-slug: Web/JavaScript/Referencia/Sentencias/default
+slug: conflicting/Web/JavaScript/Reference/Statements/switch
tags:
- JavaScript
- Palabra clave
translation_of: Web/JavaScript/Reference/Statements/switch
translation_of_original: Web/JavaScript/Reference/Statements/default
+original_slug: Web/JavaScript/Referencia/Sentencias/default
---
<div>{{jsSidebar("Sentencias")}}</div>
diff --git a/files/es/conflicting/web/media/formats/index.html b/files/es/conflicting/web/media/formats/index.html
index f342f64d11..15b4627d03 100644
--- a/files/es/conflicting/web/media/formats/index.html
+++ b/files/es/conflicting/web/media/formats/index.html
@@ -1,8 +1,9 @@
---
title: Formatos de medios admitidos por los elementos HTML audio y video
-slug: Web/HTML/Formatos_admitidos_de_audio_y_video_en_html5
+slug: conflicting/Web/Media/Formats
translation_of: Web/Media/Formats
translation_of_original: Web/HTML/Supported_media_formats
+original_slug: Web/HTML/Formatos_admitidos_de_audio_y_video_en_html5
---
<p>Las etiquetas {{ HTMLElement("audio") }} y {{ HTMLElement("video") }} <span id="result_box" lang="es"><span class="hps">proporcionan apoyo</span> <span class="hps">para la reproducción de</span> <span class="hps">audio</span> <span class="hps">y video</span> <span class="hps">sin necesidad de</span> <span class="atn hps">plug-</span><span>ins.</span> <span class="hps">Codecs</span> <span class="hps">de vídeo</span> <span class="hps">y codecs</span> <span class="hps">de audio</span> <span class="hps">se utilizan para manejar</span> <span class="hps">vídeo y</span> <span class="hps">audio,</span> <span class="hps">y los diferentes</span> <span class="hps">codecs</span> <span class="hps">ofrecen diferentes</span> <span class="hps">niveles de compresión</span> <span class="hps">y calidad.</span> <span class="hps">Un</span> <span class="hps">formato de contenedor</span> <span class="hps">se utiliza para</span> <span class="hps">almacenar y transmitir</span> <span class="hps">el vídeo</span> <span class="hps">y el audio</span> <span class="hps">codificado</span> <span class="hps">juntos.</span> <span class="hps">Muchos</span> <span class="hps">codecs</span> <span class="hps">y formatos</span> <span class="hps">de contenedor</span> <span class="hps">existe</span><span>,</span> <span class="hps">e incluso hay</span> <span class="hps">más combinaciones de</span> <span class="hps">ellos.</span> <span class="hps">Para su uso</span> <span class="hps">en la web,</span> <span class="hps">sólo un puñado de</span> <span class="hps">combinaciones</span> <span class="hps">son relevantes.</span></span></p>
diff --git a/files/es/conflicting/web/opensearch/index.html b/files/es/conflicting/web/opensearch/index.html
index 638147ee38..524c22557e 100644
--- a/files/es/conflicting/web/opensearch/index.html
+++ b/files/es/conflicting/web/opensearch/index.html
@@ -1,10 +1,11 @@
---
title: Añadir motores de búsqueda desde páginas web
-slug: Añadir_motores_de_búsqueda_desde_páginas_web
+slug: conflicting/Web/OpenSearch
tags:
- Plugins_de_búsqueda
translation_of: Web/OpenSearch
translation_of_original: Web/API/Window/sidebar/Adding_search_engines_from_Web_pages
+original_slug: Añadir_motores_de_búsqueda_desde_páginas_web
---
<p>Firefox permite que código JavaScript instale plugins de motores de búsqueda, y soporta dos formatos de plugin de motores de búsqueda: <a href="es/Creando_plugins_de_OpenSearch_para_Firefox">OpenSearch</a>, y Sherlock.
</p>
diff --git a/files/es/conflicting/web/progressive_web_apps/index.html b/files/es/conflicting/web/progressive_web_apps/index.html
index 6445a631af..4025b422b5 100644
--- a/files/es/conflicting/web/progressive_web_apps/index.html
+++ b/files/es/conflicting/web/progressive_web_apps/index.html
@@ -1,8 +1,9 @@
---
title: Diseño adaptable («responsivo»)
-slug: Web_Development/Mobile/Diseño_responsivo
+slug: conflicting/Web/Progressive_web_apps
translation_of: Web/Progressive_web_apps
translation_of_original: Web/Guide/Responsive_design
+original_slug: Web_Development/Mobile/Diseño_responsivo
---
<p>Como reacción a los problemas asociados con la estrategia de desarrollar <a href="https://developer.mozilla.org/en/Web_Development/Mobile/Separate_sites" title="en/Web development/Mobile/Separate sites">sitios web separados</a> para los móviles y los escritorios, una idea relativamente nueva — aunque de hecho es <a class="external" href="http://www.alistapart.com/articles/dao/">bastante vieja</a>— que está aumentando en popularidad: deshacerse por completo de la detección del agente de usuario y hacer que la misma página responda a las capacidades del navegador en el lado del cliente. Este enfoque se ha denominado comúnmente como <a class="external" href="http://www.alistapart.com/articles/responsive-web-design/">diseño web adaptable —o «responsivo»—</a>. Al igual que la estrategia de sitios separados, el diseño web adaptativo tiene aspectos positivos y negativos.</p>
<h2 id="Las_ventajas">Las ventajas</h2>
diff --git a/files/es/conflicting/web/progressive_web_apps/introduction/index.html b/files/es/conflicting/web/progressive_web_apps/introduction/index.html
index e1fa9fad1f..be12926a85 100644
--- a/files/es/conflicting/web/progressive_web_apps/introduction/index.html
+++ b/files/es/conflicting/web/progressive_web_apps/introduction/index.html
@@ -1,6 +1,6 @@
---
title: Ventajas de una aplicación web progresiva (AWP)
-slug: Web/Progressive_web_apps/Ventajas
+slug: conflicting/Web/Progressive_web_apps/Introduction
tags:
- AWP
- aplicaciones web progresivas
@@ -8,6 +8,7 @@ tags:
- ventajas
translation_of: Web/Progressive_web_apps/Introduction#Advantages_of_web_applications
translation_of_original: Web/Progressive_web_apps/Advantages
+original_slug: Web/Progressive_web_apps/Ventajas
---
<p class="summary">Las Aplicaciones Web Progresivas deben tener todas las ventajas enumeradas en las siguientes secciones a continuación.</p>
diff --git a/files/es/conflicting/web/web_components/using_custom_elements/index.html b/files/es/conflicting/web/web_components/using_custom_elements/index.html
index 98c3562a7b..9ca4c50786 100644
--- a/files/es/conflicting/web/web_components/using_custom_elements/index.html
+++ b/files/es/conflicting/web/web_components/using_custom_elements/index.html
@@ -1,12 +1,13 @@
---
title: Custom Elements
-slug: Web/Web_Components/Custom_Elements
+slug: conflicting/Web/Web_Components/Using_custom_elements
tags:
- Componentes Web
- Web Components
- custom elements
translation_of: Web/Web_Components/Using_custom_elements
translation_of_original: Web/Web_Components/Custom_Elements
+original_slug: Web/Web_Components/Custom_Elements
---
<p>Los <em>Custom Elements </em>son una característica que permite crear tus propios <a href="https://developer.mozilla.org/en-US/docs/Glossary/Element">elementos</a> HTML personalizados. Pueden tener un comportamiento personalizado y estilos CSS propios. Son una parte de los <a href="https://developer.mozilla.org/en-US/docs/Web/Web_Components">Web Components</a>, pero también pueden ser utilizados independientemente.</p>