aboutsummaryrefslogtreecommitdiff
path: root/files/fr/conflicting
diff options
context:
space:
mode:
authorFlorian Merz <me@fiji-flo.de>2021-02-11 12:36:30 +0100
committerFlorian Merz <me@fiji-flo.de>2021-02-11 12:36:30 +0100
commit7766d67593cf81cc5d15a77b6dcad98d1b98f6aa (patch)
tree004e031fc47a2ed576e83000b7ef08f9355459f4 /files/fr/conflicting
parent39f2114f9797eb51994966c6bb8ff1814c9a4da8 (diff)
downloadtranslated-content-7766d67593cf81cc5d15a77b6dcad98d1b98f6aa.tar.gz
translated-content-7766d67593cf81cc5d15a77b6dcad98d1b98f6aa.tar.bz2
translated-content-7766d67593cf81cc5d15a77b6dcad98d1b98f6aa.zip
unslug fr: modify
Diffstat (limited to 'files/fr/conflicting')
-rw-r--r--files/fr/conflicting/glossary/chrome/index.html3
-rw-r--r--files/fr/conflicting/glossary/doctype/index.html3
-rw-r--r--files/fr/conflicting/glossary/dom/index.html3
-rw-r--r--files/fr/conflicting/learn/common_questions/set_up_a_local_testing_server/index.html3
-rw-r--r--files/fr/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html5
-rw-r--r--files/fr/conflicting/learn/css/building_blocks/index.html5
-rw-r--r--files/fr/conflicting/learn/css/building_blocks/selectors/index.html3
-rw-r--r--files/fr/conflicting/learn/css/building_blocks/selectors_9bc80fea302c91cd60fb72c4e83c83e9/index.html6
-rw-r--r--files/fr/conflicting/learn/css/building_blocks/styling_tables/index.html5
-rw-r--r--files/fr/conflicting/learn/css/building_blocks/values_and_units/index.html5
-rw-r--r--files/fr/conflicting/learn/css/css_layout/index.html5
-rw-r--r--files/fr/conflicting/learn/css/css_layout/introduction/index.html3
-rw-r--r--files/fr/conflicting/learn/css/first_steps/how_css_is_structured/index.html5
-rw-r--r--files/fr/conflicting/learn/css/first_steps/how_css_works/index.html3
-rw-r--r--files/fr/conflicting/learn/css/first_steps/how_css_works_cdccf923f6bd040e8d243ee03d223ddc/index.html6
-rw-r--r--files/fr/conflicting/learn/css/first_steps/how_css_works_cf31463f874ecd8e10e648dacde4a995/index.html4
-rw-r--r--files/fr/conflicting/learn/css/first_steps/how_css_works_dba75d8c56ccc773f03d946ce2dbb25c/index.html6
-rw-r--r--files/fr/conflicting/learn/css/first_steps/how_css_works_ecbda2160290b96c02dcfa8276c0333a/index.html6
-rw-r--r--files/fr/conflicting/learn/css/first_steps/index.html5
-rw-r--r--files/fr/conflicting/learn/css/styling_text/fundamentals/index.html3
-rw-r--r--files/fr/conflicting/learn/css/styling_text/fundamentals_8249b1bf53d09b06ed51f43697880b5b/index.html6
-rw-r--r--files/fr/conflicting/learn/css/styling_text/fundamentals_9e7ba587262abbb02304cbc099c1f0d8/index.html4
-rw-r--r--files/fr/conflicting/learn/css/styling_text/styling_lists/index.html3
-rw-r--r--files/fr/conflicting/learn/css/styling_text/styling_lists_06e9538892250c13976a84639f0dadd2/index.html6
-rw-r--r--files/fr/conflicting/learn/getting_started_with_the_web/dealing_with_files/index.html3
-rw-r--r--files/fr/conflicting/learn/getting_started_with_the_web/index.html3
-rw-r--r--files/fr/conflicting/learn/getting_started_with_the_web/javascript_basics/index.html3
-rw-r--r--files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting/index.html3
-rw-r--r--files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting_b235e00aa38ee1d4b535fc921395f446/index.html4
-rw-r--r--files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting_c8b0b9eb353375fb9a4679f68164e682/index.html4
-rw-r--r--files/fr/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html3
-rw-r--r--files/fr/conflicting/learn/html/introduction_to_html/creating_hyperlinks_10fd94f15ce1a469a3483e0478cb5d85/index.html4
-rw-r--r--files/fr/conflicting/learn/html/introduction_to_html/document_and_website_structure/index.html3
-rw-r--r--files/fr/conflicting/learn/html/introduction_to_html/getting_started/index.html3
-rw-r--r--files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals/index.html3
-rw-r--r--files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals_42ad0dcdd765b60d8adda1f6293954b6/index.html4
-rw-r--r--files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals_e22cde852fd55bbd8b014a4eac49a3bc/index.html4
-rw-r--r--files/fr/conflicting/learn/html/introduction_to_html/index.html3
-rw-r--r--files/fr/conflicting/learn/html/multimedia_and_embedding/images_in_html/index.html3
-rw-r--r--files/fr/conflicting/learn/html/multimedia_and_embedding/images_in_html_2c0377f7605f693cad465c2b4839addc/index.html4
-rw-r--r--files/fr/conflicting/learn/html/multimedia_and_embedding/other_embedding_technologies/index.html3
-rw-r--r--files/fr/conflicting/learn/html/multimedia_and_embedding/other_embedding_technologies_fbe06d127f73df4dd2f56a31b7c2bd2d/index.html4
-rw-r--r--files/fr/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html3
-rw-r--r--files/fr/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content_040b1c36f4218ba488ffb0284dfe52bf/index.html4
-rw-r--r--files/fr/conflicting/learn/index.html3
-rw-r--r--files/fr/conflicting/learn/javascript/client-side_web_apis/manipulating_documents/index.html5
-rw-r--r--files/fr/conflicting/learn/javascript/objects/index.html3
-rw-r--r--files/fr/conflicting/learn_370bfb0fa23e42f4384f010341852c43/index.html3
-rw-r--r--files/fr/conflicting/learn_6767a192c90d2c9c5179cf004fce2ee8/index.html3
-rw-r--r--files/fr/conflicting/mdn/contribute/index.html3
-rw-r--r--files/fr/conflicting/mdn/tools/index.html3
-rw-r--r--files/fr/conflicting/mozilla/add-ons/webextensions/api/menus/overridecontext/index.html3
-rw-r--r--files/fr/conflicting/mozilla/add-ons/webextensions/api/userscripts/registereduserscript/unregister/index.html4
-rw-r--r--files/fr/conflicting/tools/debugger/how_to/set_watch_expressions/index.html7
-rw-r--r--files/fr/conflicting/tools/memory/basic_operations/index.html3
-rw-r--r--files/fr/conflicting/tools/memory/basic_operations_9264f1c8b3be17d004821ca45ca04d3a/index.html3
-rw-r--r--files/fr/conflicting/tools/memory/basic_operations_f2c86b478396e7a233344f64c4d4f1da/index.html3
-rw-r--r--files/fr/conflicting/tools/page_inspector/ui_tour/index.html5
-rw-r--r--files/fr/conflicting/tools/performance/waterfall/index.html3
-rw-r--r--files/fr/conflicting/tools/responsive_design_mode/index.html3
-rw-r--r--files/fr/conflicting/web/accessibility/index.html3
-rw-r--r--files/fr/conflicting/web/api/canvas_api/tutorial/index.html3
-rw-r--r--files/fr/conflicting/web/api/document/createevent/index.html3
-rw-r--r--files/fr/conflicting/web/api/document_object_model/index.html3
-rw-r--r--files/fr/conflicting/web/api/document_object_model_03f6e13c52ad7c539d9b4c33c51ac4a3/index.html3
-rw-r--r--files/fr/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html3
-rw-r--r--files/fr/conflicting/web/api/formdata/using_formdata_objects/index.html3
-rw-r--r--files/fr/conflicting/web/api/globaleventhandlers/onresize/index.html3
-rw-r--r--files/fr/conflicting/web/api/htmlmediaelement/abort_event/index.html3
-rw-r--r--files/fr/conflicting/web/api/htmlmediaelement/ended_event/index.html3
-rw-r--r--files/fr/conflicting/web/api/index.html3
-rw-r--r--files/fr/conflicting/web/api/node/getrootnode/index.html3
-rw-r--r--files/fr/conflicting/web/api/node/index.html3
-rw-r--r--files/fr/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html3
-rw-r--r--files/fr/conflicting/web/api/selection/index.html3
-rw-r--r--files/fr/conflicting/web/api/url/index.html3
-rw-r--r--files/fr/conflicting/web/api/web_storage_api/index.html3
-rw-r--r--files/fr/conflicting/web/api/web_workers_api/using_web_workers/index.html3
-rw-r--r--files/fr/conflicting/web/api/webrtc_api/index.html3
-rw-r--r--files/fr/conflicting/web/api/webrtc_api_d8621144cbc61520339c3b10c61731f0/index.html3
-rw-r--r--files/fr/conflicting/web/api/window/localstorage/index.html3
-rw-r--r--files/fr/conflicting/web/api/xsltprocessor/index.html3
-rw-r--r--files/fr/conflicting/web/api/xsltprocessor_197eea6e529b0a946d29ce7cc292e7ef/index.html3
-rw-r--r--files/fr/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport_3ecbd2877baedebcfaffc13eaa7d61ce/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport_7861ca3461a359b150d44f2c8d74e53a/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport_a47f799d4189f98a73bc55899628d6d7/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport_c5f2dc316e069e8c32ab24f9117600a7/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html3
-rw-r--r--files/fr/conflicting/web/css/@viewport_ff9d4f4f351256d9fdb3d21397eb3880/index.html3
-rw-r--r--files/fr/conflicting/web/css/_colon_is/index.html7
-rw-r--r--files/fr/conflicting/web/css/_colon_placeholder-shown/index.html7
-rw-r--r--files/fr/conflicting/web/css/_doublecolon_placeholder/index.html7
-rw-r--r--files/fr/conflicting/web/css/border-collapse/index.html3
-rw-r--r--files/fr/conflicting/web/css/box-ordinal-group/index.html3
-rw-r--r--files/fr/conflicting/web/css/color_value/index.html3
-rw-r--r--files/fr/conflicting/web/css/column-gap/index.html3
-rw-r--r--files/fr/conflicting/web/css/css_backgrounds_and_borders/index.html3
-rw-r--r--files/fr/conflicting/web/css/css_color/index.html3
-rw-r--r--files/fr/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html3
-rw-r--r--files/fr/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html3
-rw-r--r--files/fr/conflicting/web/css/cursor/index.html3
-rw-r--r--files/fr/conflicting/web/css/filter_effects/index.html3
-rw-r--r--files/fr/conflicting/web/css/float/index.html3
-rw-r--r--files/fr/conflicting/web/css/font-variant/index.html3
-rw-r--r--files/fr/conflicting/web/css/index.html3
-rw-r--r--files/fr/conflicting/web/css/mask-image/index.html3
-rw-r--r--files/fr/conflicting/web/css/mozilla_extensions/index.html3
-rw-r--r--files/fr/conflicting/web/css/pseudo-classes/index.html3
-rw-r--r--files/fr/conflicting/web/css/scroll-snap-type/index.html3
-rw-r--r--files/fr/conflicting/web/css/shape-outside/index.html3
-rw-r--r--files/fr/conflicting/web/css/url()/index.html3
-rw-r--r--files/fr/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html3
-rw-r--r--files/fr/conflicting/web/css/user-select/index.html3
-rw-r--r--files/fr/conflicting/web/css/width/index.html3
-rw-r--r--files/fr/conflicting/web/guide/events/creating_and_triggering_events/index.html3
-rw-r--r--files/fr/conflicting/web/guide/index.html3
-rw-r--r--files/fr/conflicting/web/html/element/index.html3
-rw-r--r--files/fr/conflicting/web/html/global_attributes/index.html3
-rw-r--r--files/fr/conflicting/web/http/basics_of_http/mime_types/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/equality_comparisons_and_sameness/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/guide/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/guide/introduction/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/guide/introduction_6f341ba6db4b060ccbd8dce4a0d5214b/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/guide/regular_expressions/assertions/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/inheritance_and_the_prototype_chain/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/arraybuffer/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/boolean/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/dataview/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/date/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/date/tostring/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/error/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/evalerror/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/function/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/generatorfunction/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/internalerror/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/intl/collator/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/intl/listformat/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/intl/locale/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/intl/numberformat/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/intl/pluralrules/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/intl/relativetimeformat/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/json/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/map/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/number/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/object/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/object/tosource/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/promise/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/rangeerror/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/referenceerror/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/regexp/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/set/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/sharedarraybuffer/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/string/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/symbol/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/typedarray/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/typeerror/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/urierror/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/weakmap/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/weakset/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/webassembly/global/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/webassembly/instance/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/webassembly/memory/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/webassembly/module/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/global_objects/webassembly/table/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/lexical_grammar/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/operators/index.html3
-rw-r--r--files/fr/conflicting/web/javascript/reference/operators_03cb648b1d07bbaa8b57526b509d6d55/index.html4
-rw-r--r--files/fr/conflicting/web/javascript/reference/operators_201bc9aef1615ff38f215c35d4cde8c9/index.html4
-rw-r--r--files/fr/conflicting/web/javascript/reference/operators_2be16fc74d75a7c9dca0abca1dc5883b/index.html4
-rw-r--r--files/fr/conflicting/web/javascript/reference/operators_688eef608213025193cd6b8e1e75b5c3/index.html4
-rw-r--r--files/fr/conflicting/web/javascript/reference/operators_d0fb75b0fac950a91a017a1f497c6a1f/index.html4
-rw-r--r--files/fr/conflicting/web/javascript/reference/statements/switch/index.html3
-rw-r--r--files/fr/conflicting/web/progressive_web_apps/index.html3
-rw-r--r--files/fr/conflicting/web/progressive_web_apps_0d5c38b9aa908cbb52e4c39037b4f28b/index.html3
-rw-r--r--files/fr/conflicting/web/progressive_web_apps_12fa0bab73df8b67470cc2aaa3a2effc/index.html3
-rw-r--r--files/fr/conflicting/web/progressive_web_apps_7b3e1886320599eacfee6834ead473f1/index.html3
-rw-r--r--files/fr/conflicting/web/progressive_web_apps_954d3e6cc1e06f006b865b74099f55cf/index.html3
-rw-r--r--files/fr/conflicting/web/progressive_web_apps_ab4d34f3f29326f76d3aab740be03d31/index.html3
-rw-r--r--files/fr/conflicting/web/progressive_web_apps_cb2823fe6cfc1ddee5db1f6a5d240c67/index.html3
-rw-r--r--files/fr/conflicting/web/xpath/introduction_to_using_xpath_in_javascript/index.html3
189 files changed, 423 insertions, 212 deletions
diff --git a/files/fr/conflicting/glossary/chrome/index.html b/files/fr/conflicting/glossary/chrome/index.html
index 4c11e52a8c..e6892c6a24 100644
--- a/files/fr/conflicting/glossary/chrome/index.html
+++ b/files/fr/conflicting/glossary/chrome/index.html
@@ -1,10 +1,11 @@
---
title: Chrome
-slug: Chrome
+slug: conflicting/Glossary/Chrome
tags:
- API_du_toolkit
translation_of: Glossary/Chrome
translation_of_original: Chrome
+original_slug: Chrome
---
<p>Le terme <b>Chrome</b> a historiquement plusieurs significations dans le cadre de Mozilla.</p>
<dl>
diff --git a/files/fr/conflicting/glossary/doctype/index.html b/files/fr/conflicting/glossary/doctype/index.html
index 803f8cc228..bb96b29d9f 100644
--- a/files/fr/conflicting/glossary/doctype/index.html
+++ b/files/fr/conflicting/glossary/doctype/index.html
@@ -1,10 +1,11 @@
---
title: DTD
-slug: Glossaire/DTD
+slug: conflicting/Glossary/Doctype
tags:
- Encodage
- Glossaire
translation_of: Glossary/Doctype
translation_of_original: Glossary/DTD
+original_slug: Glossaire/DTD
---
<p>{{page("/fr/docs/Glossaire/Doctype")}}</p>
diff --git a/files/fr/conflicting/glossary/dom/index.html b/files/fr/conflicting/glossary/dom/index.html
index 196eda1157..b621b29c81 100644
--- a/files/fr/conflicting/glossary/dom/index.html
+++ b/files/fr/conflicting/glossary/dom/index.html
@@ -1,8 +1,9 @@
---
title: Référence DOM Gecko
-slug: Référence_DOM_Gecko
+slug: conflicting/Glossary/DOM
translation_of: Glossary/DOM
translation_of_original: Document_Object_Model_(DOM)
+original_slug: Référence_DOM_Gecko
---
<div>
Table des matières du DOM Gecko</div>
diff --git a/files/fr/conflicting/learn/common_questions/set_up_a_local_testing_server/index.html b/files/fr/conflicting/learn/common_questions/set_up_a_local_testing_server/index.html
index d688fcce92..c3430f5eab 100644
--- a/files/fr/conflicting/learn/common_questions/set_up_a_local_testing_server/index.html
+++ b/files/fr/conflicting/learn/common_questions/set_up_a_local_testing_server/index.html
@@ -1,6 +1,6 @@
---
title: Mettre en place un environnement de travail
-slug: Apprendre/Mettre_en_place_un_environnement_de_travail
+slug: conflicting/Learn/Common_questions/set_up_a_local_testing_server
tags:
- Beginner
- CodingScripting
@@ -8,6 +8,7 @@ tags:
- Learn
translation_of: Learn/Common_questions/set_up_a_local_testing_server
translation_of_original: Learn/Common_questions/Set_up_a_basic_working_environment
+original_slug: Apprendre/Mettre_en_place_un_environnement_de_travail
---
<div class="summary">
<p>Cet article indique comment mettre en place un environnement de travail et de test afin d'organiser vos pages web.</p>
diff --git a/files/fr/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html b/files/fr/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
index d5c4ea0ea9..2dd53fcb87 100644
--- a/files/fr/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
+++ b/files/fr/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
@@ -1,11 +1,12 @@
---
title: Cascade et héritage
-slug: CSS/Premiers_pas/Cascade_et_héritage
+slug: conflicting/Learn/CSS/Building_blocks/Cascade_and_inheritance
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/Building_blocks/Cascade_and_inheritance
translation_of_original: Web/Guide/CSS/Getting_started/Cascading_and_inheritance
+original_slug: CSS/Premiers_pas/Cascade_et_héritage
---
<p> </p>
<p>Cette page met en évidence la façon dont les feuilles de style interagissent dans une cascade et comment les éléments héritent leur style de leurs parents.</p>
diff --git a/files/fr/conflicting/learn/css/building_blocks/index.html b/files/fr/conflicting/learn/css/building_blocks/index.html
index fd147c876d..399af012a1 100644
--- a/files/fr/conflicting/learn/css/building_blocks/index.html
+++ b/files/fr/conflicting/learn/css/building_blocks/index.html
@@ -1,11 +1,12 @@
---
title: Boîtes
-slug: CSS/Premiers_pas/Boîtes
+slug: conflicting/Learn/CSS/Building_blocks
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/Building_blocks
translation_of_original: Web/Guide/CSS/Getting_started/Boxes
+original_slug: CSS/Premiers_pas/Boîtes
---
<p> </p>
<p>Cette page explique comment utiliser CSS pour contrôler l'espace occupé par un élément lorsqu'il est affiché.</p>
diff --git a/files/fr/conflicting/learn/css/building_blocks/selectors/index.html b/files/fr/conflicting/learn/css/building_blocks/selectors/index.html
index d3ab8e9794..6f8167820f 100644
--- a/files/fr/conflicting/learn/css/building_blocks/selectors/index.html
+++ b/files/fr/conflicting/learn/css/building_blocks/selectors/index.html
@@ -1,6 +1,6 @@
---
title: Les propriétés CSS et comment s'en servir
-slug: Apprendre/CSS/Les_propriétés_CSS
+slug: conflicting/Learn/CSS/Building_blocks/Selectors
tags:
- Beginner
- CSS
@@ -8,6 +8,7 @@ tags:
- NeedsActiveLearning
translation_of: Learn/CSS/Building_blocks/Selectors
translation_of_original: Learn/CSS/CSS_properties
+original_slug: Apprendre/CSS/Les_propriétés_CSS
---
<div>{{IncludeSubnav("/fr/Apprendre")}}</div>
<div class="summary">
diff --git a/files/fr/conflicting/learn/css/building_blocks/selectors_9bc80fea302c91cd60fb72c4e83c83e9/index.html b/files/fr/conflicting/learn/css/building_blocks/selectors_9bc80fea302c91cd60fb72c4e83c83e9/index.html
index 9371d826b3..0a415b7af8 100644
--- a/files/fr/conflicting/learn/css/building_blocks/selectors_9bc80fea302c91cd60fb72c4e83c83e9/index.html
+++ b/files/fr/conflicting/learn/css/building_blocks/selectors_9bc80fea302c91cd60fb72c4e83c83e9/index.html
@@ -1,11 +1,13 @@
---
title: Les sélecteurs
-slug: CSS/Premiers_pas/Les_sélecteurs
+slug: >-
+ conflicting/Learn/CSS/Building_blocks/Selectors_9bc80fea302c91cd60fb72c4e83c83e9
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/Building_blocks/Selectors
translation_of_original: Web/Guide/CSS/Getting_started/Selectors
+original_slug: CSS/Premiers_pas/Les_sélecteurs
---
<p> </p>
diff --git a/files/fr/conflicting/learn/css/building_blocks/styling_tables/index.html b/files/fr/conflicting/learn/css/building_blocks/styling_tables/index.html
index 9fcc9dbd2d..a080656067 100644
--- a/files/fr/conflicting/learn/css/building_blocks/styling_tables/index.html
+++ b/files/fr/conflicting/learn/css/building_blocks/styling_tables/index.html
@@ -1,11 +1,12 @@
---
title: Tableaux
-slug: CSS/Premiers_pas/Tableaux
+slug: conflicting/Learn/CSS/Building_blocks/Styling_tables
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/Building_blocks/Styling_tables
translation_of_original: Web/Guide/CSS/Getting_started/Tables
+original_slug: CSS/Premiers_pas/Tableaux
---
<p> </p>
<p>Cette page présente des sélecteurs plus avancés, et certaines manières spécifiques de styler les tableaux.</p>
diff --git a/files/fr/conflicting/learn/css/building_blocks/values_and_units/index.html b/files/fr/conflicting/learn/css/building_blocks/values_and_units/index.html
index 24952f7505..920a96636a 100644
--- a/files/fr/conflicting/learn/css/building_blocks/values_and_units/index.html
+++ b/files/fr/conflicting/learn/css/building_blocks/values_and_units/index.html
@@ -1,11 +1,12 @@
---
title: Couleurs
-slug: CSS/Premiers_pas/Couleurs
+slug: conflicting/Learn/CSS/Building_blocks/Values_and_units
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/Introduction_to_CSS/Values_and_units#Colors
translation_of_original: Web/Guide/CSS/Getting_started/Color
+original_slug: CSS/Premiers_pas/Couleurs
---
<p> </p>
<p>Cette page donne plus de détails sur la manière de spécifier les couleurs en CSS.</p>
diff --git a/files/fr/conflicting/learn/css/css_layout/index.html b/files/fr/conflicting/learn/css/css_layout/index.html
index f8d9872975..d4ac54d74a 100644
--- a/files/fr/conflicting/learn/css/css_layout/index.html
+++ b/files/fr/conflicting/learn/css/css_layout/index.html
@@ -1,11 +1,12 @@
---
title: Mise en page
-slug: CSS/Premiers_pas/Mise_en_page
+slug: conflicting/Learn/CSS/CSS_layout
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/CSS_layout
translation_of_original: Web/Guide/CSS/Getting_started/Layout
+original_slug: CSS/Premiers_pas/Mise_en_page
---
<p> </p>
<p>Cette page présente plusieurs manières d'ajuster la mise en page de votre document.</p>
diff --git a/files/fr/conflicting/learn/css/css_layout/introduction/index.html b/files/fr/conflicting/learn/css/css_layout/introduction/index.html
index 526af5a0b0..4c66ddf62d 100644
--- a/files/fr/conflicting/learn/css/css_layout/introduction/index.html
+++ b/files/fr/conflicting/learn/css/css_layout/introduction/index.html
@@ -1,11 +1,12 @@
---
title: La disposition en CSS
-slug: Apprendre/CSS/Introduction_à_CSS/La_disposition
+slug: conflicting/Learn/CSS/CSS_layout/Introduction
tags:
- Apprendre
- CSS
translation_of: Learn/CSS/CSS_layout/Introduction
translation_of_original: Learn/CSS/Basics/Layout
+original_slug: Apprendre/CSS/Introduction_à_CSS/La_disposition
---
<p>{{PreviousNext("Apprendre/CSS/Les_bases/Le_modèle_de_boîte","Apprendre/CSS/Comment/Mettre_en_forme_du_texte")}}</p>
diff --git a/files/fr/conflicting/learn/css/first_steps/how_css_is_structured/index.html b/files/fr/conflicting/learn/css/first_steps/how_css_is_structured/index.html
index 57da469f28..a163bef2d6 100644
--- a/files/fr/conflicting/learn/css/first_steps/how_css_is_structured/index.html
+++ b/files/fr/conflicting/learn/css/first_steps/how_css_is_structured/index.html
@@ -1,11 +1,12 @@
---
title: Des CSS lisibles
-slug: CSS/Premiers_pas/Des_CSS_lisibles
+slug: conflicting/Learn/CSS/First_steps/How_CSS_is_structured
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
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: CSS/Premiers_pas/Des_CSS_lisibles
---
<p> </p>
<p>Cette page aborde le style et la grammaire du langage CSS lui-même.</p>
diff --git a/files/fr/conflicting/learn/css/first_steps/how_css_works/index.html b/files/fr/conflicting/learn/css/first_steps/how_css_works/index.html
index ace461991e..4930b3a550 100644
--- a/files/fr/conflicting/learn/css/first_steps/how_css_works/index.html
+++ b/files/fr/conflicting/learn/css/first_steps/how_css_works/index.html
@@ -1,6 +1,6 @@
---
title: Utiliser le CSS dans une page web
-slug: Apprendre/CSS/Utiliser_CSS_dans_une_page_web
+slug: conflicting/Learn/CSS/First_steps/How_CSS_works
tags:
- Beginner
- CSS
@@ -9,6 +9,7 @@ tags:
- NeedsActiveLearning
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Learn/CSS/Using_CSS_in_a_web_page
+original_slug: Apprendre/CSS/Utiliser_CSS_dans_une_page_web
---
<div>{{IncludeSubnav("/fr/Apprendre")}}</div>
diff --git a/files/fr/conflicting/learn/css/first_steps/how_css_works_cdccf923f6bd040e8d243ee03d223ddc/index.html b/files/fr/conflicting/learn/css/first_steps/how_css_works_cdccf923f6bd040e8d243ee03d223ddc/index.html
index aa08f6ffea..62388feb0a 100644
--- a/files/fr/conflicting/learn/css/first_steps/how_css_works_cdccf923f6bd040e8d243ee03d223ddc/index.html
+++ b/files/fr/conflicting/learn/css/first_steps/how_css_works_cdccf923f6bd040e8d243ee03d223ddc/index.html
@@ -1,11 +1,13 @@
---
title: Fonctionnement de CSS
-slug: CSS/Premiers_pas/Fonctionnement_de_CSS
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_cdccf923f6bd040e8d243ee03d223ddc
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/How_CSS_works
+original_slug: CSS/Premiers_pas/Fonctionnement_de_CSS
---
<p> </p>
diff --git a/files/fr/conflicting/learn/css/first_steps/how_css_works_cf31463f874ecd8e10e648dacde4a995/index.html b/files/fr/conflicting/learn/css/first_steps/how_css_works_cf31463f874ecd8e10e648dacde4a995/index.html
index e0b9c64a2e..1e34cbcce2 100644
--- a/files/fr/conflicting/learn/css/first_steps/how_css_works_cf31463f874ecd8e10e648dacde4a995/index.html
+++ b/files/fr/conflicting/learn/css/first_steps/how_css_works_cf31463f874ecd8e10e648dacde4a995/index.html
@@ -1,6 +1,7 @@
---
title: Appliquer du CSS à une page web
-slug: Apprendre/HTML/Comment/Appliquer_du_CSS_à_une_page_web
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_cf31463f874ecd8e10e648dacde4a995
tags:
- Beginner
- CSS
@@ -8,6 +9,7 @@ tags:
- HTML
translation_of: Learn/CSS/Introduction_to_CSS/How_CSS_works#How_to_apply_your_CSS_to_your_HTML
translation_of_original: Learn/HTML/Howto/Use_CSS_within_a_webpage
+original_slug: Apprendre/HTML/Comment/Appliquer_du_CSS_à_une_page_web
---
<div class="summary">
<p>Le code HTML d'une page web définit sa signification et sa structure. Le code CSS, quant à lui, permet de définir la mise en forme d'une page. Dans cet article, nous verrons comment appliquer du code CSS à un document HTML.</p>
diff --git a/files/fr/conflicting/learn/css/first_steps/how_css_works_dba75d8c56ccc773f03d946ce2dbb25c/index.html b/files/fr/conflicting/learn/css/first_steps/how_css_works_dba75d8c56ccc773f03d946ce2dbb25c/index.html
index 1782164624..c499669d9c 100644
--- a/files/fr/conflicting/learn/css/first_steps/how_css_works_dba75d8c56ccc773f03d946ce2dbb25c/index.html
+++ b/files/fr/conflicting/learn/css/first_steps/how_css_works_dba75d8c56ccc773f03d946ce2dbb25c/index.html
@@ -1,11 +1,13 @@
---
title: Présentation des CSS
-slug: CSS/Premiers_pas/Présentation_des_CSS
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_dba75d8c56ccc773f03d946ce2dbb25c
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/What_is_CSS
+original_slug: CSS/Premiers_pas/Présentation_des_CSS
---
<p>
{{previousPage("/fr/docs/CSS/Premiers_pas", "Premiers pas")}}
diff --git a/files/fr/conflicting/learn/css/first_steps/how_css_works_ecbda2160290b96c02dcfa8276c0333a/index.html b/files/fr/conflicting/learn/css/first_steps/how_css_works_ecbda2160290b96c02dcfa8276c0333a/index.html
index 682482eefb..5e37520d12 100644
--- a/files/fr/conflicting/learn/css/first_steps/how_css_works_ecbda2160290b96c02dcfa8276c0333a/index.html
+++ b/files/fr/conflicting/learn/css/first_steps/how_css_works_ecbda2160290b96c02dcfa8276c0333a/index.html
@@ -1,11 +1,13 @@
---
title: Pourquoi utiliser CSS
-slug: CSS/Premiers_pas/Pourquoi_utiliser_CSS
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_ecbda2160290b96c02dcfa8276c0333a
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/Why_use_CSS
+original_slug: CSS/Premiers_pas/Pourquoi_utiliser_CSS
---
<p> </p>
<p>Cette page explique pourquoi les documents utilisent CSS. Vous utiliserez CSS pour ajouter une feuille de style à votre document de démonstration.</p>
diff --git a/files/fr/conflicting/learn/css/first_steps/index.html b/files/fr/conflicting/learn/css/first_steps/index.html
index 5a802a6899..43e8c6ed9c 100644
--- a/files/fr/conflicting/learn/css/first_steps/index.html
+++ b/files/fr/conflicting/learn/css/first_steps/index.html
@@ -1,11 +1,12 @@
---
title: Premiers pas
-slug: CSS/Premiers_pas
+slug: conflicting/Learn/CSS/First_steps
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/First_steps
translation_of_original: Web/Guide/CSS/Getting_started
+original_slug: CSS/Premiers_pas
---
<h3 id="Introduction" name="Introduction">Introduction</h3>
diff --git a/files/fr/conflicting/learn/css/styling_text/fundamentals/index.html b/files/fr/conflicting/learn/css/styling_text/fundamentals/index.html
index 67864f3b97..8506c0ab74 100644
--- a/files/fr/conflicting/learn/css/styling_text/fundamentals/index.html
+++ b/files/fr/conflicting/learn/css/styling_text/fundamentals/index.html
@@ -1,12 +1,13 @@
---
title: Mettre en forme du texte
-slug: Apprendre/CSS/Comment/Mettre_en_forme_du_texte
+slug: conflicting/Learn/CSS/Styling_text/Fundamentals
tags:
- Apprendre
- CSS
- Débutant
translation_of: Learn/CSS/Styling_text/Fundamentals
translation_of_original: Learn/CSS/Howto/style_text
+original_slug: Apprendre/CSS/Comment/Mettre_en_forme_du_texte
---
<p class="summary">La mise en forme du texte est au cœur de CSS. Celui-ci fournit de nombreuses propriétés permettant de modifier l'apparence du texte. En quelque sorte, CSS est le prolongement, sur le Web, de la typographie qui existe depuis plusieurs siècles.</p>
diff --git a/files/fr/conflicting/learn/css/styling_text/fundamentals_8249b1bf53d09b06ed51f43697880b5b/index.html b/files/fr/conflicting/learn/css/styling_text/fundamentals_8249b1bf53d09b06ed51f43697880b5b/index.html
index 61bccf32f1..490b201953 100644
--- a/files/fr/conflicting/learn/css/styling_text/fundamentals_8249b1bf53d09b06ed51f43697880b5b/index.html
+++ b/files/fr/conflicting/learn/css/styling_text/fundamentals_8249b1bf53d09b06ed51f43697880b5b/index.html
@@ -1,11 +1,13 @@
---
title: Styles de texte
-slug: CSS/Premiers_pas/Styles_de_texte
+slug: >-
+ conflicting/Learn/CSS/Styling_text/Fundamentals_8249b1bf53d09b06ed51f43697880b5b
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/Styling_text/Fundamentals
translation_of_original: Web/Guide/CSS/Getting_started/Text_styles
+original_slug: CSS/Premiers_pas/Styles_de_texte
---
<p> </p>
<p>Cette page vous donne plus d'exemples de styles de texte.</p>
diff --git a/files/fr/conflicting/learn/css/styling_text/fundamentals_9e7ba587262abbb02304cbc099c1f0d8/index.html b/files/fr/conflicting/learn/css/styling_text/fundamentals_9e7ba587262abbb02304cbc099c1f0d8/index.html
index 5a9fcb6c63..0f6b1b435d 100644
--- a/files/fr/conflicting/learn/css/styling_text/fundamentals_9e7ba587262abbb02304cbc099c1f0d8/index.html
+++ b/files/fr/conflicting/learn/css/styling_text/fundamentals_9e7ba587262abbb02304cbc099c1f0d8/index.html
@@ -1,6 +1,7 @@
---
title: Mise en forme basique du texte avec CSS
-slug: Apprendre/CSS/formatage_texte_CSS
+slug: >-
+ conflicting/Learn/CSS/Styling_text/Fundamentals_9e7ba587262abbb02304cbc099c1f0d8
tags:
- Beginner
- CSS
@@ -11,6 +12,7 @@ tags:
- NeedsActiveLearning
translation_of: Learn/CSS/Styling_text/Fundamentals
translation_of_original: Learn/CSS/Basic_text_styling_in_CSS
+original_slug: Apprendre/CSS/formatage_texte_CSS
---
<div>{{IncludeSubnav("/fr/Apprendre")}}</div>
diff --git a/files/fr/conflicting/learn/css/styling_text/styling_lists/index.html b/files/fr/conflicting/learn/css/styling_text/styling_lists/index.html
index 3b25f0218c..8e94b73728 100644
--- a/files/fr/conflicting/learn/css/styling_text/styling_lists/index.html
+++ b/files/fr/conflicting/learn/css/styling_text/styling_lists/index.html
@@ -1,8 +1,9 @@
---
title: personnaliser une liste
-slug: Apprendre/CSS/Comment/personnaliser_une_liste
+slug: conflicting/Learn/CSS/Styling_text/Styling_lists
translation_of: Learn/CSS/Styling_text/Styling_lists
translation_of_original: Learn/CSS/Howto/customize_a_list
+original_slug: Apprendre/CSS/Comment/personnaliser_une_liste
---
<p>{{draft}}</p>
diff --git a/files/fr/conflicting/learn/css/styling_text/styling_lists_06e9538892250c13976a84639f0dadd2/index.html b/files/fr/conflicting/learn/css/styling_text/styling_lists_06e9538892250c13976a84639f0dadd2/index.html
index fd091907fe..d601fabd1d 100644
--- a/files/fr/conflicting/learn/css/styling_text/styling_lists_06e9538892250c13976a84639f0dadd2/index.html
+++ b/files/fr/conflicting/learn/css/styling_text/styling_lists_06e9538892250c13976a84639f0dadd2/index.html
@@ -1,11 +1,13 @@
---
title: Listes
-slug: CSS/Premiers_pas/Listes
+slug: >-
+ conflicting/Learn/CSS/Styling_text/Styling_lists_06e9538892250c13976a84639f0dadd2
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/CSS/Styling_text/Styling_lists
translation_of_original: Web/Guide/CSS/Getting_started/Lists
+original_slug: CSS/Premiers_pas/Listes
---
<p> </p>
<p>Cette page explique comment utiliser CSS pour spécifier l'apparence des listes.</p>
diff --git a/files/fr/conflicting/learn/getting_started_with_the_web/dealing_with_files/index.html b/files/fr/conflicting/learn/getting_started_with_the_web/dealing_with_files/index.html
index 48f1d4cd14..fb5caab933 100644
--- a/files/fr/conflicting/learn/getting_started_with_the_web/dealing_with_files/index.html
+++ b/files/fr/conflicting/learn/getting_started_with_the_web/dealing_with_files/index.html
@@ -1,6 +1,6 @@
---
title: Ouvrir un fichier dans un navigateur web
-slug: Apprendre/Ouvrir_un_fichier_dans_un_navigateur_web
+slug: conflicting/Learn/Getting_started_with_the_web/Dealing_with_files
tags:
- Beginner
- CodingScripting
@@ -8,6 +8,7 @@ tags:
- WebMechanics
translation_of: Learn/Getting_started_with_the_web/Dealing_with_files
translation_of_original: Learn/Open_a_file_in_a_browser
+original_slug: Apprendre/Ouvrir_un_fichier_dans_un_navigateur_web
---
<div class="summary">
<p>Dans article, nous verrons comment ouvrir un fichier avec un navigateur web.</p>
diff --git a/files/fr/conflicting/learn/getting_started_with_the_web/index.html b/files/fr/conflicting/learn/getting_started_with_the_web/index.html
index 978bfc7c17..65417dac9a 100644
--- a/files/fr/conflicting/learn/getting_started_with_the_web/index.html
+++ b/files/fr/conflicting/learn/getting_started_with_the_web/index.html
@@ -1,6 +1,6 @@
---
title: Écrire une simple page HTML
-slug: Apprendre/HTML/Écrire_une_simple_page_HTML
+slug: conflicting/Learn/Getting_started_with_the_web
tags:
- Beginner
- CodingScripting
@@ -10,6 +10,7 @@ tags:
- Web Development
translation_of: Learn/Getting_started_with_the_web
translation_of_original: Learn/HTML/Write_a_simple_page_in_HTML
+original_slug: Apprendre/HTML/Écrire_une_simple_page_HTML
---
<div class="summary">
<p>Dans ceta rticle, vous apprendrez à créer une page web simple grâce à {{Glossary("HTML")}}.</p>
diff --git a/files/fr/conflicting/learn/getting_started_with_the_web/javascript_basics/index.html b/files/fr/conflicting/learn/getting_started_with_the_web/javascript_basics/index.html
index c95ba3d3a2..ca7bece7b7 100644
--- a/files/fr/conflicting/learn/getting_started_with_the_web/javascript_basics/index.html
+++ b/files/fr/conflicting/learn/getting_started_with_the_web/javascript_basics/index.html
@@ -1,6 +1,6 @@
---
title: Tutoriel pour débuter en JavaScript
-slug: Web/JavaScript/guide_de_demarrage
+slug: conflicting/Learn/Getting_started_with_the_web/JavaScript_basics
tags:
- Beginner
- JavaScript
@@ -8,6 +8,7 @@ tags:
- Tutorial
translation_of: Learn/Getting_started_with_the_web/JavaScript_basics
translation_of_original: Web/JavaScript/Getting_Started
+original_slug: Web/JavaScript/guide_de_demarrage
---
<h2 id="Why_JavaScript.3F" name="Why_JavaScript.3F">Pourquoi JavaScript ?</h2>
<p>JavaScript est un langage de programmation puissant, complexe et trop souvent mal compris. Il permet le développement rapide d'applications avec lesquelles l'utilisateur va pouvoir intéragir pour saisir des données et observer le résultat de leur traitement.</p>
diff --git a/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting/index.html b/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting/index.html
index db22bdd6f4..739db143be 100644
--- a/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting/index.html
+++ b/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting/index.html
@@ -1,6 +1,6 @@
---
title: Afficher du code informatique avec HTML
-slug: Apprendre/HTML/Comment/Afficher_du_code_informatique_avec_HTML
+slug: conflicting/Learn/HTML/Introduction_to_HTML/Advanced_text_formatting
tags:
- Beginner
- Guide
@@ -9,6 +9,7 @@ tags:
translation_of: >-
Learn/HTML/Introduction_to_HTML/Advanced_text_formatting#Representing_computer_code
translation_of_original: Learn/HTML/Howto/Display_computer_code_with_HTML
+original_slug: Apprendre/HTML/Comment/Afficher_du_code_informatique_avec_HTML
---
<div class="summary">
<p>HTML offre différents éléments pour écrire de la documentation technique. Dans cet article, nous aborderons les éléments HTML qui portent sur la représentation de code informatique.</p>
diff --git a/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting_b235e00aa38ee1d4b535fc921395f446/index.html b/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting_b235e00aa38ee1d4b535fc921395f446/index.html
index 99ad7a8733..2b074bec26 100644
--- a/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting_b235e00aa38ee1d4b535fc921395f446/index.html
+++ b/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting_b235e00aa38ee1d4b535fc921395f446/index.html
@@ -1,6 +1,7 @@
---
title: Identifier et expliquer des abréviations avec HTML
-slug: Apprendre/HTML/Comment/Identifier_et_expliquer_des_abréviations
+slug: >-
+ conflicting/Learn/HTML/Introduction_to_HTML/Advanced_text_formatting_b235e00aa38ee1d4b535fc921395f446
tags:
- Beginner
- HTML
@@ -8,6 +9,7 @@ tags:
- OpenPractices
translation_of: Learn/HTML/Introduction_to_HTML/Advanced_text_formatting#Abbreviations
translation_of_original: Learn/HTML/Howto/Mark_abbreviations_and_make_them_understandable
+original_slug: Apprendre/HTML/Comment/Identifier_et_expliquer_des_abréviations
---
<div class="summary">
<p>HTML fournit une méthode simple et rapide pour indiquer la présence d'abrévations et pour fournir leur signification au lecteur.</p>
diff --git a/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting_c8b0b9eb353375fb9a4679f68164e682/index.html b/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting_c8b0b9eb353375fb9a4679f68164e682/index.html
index 99e17662ab..391243f3a8 100644
--- a/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting_c8b0b9eb353375fb9a4679f68164e682/index.html
+++ b/files/fr/conflicting/learn/html/introduction_to_html/advanced_text_formatting_c8b0b9eb353375fb9a4679f68164e682/index.html
@@ -1,12 +1,14 @@
---
title: Ajouter des citations sur une page web
-slug: Apprendre/HTML/Comment/Ajouter_citations_sur_page_web
+slug: >-
+ conflicting/Learn/HTML/Introduction_to_HTML/Advanced_text_formatting_c8b0b9eb353375fb9a4679f68164e682
tags:
- Beginner
- Guide
- HTML
translation_of: Learn/HTML/Introduction_to_HTML/Advanced_text_formatting#Quotations
translation_of_original: Learn/HTML/Howto/Add_citations_to_webpages
+original_slug: Apprendre/HTML/Comment/Ajouter_citations_sur_page_web
---
<div class="summary">
<p>Cet article illustre comment citer quelqu'un de façon précise et en fournissant la source de la citation.</p>
diff --git a/files/fr/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html b/files/fr/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html
index 3f2f001f9c..6c3d33a2f2 100644
--- a/files/fr/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html
+++ b/files/fr/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html
@@ -1,6 +1,6 @@
---
title: Créer un hyperlien
-slug: Apprendre/HTML/Comment/Créer_un_hyperlien
+slug: conflicting/Learn/HTML/Introduction_to_HTML/Creating_hyperlinks
tags:
- Beginner
- HTML
@@ -8,6 +8,7 @@ tags:
- Navigation
translation_of: Learn/HTML/Introduction_to_HTML/Creating_hyperlinks
translation_of_original: Learn/HTML/Howto/Create_a_hyperlink
+original_slug: Apprendre/HTML/Comment/Créer_un_hyperlien
---
<p class="summary">Dans cet article, nous verrons comment créer des liens {{glossary('accessibilité','accessibles')}} et utiles  au {{glossary("référencement")}}.</p>
diff --git a/files/fr/conflicting/learn/html/introduction_to_html/creating_hyperlinks_10fd94f15ce1a469a3483e0478cb5d85/index.html b/files/fr/conflicting/learn/html/introduction_to_html/creating_hyperlinks_10fd94f15ce1a469a3483e0478cb5d85/index.html
index 77e52eafb4..703b2cbadf 100644
--- a/files/fr/conflicting/learn/html/introduction_to_html/creating_hyperlinks_10fd94f15ce1a469a3483e0478cb5d85/index.html
+++ b/files/fr/conflicting/learn/html/introduction_to_html/creating_hyperlinks_10fd94f15ce1a469a3483e0478cb5d85/index.html
@@ -1,6 +1,7 @@
---
title: Liens email
-slug: Web/Guide/HTML/Liens_email
+slug: >-
+ conflicting/Learn/HTML/Introduction_to_HTML/Creating_hyperlinks_10fd94f15ce1a469a3483e0478cb5d85
tags:
- Beginner
- Exemple
@@ -9,6 +10,7 @@ tags:
- Web
translation_of: Learn/HTML/Introduction_to_HTML/Creating_hyperlinks#E-mail_links
translation_of_original: Web/Guide/HTML/Email_links
+original_slug: Web/Guide/HTML/Liens_email
---
<p><span class="seoSummary">Il est parfois utile de créer des liens ou des boutons qui nous permettent d'écrire un nouvel e-mail. Par exemple, on peut les utiliser pour créer un bouton « contactez-nous ». Ceci est possible grâce à l'élement HTML {{HTMLElement("a")}} et au format d'URL <code>mailto</code>.</span></p>
diff --git a/files/fr/conflicting/learn/html/introduction_to_html/document_and_website_structure/index.html b/files/fr/conflicting/learn/html/introduction_to_html/document_and_website_structure/index.html
index 170ad81290..5f4bb71eac 100644
--- a/files/fr/conflicting/learn/html/introduction_to_html/document_and_website_structure/index.html
+++ b/files/fr/conflicting/learn/html/introduction_to_html/document_and_website_structure/index.html
@@ -1,6 +1,6 @@
---
title: Découper une page web en sections logiques
-slug: Apprendre/HTML/Comment/Découper_une_page_web_en_sections_logiques
+slug: conflicting/Learn/HTML/Introduction_to_HTML/Document_and_website_structure
tags:
- Beginner
- DesignAccessibility
@@ -8,6 +8,7 @@ tags:
- Learn
translation_of: Learn/HTML/Introduction_to_HTML/Document_and_website_structure
translation_of_original: Learn/HTML/Howto/Divide_a_webpage_into_logical_sections
+original_slug: Apprendre/HTML/Comment/Découper_une_page_web_en_sections_logiques
---
<div class="summary">
<p>Dans cet article, nous verrons comment structurer un document afin que son plan soit logique pour vous, vos visiteurs dont ceux qui utilisent des technologies d'aide à la navigation.</p>
diff --git a/files/fr/conflicting/learn/html/introduction_to_html/getting_started/index.html b/files/fr/conflicting/learn/html/introduction_to_html/getting_started/index.html
index 3e911e92c8..4e93313eb4 100644
--- a/files/fr/conflicting/learn/html/introduction_to_html/getting_started/index.html
+++ b/files/fr/conflicting/learn/html/introduction_to_html/getting_started/index.html
@@ -1,6 +1,6 @@
---
title: Créer un document HTML simple
-slug: Apprendre/HTML/Comment/Créer_un_document_HTML_simple
+slug: conflicting/Learn/HTML/Introduction_to_HTML/Getting_started
tags:
- Beginner
- Guide
@@ -8,6 +8,7 @@ tags:
- Learn
translation_of: Learn/HTML/Introduction_to_HTML/Getting_started
translation_of_original: Learn/HTML/Howto/Create_a_basic_HTML_document
+original_slug: Apprendre/HTML/Comment/Créer_un_document_HTML_simple
---
<p class="summary">Pour créer un site web, on commence par rédiger un document HTML. Les navigateurs actuels sont plutôt tolérants mais pour éviter quelques maux de tête, mieux vaut l'assembler correctement dès le début.</p>
diff --git a/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals/index.html b/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals/index.html
index e7c828c348..a7a0dc27a6 100644
--- a/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals/index.html
+++ b/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals/index.html
@@ -1,12 +1,13 @@
---
title: Créer une liste d'éléments avec HTML
-slug: Apprendre/HTML/Comment/Créer_une_liste_d_éléments_avec_HTML
+slug: conflicting/Learn/HTML/Introduction_to_HTML/HTML_text_fundamentals
tags:
- Beginner
- Guide
- HTML
translation_of: Learn/HTML/Introduction_to_HTML/HTML_text_fundamentals#Lists
translation_of_original: Learn/HTML/Howto/Create_list_of_items_with_HTML
+original_slug: Apprendre/HTML/Comment/Créer_une_liste_d_éléments_avec_HTML
---
<div class="summary">
<p>Vous souhaitez ajouter une liste numérotée ou une liste à puces. Quel que soit son type, HTML permet de dresser une liste très rapidement.</p>
diff --git a/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals_42ad0dcdd765b60d8adda1f6293954b6/index.html b/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals_42ad0dcdd765b60d8adda1f6293954b6/index.html
index 668ad5c084..87ab98ed98 100644
--- a/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals_42ad0dcdd765b60d8adda1f6293954b6/index.html
+++ b/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals_42ad0dcdd765b60d8adda1f6293954b6/index.html
@@ -1,7 +1,7 @@
---
title: Mettre l'accent sur un contenu ou indiquer qu'un texte est important
slug: >-
- Apprendre/HTML/Comment/Mettre_l_accent_sur_un_contenu_ou_indiquer_qu_un_texte_est_important
+ conflicting/Learn/HTML/Introduction_to_HTML/HTML_text_fundamentals_42ad0dcdd765b60d8adda1f6293954b6
tags:
- Beginner
- Composing
@@ -11,6 +11,8 @@ tags:
- OpenPractices
translation_of: Learn/HTML/Introduction_to_HTML/HTML_text_fundamentals#Emphasis_and_importance
translation_of_original: Learn/HTML/Howto/Emphasize_content_or_indicate_that_text_is_important
+original_slug: >-
+ Apprendre/HTML/Comment/Mettre_l_accent_sur_un_contenu_ou_indiquer_qu_un_texte_est_important
---
<p class="summary">Dans cet article, nous verrons comment baliser des passages caractéristiques, selon leur importance, leur pertinence ou un changement de ton.</p>
diff --git a/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals_e22cde852fd55bbd8b014a4eac49a3bc/index.html b/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals_e22cde852fd55bbd8b014a4eac49a3bc/index.html
index 788bcc2a44..51b33e4874 100644
--- a/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals_e22cde852fd55bbd8b014a4eac49a3bc/index.html
+++ b/files/fr/conflicting/learn/html/introduction_to_html/html_text_fundamentals_e22cde852fd55bbd8b014a4eac49a3bc/index.html
@@ -1,12 +1,14 @@
---
title: Mettre en place une hiérarchie de titres
-slug: Apprendre/HTML/Comment/Mettre_en_place_une_hiérarchie_de_titres
+slug: >-
+ conflicting/Learn/HTML/Introduction_to_HTML/HTML_text_fundamentals_e22cde852fd55bbd8b014a4eac49a3bc
tags:
- Beginner
- HTML
- Learn
translation_of: Learn/HTML/Introduction_to_HTML/HTML_text_fundamentals
translation_of_original: Learn/HTML/Howto/Set_up_a_proper_title_hierarchy
+original_slug: Apprendre/HTML/Comment/Mettre_en_place_une_hiérarchie_de_titres
---
<p class="summary">Dans cet article, nous verrons comment ajouter des titres de différents niveaux à un document web afin que les lecteurs puissent identifier le contenu et trouver les réponses à leurs questions plus efficacement.</p>
diff --git a/files/fr/conflicting/learn/html/introduction_to_html/index.html b/files/fr/conflicting/learn/html/introduction_to_html/index.html
index 7e449e92e0..15dba45e73 100644
--- a/files/fr/conflicting/learn/html/introduction_to_html/index.html
+++ b/files/fr/conflicting/learn/html/introduction_to_html/index.html
@@ -1,12 +1,13 @@
---
title: Les balises HTML et leur rôle
-slug: Apprendre/HTML/Balises_HTML
+slug: conflicting/Learn/HTML/Introduction_to_HTML
tags:
- Beginner
- CodingScripting
- HTML
translation_of: Learn/HTML/Introduction_to_HTML
translation_of_original: Learn/HTML/HTML_tags
+original_slug: Apprendre/HTML/Balises_HTML
---
<div class="summary">
<p>Cet article aborde les bases de {{Glossary("HTML")}} : les balises et comment les utiliser.</p>
diff --git a/files/fr/conflicting/learn/html/multimedia_and_embedding/images_in_html/index.html b/files/fr/conflicting/learn/html/multimedia_and_embedding/images_in_html/index.html
index 36c8d1cfbb..a6db58f092 100644
--- a/files/fr/conflicting/learn/html/multimedia_and_embedding/images_in_html/index.html
+++ b/files/fr/conflicting/learn/html/multimedia_and_embedding/images_in_html/index.html
@@ -1,6 +1,6 @@
---
title: Ajouter des images à une page web
-slug: Apprendre/HTML/Comment/Ajouter_des_images_à_une_page_web
+slug: conflicting/Learn/HTML/Multimedia_and_embedding/Images_in_HTML
tags:
- Beginner
- Composing
@@ -10,6 +10,7 @@ tags:
translation_of: >-
Learn/HTML/Multimedia_and_embedding/Images_in_HTML#How_do_we_put_an_image_on_a_webpage
translation_of_original: Learn/HTML/Howto/Add_images_to_a_webpage
+original_slug: Apprendre/HTML/Comment/Ajouter_des_images_à_une_page_web
---
<p class="summary">Les images permettent de faire passer des messages plus simplement et plus directement. Elles attirent l'œil du visiteur lorsqu'il consulte le site. Dans cet articles, nous allons voir comment ajouter, simplement, des images à une page web.</p>
diff --git a/files/fr/conflicting/learn/html/multimedia_and_embedding/images_in_html_2c0377f7605f693cad465c2b4839addc/index.html b/files/fr/conflicting/learn/html/multimedia_and_embedding/images_in_html_2c0377f7605f693cad465c2b4839addc/index.html
index ad32d4ea26..e9f4484c14 100644
--- a/files/fr/conflicting/learn/html/multimedia_and_embedding/images_in_html_2c0377f7605f693cad465c2b4839addc/index.html
+++ b/files/fr/conflicting/learn/html/multimedia_and_embedding/images_in_html_2c0377f7605f693cad465c2b4839addc/index.html
@@ -1,6 +1,7 @@
---
title: Annoter des images et graphiques
-slug: Apprendre/HTML/Comment/Annoter_des_images_et_graphiques
+slug: >-
+ conflicting/Learn/HTML/Multimedia_and_embedding/Images_in_HTML_2c0377f7605f693cad465c2b4839addc
tags:
- Accessibility
- Beginner
@@ -10,6 +11,7 @@ tags:
translation_of: >-
Learn/HTML/Multimedia_and_embedding/Images_in_HTML#Annotating_images_with_figures_and_figure_captions
translation_of_original: Learn/HTML/Howto/Annotate_images_and_graphics
+original_slug: Apprendre/HTML/Comment/Annoter_des_images_et_graphiques
---
<div class="summary">
<p>HTML fournit une méthode simple pour ajouter des figures et leurs légendes.</p>
diff --git a/files/fr/conflicting/learn/html/multimedia_and_embedding/other_embedding_technologies/index.html b/files/fr/conflicting/learn/html/multimedia_and_embedding/other_embedding_technologies/index.html
index fcbe0b40c9..c5377f1f09 100644
--- a/files/fr/conflicting/learn/html/multimedia_and_embedding/other_embedding_technologies/index.html
+++ b/files/fr/conflicting/learn/html/multimedia_and_embedding/other_embedding_technologies/index.html
@@ -1,6 +1,6 @@
---
title: Ajouter du contenu Flash dans une page web
-slug: Apprendre/HTML/Comment/Ajouter_contenu_Flash_dans_page_web
+slug: conflicting/Learn/HTML/Multimedia_and_embedding/Other_embedding_technologies
tags:
- Accessibility
- Advanced
@@ -10,6 +10,7 @@ tags:
translation_of: >-
Learn/HTML/Multimedia_and_embedding/Other_embedding_technologies#The_%3Cembed%3E_and_%3Cobject%3E_elements
translation_of_original: Learn/HTML/Howto/Add_Flash_content_within_a_webpage
+original_slug: Apprendre/HTML/Comment/Ajouter_contenu_Flash_dans_page_web
---
<div class="summary">
<p>Cet article illustre pourquoi il est nécessaire que le contenu d'une page web soit accessible sans plugin. Si vous avez besoin de tels plugins (pour un cas bien spécifique ou pour des raisons historiques), nous illustrerons également un cas expliquant comment intégrer du contenu de cette façon.</p>
diff --git a/files/fr/conflicting/learn/html/multimedia_and_embedding/other_embedding_technologies_fbe06d127f73df4dd2f56a31b7c2bd2d/index.html b/files/fr/conflicting/learn/html/multimedia_and_embedding/other_embedding_technologies_fbe06d127f73df4dd2f56a31b7c2bd2d/index.html
index b5d0db7caa..d371efff45 100644
--- a/files/fr/conflicting/learn/html/multimedia_and_embedding/other_embedding_technologies_fbe06d127f73df4dd2f56a31b7c2bd2d/index.html
+++ b/files/fr/conflicting/learn/html/multimedia_and_embedding/other_embedding_technologies_fbe06d127f73df4dd2f56a31b7c2bd2d/index.html
@@ -1,6 +1,7 @@
---
title: Intégrer une page web au sein d'une autre page web
-slug: Apprendre/HTML/Comment/Intégrer_une_page_web_dans_une_autre_page_web
+slug: >-
+ conflicting/Learn/HTML/Multimedia_and_embedding/Other_embedding_technologies_fbe06d127f73df4dd2f56a31b7c2bd2d
tags:
- Beginner
- Guide
@@ -9,6 +10,7 @@ tags:
- Security
translation_of: Learn/HTML/Multimedia_and_embedding/Other_embedding_technologies
translation_of_original: Learn/HTML/Howto/Embed_a_webpage_within_another_webpage
+original_slug: Apprendre/HTML/Comment/Intégrer_une_page_web_dans_une_autre_page_web
---
<div class="summary">
<p>Dans cet article, nous verrons comment intégrer une page web dans une autre, tout en minimisant les risques encourus par une telle manipulation.</p>
diff --git a/files/fr/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html b/files/fr/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
index 8d3caf06b2..58d7af5213 100644
--- a/files/fr/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
+++ b/files/fr/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
@@ -1,6 +1,6 @@
---
title: Ajouter du contenu audio ou vidéo à une page web
-slug: Apprendre/HTML/Comment/Ajouter_contenu_audio_vidéo_page_web
+slug: conflicting/Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
tags:
- Audio
- Beginner
@@ -9,6 +9,7 @@ tags:
- Video
translation_of: Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
translation_of_original: Learn/HTML/Howto/Add_audio_or_video_content_to_a_webpage
+original_slug: Apprendre/HTML/Comment/Ajouter_contenu_audio_vidéo_page_web
---
<div class="summary">
<p>Dans cet article, nous verrons comment intégrer des éléments vidéo et audio de premier rang, accessibles à chacun, quelle que soit la méthode utilisée.</p>
diff --git a/files/fr/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content_040b1c36f4218ba488ffb0284dfe52bf/index.html b/files/fr/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content_040b1c36f4218ba488ffb0284dfe52bf/index.html
index efa30853e6..b481eece73 100644
--- a/files/fr/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content_040b1c36f4218ba488ffb0284dfe52bf/index.html
+++ b/files/fr/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content_040b1c36f4218ba488ffb0284dfe52bf/index.html
@@ -1,6 +1,7 @@
---
title: Utilisation d'audio et video en HTML5
-slug: Web/HTML/Utilisation_d'audio_et_video_en_HTML5
+slug: >-
+ conflicting/Learn/HTML/Multimedia_and_embedding/Video_and_audio_content_040b1c36f4218ba488ffb0284dfe52bf
tags:
- Aperçu
- Featured
@@ -11,6 +12,7 @@ tags:
- Web
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/Utilisation_d'audio_et_video_en_HTML5
---
<p>{{ gecko_minversion_header("1.9.1") }}</p>
diff --git a/files/fr/conflicting/learn/index.html b/files/fr/conflicting/learn/index.html
index b1aee4ae00..6e7ed35b78 100644
--- a/files/fr/conflicting/learn/index.html
+++ b/files/fr/conflicting/learn/index.html
@@ -1,10 +1,11 @@
---
title: Compétences
-slug: Apprendre/Compétences
+slug: conflicting/Learn
tags:
- Index
translation_of: Learn
translation_of_original: Learn/Skills
+original_slug: Apprendre/Compétences
---
<p>Lorsqu'il s'agit d'apprendre le développement Web, il existe plusieurs compétences, listées par <a href="https://webmaker.org" rel="external">WebMaker</a> dans la <a href="https://webmaker.org/literacy" rel="external">littéracie web</a> : une carte destinée aux débutants pour apprendre les bases. Sur MDN, les articles de cette section sont consacrés au développement de sites web et sont destinés à tous publics :</p>
diff --git a/files/fr/conflicting/learn/javascript/client-side_web_apis/manipulating_documents/index.html b/files/fr/conflicting/learn/javascript/client-side_web_apis/manipulating_documents/index.html
index 6e9414972d..749411d2b2 100644
--- a/files/fr/conflicting/learn/javascript/client-side_web_apis/manipulating_documents/index.html
+++ b/files/fr/conflicting/learn/javascript/client-side_web_apis/manipulating_documents/index.html
@@ -1,11 +1,12 @@
---
title: JavaScript
-slug: CSS/Premiers_pas/JavaScript
+slug: conflicting/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
tags:
- CSS
- - 'CSS:Premiers_pas'
+ - CSS:Premiers_pas
translation_of: Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
translation_of_original: Web/Guide/CSS/Getting_started/JavaScript
+original_slug: CSS/Premiers_pas/JavaScript
---
<p> </p>
<p>Vous entrez dans la partie II du tutoriel. Cette partie contient des exemples montrant toute la portée de CSS dans Mozilla.</p>
diff --git a/files/fr/conflicting/learn/javascript/objects/index.html b/files/fr/conflicting/learn/javascript/objects/index.html
index c778187586..1ef0e8d990 100644
--- a/files/fr/conflicting/learn/javascript/objects/index.html
+++ b/files/fr/conflicting/learn/javascript/objects/index.html
@@ -1,6 +1,6 @@
---
title: Introduction à JavaScript orienté objet
-slug: Web/JavaScript/Introduction_à_JavaScript_orienté_objet
+slug: conflicting/Learn/JavaScript/Objects
tags:
- Encapsulation
- Intermédiaire
@@ -10,6 +10,7 @@ tags:
- Orienté objet
translation_of: Learn/JavaScript/Objects
translation_of_original: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript
+original_slug: Web/JavaScript/Introduction_à_JavaScript_orienté_objet
---
<div>{{jsSidebar("Introductory")}}</div>
diff --git a/files/fr/conflicting/learn_370bfb0fa23e42f4384f010341852c43/index.html b/files/fr/conflicting/learn_370bfb0fa23e42f4384f010341852c43/index.html
index c60efcffac..087dd96c87 100644
--- a/files/fr/conflicting/learn_370bfb0fa23e42f4384f010341852c43/index.html
+++ b/files/fr/conflicting/learn_370bfb0fa23e42f4384f010341852c43/index.html
@@ -1,12 +1,13 @@
---
title: Comment construire un site web
-slug: Apprendre/Tutoriels/Comment_construire_un_site_web
+slug: conflicting/Learn_370bfb0fa23e42f4384f010341852c43
tags:
- Beginner
- Index
- NeedsContent
translation_of: Learn
translation_of_original: Learn/tutorial/How_to_build_a_web_site
+original_slug: Apprendre/Tutoriels/Comment_construire_un_site_web
---
<p>Lorsqu'il s'agit d'apprendre la conception et le développement web, beaucoup souhaitent construire leur site web le plus rapidement possible. Pour faciliter votre progression, nous avons organisé et listé ici les connaissances minimales à acquérir.</p>
diff --git a/files/fr/conflicting/learn_6767a192c90d2c9c5179cf004fce2ee8/index.html b/files/fr/conflicting/learn_6767a192c90d2c9c5179cf004fce2ee8/index.html
index 407a95704e..e7e9667bc1 100644
--- a/files/fr/conflicting/learn_6767a192c90d2c9c5179cf004fce2ee8/index.html
+++ b/files/fr/conflicting/learn_6767a192c90d2c9c5179cf004fce2ee8/index.html
@@ -1,11 +1,12 @@
---
title: Tutoriels
-slug: Apprendre/Tutoriels
+slug: conflicting/Learn_6767a192c90d2c9c5179cf004fce2ee8
tags:
- Index
- TopicStub
translation_of: Learn
translation_of_original: Learn/tutorial
+original_slug: Apprendre/Tutoriels
---
<p>Connaître les technologies Web et leurs concepts est un premier pas important. Mais il arrrive un moment où la mise en pratique est nécessaire. Pour cela, nous avons dressé quelques « chemins » qui vous aideront à parcourir les technologies web et à mettre en œuvre ce que vous pouvez apprendre !</p>
diff --git a/files/fr/conflicting/mdn/contribute/index.html b/files/fr/conflicting/mdn/contribute/index.html
index a4cd040a80..1e5662fde0 100644
--- a/files/fr/conflicting/mdn/contribute/index.html
+++ b/files/fr/conflicting/mdn/contribute/index.html
@@ -1,9 +1,10 @@
---
title: Contribuer à MDN
-slug: MDN_a_dix_ans/Contribuer_à_MDN
+slug: conflicting/MDN/Contribute
tags:
- MDN
translation_of: MDN_at_ten/Contributing_to_MDN
+original_slug: MDN_a_dix_ans/Contribuer_à_MDN
---
<div class="column-container">
<div class="column-8">
diff --git a/files/fr/conflicting/mdn/tools/index.html b/files/fr/conflicting/mdn/tools/index.html
index bf1a518498..fcae68e971 100644
--- a/files/fr/conflicting/mdn/tools/index.html
+++ b/files/fr/conflicting/mdn/tools/index.html
@@ -1,6 +1,6 @@
---
title: Guide de l'utilisateur MDN
-slug: MDN/User_guide
+slug: conflicting/MDN/Tools
tags:
- Documentation
- Démarrer
@@ -8,6 +8,7 @@ tags:
- Projet MDC
translation_of: MDN/Tools
translation_of_original: MDN/User_guide
+original_slug: MDN/User_guide
---
<div>{{MDNSidebar}}</div><p>Le site Mozilla Developper Network est un système avancé pour trouver, lire et contribuer à la documentation ainsi qu'au code pour les développeurs Web (mais aussi pour les développeurs Firefox et Firefox OS). Le guide de l'utilisateur MDS regorge d'articles détaillant comment utiliser le site MDS pour trouver la documentation dont vous avez besoin et si vous le désirez, comment aider à rendre les outils encore meilleurs et complets.</p>
diff --git a/files/fr/conflicting/mozilla/add-ons/webextensions/api/menus/overridecontext/index.html b/files/fr/conflicting/mozilla/add-ons/webextensions/api/menus/overridecontext/index.html
index 8d8463f069..6f4104c216 100644
--- a/files/fr/conflicting/mozilla/add-ons/webextensions/api/menus/overridecontext/index.html
+++ b/files/fr/conflicting/mozilla/add-ons/webextensions/api/menus/overridecontext/index.html
@@ -1,6 +1,6 @@
---
title: menus.overrideContext()
-slug: Mozilla/Add-ons/WebExtensions/API/menus/menus.overrideContext()
+slug: conflicting/Mozilla/Add-ons/WebExtensions/API/menus/overrideContext
tags:
- API
- Add-ons
@@ -9,6 +9,7 @@ tags:
- WebExtensions
- contextMenus
translation_of: Mozilla/Add-ons/WebExtensions/API/menus/menus.overrideContext()
+original_slug: Mozilla/Add-ons/WebExtensions/API/menus/menus.overrideContext()
---
<div>{{AddonSidebar()}}</div>
diff --git a/files/fr/conflicting/mozilla/add-ons/webextensions/api/userscripts/registereduserscript/unregister/index.html b/files/fr/conflicting/mozilla/add-ons/webextensions/api/userscripts/registereduserscript/unregister/index.html
index 0a71ce921b..fc431fc09a 100644
--- a/files/fr/conflicting/mozilla/add-ons/webextensions/api/userscripts/registereduserscript/unregister/index.html
+++ b/files/fr/conflicting/mozilla/add-ons/webextensions/api/userscripts/registereduserscript/unregister/index.html
@@ -1,7 +1,7 @@
---
title: unregister
slug: >-
- Mozilla/Add-ons/WebExtensions/API/userScripts/RegisteredUserScript/RegisteredUserScript.unregister()
+ conflicting/Mozilla/Add-ons/WebExtensions/API/userScripts/RegisteredUserScript/unregister
tags:
- API
- Extensions
@@ -12,6 +12,8 @@ tags:
- userScripts
translation_of: >-
Mozilla/Add-ons/WebExtensions/API/userScripts/RegisteredUserScript/RegisteredUserScript.unregister()
+original_slug: >-
+ Mozilla/Add-ons/WebExtensions/API/userScripts/RegisteredUserScript/RegisteredUserScript.unregister()
---
<p>{{AddonSidebar}}</p>
diff --git a/files/fr/conflicting/tools/debugger/how_to/set_watch_expressions/index.html b/files/fr/conflicting/tools/debugger/how_to/set_watch_expressions/index.html
index ff534ba3ae..3aad49ff3b 100644
--- a/files/fr/conflicting/tools/debugger/how_to/set_watch_expressions/index.html
+++ b/files/fr/conflicting/tools/debugger/how_to/set_watch_expressions/index.html
@@ -1,8 +1,9 @@
---
-title: 'Examiner, modifier, et espionner des variables'
-slug: 'Outils/Débogueur/Comment/Examiner,_modifier,_et_espionner_des_variables'
+title: Examiner, modifier, et espionner des variables
+slug: conflicting/Tools/Debugger/How_to/Set_Watch_Expressions
translation_of: Tools/Debugger/How_to/Set_Watch_Expressions
-translation_of_original: 'Tools/Debugger/How_to/Examine,_modify,_and_watch_variables'
+translation_of_original: Tools/Debugger/How_to/Examine,_modify,_and_watch_variables
+original_slug: Outils/Débogueur/Comment/Examiner,_modifier,_et_espionner_des_variables
---
<div>{{ToolsSidebar}}</div><div class="note">
<p>Cette fonctionnalité n'est pas encore supportée par le nouveau Débogueur. Si vous avez besoin de l'utiliser, il faut changer la préférence "devtools.debugger.new-debugger-frontend" dans about:config (page interne du navigateur)</p>
diff --git a/files/fr/conflicting/tools/memory/basic_operations/index.html b/files/fr/conflicting/tools/memory/basic_operations/index.html
index 2524339f8d..ce779acc7d 100644
--- a/files/fr/conflicting/tools/memory/basic_operations/index.html
+++ b/files/fr/conflicting/tools/memory/basic_operations/index.html
@@ -1,8 +1,9 @@
---
title: Comparer deux captures de la heap
-slug: Outils/Memory/Comparing_heap_snapshots
+slug: conflicting/Tools/Memory/Basic_operations
translation_of: Tools/Memory/Basic_operations
translation_of_original: Tools/Memory/Comparing_heap_snapshots
+original_slug: Outils/Memory/Comparing_heap_snapshots
---
<div>{{ToolsSidebar}}</div><div class="geckoVersionNote">
<p>Cette fonctionnalité est une des nouveautés de Firefox 45.</p>
diff --git a/files/fr/conflicting/tools/memory/basic_operations_9264f1c8b3be17d004821ca45ca04d3a/index.html b/files/fr/conflicting/tools/memory/basic_operations_9264f1c8b3be17d004821ca45ca04d3a/index.html
index 2c851f8ce6..049eb24a7d 100644
--- a/files/fr/conflicting/tools/memory/basic_operations_9264f1c8b3be17d004821ca45ca04d3a/index.html
+++ b/files/fr/conflicting/tools/memory/basic_operations_9264f1c8b3be17d004821ca45ca04d3a/index.html
@@ -1,8 +1,9 @@
---
title: Ouvrir l'outil Mémoire
-slug: Outils/Memory/Open_the_Memory_tool
+slug: conflicting/Tools/Memory/Basic_operations_9264f1c8b3be17d004821ca45ca04d3a
translation_of: Tools/Memory/Basic_operations
translation_of_original: Tools/Memory/Open_the_Memory_tool
+original_slug: Outils/Memory/Open_the_Memory_tool
---
<div>{{ToolsSidebar}}</div><p>Actuellement, l'outil Mémoire n'est pas activé par défaut, pour l'activer, il faut ouvrir les options des outils des développements (F12 puis cliquer sur l'icône en forme d'engrenage en haut à droite) et cocher l'option "Mémoire" dans la catégorie "Outils de développement par défaut" :</p>
diff --git a/files/fr/conflicting/tools/memory/basic_operations_f2c86b478396e7a233344f64c4d4f1da/index.html b/files/fr/conflicting/tools/memory/basic_operations_f2c86b478396e7a233344f64c4d4f1da/index.html
index ac0d2d630f..ac6e5e0b04 100644
--- a/files/fr/conflicting/tools/memory/basic_operations_f2c86b478396e7a233344f64c4d4f1da/index.html
+++ b/files/fr/conflicting/tools/memory/basic_operations_f2c86b478396e7a233344f64c4d4f1da/index.html
@@ -1,8 +1,9 @@
---
title: Capturer un instantané
-slug: Outils/Memory/Take_a_heap_snapshot
+slug: conflicting/Tools/Memory/Basic_operations_f2c86b478396e7a233344f64c4d4f1da
translation_of: Tools/Memory/Basic_operations
translation_of_original: Tools/Memory/Take_a_heap_snapshot
+original_slug: Outils/Memory/Take_a_heap_snapshot
---
<div>{{ToolsSidebar}}</div><p>Pour prendre une capture de la heap, il faut cliquer sur le bouton "Capturer un instantané" ou cliquer sur l'icône en forme d'appareil photo en haut à gauche :</p>
diff --git a/files/fr/conflicting/tools/page_inspector/ui_tour/index.html b/files/fr/conflicting/tools/page_inspector/ui_tour/index.html
index 26a4192b00..2fa8a8587d 100644
--- a/files/fr/conflicting/tools/page_inspector/ui_tour/index.html
+++ b/files/fr/conflicting/tools/page_inspector/ui_tour/index.html
@@ -1,12 +1,13 @@
---
title: Panneau HTML
-slug: Outils/Inspecteur/Panneau_HTML
+slug: conflicting/Tools/Page_Inspector/UI_Tour
tags:
- HTML
- Tools
- Web Development
- - 'Web Development:Tools'
+ - Web Development:Tools
translation_of: Tools/Page_Inspector/UI_Tour
translation_of_original: Tools/Page_Inspector/HTML_panel
+original_slug: Outils/Inspecteur/Panneau_HTML
---
<div>{{ToolsSidebar}}</div><p>Le contenu de cette page à été transféré dans la section "Panneau HTML" de la <a href="/fr/docs/Tools/Page_Inspector/UI_Tour#HTML_pane" title="/fr/docs/Tools/Page_Inspector/UI_Tour#HTML_pane"> visite guidée de l'Inspecteur</a>.</p>
diff --git a/files/fr/conflicting/tools/performance/waterfall/index.html b/files/fr/conflicting/tools/performance/waterfall/index.html
index 215ce97ad5..7ad39fce90 100644
--- a/files/fr/conflicting/tools/performance/waterfall/index.html
+++ b/files/fr/conflicting/tools/performance/waterfall/index.html
@@ -1,12 +1,13 @@
---
title: Frise chronologique
-slug: Outils/Frise_chronologique
+slug: conflicting/Tools/Performance/Waterfall
tags:
- Gecko
- Guide
- Tools
translation_of: Tools/Performance/Waterfall
translation_of_original: Tools/Timeline
+original_slug: Outils/Frise_chronologique
---
<div>{{ToolsSidebar}}</div><p>La frise chronologique suit à la trace les opérations réalisées par Gecko, le moteur du navigateur.Il faut aller dans les <a href="/en-US/docs/Tools/Tools_Toolbox#Settings_2">the devtools options des outils de developemment</a> pour activer la frise chronologique.</p>
diff --git a/files/fr/conflicting/tools/responsive_design_mode/index.html b/files/fr/conflicting/tools/responsive_design_mode/index.html
index 086a531ea3..17b8d86fa0 100644
--- a/files/fr/conflicting/tools/responsive_design_mode/index.html
+++ b/files/fr/conflicting/tools/responsive_design_mode/index.html
@@ -1,8 +1,9 @@
---
title: Vue Adaptative (avant Firefox 52)
-slug: Outils/Responsive_Design_Mode_(before_Firefox_52)
+slug: conflicting/Tools/Responsive_Design_Mode
translation_of: Tools/Responsive_Design_Mode
translation_of_original: Tools/Responsive_Design_Mode_(before_Firefox_52)
+original_slug: Outils/Responsive_Design_Mode_(before_Firefox_52)
---
<div>{{ToolsSidebar}}</div><div class="note">
<p>Cette page décrit la Vue Adaptative telle qu'elle apparait avant Firefox 52.  Il est également possible d'avoir cette version de l'outil si le  <a href="https://support.mozilla.org/t5/Manage-preferences-and-add-ons/Enable-multiprocess-support/ta-p/1371917">support multiprocessus (e10s)</a> est désactivé. Pour l'article décrivant la version ultérieure à Firefox 52, voir <a href="/fr/docs/Tools/Responsive_Design_Mode">Vue Adaptative</a>.</p>
diff --git a/files/fr/conflicting/web/accessibility/index.html b/files/fr/conflicting/web/accessibility/index.html
index d87406d368..df7b37fd57 100644
--- a/files/fr/conflicting/web/accessibility/index.html
+++ b/files/fr/conflicting/web/accessibility/index.html
@@ -1,6 +1,6 @@
---
title: Développement Web
-slug: Accessibilité/Développement_Web
+slug: conflicting/Web/Accessibility
tags:
- ARIA
- Accessibilité
@@ -9,6 +9,7 @@ tags:
- À relire
translation_of: Web/Accessibility
translation_of_original: Web/Accessibility/Web_Development
+original_slug: Accessibilité/Développement_Web
---
<p> </p>
<table>
diff --git a/files/fr/conflicting/web/api/canvas_api/tutorial/index.html b/files/fr/conflicting/web/api/canvas_api/tutorial/index.html
index 0b0a96257e..a717d76113 100644
--- a/files/fr/conflicting/web/api/canvas_api/tutorial/index.html
+++ b/files/fr/conflicting/web/api/canvas_api/tutorial/index.html
@@ -1,11 +1,12 @@
---
title: Dessiner avec Canvas
-slug: Web/Guide/Graphics/Dessiner_avec_canvas
+slug: conflicting/Web/API/Canvas_API/Tutorial
tags:
- Canvas
- HTML
translation_of: Web/API/Canvas_API/Tutorial
translation_of_original: Web/API/Canvas_API/Drawing_graphics_with_canvas
+original_slug: Web/Guide/Graphics/Dessiner_avec_canvas
---
<p> </p>
<h3 id="Introduction" name="Introduction">Introduction</h3>
diff --git a/files/fr/conflicting/web/api/document/createevent/index.html b/files/fr/conflicting/web/api/document/createevent/index.html
index 5cfbb7f05f..b8ff184d41 100644
--- a/files/fr/conflicting/web/api/document/createevent/index.html
+++ b/files/fr/conflicting/web/api/document/createevent/index.html
@@ -1,6 +1,6 @@
---
title: Event.createEvent()
-slug: Web/API/Event/createEvent
+slug: conflicting/Web/API/Document/createEvent
tags:
- API
- DOM
@@ -8,6 +8,7 @@ tags:
- Méthodes
translation_of: Web/API/Document/createEvent
translation_of_original: Web/API/Event/createEvent
+original_slug: Web/API/Event/createEvent
---
<p>{{APIRef("DOM")}}</p>
diff --git a/files/fr/conflicting/web/api/document_object_model/index.html b/files/fr/conflicting/web/api/document_object_model/index.html
index 518da7e3d8..d9480aca59 100644
--- a/files/fr/conflicting/web/api/document_object_model/index.html
+++ b/files/fr/conflicting/web/api/document_object_model/index.html
@@ -1,10 +1,11 @@
---
title: À propos du Document Object Model
-slug: À_propos_du_Document_Object_Model
+slug: conflicting/Web/API/Document_Object_Model
tags:
- DOM
translation_of: Web/API/Document_Object_Model
translation_of_original: DOM/About_the_Document_Object_Model
+original_slug: À_propos_du_Document_Object_Model
---
<h3 id="Présentation_du_DOM">Présentation du DOM</h3>
<p>Le <a href="/fr/docs/DOM">Document Object Model</a>, ou modèle objet de document, est une API pour les documents <a href="/fr/docs/Web/HTML">HTML</a> et <a href="/fr/docs/XML">XML</a>. Le DOM fournit une représentation structurelle du document, permettant de modifier son contenu et sa présentation visuelle. Fondamentalement, il relie les pages Web aux scripts et langages de programmation.</p>
diff --git a/files/fr/conflicting/web/api/document_object_model_03f6e13c52ad7c539d9b4c33c51ac4a3/index.html b/files/fr/conflicting/web/api/document_object_model_03f6e13c52ad7c539d9b4c33c51ac4a3/index.html
index 77c272f5b2..d97eb27eed 100644
--- a/files/fr/conflicting/web/api/document_object_model_03f6e13c52ad7c539d9b4c33c51ac4a3/index.html
+++ b/files/fr/conflicting/web/api/document_object_model_03f6e13c52ad7c539d9b4c33c51ac4a3/index.html
@@ -1,10 +1,11 @@
---
title: Préface
-slug: Web/API/Document_Object_Model/Préface
+slug: conflicting/Web/API/Document_Object_Model_03f6e13c52ad7c539d9b4c33c51ac4a3
tags:
- Référence_du_DOM_Gecko
translation_of: Web/API/Document_Object_Model
translation_of_original: Web/API/Document_Object_Model/Preface
+original_slug: Web/API/Document_Object_Model/Préface
---
<p>{{ ApiRef() }}</p>
<h3 id=".C3.80_propos_de_cette_r.C3.A9f.C3.A9rence" name=".C3.80_propos_de_cette_r.C3.A9f.C3.A9rence">À propos de cette référence</h3>
diff --git a/files/fr/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html b/files/fr/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html
index ad672dee28..40c9cc7859 100644
--- a/files/fr/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html
+++ b/files/fr/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html
@@ -1,6 +1,6 @@
---
title: Guides DOM pour développeurs
-slug: Web/Guide/DOM
+slug: conflicting/Web/API/Document_Object_Model_656f0e51418b39c498011268be9b3a10
tags:
- API
- DOM
@@ -8,6 +8,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>
diff --git a/files/fr/conflicting/web/api/formdata/using_formdata_objects/index.html b/files/fr/conflicting/web/api/formdata/using_formdata_objects/index.html
index 3d07259319..a8df539f4f 100644
--- a/files/fr/conflicting/web/api/formdata/using_formdata_objects/index.html
+++ b/files/fr/conflicting/web/api/formdata/using_formdata_objects/index.html
@@ -1,8 +1,9 @@
---
title: Utiliser les objets FormData
-slug: Web/Guide/Using_FormData_Objects
+slug: conflicting/Web/API/FormData/Using_FormData_Objects
translation_of: Web/API/FormData/Using_FormData_Objects
translation_of_original: Web/Guide/Using_FormData_Objects
+original_slug: Web/Guide/Using_FormData_Objects
---
<p>L'objet <a href="/en/DOM/XMLHttpRequest/FormData" title="en/DOM/XMLHttpRequest/FormData"><code>FormData</code></a> vous permet de créer un ensemble de paires clef-valeur pour un envoi via <code>XMLHttpRequest</code>. Cet objet est destiné avant tout à l'envoi de données de formulaire, mais il peut être utilisé indépendamment des formulaires afin de transmettre des données associées à une clef. Les données transmises sont dans le même format qu'utiliserait la méthode <code>submit()</code> pour envoyer des données si le type d'encodage du formulaire correspondait à "multipart/form-data".</p>
diff --git a/files/fr/conflicting/web/api/globaleventhandlers/onresize/index.html b/files/fr/conflicting/web/api/globaleventhandlers/onresize/index.html
index d2c0d6304f..b49b3e524a 100644
--- a/files/fr/conflicting/web/api/globaleventhandlers/onresize/index.html
+++ b/files/fr/conflicting/web/api/globaleventhandlers/onresize/index.html
@@ -1,6 +1,6 @@
---
title: window.onresize
-slug: Web/API/Window/onresize
+slug: conflicting/Web/API/GlobalEventHandlers/onresize
tags:
- API
- DOM
@@ -8,6 +8,7 @@ tags:
- Propriété
- évènements
translation_of: Web/API/GlobalEventHandlers/onresize
+original_slug: Web/API/Window/onresize
---
<p>{{ ApiRef() }}</p>
diff --git a/files/fr/conflicting/web/api/htmlmediaelement/abort_event/index.html b/files/fr/conflicting/web/api/htmlmediaelement/abort_event/index.html
index 68e28e9626..f8d70358fe 100644
--- a/files/fr/conflicting/web/api/htmlmediaelement/abort_event/index.html
+++ b/files/fr/conflicting/web/api/htmlmediaelement/abort_event/index.html
@@ -1,8 +1,9 @@
---
title: abort
-slug: Web/Events/abort
+slug: conflicting/Web/API/HTMLMediaElement/abort_event
translation_of: Web/API/HTMLMediaElement/abort_event
translation_of_original: Web/Events/abort
+original_slug: Web/Events/abort
---
<div>L'événement <strong>abort</strong> est déclenché lorsque le chargement d'une resource a été interrompu.</div>
diff --git a/files/fr/conflicting/web/api/htmlmediaelement/ended_event/index.html b/files/fr/conflicting/web/api/htmlmediaelement/ended_event/index.html
index 950e8ef545..f4da2370bf 100644
--- a/files/fr/conflicting/web/api/htmlmediaelement/ended_event/index.html
+++ b/files/fr/conflicting/web/api/htmlmediaelement/ended_event/index.html
@@ -1,8 +1,9 @@
---
title: ended (Web Audio)
-slug: Web/Events/ended_(Web_Audio)
+slug: conflicting/Web/API/HTMLMediaElement/ended_event
translation_of: Web/API/HTMLMediaElement/ended_event
translation_of_original: Web/Events/ended_(Web_Audio)
+original_slug: Web/Events/ended_(Web_Audio)
---
<div>
<p>L'événement <strong>ended </strong>est déclenché lorsque la lecture s'est arrêté parce que la fin du média a été atteinte.</p>
diff --git a/files/fr/conflicting/web/api/index.html b/files/fr/conflicting/web/api/index.html
index a4f8a6ba0a..636324d19f 100644
--- a/files/fr/conflicting/web/api/index.html
+++ b/files/fr/conflicting/web/api/index.html
@@ -1,6 +1,6 @@
---
title: element.name
-slug: Web/API/Element/name
+slug: conflicting/Web/API
tags:
- API
- DOM
@@ -9,6 +9,7 @@ tags:
- Propriétés
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/fr/conflicting/web/api/node/getrootnode/index.html b/files/fr/conflicting/web/api/node/getrootnode/index.html
index 7ee512dd8f..ac35922132 100644
--- a/files/fr/conflicting/web/api/node/getrootnode/index.html
+++ b/files/fr/conflicting/web/api/node/getrootnode/index.html
@@ -1,6 +1,6 @@
---
title: Node.rootNode
-slug: Web/API/Node/rootNode
+slug: conflicting/Web/API/Node/getRootNode
tags:
- API
- Arborescence
@@ -10,6 +10,7 @@ tags:
- Racine
translation_of: Web/API/Node/getRootNode
translation_of_original: Web/API/Node/rootNode
+original_slug: Web/API/Node/rootNode
---
<p>{{deprecated_header}}{{APIRef("DOM")}}{{SeeCompatTable}}</p>
diff --git a/files/fr/conflicting/web/api/node/index.html b/files/fr/conflicting/web/api/node/index.html
index 617ed79d8e..3f0b54a386 100644
--- a/files/fr/conflicting/web/api/node/index.html
+++ b/files/fr/conflicting/web/api/node/index.html
@@ -1,6 +1,6 @@
---
title: Node.baseURIObject
-slug: Web/API/Node/baseURIObject
+slug: conflicting/Web/API/Node
tags:
- API
- DOM
@@ -10,6 +10,7 @@ tags:
- URL
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/fr/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html b/files/fr/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html
index 33144eae42..50f42907e0 100644
--- a/files/fr/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html
+++ b/files/fr/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html
@@ -1,6 +1,6 @@
---
title: Node.nodePrincipal
-slug: Web/API/Node/nodePrincipal
+slug: conflicting/Web/API/Node_378aed5ed6869e50853edbc988cf9556
tags:
- API
- DOM
@@ -9,6 +9,7 @@ tags:
- Propriétés
translation_of: Web/API/Node
translation_of_original: Web/API/Node/nodePrincipal
+original_slug: Web/API/Node/nodePrincipal
---
<div>{{APIRef("DOM")}} {{Non-standard_header}}</div>
diff --git a/files/fr/conflicting/web/api/selection/index.html b/files/fr/conflicting/web/api/selection/index.html
index bca8077699..29024a1140 100644
--- a/files/fr/conflicting/web/api/selection/index.html
+++ b/files/fr/conflicting/web/api/selection/index.html
@@ -1,7 +1,8 @@
---
title: Selection API
-slug: Web/API/Selection_API
+slug: conflicting/Web/API/Selection
translation_of: Web/API/Selection_API
+original_slug: Web/API/Selection_API
---
<p>{{APIRef}}</p>
diff --git a/files/fr/conflicting/web/api/url/index.html b/files/fr/conflicting/web/api/url/index.html
index 223701977c..a0ecb87540 100644
--- a/files/fr/conflicting/web/api/url/index.html
+++ b/files/fr/conflicting/web/api/url/index.html
@@ -1,8 +1,9 @@
---
title: Window.URL
-slug: Web/API/Window/URL
+slug: conflicting/Web/API/URL
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/fr/conflicting/web/api/web_storage_api/index.html b/files/fr/conflicting/web/api/web_storage_api/index.html
index 2b52e93ad8..916bd25334 100644
--- a/files/fr/conflicting/web/api/web_storage_api/index.html
+++ b/files/fr/conflicting/web/api/web_storage_api/index.html
@@ -1,6 +1,6 @@
---
title: Storage
-slug: DOM/Storage
+slug: conflicting/Web/API/Web_Storage_API
tags:
- Applications_web_hors_ligne
- DOM
@@ -8,6 +8,7 @@ tags:
- Référence_du_DOM_Gecko
translation_of: Web/API/Web_Storage_API
translation_of_original: Web/Guide/API/DOM/Storage
+original_slug: DOM/Storage
---
<p>{{ ApiRef() }} {{ Fx_minversion_header(2) }}</p>
<div class="note">
diff --git a/files/fr/conflicting/web/api/web_workers_api/using_web_workers/index.html b/files/fr/conflicting/web/api/web_workers_api/using_web_workers/index.html
index b925ca7f4b..1c1b91774d 100644
--- a/files/fr/conflicting/web/api/web_workers_api/using_web_workers/index.html
+++ b/files/fr/conflicting/web/api/web_workers_api/using_web_workers/index.html
@@ -1,8 +1,9 @@
---
title: Concepts avancés et exemples
-slug: Web/API/Web_Workers_API/Advanced_concepts_and_examples
+slug: conflicting/Web/API/Web_Workers_API/Using_web_workers
translation_of: Web/API/Web_Workers_API/Using_web_workers
translation_of_original: Web/API/Web_Workers_API/Advanced_concepts_and_examples
+original_slug: Web/API/Web_Workers_API/Advanced_concepts_and_examples
---
<div class="summary">
<p>Cet article fournit de nombreux détails et maints exemples pour illustrer les concepts avancés des web workers.</p>
diff --git a/files/fr/conflicting/web/api/webrtc_api/index.html b/files/fr/conflicting/web/api/webrtc_api/index.html
index 2d516d62d5..24932d8d34 100644
--- a/files/fr/conflicting/web/api/webrtc_api/index.html
+++ b/files/fr/conflicting/web/api/webrtc_api/index.html
@@ -1,11 +1,12 @@
---
title: WebRTC
-slug: Web/Guide/API/WebRTC
+slug: conflicting/Web/API/WebRTC_API
tags:
- Intro
- WebRTC
translation_of: Web/API/WebRTC_API
translation_of_original: Web/Guide/API/WebRTC
+original_slug: Web/Guide/API/WebRTC
---
<p><strong>WebRTC</strong> (où RTC signifie Real-Time Communications -Communications en temps réel-) est une technologie qui permet la transmission en continue (streaming) de l'audio/vidéo et le partage de données entre les navigateurs clients (peers). Comme un ensemble de normes (standards), le WebRTC fournit à n'importe quel navigateur la capacité de partager des données d'application et d'effectuer des téléconférences d’égal à égal, sans avoir à installer quelques plug-ins ou logiciels tiers.</p>
<p>Les composants WebRTC sont accessibles grâce aux APIs JavaScript : l'API de flux réseau (Network Stream), qui représente un flux de données audio ou vidéo ; l'API de Connexion (PeerConnection), qui permet à plusieurs utilisateurs de communiquer via leurs navigateurs ; et l'API DataChannel qui permet la communication d'autres types de données pour le jeu en temps réel, dialogue en ligne, transfert de fichiers, etc.</p>
diff --git a/files/fr/conflicting/web/api/webrtc_api_d8621144cbc61520339c3b10c61731f0/index.html b/files/fr/conflicting/web/api/webrtc_api_d8621144cbc61520339c3b10c61731f0/index.html
index 7bff67c30f..9b19e7c9b7 100644
--- a/files/fr/conflicting/web/api/webrtc_api_d8621144cbc61520339c3b10c61731f0/index.html
+++ b/files/fr/conflicting/web/api/webrtc_api_d8621144cbc61520339c3b10c61731f0/index.html
@@ -1,10 +1,11 @@
---
title: WebRTC
-slug: WebRTC
+slug: conflicting/Web/API/WebRTC_API_d8621144cbc61520339c3b10c61731f0
tags:
- WebRTC
translation_of: Web/API/WebRTC_API
translation_of_original: WebRTC
+original_slug: WebRTC
---
<p>Le RTC de WebRTC est synonyme de communications en temps réel, la technologie qui permet streaming audio / vidéo et le partage de données entre les clients de navigateur (pairs). Comme ensemble de normes, WebRTC permet à n'importe quel navigateur d'avoir la possibilité de partager les données d'application et d'effectuer des téléconférences entre pairs, sans la nécessité d'installer des plug-ins ou logiciels tiers.</p>
diff --git a/files/fr/conflicting/web/api/window/localstorage/index.html b/files/fr/conflicting/web/api/window/localstorage/index.html
index 9f6c400f86..f6b80c6de0 100644
--- a/files/fr/conflicting/web/api/window/localstorage/index.html
+++ b/files/fr/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>{{APIRef()}}</p>
diff --git a/files/fr/conflicting/web/api/xsltprocessor/index.html b/files/fr/conflicting/web/api/xsltprocessor/index.html
index 0b42bdbde9..03a9d6203d 100644
--- a/files/fr/conflicting/web/api/xsltprocessor/index.html
+++ b/files/fr/conflicting/web/api/xsltprocessor/index.html
@@ -1,10 +1,11 @@
---
title: XSLT dans Gecko
-slug: XSLT_dans_Gecko
+slug: conflicting/Web/API/XSLTProcessor
tags:
- XSLT
translation_of: Web/API/XSLTProcessor
translation_of_original: XSLT_in_Gecko
+original_slug: XSLT_dans_Gecko
---
<p> </p>
diff --git a/files/fr/conflicting/web/api/xsltprocessor_197eea6e529b0a946d29ce7cc292e7ef/index.html b/files/fr/conflicting/web/api/xsltprocessor_197eea6e529b0a946d29ce7cc292e7ef/index.html
index 940157af5f..70124f4d01 100644
--- a/files/fr/conflicting/web/api/xsltprocessor_197eea6e529b0a946d29ce7cc292e7ef/index.html
+++ b/files/fr/conflicting/web/api/xsltprocessor_197eea6e529b0a946d29ce7cc292e7ef/index.html
@@ -1,8 +1,9 @@
---
title: XSLTProcessor
-slug: XSLTProcessor
+slug: conflicting/Web/API/XSLTProcessor_197eea6e529b0a946d29ce7cc292e7ef
translation_of: Web/API/XSLTProcessor
translation_of_original: XSLTProcessor
+original_slug: XSLTProcessor
---
<p>
</p><p>XSLTProcesor est un objet fournissant une interface avec le moteur XSLT de Mozilla. Il est utilisable par du code JavaScript sans privilèges.
diff --git a/files/fr/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html b/files/fr/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html
index 17459c2dfd..6085578ec9 100644
--- a/files/fr/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html
+++ b/files/fr/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html
@@ -1,10 +1,11 @@
---
title: WebAPI
-slug: WebAPI
+slug: conflicting/Web/API_dd04ca1265cb79b990b8120e5f5070d3
tags:
- Portail
translation_of: Web/API
translation_of_original: WebAPI
+original_slug: WebAPI
---
<p>Le terme <strong>WebAPI</strong> permet de regrouper différentes API permettant d'accéder aux composants ou aux caractéristiques des appareil (comme la batterie, les vibrations...). Elles permettent aussi d'accéder aux informations enregistrées sur l'appareil (liste de contacts, agenda...). En créant ces API, nous espérons offrir de nouvelles possibilités au Web, jusqu'a présent réservées aux plates-formes propriétaires.</p>
diff --git a/files/fr/conflicting/web/css/@viewport/index.html b/files/fr/conflicting/web/css/@viewport/index.html
index bd7b0871c9..38e9ba9a6c 100644
--- a/files/fr/conflicting/web/css/@viewport/index.html
+++ b/files/fr/conflicting/web/css/@viewport/index.html
@@ -1,6 +1,6 @@
---
title: height
-slug: Web/CSS/@viewport/height
+slug: conflicting/Web/CSS/@viewport
tags:
- '@viewport'
- CSS
@@ -8,6 +8,7 @@ tags:
- Reference
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/fr/conflicting/web/css/@viewport_3ecbd2877baedebcfaffc13eaa7d61ce/index.html b/files/fr/conflicting/web/css/@viewport_3ecbd2877baedebcfaffc13eaa7d61ce/index.html
index 45f9b90ef5..dbbb78795b 100644
--- a/files/fr/conflicting/web/css/@viewport_3ecbd2877baedebcfaffc13eaa7d61ce/index.html
+++ b/files/fr/conflicting/web/css/@viewport_3ecbd2877baedebcfaffc13eaa7d61ce/index.html
@@ -1,12 +1,13 @@
---
title: user-zoom
-slug: Web/CSS/@viewport/user-zoom
+slug: conflicting/Web/CSS/@viewport_3ecbd2877baedebcfaffc13eaa7d61ce
tags:
- CSS
- Descripteur
- Reference
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/fr/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html b/files/fr/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html
index fd3499f24c..fa8238ea67 100644
--- a/files/fr/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html
+++ b/files/fr/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html
@@ -1,6 +1,6 @@
---
title: max-height
-slug: Web/CSS/@viewport/max-height
+slug: conflicting/Web/CSS/@viewport_516ab4b0283b5b2231fb657505e22440
tags:
- '@viewport'
- CSS
@@ -8,6 +8,7 @@ tags:
- Reference
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/max-height
+original_slug: Web/CSS/@viewport/max-height
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html b/files/fr/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html
index 295e87ce7a..9a1aa098dc 100644
--- a/files/fr/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html
+++ b/files/fr/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html
@@ -1,12 +1,13 @@
---
title: min-zoom
-slug: Web/CSS/@viewport/min-zoom
+slug: conflicting/Web/CSS/@viewport_6e9c91ec34cdb0393d301240d0d50d84
tags:
- CSS
- Descripteur
- Reference
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/min-zoom
+original_slug: Web/CSS/@viewport/min-zoom
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/@viewport_7861ca3461a359b150d44f2c8d74e53a/index.html b/files/fr/conflicting/web/css/@viewport_7861ca3461a359b150d44f2c8d74e53a/index.html
index 42e89f24e5..09560d1c95 100644
--- a/files/fr/conflicting/web/css/@viewport_7861ca3461a359b150d44f2c8d74e53a/index.html
+++ b/files/fr/conflicting/web/css/@viewport_7861ca3461a359b150d44f2c8d74e53a/index.html
@@ -1,12 +1,13 @@
---
title: orientation
-slug: Web/CSS/@viewport/orientation
+slug: conflicting/Web/CSS/@viewport_7861ca3461a359b150d44f2c8d74e53a
tags:
- CSS
- Descripteur
- Reference
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/orientation
+original_slug: Web/CSS/@viewport/orientation
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html b/files/fr/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html
index 5532ed2191..69ab7cae5b 100644
--- a/files/fr/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html
+++ b/files/fr/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html
@@ -1,6 +1,6 @@
---
title: viewport-fit
-slug: Web/CSS/@viewport/viewport-fit
+slug: conflicting/Web/CSS/@viewport_a33ee59ffd8336ffb3336900dea02e9f
tags:
- '@viewport'
- CSS
@@ -9,6 +9,7 @@ tags:
- Reference
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/viewport-fit
+original_slug: Web/CSS/@viewport/viewport-fit
---
<div>{{CSSRef}}{{Draft}}{{SeeCompatTable}}</div>
diff --git a/files/fr/conflicting/web/css/@viewport_a47f799d4189f98a73bc55899628d6d7/index.html b/files/fr/conflicting/web/css/@viewport_a47f799d4189f98a73bc55899628d6d7/index.html
index 83a55c3c66..6d31386abd 100644
--- a/files/fr/conflicting/web/css/@viewport_a47f799d4189f98a73bc55899628d6d7/index.html
+++ b/files/fr/conflicting/web/css/@viewport_a47f799d4189f98a73bc55899628d6d7/index.html
@@ -1,6 +1,6 @@
---
title: min-height
-slug: Web/CSS/@viewport/min-height
+slug: conflicting/Web/CSS/@viewport_a47f799d4189f98a73bc55899628d6d7
tags:
- '@viewport'
- CSS
@@ -8,6 +8,7 @@ tags:
- Reference
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/min-height
+original_slug: Web/CSS/@viewport/min-height
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/@viewport_c5f2dc316e069e8c32ab24f9117600a7/index.html b/files/fr/conflicting/web/css/@viewport_c5f2dc316e069e8c32ab24f9117600a7/index.html
index aa345f6c1e..3cb1b93005 100644
--- a/files/fr/conflicting/web/css/@viewport_c5f2dc316e069e8c32ab24f9117600a7/index.html
+++ b/files/fr/conflicting/web/css/@viewport_c5f2dc316e069e8c32ab24f9117600a7/index.html
@@ -1,12 +1,13 @@
---
title: min-width
-slug: Web/CSS/@viewport/min-width
+slug: conflicting/Web/CSS/@viewport_c5f2dc316e069e8c32ab24f9117600a7
tags:
- CSS
- Descripteur
- Reference
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/min-width
+original_slug: Web/CSS/@viewport/min-width
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html b/files/fr/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html
index 26e657d76a..3ea88bc7b9 100644
--- a/files/fr/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html
+++ b/files/fr/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html
@@ -1,12 +1,13 @@
---
title: width
-slug: Web/CSS/@viewport/width
+slug: conflicting/Web/CSS/@viewport_c925ec0506b352ea1185248b874f7848
tags:
- CSS
- Descripteur
- Reference
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/fr/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html b/files/fr/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html
index a5021d48f3..3a4080663c 100644
--- a/files/fr/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html
+++ b/files/fr/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html
@@ -1,12 +1,13 @@
---
title: max-zoom
-slug: Web/CSS/@viewport/max-zoom
+slug: conflicting/Web/CSS/@viewport_d03ebc763769680c55d1a4258592d3ed
tags:
- CSS
- Descripteur
- Reference
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/max-zoom
+original_slug: Web/CSS/@viewport/max-zoom
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html b/files/fr/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html
index c995febbea..2cf4ac2ea8 100644
--- a/files/fr/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html
+++ b/files/fr/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html
@@ -1,12 +1,13 @@
---
title: zoom
-slug: Web/CSS/@viewport/zoom
+slug: conflicting/Web/CSS/@viewport_e065ce90bde08c9679692adbe64f6518
tags:
- CSS
- Descripteur
- Reference
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/zoom
+original_slug: Web/CSS/@viewport/zoom
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/@viewport_ff9d4f4f351256d9fdb3d21397eb3880/index.html b/files/fr/conflicting/web/css/@viewport_ff9d4f4f351256d9fdb3d21397eb3880/index.html
index f131a09f7d..cd53d9ba32 100644
--- a/files/fr/conflicting/web/css/@viewport_ff9d4f4f351256d9fdb3d21397eb3880/index.html
+++ b/files/fr/conflicting/web/css/@viewport_ff9d4f4f351256d9fdb3d21397eb3880/index.html
@@ -1,12 +1,13 @@
---
title: max-width
-slug: Web/CSS/@viewport/max-width
+slug: conflicting/Web/CSS/@viewport_ff9d4f4f351256d9fdb3d21397eb3880
tags:
- CSS
- Descripteur
- Reference
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/max-width
+original_slug: Web/CSS/@viewport/max-width
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/_colon_is/index.html b/files/fr/conflicting/web/css/_colon_is/index.html
index f3036e1ee9..9c45ec21a4 100644
--- a/files/fr/conflicting/web/css/_colon_is/index.html
+++ b/files/fr/conflicting/web/css/_colon_is/index.html
@@ -1,13 +1,14 @@
---
title: ':any()'
-slug: 'Web/CSS/:any'
+slug: conflicting/Web/CSS/:is
tags:
- CSS
- Experimental
- Pseudo-classe
- Reference
-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/fr/conflicting/web/css/_colon_placeholder-shown/index.html b/files/fr/conflicting/web/css/_colon_placeholder-shown/index.html
index 8b1111134c..5d96fb7af4 100644
--- a/files/fr/conflicting/web/css/_colon_placeholder-shown/index.html
+++ b/files/fr/conflicting/web/css/_colon_placeholder-shown/index.html
@@ -1,13 +1,14 @@
---
title: ':-ms-input-placeholder'
-slug: 'Web/CSS/:-ms-input-placeholder'
+slug: conflicting/Web/CSS/:placeholder-shown
tags:
- CSS
- Non-standard
- Pseudo-classe
- Référence(2)
-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/fr/conflicting/web/css/_doublecolon_placeholder/index.html b/files/fr/conflicting/web/css/_doublecolon_placeholder/index.html
index 4be89a52e0..30b93b1970 100644
--- a/files/fr/conflicting/web/css/_doublecolon_placeholder/index.html
+++ b/files/fr/conflicting/web/css/_doublecolon_placeholder/index.html
@@ -1,13 +1,14 @@
---
title: '::-webkit-input-placeholder'
-slug: 'Web/CSS/::-webkit-input-placeholder'
+slug: conflicting/Web/CSS/::placeholder
tags:
- CSS
- Non-standard
- Pseudo-element
- Reference
-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/fr/conflicting/web/css/border-collapse/index.html b/files/fr/conflicting/web/css/border-collapse/index.html
index 3a1430f65e..69a227630d 100644
--- a/files/fr/conflicting/web/css/border-collapse/index.html
+++ b/files/fr/conflicting/web/css/border-collapse/index.html
@@ -1,10 +1,11 @@
---
title: Tableaux
-slug: Astuces_CSS/Tableaux
+slug: conflicting/Web/CSS/border-collapse
tags:
- CSS
translation_of: Web/CSS/border-collapse
translation_of_original: Useful_CSS_tips/Tables
+original_slug: Astuces_CSS/Tableaux
---
<h3 id="Centrage" name="Centrage">Centrage</h3>
<p>Si vous voulez centrer un tableau, il n'est pas correct d'utiliser</p>
diff --git a/files/fr/conflicting/web/css/box-ordinal-group/index.html b/files/fr/conflicting/web/css/box-ordinal-group/index.html
index 4215966858..0383bcd501 100644
--- a/files/fr/conflicting/web/css/box-ordinal-group/index.html
+++ b/files/fr/conflicting/web/css/box-ordinal-group/index.html
@@ -1,6 +1,6 @@
---
title: '-moz-box-ordinal-group'
-slug: Web/CSS/-moz-box-ordinal-group
+slug: conflicting/Web/CSS/box-ordinal-group
tags:
- CSS
- Non-standard
@@ -8,6 +8,7 @@ tags:
- Reference
translation_of: Web/CSS/box-ordinal-group
translation_of_original: Web/CSS/-moz-box-ordinal-group
+original_slug: Web/CSS/-moz-box-ordinal-group
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/color_value/index.html b/files/fr/conflicting/web/css/color_value/index.html
index 3880593692..8b36e3e59d 100644
--- a/files/fr/conflicting/web/css/color_value/index.html
+++ b/files/fr/conflicting/web/css/color_value/index.html
@@ -1,10 +1,11 @@
---
title: Couleurs et fonds
-slug: Astuces_CSS/Couleurs_et_fonds
+slug: conflicting/Web/CSS/color_value
tags:
- CSS
translation_of: Web/CSS/color_value
translation_of_original: Useful_CSS_tips/Color_and_Background
+original_slug: Astuces_CSS/Couleurs_et_fonds
---
<p>
</p>
diff --git a/files/fr/conflicting/web/css/column-gap/index.html b/files/fr/conflicting/web/css/column-gap/index.html
index 05b3e559d2..75e47d95a9 100644
--- a/files/fr/conflicting/web/css/column-gap/index.html
+++ b/files/fr/conflicting/web/css/column-gap/index.html
@@ -1,12 +1,13 @@
---
title: grid-column-gap
-slug: Web/CSS/grid-column-gap
+slug: conflicting/Web/CSS/column-gap
tags:
- CSS
- Propriété
- Reference
translation_of: Web/CSS/column-gap
translation_of_original: Web/CSS/grid-column-gap
+original_slug: Web/CSS/grid-column-gap
---
<div>{{CSSRef}}{{Deprecated_Header}}</div>
diff --git a/files/fr/conflicting/web/css/css_backgrounds_and_borders/index.html b/files/fr/conflicting/web/css/css_backgrounds_and_borders/index.html
index 8873196702..43168c248f 100644
--- a/files/fr/conflicting/web/css/css_backgrounds_and_borders/index.html
+++ b/files/fr/conflicting/web/css/css_backgrounds_and_borders/index.html
@@ -1,11 +1,12 @@
---
title: Arrière-plans et bordures CSS
-slug: Web/CSS/Arrière-plans_et_bordures_CSS
+slug: conflicting/Web/CSS/CSS_Backgrounds_and_Borders
tags:
- CSS
- Référence(2)
translation_of: Web/CSS/CSS_Backgrounds_and_Borders
translation_of_original: Web/CSS/CSS_Background_and_Borders
+original_slug: Web/CSS/Arrière-plans_et_bordures_CSS
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/css_color/index.html b/files/fr/conflicting/web/css/css_color/index.html
index fb589fa689..efbefc74a2 100644
--- a/files/fr/conflicting/web/css/css_color/index.html
+++ b/files/fr/conflicting/web/css/css_color/index.html
@@ -1,6 +1,6 @@
---
title: Couleurs CSS
-slug: Web/CSS/Couleurs_CSS
+slug: conflicting/Web/CSS/CSS_Color
tags:
- Aperçu
- CSS
@@ -8,6 +8,7 @@ tags:
- Reference
translation_of: Web/CSS/CSS_Color
translation_of_original: Web/CSS/CSS_Colors
+original_slug: Web/CSS/Couleurs_CSS
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html b/files/fr/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html
index b36e1eb0f4..2c4fe59e6e 100644
--- a/files/fr/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html
+++ b/files/fr/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html
@@ -1,6 +1,6 @@
---
title: Rétrocompatibilité de flexbox
-slug: Web/CSS/CSS_Flexible_Box_Layout/Rétrocompatibilite_de_flexbox
+slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Backwards_Compatibility_of_Flexbox
tags:
- '@supports'
- Boîtes flexibles
@@ -9,6 +9,7 @@ tags:
- Intermediate
- flexbox
translation_of: Web/CSS/CSS_Flexible_Box_Layout/Backwards_Compatibility_of_Flexbox
+original_slug: Web/CSS/CSS_Flexible_Box_Layout/Rétrocompatibilite_de_flexbox
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html b/files/fr/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html
index f91090e0dc..0cb39985fe 100644
--- a/files/fr/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html
+++ b/files/fr/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html
@@ -1,12 +1,13 @@
---
title: Utiliser les boîtes flexibles pour les applications web
-slug: Web/CSS/CSS_Flexible_Box_Layout/Boîtes_flexibles_pour_applications_web
+slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Typical_Use_Cases_of_Flexbox
tags:
- Avancé
- CSS
- Guide
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/Boîtes_flexibles_pour_applications_web
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/cursor/index.html b/files/fr/conflicting/web/css/cursor/index.html
index a7121bf02e..263b6695dd 100644
--- a/files/fr/conflicting/web/css/cursor/index.html
+++ b/files/fr/conflicting/web/css/cursor/index.html
@@ -1,6 +1,6 @@
---
title: '-moz-cell'
-slug: Web/CSS/-moz-cell
+slug: conflicting/Web/CSS/cursor
tags:
- CSS
- Obsolete
@@ -8,6 +8,7 @@ tags:
- Reference
translation_of: Web/CSS/cursor
translation_of_original: Web/CSS/-moz-cell
+original_slug: Web/CSS/-moz-cell
---
<div class="boxed translate-rendered">
<div>{{CSSRef}}{{deprecated_header}}</div>
diff --git a/files/fr/conflicting/web/css/filter_effects/index.html b/files/fr/conflicting/web/css/filter_effects/index.html
index 6976999a5f..6169a47ce3 100644
--- a/files/fr/conflicting/web/css/filter_effects/index.html
+++ b/files/fr/conflicting/web/css/filter_effects/index.html
@@ -1,11 +1,12 @@
---
title: Filters Effects
-slug: Web/CSS/Filters_Effects
+slug: conflicting/Web/CSS/Filter_Effects
tags:
- CSS
- Reference
translation_of: Web/CSS/Filter_Effects
translation_of_original: Web/CSS/Filters_Effects
+original_slug: Web/CSS/Filters_Effects
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/float/index.html b/files/fr/conflicting/web/css/float/index.html
index 471bfdc5af..6e8b3aef86 100644
--- a/files/fr/conflicting/web/css/float/index.html
+++ b/files/fr/conflicting/web/css/float/index.html
@@ -1,11 +1,12 @@
---
title: none
-slug: Web/CSS/none
+slug: conflicting/Web/CSS/float
tags:
- CSS
- Référence CSS
translation_of: Web/CSS/float
translation_of_original: Web/CSS/none
+original_slug: Web/CSS/none
---
<p>{{ CSSRef() }}</p>
<h2 id="Résumé">Résumé</h2>
diff --git a/files/fr/conflicting/web/css/font-variant/index.html b/files/fr/conflicting/web/css/font-variant/index.html
index 5b611f0369..7b4e177c8f 100644
--- a/files/fr/conflicting/web/css/font-variant/index.html
+++ b/files/fr/conflicting/web/css/font-variant/index.html
@@ -1,11 +1,12 @@
---
title: normal
-slug: Web/CSS/normal
+slug: conflicting/Web/CSS/font-variant
tags:
- CSS
- Référence CSS
translation_of: Web/CSS/font-variant
translation_of_original: Web/CSS/normal
+original_slug: Web/CSS/normal
---
<p>{{ CSSRef() }}</p>
<h2 id="Résumé">Résumé</h2>
diff --git a/files/fr/conflicting/web/css/index.html b/files/fr/conflicting/web/css/index.html
index 213bc187b5..fe99a6d344 100644
--- a/files/fr/conflicting/web/css/index.html
+++ b/files/fr/conflicting/web/css/index.html
@@ -1,10 +1,11 @@
---
title: Astuces CSS
-slug: Astuces_CSS
+slug: conflicting/Web/CSS
tags:
- CSS
translation_of: Web/CSS
translation_of_original: Useful_CSS_tips
+original_slug: Astuces_CSS
---
<p>
</p><p>Cette page présente quelques astuces concernant l'utilisation de CSS. Chaque astuce est prévue pour être aussi courte que possible et fournir les informations nécessaires sur les propriétés et caractéristiques les plus recherchées mais peu connues ou sujettes à des erreurs fréquentes.
diff --git a/files/fr/conflicting/web/css/mask-image/index.html b/files/fr/conflicting/web/css/mask-image/index.html
index 2303f48997..a88b476043 100644
--- a/files/fr/conflicting/web/css/mask-image/index.html
+++ b/files/fr/conflicting/web/css/mask-image/index.html
@@ -1,10 +1,11 @@
---
title: '-webkit-mask-image'
-slug: Web/CSS/-webkit-mask-image
+slug: conflicting/Web/CSS/mask-image
tags:
- CSS
translation_of: Web/CSS/mask-image
translation_of_original: Web/CSS/-webkit-mask-image
+original_slug: Web/CSS/-webkit-mask-image
---
<p style="margin-top: 0px; margin-right: 0px; margin-bottom: 1.286em; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;">{{ CSSRef() }}</p>
diff --git a/files/fr/conflicting/web/css/mozilla_extensions/index.html b/files/fr/conflicting/web/css/mozilla_extensions/index.html
index 98f3c88b72..8f1fc80549 100644
--- a/files/fr/conflicting/web/css/mozilla_extensions/index.html
+++ b/files/fr/conflicting/web/css/mozilla_extensions/index.html
@@ -1,12 +1,13 @@
---
title: Implémentation des fonctionnalités CSS à l'état de brouillon
-slug: Web/CSS/Implémentation_des_Brouillons_CSS
+slug: conflicting/Web/CSS/Mozilla_Extensions
tags:
- CSS
- Draft
- NeedsContent
translation_of: Web/CSS/Mozilla_Extensions
translation_of_original: Web/CSS/Draft_Implementations_of_CSS_Features
+original_slug: Web/CSS/Implémentation_des_Brouillons_CSS
---
<div>{{CSSRef}}{{Draft}}</div>
diff --git a/files/fr/conflicting/web/css/pseudo-classes/index.html b/files/fr/conflicting/web/css/pseudo-classes/index.html
index c6c631c6c0..14ca90be5c 100644
--- a/files/fr/conflicting/web/css/pseudo-classes/index.html
+++ b/files/fr/conflicting/web/css/pseudo-classes/index.html
@@ -1,10 +1,11 @@
---
title: Liens
-slug: Astuces_CSS/Liens
+slug: conflicting/Web/CSS/Pseudo-classes
tags:
- CSS
translation_of: Web/CSS/Pseudo-classes
translation_of_original: Useful_CSS_tips/Links
+original_slug: Astuces_CSS/Liens
---
<p>
</p>
diff --git a/files/fr/conflicting/web/css/scroll-snap-type/index.html b/files/fr/conflicting/web/css/scroll-snap-type/index.html
index fff872ad27..43e3de46d8 100644
--- a/files/fr/conflicting/web/css/scroll-snap-type/index.html
+++ b/files/fr/conflicting/web/css/scroll-snap-type/index.html
@@ -1,12 +1,13 @@
---
title: '-ms-scroll-snap-type'
-slug: Web/CSS/-ms-scroll-snap-type
+slug: conflicting/Web/CSS/scroll-snap-type
tags:
- CSS
- Non-standard
- Reference
translation_of: Web/CSS/scroll-snap-type
translation_of_original: Web/CSS/-ms-scroll-snap-type
+original_slug: Web/CSS/-ms-scroll-snap-type
---
<div>{{CSSRef}}{{non-standard_header}}</div>
diff --git a/files/fr/conflicting/web/css/shape-outside/index.html b/files/fr/conflicting/web/css/shape-outside/index.html
index de7ad2607a..cb5324dda5 100644
--- a/files/fr/conflicting/web/css/shape-outside/index.html
+++ b/files/fr/conflicting/web/css/shape-outside/index.html
@@ -1,12 +1,13 @@
---
title: <shape-box>
-slug: Web/CSS/shape-box
+slug: conflicting/Web/CSS/shape-outside
tags:
- CSS
- Reference
- Type
translation_of: Web/CSS/shape-outside
translation_of_original: Web/CSS/shape-box
+original_slug: Web/CSS/shape-box
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/url()/index.html b/files/fr/conflicting/web/css/url()/index.html
index a31d8c3342..c5e0d6c01a 100644
--- a/files/fr/conflicting/web/css/url()/index.html
+++ b/files/fr/conflicting/web/css/url()/index.html
@@ -1,12 +1,13 @@
---
title: url()
-slug: Web/CSS/filter-function/url
+slug: conflicting/Web/CSS/url()
tags:
- CSS
- Junk
- Reference
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/fr/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html b/files/fr/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html
index d68db30cfe..1d16140856 100644
--- a/files/fr/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html
+++ b/files/fr/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html
@@ -1,12 +1,13 @@
---
title: <url>
-slug: Web/CSS/url
+slug: conflicting/Web/CSS/url()_168028c4e5edd9e19c061adb4b604d4f
tags:
- CSS
- Reference
- Type
translation_of: Web/CSS/url()
translation_of_original: Web/CSS/url
+original_slug: Web/CSS/url
---
<div>{{CSSRef}}</div>
diff --git a/files/fr/conflicting/web/css/user-select/index.html b/files/fr/conflicting/web/css/user-select/index.html
index 047c721acc..f8035c96b4 100644
--- a/files/fr/conflicting/web/css/user-select/index.html
+++ b/files/fr/conflicting/web/css/user-select/index.html
@@ -1,6 +1,6 @@
---
title: '-ms-user-select'
-slug: Web/CSS/-ms-user-select
+slug: conflicting/Web/CSS/user-select
tags:
- CSS
- Non-standard
@@ -8,6 +8,7 @@ tags:
- Reference
translation_of: Web/CSS/user-select
translation_of_original: Web/CSS/-ms-user-select
+original_slug: Web/CSS/-ms-user-select
---
<div>{{CSSRef}}{{non-standard_header}}</div>
diff --git a/files/fr/conflicting/web/css/width/index.html b/files/fr/conflicting/web/css/width/index.html
index 92535f6d82..d8143e66f4 100644
--- a/files/fr/conflicting/web/css/width/index.html
+++ b/files/fr/conflicting/web/css/width/index.html
@@ -1,11 +1,12 @@
---
title: auto
-slug: Web/CSS/auto
+slug: conflicting/Web/CSS/width
tags:
- CSS
- Référence CSS
translation_of: Web/CSS/width
translation_of_original: Web/CSS/auto
+original_slug: Web/CSS/auto
---
<p>{{ CSSRef() }}</p>
<h2 id="Résumé">Résumé</h2>
diff --git a/files/fr/conflicting/web/guide/events/creating_and_triggering_events/index.html b/files/fr/conflicting/web/guide/events/creating_and_triggering_events/index.html
index c075a3eec7..ab0f513ec3 100644
--- a/files/fr/conflicting/web/guide/events/creating_and_triggering_events/index.html
+++ b/files/fr/conflicting/web/guide/events/creating_and_triggering_events/index.html
@@ -1,10 +1,11 @@
---
title: dispatchEvent exemple
-slug: DOM/dispatchEvent_exemple
+slug: conflicting/Web/Guide/Events/Creating_and_triggering_events
tags:
- Référence_du_DOM_Gecko
translation_of: Web/Guide/Events/Creating_and_triggering_events
translation_of_original: Web/Guide/Events/Event_dispatching_example
+original_slug: DOM/dispatchEvent_exemple
---
<div class="noinclude">
{{ ApiRef() }}</div>
diff --git a/files/fr/conflicting/web/guide/index.html b/files/fr/conflicting/web/guide/index.html
index 303018ea82..29c85ccbdc 100644
--- a/files/fr/conflicting/web/guide/index.html
+++ b/files/fr/conflicting/web/guide/index.html
@@ -1,10 +1,11 @@
---
title: Développement Web
-slug: Développement_Web
+slug: conflicting/Web/Guide
tags:
- Développement_Web
translation_of: Web/Guide
translation_of_original: Web_Development
+original_slug: Développement_Web
---
<p>Le <strong>développement Web</strong> comprend tous les aspects du développement d'un site ou d'une application Web.</p>
<p>Découvrez comment créer d'un simple site web à des applications complexes et interactives utilisant les dernières technologies du web en parcourant les articles que vous trouverez ici.</p>
diff --git a/files/fr/conflicting/web/html/element/index.html b/files/fr/conflicting/web/html/element/index.html
index 42f2df0c51..28c186a9a7 100644
--- a/files/fr/conflicting/web/html/element/index.html
+++ b/files/fr/conflicting/web/html/element/index.html
@@ -1,6 +1,6 @@
---
title: Liste des éléments HTML5
-slug: Web/Guide/HTML/HTML5/Liste_des_éléments_HTML5
+slug: conflicting/Web/HTML/Element
tags:
- Débutant
- Guide
@@ -9,6 +9,7 @@ tags:
- Web
translation_of: Web/HTML/Element
translation_of_original: Web/Guide/HTML/HTML5/HTML5_element_list
+original_slug: Web/Guide/HTML/HTML5/Liste_des_éléments_HTML5
---
<p>Cette Page n'est pas encore complète.</p>
diff --git a/files/fr/conflicting/web/html/global_attributes/index.html b/files/fr/conflicting/web/html/global_attributes/index.html
index 3ff9306fa4..7949b21a40 100644
--- a/files/fr/conflicting/web/html/global_attributes/index.html
+++ b/files/fr/conflicting/web/html/global_attributes/index.html
@@ -1,12 +1,13 @@
---
title: Attribut universel
-slug: Glossaire/Attribut_global
+slug: conflicting/Web/HTML/Global_attributes
tags:
- Attribut
- Glossaire
- HTML
translation_of: Web/HTML/Global_attributes
translation_of_original: Glossary/Global_attribute
+original_slug: Glossaire/Attribut_global
---
<p>Les <strong>attributs universels</strong> sont des {{glossary("attribute","attributs")}} qui peuvent être utilisés avec tous les {{glossary("element","éléments")}} (bien que parfois sans effet sur certains d'entre-eux).</p>
diff --git a/files/fr/conflicting/web/http/basics_of_http/mime_types/index.html b/files/fr/conflicting/web/http/basics_of_http/mime_types/index.html
index 8b529a4399..30b88c017e 100644
--- a/files/fr/conflicting/web/http/basics_of_http/mime_types/index.html
+++ b/files/fr/conflicting/web/http/basics_of_http/mime_types/index.html
@@ -1,10 +1,11 @@
---
title: Type MIME incorrect pour les fichiers CSS
-slug: Type_MIME_incorrect_pour_les_fichiers_CSS
+slug: conflicting/Web/HTTP/Basics_of_HTTP/MIME_types
tags:
- CSS
translation_of: Web/HTTP/Basics_of_HTTP/MIME_types
translation_of_original: Incorrect_MIME_Type_for_CSS_Files
+original_slug: Type_MIME_incorrect_pour_les_fichiers_CSS
---
<h3 id="Description_du_probl.C3.A8me" name="Description_du_probl.C3.A8me">Description du problème</h3>
diff --git a/files/fr/conflicting/web/javascript/equality_comparisons_and_sameness/index.html b/files/fr/conflicting/web/javascript/equality_comparisons_and_sameness/index.html
index 7a6c3c3ac8..2b91ab94f8 100644
--- a/files/fr/conflicting/web/javascript/equality_comparisons_and_sameness/index.html
+++ b/files/fr/conflicting/web/javascript/equality_comparisons_and_sameness/index.html
@@ -1,6 +1,6 @@
---
title: L'égalité en JavaScript
-slug: Web/JavaScript/Guide/Égalité_en_JavaScript
+slug: conflicting/Web/JavaScript/Equality_comparisons_and_sameness
tags:
- Advanced
- Guide
@@ -8,6 +8,7 @@ tags:
- Operators
translation_of: Web/JavaScript/Equality_comparisons_and_sameness
translation_of_original: Web/JavaScript/Guide/Sameness
+original_slug: Web/JavaScript/Guide/Égalité_en_JavaScript
---
<p>{{jsSidebar("JavaScript Guide")}}</p>
<p>EcmaScript6 possède trois outils pour déterminer si deux valeurs x et y sont « égales ».  Il y a l'égalité simple (deux signes égal) (<a href="/fr/docs/JavaScript/Reference/R%C3%A9f%C3%A9rence_JavaScript/Op%C3%A9rateurs/Op%C3%A9rateurs_de_comparaison"><code>==</code></a>), l'égalité stricte (trois signes égal) (<a href="/fr/docs/JavaScript/Reference/R%C3%A9f%C3%A9rence_JavaScript/Op%C3%A9rateurs/Op%C3%A9rateurs_de_comparaison"><code>===</code></a>), et la méthode <a href="/fr/docs/Web/JavaScript/Reference/Objets_globaux/Object/is"><code>Object.is</code></a>. (Cette méthode a été ajoutée avec ES6. Les opérateurs d'égalité simple et stricte étaient présents en JavaScript avant ES6 et ont conservé leur comportement.)</p>
diff --git a/files/fr/conflicting/web/javascript/guide/index.html b/files/fr/conflicting/web/javascript/guide/index.html
index a251b58105..1e2aa0e6c6 100644
--- a/files/fr/conflicting/web/javascript/guide/index.html
+++ b/files/fr/conflicting/web/javascript/guide/index.html
@@ -1,12 +1,13 @@
---
title: Objets élémentaires JavaScript
-slug: Web/JavaScript/Guide/Objets_élémentaires_JavaScript
+slug: conflicting/Web/JavaScript/Guide
tags:
- Guide
- JavaScript
- Objets JavaScript
translation_of: Web/JavaScript/Guide
translation_of_original: Web/JavaScript/Guide/Predefined_Core_Objects
+original_slug: Web/JavaScript/Guide/Objets_élémentaires_JavaScript
---
<p>{{jsSidebar("JavaScript Guide")}}</p>
diff --git a/files/fr/conflicting/web/javascript/guide/introduction/index.html b/files/fr/conflicting/web/javascript/guide/introduction/index.html
index d9e7239070..a32d7f7daf 100644
--- a/files/fr/conflicting/web/javascript/guide/introduction/index.html
+++ b/files/fr/conflicting/web/javascript/guide/introduction/index.html
@@ -1,11 +1,12 @@
---
title: A propos de ce guide
-slug: Web/JavaScript/Guide/Apropos
+slug: conflicting/Web/JavaScript/Guide/Introduction
tags:
- Guide
- JavaScript
translation_of: Web/JavaScript/Guide/Introduction
translation_of_original: Web/JavaScript/Guide/About
+original_slug: Web/JavaScript/Guide/Apropos
---
<p>{{jsSidebar("JavaScript Guide")}}</p>
diff --git a/files/fr/conflicting/web/javascript/guide/introduction_6f341ba6db4b060ccbd8dce4a0d5214b/index.html b/files/fr/conflicting/web/javascript/guide/introduction_6f341ba6db4b060ccbd8dce4a0d5214b/index.html
index a5ec22c993..8fe1c8115f 100644
--- a/files/fr/conflicting/web/javascript/guide/introduction_6f341ba6db4b060ccbd8dce4a0d5214b/index.html
+++ b/files/fr/conflicting/web/javascript/guide/introduction_6f341ba6db4b060ccbd8dce4a0d5214b/index.html
@@ -1,12 +1,13 @@
---
title: Aperçu de JavaScript
-slug: Web/JavaScript/Guide/JavaScript_Overview
+slug: conflicting/Web/JavaScript/Guide/Introduction_6f341ba6db4b060ccbd8dce4a0d5214b
tags:
- Guide
- Intermediate
- JavaScript
translation_of: Web/JavaScript/Guide/Introduction
translation_of_original: Web/JavaScript/Guide/JavaScript_Overview
+original_slug: Web/JavaScript/Guide/JavaScript_Overview
---
<p>{{jsSidebar("JavaScript Guide")}}</p>
<p>Ce chapitre est une introduction à JavaScript et détaille quelques-uns des concepts fondamentaux de ce langage.</p>
diff --git a/files/fr/conflicting/web/javascript/guide/regular_expressions/assertions/index.html b/files/fr/conflicting/web/javascript/guide/regular_expressions/assertions/index.html
index f56d56a399..67fd87e655 100644
--- a/files/fr/conflicting/web/javascript/guide/regular_expressions/assertions/index.html
+++ b/files/fr/conflicting/web/javascript/guide/regular_expressions/assertions/index.html
@@ -1,6 +1,6 @@
---
title: Limites
-slug: Web/JavaScript/Guide/Expressions_régulières/Limites
+slug: conflicting/Web/JavaScript/Guide/Regular_Expressions/Assertions
tags:
- Guide
- JavaScript
@@ -8,6 +8,7 @@ tags:
- RegExp
translation_of: Web/JavaScript/Guide/Regular_Expressions/Assertions
translation_of_original: Web/JavaScript/Guide/Regular_Expressions/Boundaries
+original_slug: Web/JavaScript/Guide/Expressions_régulières/Limites
---
<p>{{jsSidebar("JavaScript Guide")}}{{draft}}</p>
diff --git a/files/fr/conflicting/web/javascript/inheritance_and_the_prototype_chain/index.html b/files/fr/conflicting/web/javascript/inheritance_and_the_prototype_chain/index.html
index 1397899d63..514def39ea 100644
--- a/files/fr/conflicting/web/javascript/inheritance_and_the_prototype_chain/index.html
+++ b/files/fr/conflicting/web/javascript/inheritance_and_the_prototype_chain/index.html
@@ -1,12 +1,13 @@
---
title: Retours sur l'héritage
-slug: Web/JavaScript/Guide/Retours_sur_héritage
+slug: conflicting/Web/JavaScript/Inheritance_and_the_prototype_chain
tags:
- Guide
- JavaScript
- Prototype
translation_of: Web/JavaScript/Inheritance_and_the_prototype_chain
translation_of_original: Web/JavaScript/Guide/Inheritance_Revisited
+original_slug: Web/JavaScript/Guide/Retours_sur_héritage
---
<p>Pour des informations plus générales sur l'héritage et les prototypes dans JavaScript, il est conseillé de lire la page <a href="/fr/docs/JavaScript/Guide/Inheritance_and_the_prototype_chain" title="/fr/docs/JavaScript/Guide/Inheritance_and_the_prototype_chain">Héritage et chaîne de prototypes</a>.</p>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/arraybuffer/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/arraybuffer/index.html
index a0c018f6ed..c166afdc6e 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/arraybuffer/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/arraybuffer/index.html
@@ -1,6 +1,6 @@
---
title: ArrayBuffer.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/ArrayBuffer/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/ArrayBuffer
tags:
- ArrayBuffer
- JavaScript
@@ -8,6 +8,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/ArrayBuffer
translation_of_original: Web/JavaScript/Reference/Global_Objects/ArrayBuffer/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/ArrayBuffer/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/boolean/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/boolean/index.html
index 8aebedeab9..29d9824975 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/boolean/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/boolean/index.html
@@ -1,6 +1,6 @@
---
title: Boolean.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Boolean/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Boolean
tags:
- Boolean
- JavaScript
@@ -9,6 +9,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/Boolean
translation_of_original: Web/JavaScript/Reference/Global_Objects/Boolean/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Boolean/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/dataview/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/dataview/index.html
index fd20057af1..eeb3dcbd40 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/dataview/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/dataview/index.html
@@ -1,6 +1,6 @@
---
title: DataView.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/DataView/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/DataView
tags:
- DataView
- JavaScript
@@ -9,6 +9,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/DataView
translation_of_original: Web/JavaScript/Reference/Global_Objects/DataView/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/DataView/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/date/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/date/index.html
index 5d65e47b12..d251063077 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/date/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/date/index.html
@@ -1,6 +1,6 @@
---
title: Date.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Date/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Date
tags:
- Date
- JavaScript
@@ -9,6 +9,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/Date
translation_of_original: Web/JavaScript/Reference/Global_Objects/Date/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Date/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/date/tostring/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/date/tostring/index.html
index b558e82142..5ba0fdcde5 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/date/tostring/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/date/tostring/index.html
@@ -1,10 +1,11 @@
---
title: toString
-slug: toString
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Date/toString
tags:
- Désambiguation
translation_of: Web/JavaScript/Reference/Global_Objects/Date/toString
translation_of_original: toString
+original_slug: toString
---
<div class="noinclude"><strong>toString</strong> est une méthode de plusieurs objets JavaScript :</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/error/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/error/index.html
index 014afc9ce2..af25e67737 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/error/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/error/index.html
@@ -1,6 +1,6 @@
---
title: Error.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Error/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Error
tags:
- Error
- JavaScript
@@ -8,6 +8,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/Error
translation_of_original: Web/JavaScript/Reference/Global_Objects/Error/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Error/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/evalerror/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/evalerror/index.html
index 1123259c3d..de61990d66 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/evalerror/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/evalerror/index.html
@@ -1,6 +1,6 @@
---
title: EvalError.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/EvalError/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/EvalError
tags:
- Error
- EvalError
@@ -9,6 +9,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/EvalError
translation_of_original: Web/JavaScript/Reference/Global_Objects/EvalError/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/EvalError/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/function/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/function/index.html
index ff4a70e10f..e1a47c0578 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/function/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/function/index.html
@@ -1,6 +1,6 @@
---
title: Function.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Function/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Function
tags:
- Function
- JavaScript
@@ -9,6 +9,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/Function
translation_of_original: Web/JavaScript/Reference/Global_Objects/Function/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Function/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/generatorfunction/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/generatorfunction/index.html
index 1a23ca8eb5..dea1262a82 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/generatorfunction/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/generatorfunction/index.html
@@ -1,6 +1,6 @@
---
title: GeneratorFunction.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/GeneratorFunction/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/GeneratorFunction
tags:
- ECMAScript 2015
- GeneratorFunction
@@ -11,6 +11,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/GeneratorFunction
translation_of_original: Web/JavaScript/Reference/Global_Objects/GeneratorFunction/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/GeneratorFunction/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/internalerror/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/internalerror/index.html
index 7d44d99002..816ef8e5b6 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/internalerror/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/internalerror/index.html
@@ -1,6 +1,6 @@
---
title: InternalError.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/InternalError/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/InternalError
tags:
- Error
- InternalError
@@ -9,6 +9,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/InternalError
translation_of_original: Web/JavaScript/Reference/Global_Objects/InternalError/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/InternalError/prototype
---
<div>{{JSRef}} {{non-standard_header}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/intl/collator/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/intl/collator/index.html
index b523b88842..7f22c8754a 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/intl/collator/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/intl/collator/index.html
@@ -1,6 +1,6 @@
---
title: Intl.Collator.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Intl/Collator/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Intl/Collator
tags:
- Collator
- Internationalisation
@@ -12,6 +12,7 @@ tags:
- i18n
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/Objets_globaux/Intl/Collator/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html
index 39e6679295..7113b76a12 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html
@@ -1,6 +1,6 @@
---
title: Intl.DateTimeFormat.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Intl/DateTimeFormat/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat
tags:
- Internationalisation
- Intl
@@ -11,6 +11,7 @@ tags:
- i18n
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/Objets_globaux/Intl/DateTimeFormat/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/intl/listformat/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/intl/listformat/index.html
index 1aab6a459d..455b244609 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/intl/listformat/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/intl/listformat/index.html
@@ -1,6 +1,6 @@
---
title: Intl.ListFormat.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Intl/ListFormat/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Intl/ListFormat
tags:
- Experimental
- Intl
@@ -11,6 +11,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/Intl/ListFormat
translation_of_original: Web/JavaScript/Reference/Global_Objects/Intl/ListFormat/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Intl/ListFormat/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/intl/locale/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/intl/locale/index.html
index cc22f45a17..4b34e387eb 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/intl/locale/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/intl/locale/index.html
@@ -1,6 +1,6 @@
---
title: Intl.Locale.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Intl/Locale/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Intl/Locale
tags:
- Internationalisation
- Intl
@@ -10,6 +10,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/Intl/Locale
translation_of_original: Web/JavaScript/Reference/Global_Objects/Intl/Locale/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Intl/Locale/prototype
---
<p>{{JSRef}}</p>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/intl/numberformat/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/intl/numberformat/index.html
index 7627a01670..ac9a10ea3c 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/intl/numberformat/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/intl/numberformat/index.html
@@ -1,6 +1,6 @@
---
title: Intl.NumberFormat.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Intl/NumberFormat/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat
tags:
- Internationalisation
- Intl
@@ -12,6 +12,7 @@ tags:
- i18n
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/Objets_globaux/Intl/NumberFormat/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/intl/pluralrules/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/intl/pluralrules/index.html
index 6674890eb1..2455f57d26 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/intl/pluralrules/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/intl/pluralrules/index.html
@@ -1,6 +1,6 @@
---
title: Intl.PluralRules.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Intl/PluralRules/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Intl/PluralRules
tags:
- Internationalisation
- Intl
@@ -10,6 +10,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/Intl/PluralRules
translation_of_original: Web/JavaScript/Reference/Global_Objects/Intl/PluralRules/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Intl/PluralRules/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/intl/relativetimeformat/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/intl/relativetimeformat/index.html
index 9e212403c3..b8ffa6a9b7 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/intl/relativetimeformat/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/intl/relativetimeformat/index.html
@@ -1,6 +1,6 @@
---
title: Intl.RelativeTimeFormat.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Intl/RelativeTimeFormat/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat
tags:
- Internationalisation
- Intl
@@ -10,6 +10,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat
translation_of_original: Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Intl/RelativeTimeFormat/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/json/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/json/index.html
index a70dfee208..4fd5def9ec 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/json/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/json/index.html
@@ -1,6 +1,6 @@
---
title: Utiliser le JSON natif
-slug: Web/JavaScript/Guide/Utiliser_le_JSON_natif
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/JSON
tags:
- Add-ons
- Advanced
@@ -10,6 +10,7 @@ tags:
- JavaScript
translation_of: Web/JavaScript/Reference/Global_Objects/JSON
translation_of_original: Web/JavaScript/Guide/Using_native_JSON
+original_slug: Web/JavaScript/Guide/Utiliser_le_JSON_natif
---
<p>{{jsSidebar("JavaScript Guide")}}</p>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/map/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/map/index.html
index 48a00f9135..e28ce3356a 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/map/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/map/index.html
@@ -1,6 +1,6 @@
---
title: Map.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Map/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Map
tags:
- ECMAScript 2015
- JavaScript
@@ -9,6 +9,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/Map
translation_of_original: Web/JavaScript/Reference/Global_Objects/Map/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Map/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/number/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/number/index.html
index 0cb02e939e..ce0c02e822 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/number/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/number/index.html
@@ -1,6 +1,6 @@
---
title: Number.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/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/Objets_globaux/Number/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/object/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/object/index.html
index 6eb405ace4..ca4147cc2d 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/object/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/object/index.html
@@ -1,6 +1,6 @@
---
title: Object.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/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/Objets_globaux/Object/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/object/tosource/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/object/tosource/index.html
index cbd68198f6..da3d18baf1 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/object/tosource/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/object/tosource/index.html
@@ -1,10 +1,11 @@
---
title: toSource
-slug: toSource
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Object/toSource
tags:
- Désambiguation
translation_of: Web/JavaScript/Reference/Global_Objects/Object/toSource
translation_of_original: toSource
+original_slug: toSource
---
<div class="noinclude"><strong>toSource</strong> est une méthode de différents objets JavaScript :</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/promise/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/promise/index.html
index 9a6146375f..a4baddd6e8 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/promise/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/promise/index.html
@@ -1,6 +1,6 @@
---
title: Promise.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Promise/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Promise
tags:
- JavaScript
- Promise
@@ -9,6 +9,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/Promise
translation_of_original: Web/JavaScript/Reference/Global_Objects/Promise/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Promise/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/rangeerror/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/rangeerror/index.html
index 1af96393bc..1bb6017897 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/rangeerror/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/rangeerror/index.html
@@ -1,6 +1,6 @@
---
title: RangeError.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/RangeError/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/RangeError
tags:
- Error
- JavaScript
@@ -10,6 +10,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/RangeError
translation_of_original: Web/JavaScript/Reference/Global_Objects/RangeError/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/RangeError/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/referenceerror/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/referenceerror/index.html
index bdbf50f34c..e2fff2ad32 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/referenceerror/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/referenceerror/index.html
@@ -1,6 +1,6 @@
---
title: ReferenceError.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/ReferenceError/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/ReferenceError
tags:
- Error
- JavaScript
@@ -10,6 +10,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/Objets_globaux/ReferenceError/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/regexp/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/regexp/index.html
index 7a507e9699..09603b661a 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/regexp/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/regexp/index.html
@@ -1,6 +1,6 @@
---
title: RegExp.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/RegExp/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/RegExp
tags:
- JavaScript
- Propriété
@@ -9,6 +9,7 @@ tags:
- RegExp
translation_of: Web/JavaScript/Reference/Global_Objects/RegExp
translation_of_original: Web/JavaScript/Reference/Global_Objects/RegExp/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/RegExp/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/set/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/set/index.html
index 485be156ee..eb20f50e82 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/set/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/set/index.html
@@ -1,6 +1,6 @@
---
title: Set.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Set/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Set
tags:
- ECMAScript 2015
- JavaScript
@@ -8,6 +8,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Global_Objects/Set
translation_of_original: Web/JavaScript/Reference/Global_Objects/Set/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Set/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/sharedarraybuffer/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/sharedarraybuffer/index.html
index 58e0f921fd..497e42f393 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/sharedarraybuffer/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/sharedarraybuffer/index.html
@@ -1,6 +1,6 @@
---
title: SharedArrayBuffer.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/SharedArrayBuffer/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer
tags:
- JavaScript
- Mémoire partagée
@@ -10,6 +10,7 @@ tags:
- TypedArrays
translation_of: Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer
translation_of_original: Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/SharedArrayBuffer/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/string/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/string/index.html
index f7fc1c80a6..08dbbfc5b2 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/string/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/string/index.html
@@ -1,6 +1,6 @@
---
title: String.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/String/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/String
tags:
- JavaScript
- Propriété
@@ -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/Objets_globaux/String/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/symbol/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/symbol/index.html
index 9f3c6f0703..74360162a2 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/symbol/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/symbol/index.html
@@ -1,6 +1,6 @@
---
title: Symbol.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/Symbol/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Symbol
tags:
- ECMAScript6
- JavaScript
@@ -9,6 +9,7 @@ tags:
- Symbol
translation_of: Web/JavaScript/Reference/Global_Objects/Symbol
translation_of_original: Web/JavaScript/Reference/Global_Objects/Symbol/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/Symbol/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html
index 7407f68670..b8630d3fab 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/syntaxerror/index.html
@@ -1,6 +1,6 @@
---
title: SyntaxError.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/SyntaxError/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/SyntaxError
tags:
- Error
- JavaScript
@@ -10,6 +10,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/Objets_globaux/SyntaxError/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/typedarray/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/typedarray/index.html
index 85c7f14222..1b800b908e 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/typedarray/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/typedarray/index.html
@@ -1,6 +1,6 @@
---
title: TypedArray.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/TypedArray/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/TypedArray
tags:
- JavaScript
- Propriété
@@ -9,6 +9,7 @@ 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/Objets_globaux/TypedArray/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/typeerror/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/typeerror/index.html
index 041451e11c..0f818427fb 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/typeerror/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/typeerror/index.html
@@ -1,6 +1,6 @@
---
title: TypeError.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/TypeError/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/TypeError
tags:
- Error
- JavaScript
@@ -10,6 +10,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/Objets_globaux/TypeError/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/urierror/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/urierror/index.html
index 4c45a4af6b..2321ca906f 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/urierror/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/urierror/index.html
@@ -1,6 +1,6 @@
---
title: URIError.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/URIError/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/URIError
tags:
- Error
- JavaScript
@@ -10,6 +10,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/Objets_globaux/URIError/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/weakmap/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/weakmap/index.html
index 7ca2bf02d1..f279908c96 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/weakmap/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/weakmap/index.html
@@ -1,6 +1,6 @@
---
title: WeakMap.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/WeakMap/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WeakMap
tags:
- ECMAScript 2015
- JavaScript
@@ -9,6 +9,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/Reference/Objets_globaux/WeakMap/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/weakset/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/weakset/index.html
index 092f97b6c3..04354ee98c 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/weakset/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/weakset/index.html
@@ -1,6 +1,6 @@
---
title: WeakSet.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/WeakSet/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WeakSet
tags:
- ECMAScript 2015
- JavaScript
@@ -9,6 +9,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/Objets_globaux/WeakSet/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/global/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/global/index.html
index fabce82ac1..fe27343864 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/global/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/global/index.html
@@ -1,6 +1,6 @@
---
title: WebAssembly.Global.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/WebAssembly/Global/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global
tags:
- JavaScript
- Propriété
@@ -8,6 +8,7 @@ tags:
- WebAssembly
translation_of: Web/JavaScript/Reference/Global_Objects/WebAssembly/Global
translation_of_original: Web/JavaScript/Reference/Global_Objects/WebAssembly/Global/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/WebAssembly/Global/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/instance/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/instance/index.html
index 504c57504a..62b9fa7e39 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/instance/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/instance/index.html
@@ -1,6 +1,6 @@
---
title: WebAssembly.Instance.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/WebAssembly/Instance/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance
tags:
- JavaScript
- Propriété
@@ -10,6 +10,7 @@ tags:
- instance
translation_of: Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance
translation_of_original: Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/WebAssembly/Instance/prototype
---
<div>{{JSRef}} {{SeeCompatTable}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/memory/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/memory/index.html
index 32b16d8969..9edc7f0727 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/memory/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/memory/index.html
@@ -1,6 +1,6 @@
---
title: WebAssembly.Memory.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/WebAssembly/Memory/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WebAssembly/Memory
tags:
- JavaScript
- Propriété
@@ -10,6 +10,7 @@ tags:
- memory
translation_of: Web/JavaScript/Reference/Global_Objects/WebAssembly/Memory
translation_of_original: Web/JavaScript/Reference/Global_Objects/WebAssembly/Memory/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/WebAssembly/Memory/prototype
---
<div>{{JSRef}} {{SeeCompatTable}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/module/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/module/index.html
index 3ac694ae07..3c1fb126b6 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/module/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/module/index.html
@@ -1,6 +1,6 @@
---
title: WebAssembly.Module.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/WebAssembly/Module/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WebAssembly/Module
tags:
- Experimental
- JavaScript
@@ -11,6 +11,7 @@ tags:
- WebAssembly
translation_of: Web/JavaScript/Reference/Global_Objects/WebAssembly/Module
translation_of_original: Web/JavaScript/Reference/Global_Objects/WebAssembly/Module/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/WebAssembly/Module/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/table/index.html b/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/table/index.html
index b9f2be5e36..f534e5a6db 100644
--- a/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/table/index.html
+++ b/files/fr/conflicting/web/javascript/reference/global_objects/webassembly/table/index.html
@@ -1,6 +1,6 @@
---
title: WebAssembly.Table.prototype
-slug: Web/JavaScript/Reference/Objets_globaux/WebAssembly/Table/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WebAssembly/Table
tags:
- Experimental
- JavaScript
@@ -10,6 +10,7 @@ tags:
- WebAssembly
translation_of: Web/JavaScript/Reference/Global_Objects/WebAssembly/Table
translation_of_original: Web/JavaScript/Reference/Global_Objects/WebAssembly/Table/prototype
+original_slug: Web/JavaScript/Reference/Objets_globaux/WebAssembly/Table/prototype
---
<div>{{JSRef}} {{SeeCompatTable}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/lexical_grammar/index.html b/files/fr/conflicting/web/javascript/reference/lexical_grammar/index.html
index dae1cd3126..58401bb61b 100644
--- a/files/fr/conflicting/web/javascript/reference/lexical_grammar/index.html
+++ b/files/fr/conflicting/web/javascript/reference/lexical_grammar/index.html
@@ -1,8 +1,9 @@
---
title: Mots réservés
-slug: Web/JavaScript/Reference/Mots_réservés
+slug: conflicting/Web/JavaScript/Reference/Lexical_grammar
translation_of: Web/JavaScript/Reference/Lexical_grammar#Keywords
translation_of_original: Web/JavaScript/Reference/Reserved_Words
+original_slug: Web/JavaScript/Reference/Mots_réservés
---
<h3 id="Introduction">Introduction</h3>
diff --git a/files/fr/conflicting/web/javascript/reference/operators/index.html b/files/fr/conflicting/web/javascript/reference/operators/index.html
index d11d106a96..6ceb1e781b 100644
--- a/files/fr/conflicting/web/javascript/reference/operators/index.html
+++ b/files/fr/conflicting/web/javascript/reference/operators/index.html
@@ -1,12 +1,13 @@
---
title: Opérateurs arithmétiques
-slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_arithmétiques
+slug: conflicting/Web/JavaScript/Reference/Operators
tags:
- JavaScript
- Operator
- Reference
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Arithmetic_Operators
+original_slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_arithmétiques
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/operators_03cb648b1d07bbaa8b57526b509d6d55/index.html b/files/fr/conflicting/web/javascript/reference/operators_03cb648b1d07bbaa8b57526b509d6d55/index.html
index 50d1221a40..1e02f37846 100644
--- a/files/fr/conflicting/web/javascript/reference/operators_03cb648b1d07bbaa8b57526b509d6d55/index.html
+++ b/files/fr/conflicting/web/javascript/reference/operators_03cb648b1d07bbaa8b57526b509d6d55/index.html
@@ -1,12 +1,14 @@
---
title: Opérateurs de comparaison
-slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_de_comparaison
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_03cb648b1d07bbaa8b57526b509d6d55
tags:
- JavaScript
- Opérateur
- Reference
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Comparison_Operators
+original_slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_de_comparaison
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/operators_201bc9aef1615ff38f215c35d4cde8c9/index.html b/files/fr/conflicting/web/javascript/reference/operators_201bc9aef1615ff38f215c35d4cde8c9/index.html
index 5b7ec3375f..2eaf8d2284 100644
--- a/files/fr/conflicting/web/javascript/reference/operators_201bc9aef1615ff38f215c35d4cde8c9/index.html
+++ b/files/fr/conflicting/web/javascript/reference/operators_201bc9aef1615ff38f215c35d4cde8c9/index.html
@@ -1,8 +1,10 @@
---
title: Opérateurs de chaînes
-slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_de_chaînes
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_201bc9aef1615ff38f215c35d4cde8c9
translation_of: Web/JavaScript/Reference/Operators/Arithmetic_Operators#Addition
translation_of_original: Web/JavaScript/Reference/Operators/String_Operators
+original_slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_de_chaînes
---
<p> </p>
<h3 id="R.C3.A9sum.C3.A9" name="R.C3.A9sum.C3.A9">Résumé</h3>
diff --git a/files/fr/conflicting/web/javascript/reference/operators_2be16fc74d75a7c9dca0abca1dc5883b/index.html b/files/fr/conflicting/web/javascript/reference/operators_2be16fc74d75a7c9dca0abca1dc5883b/index.html
index d019cb8637..4fbcf69ed6 100644
--- a/files/fr/conflicting/web/javascript/reference/operators_2be16fc74d75a7c9dca0abca1dc5883b/index.html
+++ b/files/fr/conflicting/web/javascript/reference/operators_2be16fc74d75a7c9dca0abca1dc5883b/index.html
@@ -1,12 +1,14 @@
---
title: Opérateurs d'affectation
-slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_d_affectation
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_2be16fc74d75a7c9dca0abca1dc5883b
tags:
- JavaScript
- Operator
- Reference
translation_of: Web/JavaScript/Reference/Operators#Assignment_operators
translation_of_original: Web/JavaScript/Reference/Operators/Assignment_Operators
+original_slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_d_affectation
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/operators_688eef608213025193cd6b8e1e75b5c3/index.html b/files/fr/conflicting/web/javascript/reference/operators_688eef608213025193cd6b8e1e75b5c3/index.html
index af76410f01..1a57197b9c 100644
--- a/files/fr/conflicting/web/javascript/reference/operators_688eef608213025193cd6b8e1e75b5c3/index.html
+++ b/files/fr/conflicting/web/javascript/reference/operators_688eef608213025193cd6b8e1e75b5c3/index.html
@@ -1,6 +1,7 @@
---
title: Opérateurs binaires
-slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_binaires
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_688eef608213025193cd6b8e1e75b5c3
tags:
- JavaScript
- Operator
@@ -8,6 +9,7 @@ tags:
- Reference
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Bitwise_Operators
+original_slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_binaires
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/operators_d0fb75b0fac950a91a017a1f497c6a1f/index.html b/files/fr/conflicting/web/javascript/reference/operators_d0fb75b0fac950a91a017a1f497c6a1f/index.html
index 6b82320d69..3751e727d9 100644
--- a/files/fr/conflicting/web/javascript/reference/operators_d0fb75b0fac950a91a017a1f497c6a1f/index.html
+++ b/files/fr/conflicting/web/javascript/reference/operators_d0fb75b0fac950a91a017a1f497c6a1f/index.html
@@ -1,12 +1,14 @@
---
title: Opérateurs logiques
-slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_logiques
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_d0fb75b0fac950a91a017a1f497c6a1f
tags:
- JavaScript
- Operator
- Reference
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Logical_Operators
+original_slug: Web/JavaScript/Reference/Opérateurs/Opérateurs_logiques
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/fr/conflicting/web/javascript/reference/statements/switch/index.html b/files/fr/conflicting/web/javascript/reference/statements/switch/index.html
index e2cc368115..d144d24ae1 100644
--- a/files/fr/conflicting/web/javascript/reference/statements/switch/index.html
+++ b/files/fr/conflicting/web/javascript/reference/statements/switch/index.html
@@ -1,12 +1,13 @@
---
title: default
-slug: Web/JavaScript/Reference/Instructions/default
+slug: conflicting/Web/JavaScript/Reference/Statements/switch
tags:
- JavaScript
- Keyword
- Reference
translation_of: Web/JavaScript/Reference/Statements/switch
translation_of_original: Web/JavaScript/Reference/Statements/default
+original_slug: Web/JavaScript/Reference/Instructions/default
---
<div>{{jsSidebar("Statements")}}</div>
diff --git a/files/fr/conflicting/web/progressive_web_apps/index.html b/files/fr/conflicting/web/progressive_web_apps/index.html
index 3bea56aaa7..0756d9111a 100644
--- a/files/fr/conflicting/web/progressive_web_apps/index.html
+++ b/files/fr/conflicting/web/progressive_web_apps/index.html
@@ -1,6 +1,6 @@
---
title: Identifiable
-slug: Web/Progressive_web_apps/Identifiable
+slug: conflicting/Web/Progressive_web_apps
tags:
- Applications
- Identifiable
@@ -8,6 +8,7 @@ tags:
- Manifeste Web
translation_of: Web/Progressive_web_apps
translation_of_original: Web/Progressive_web_apps/Discoverable
+original_slug: Web/Progressive_web_apps/Identifiable
---
<div class="column-container summary">
<div class="column-11">Dès lors que vous publiez une application web, vous voulez que le monde le sache. Les moteurs de recherche le font, mais souvent on souhaite plus de contrôle sur comment l'application sera affichée dans les résultats de la recherche. Le nouveau manifeste du W3C pour les applications web peut aider à cela, ainsi que pour d'autres fonctionnalités.</div>
diff --git a/files/fr/conflicting/web/progressive_web_apps_0d5c38b9aa908cbb52e4c39037b4f28b/index.html b/files/fr/conflicting/web/progressive_web_apps_0d5c38b9aa908cbb52e4c39037b4f28b/index.html
index c5c90869f4..99d6b2901b 100644
--- a/files/fr/conflicting/web/progressive_web_apps_0d5c38b9aa908cbb52e4c39037b4f28b/index.html
+++ b/files/fr/conflicting/web/progressive_web_apps_0d5c38b9aa908cbb52e4c39037b4f28b/index.html
@@ -1,6 +1,6 @@
---
title: Sécurisée
-slug: Web/Progressive_web_apps/Securisee
+slug: conflicting/Web/Progressive_web_apps_0d5c38b9aa908cbb52e4c39037b4f28b
tags:
- Applications
- Applications web modernes
@@ -10,6 +10,7 @@ tags:
- Web
translation_of: Web/Progressive_web_apps
translation_of_original: Web/Progressive_web_apps/Safe
+original_slug: Web/Progressive_web_apps/Securisee
---
<div class="column-container summary">
<div class="column-11">La plateforme Web fournit un mécanisme sécurisé de livraison permettant d'éviter l'infiltration et s'assurer que le contenu n'a pas été altéré - aussi longtemps que vous bénéficiez de l'avantage du HTTPS et que vous développez votre application avec la sécurité à l'esprit.</div>
diff --git a/files/fr/conflicting/web/progressive_web_apps_12fa0bab73df8b67470cc2aaa3a2effc/index.html b/files/fr/conflicting/web/progressive_web_apps_12fa0bab73df8b67470cc2aaa3a2effc/index.html
index 98ad67f276..df9593f35c 100644
--- a/files/fr/conflicting/web/progressive_web_apps_12fa0bab73df8b67470cc2aaa3a2effc/index.html
+++ b/files/fr/conflicting/web/progressive_web_apps_12fa0bab73df8b67470cc2aaa3a2effc/index.html
@@ -1,6 +1,6 @@
---
title: Partageable
-slug: Web/Progressive_web_apps/Partageable
+slug: conflicting/Web/Progressive_web_apps_12fa0bab73df8b67470cc2aaa3a2effc
tags:
- Applications
- Applications web modernes
@@ -8,6 +8,7 @@ tags:
- Partageable
translation_of: Web/Progressive_web_apps
translation_of_original: Web/Progressive_web_apps/Linkable
+original_slug: Web/Progressive_web_apps/Partageable
---
<div class="column-container summary">
<div class="column-11">Une des fonctions les plus puissantes du Web est d'être capable de relier une application web à un lien URL spécifique — pas besoin de plateforme d'application, pas de processus complexe d'installation. Cela a toujours été comme ça.</div>
diff --git a/files/fr/conflicting/web/progressive_web_apps_7b3e1886320599eacfee6834ead473f1/index.html b/files/fr/conflicting/web/progressive_web_apps_7b3e1886320599eacfee6834ead473f1/index.html
index 1692b10b1d..2920de7486 100644
--- a/files/fr/conflicting/web/progressive_web_apps_7b3e1886320599eacfee6834ead473f1/index.html
+++ b/files/fr/conflicting/web/progressive_web_apps_7b3e1886320599eacfee6834ead473f1/index.html
@@ -1,12 +1,13 @@
---
title: Installable
-slug: Web/Progressive_web_apps/Installable
+slug: conflicting/Web/Progressive_web_apps_7b3e1886320599eacfee6834ead473f1
tags:
- Applications
- Installable
- Manifeste
translation_of: Web/Progressive_web_apps
translation_of_original: Web/Progressive_web_apps/Installable
+original_slug: Web/Progressive_web_apps/Installable
---
<div class="column-container summary">
<div class="column-11">Une partie basique de l'expérience avec l'application, pour un utilisateur, est d'avoir l'icône sur l'écran d'accueil et être capable de l'ouvrir dans son propre conteneur avec une bonne intégration avec la plateforme système sous-jacente. Les applications web modernes peuvent avoir ce sentiment d'application native.</div>
diff --git a/files/fr/conflicting/web/progressive_web_apps_954d3e6cc1e06f006b865b74099f55cf/index.html b/files/fr/conflicting/web/progressive_web_apps_954d3e6cc1e06f006b865b74099f55cf/index.html
index d4c0de5453..18b99b7bd1 100644
--- a/files/fr/conflicting/web/progressive_web_apps_954d3e6cc1e06f006b865b74099f55cf/index.html
+++ b/files/fr/conflicting/web/progressive_web_apps_954d3e6cc1e06f006b865b74099f55cf/index.html
@@ -1,12 +1,13 @@
---
title: Progressive
-slug: Web/Progressive_web_apps/Progressive
+slug: conflicting/Web/Progressive_web_apps_954d3e6cc1e06f006b865b74099f55cf
tags:
- Amélioration progressive
- Applications
- Design adaptatif
translation_of: Web/Progressive_web_apps
translation_of_original: Web/Progressive_web_apps/Progressive
+original_slug: Web/Progressive_web_apps/Progressive
---
<div class="column-container summary">
<div class="column-11">Les applications web modernes peuvent être développées pour fournir une experience vraiment agréable avec les navigateurs complètement compatibles, et une expérience correcte (mais pas aussi brillante) avec les navigateurs moins aptes. Nous avons fait cela pendant des années avec de bonnes pratiques comme l'amélioration progressive, donc gardons cette bonne manière de faire les choses.</div>
diff --git a/files/fr/conflicting/web/progressive_web_apps_ab4d34f3f29326f76d3aab740be03d31/index.html b/files/fr/conflicting/web/progressive_web_apps_ab4d34f3f29326f76d3aab740be03d31/index.html
index 52bcf0a121..c5649d3b9a 100644
--- a/files/fr/conflicting/web/progressive_web_apps_ab4d34f3f29326f76d3aab740be03d31/index.html
+++ b/files/fr/conflicting/web/progressive_web_apps_ab4d34f3f29326f76d3aab740be03d31/index.html
@@ -1,6 +1,6 @@
---
title: Indépendante du réseau
-slug: Web/Progressive_web_apps/Independante_du_reseau
+slug: conflicting/Web/Progressive_web_apps_ab4d34f3f29326f76d3aab740be03d31
tags:
- App shell
- Applications
@@ -11,6 +11,7 @@ tags:
- localStorage
translation_of: Web/Progressive_web_apps
translation_of_original: Web/Progressive_web_apps/Network_independent
+original_slug: Web/Progressive_web_apps/Independante_du_reseau
---
<div class="column-container summary">
<div class="column-11">Les applications web modernes peuvent fonctionner quand le réseau n'est pas fiable, ou même inexistant. Terminé les pages blanches d'erreur de connexion ou les dinosaures qui courent dans le désert. Une séparation claire entre l'affichage (UI) et le contenu ainsi qu'un cache hors-ligne et des services workers, vous permettent de stocker les données de l'application et ses dépendances pour les futures utilisations.</div>
diff --git a/files/fr/conflicting/web/progressive_web_apps_cb2823fe6cfc1ddee5db1f6a5d240c67/index.html b/files/fr/conflicting/web/progressive_web_apps_cb2823fe6cfc1ddee5db1f6a5d240c67/index.html
index 729faa93e9..e84ab387d7 100644
--- a/files/fr/conflicting/web/progressive_web_apps_cb2823fe6cfc1ddee5db1f6a5d240c67/index.html
+++ b/files/fr/conflicting/web/progressive_web_apps_cb2823fe6cfc1ddee5db1f6a5d240c67/index.html
@@ -1,6 +1,6 @@
---
title: Re-engageable
-slug: Web/Progressive_web_apps/Re-engageable
+slug: conflicting/Web/Progressive_web_apps_cb2823fe6cfc1ddee5db1f6a5d240c67
tags:
- Applications
- Notifications
@@ -9,6 +9,7 @@ tags:
- Web
translation_of: Web/Progressive_web_apps
translation_of_original: Web/Progressive_web_apps/Re-engageable
+original_slug: Web/Progressive_web_apps/Re-engageable
---
<div class="column-container summary">
<div class="column-11">Un des principaux avantages des plateformes natives est la facilité avec laquelle les utilisateurs peuvent se retrouver de nouveaux attirés par des mises-à-jour et du nouveau contenu, même quand ils ne sont pas en train de regarder l'application ou d'utiliser leur appareil. Les applications web modernes peuvent désormais le faire aussi, en utilisant de nouvelles technologies comme l'API Web Push.</div>
diff --git a/files/fr/conflicting/web/xpath/introduction_to_using_xpath_in_javascript/index.html b/files/fr/conflicting/web/xpath/introduction_to_using_xpath_in_javascript/index.html
index 861663258c..80c3a9485c 100644
--- a/files/fr/conflicting/web/xpath/introduction_to_using_xpath_in_javascript/index.html
+++ b/files/fr/conflicting/web/xpath/introduction_to_using_xpath_in_javascript/index.html
@@ -1,6 +1,6 @@
---
title: Utilisation de XPath
-slug: Utilisation_de_XPath
+slug: conflicting/Web/XPath/Introduction_to_using_XPath_in_JavaScript
tags:
- AJAX
- DOM
@@ -11,6 +11,7 @@ tags:
- XSLT
translation_of: Web/XPath/Introduction_to_using_XPath_in_JavaScript
translation_of_original: Using_XPath
+original_slug: Utilisation_de_XPath
---
<p> </p>
<p><a href="/fr/XPath" title="fr/XPath">XPath</a> est un langage de conversion des éléments d'un document XML. C'est une <a class="external" href="http://www.w3.org/TR/xpath">recommandation du W3C (en)</a>.</p>