59 files changed, 370 insertions, 315 deletions
diff --git a/files/de/_redirects.txt b/files/de/_redirects.txt
index f6ee4d81d4..0bdaf0f0ef 100644
--- a/files/de/_redirects.txt
+++ b/files/de/_redirects.txt
@@ -406,6 +406,7 @@
 /de/docs/Tools/3D_untersuchung	/de/docs/Tools/3D_View
 /de/docs/Tools/Barrierefreiheits_inspektor	/de/docs/Tools/Accessibility_inspector
 /de/docs/Tools/Browser_Werkzeuge	/de/docs/Tools/Browser_Toolbox
+/de/docs/Tools/Index	/de/docs/conflicting/Tools
 /de/docs/Tools/Page_Inspector/How_to/Event_Listener_untersuchen	/de/docs/Tools/Page_Inspector/How_to/Examine_event_listeners
 /de/docs/Tools/Page_Inspector/How_to/Raster_Layout_untersuchen	/de/docs/Tools/Page_Inspector/How_to/Examine_grid_layouts
 /de/docs/Tools/Seiten_Inspektor	/de/docs/Tools/Page_Inspector
diff --git a/files/de/_wikihistory.json b/files/de/_wikihistory.json
index 544d6f1274..0303027ece 100644
--- a/files/de/_wikihistory.json
+++ b/files/de/_wikihistory.json
@@ -2007,13 +2007,6 @@
       "AngelSankturio"
     ]
   },
-  "Tools/Index": {
-    "modified": "2020-07-16T22:36:02.468Z",
-    "contributors": [
-      "wbamberg",
-      "fscholz"
-    ]
-  },
   "Tools/JSON_viewer": {
     "modified": "2020-07-16T22:36:31.343Z",
     "contributors": [
@@ -13538,6 +13531,13 @@
       "Dria"
     ]
   },
+  "conflicting/Tools": {
+    "modified": "2020-07-16T22:36:02.468Z",
+    "contributors": [
+      "wbamberg",
+      "fscholz"
+    ]
+  },
   "conflicting/Web/API": {
     "modified": "2019-03-23T23:21:31.048Z",
     "contributors": [
diff --git a/files/de/tools/index/index.html b/files/de/conflicting/tools/index.html
index 7505b123b1..8b7e222774 100644
--- a/files/de/tools/index/index.html
+++ b/files/de/conflicting/tools/index.html
@@ -1,9 +1,10 @@
 ---
 title: Index
-slug: Tools/Index
+slug: conflicting/Tools
 tags:
   - Index
   - Tools
 translation_of: Tools/Index
+original_slug: Tools/Index
 ---
 <div>{{ToolsSidebar}}</div><p>{{Index("/de/docs/Tools")}}</p>
diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt
index f62d9cc572..7465e846fa 100644
--- a/files/es/_redirects.txt
+++ b/files/es/_redirects.txt
@@ -1543,6 +1543,7 @@
 /es/docs/Web/API/Element/onwheel	/es/docs/Web/API/GlobalEventHandlers/onwheel
 /es/docs/Web/API/ElementosHTMLparaVideo	/es/docs/Web/API/HTMLVideoElement
 /es/docs/Web/API/Event/createEvent	/es/docs/Web/API/Document/createEvent
+/es/docs/Web/API/EventSource/onopen	/es/docs/Web/API/EventSource/open_event
 /es/docs/Web/API/Fetch_API/Conceptos_basicos	/es/docs/Web/API/Fetch_API/Basic_concepts
 /es/docs/Web/API/Fetch_API/Utilizando_Fetch	/es/docs/Web/API/Fetch_API/Using_Fetch
 /es/docs/Web/API/File/fileName	/es/docs/conflicting/Web/API/File/name
@@ -1954,6 +1955,7 @@
 /es/docs/Web/HTML/Elementos_en_línea	/es/docs/Web/HTML/Inline_elements
 /es/docs/Web/HTML/Gestión_del_foco_en_HTML	/es/docs/Web/API/Document/hasFocus
 /es/docs/Web/HTML/Imagen_con_CORS_habilitado	/es/docs/Web/HTML/CORS_enabled_image
+/es/docs/Web/HTML/Index	/es/docs/conflicting/Web/HTML
 /es/docs/Web/HTML/Microdatos	/es/docs/Web/HTML/Microdata
 /es/docs/Web/HTML/Optimizing_your_pages_for_speculative_parsing	/es/docs/Glossary/speculative_parsing
 /es/docs/Web/HTML/Referencia	/es/docs/Web/HTML/Reference
@@ -1961,7 +1963,7 @@
 /es/docs/Web/HTML/Transision_adaptativa_DASH	/es/docs/Web/Media/DASH_Adaptive_Streaming_for_HTML_5_Video
 /es/docs/Web/HTML/anipular_video_por_medio_de_canvas	/es/docs/Web/API/Canvas_API/Manipulating_video_using_canvas
 /es/docs/Web/HTML/microformatos	/es/docs/Web/HTML/microformats
-/es/docs/Web/HTML/Índice	/es/docs/Web/HTML/Index
+/es/docs/Web/HTML/Índice	/es/docs/conflicting/Web/HTML
 /es/docs/Web/HTTP/Access_control_CORS	/es/docs/Web/HTTP/CORS
 /es/docs/Web/HTTP/Basics_of_HTTP/Datos_URIs	/es/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
 /es/docs/Web/HTTP/Basics_of_HTTP/Identificación_recursos_en_la_Web	/es/docs/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web
@@ -2533,6 +2535,7 @@
 /es/docs/Web/Reference/Events/transitionend	/es/docs/Web/API/HTMLElement/transitionend_event
 /es/docs/Web/Reference/Events/wheel	/es/docs/Web/API/Element/wheel_event
 /es/docs/Web/SVG/Element/glifo	/es/docs/Web/SVG/Element/glyph
+/es/docs/Web/SVG/Index	/es/docs/conflicting/Web/SVG
 /es/docs/Web/SVG/Tutorial/Introducción	/es/docs/Web/SVG/Tutorial/Introduction
 /es/docs/Web/Security/Same-origin_politica	/es/docs/Web/Security/Same-origin_policy
 /es/docs/Web/Security/Securing_your_site/desactivar_autocompletado_formulario	/es/docs/Web/Security/Securing_your_site/Turning_off_form_autocompletion
diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json
index 6156c5aff5..7cbcbe886f 100644
--- a/files/es/_wikihistory.json
+++ b/files/es/_wikihistory.json
@@ -6474,7 +6474,7 @@
       "Jabi"
     ]
   },
-  "Web/API/EventSource/onopen": {
+  "Web/API/EventSource/open_event": {
     "modified": "2019-03-23T22:03:59.180Z",
     "contributors": [
       "Hoosep"
@@ -15038,13 +15038,6 @@
       "WriestTavo"
     ]
   },
-  "Web/HTML/Index": {
-    "modified": "2019-01-16T22:12:02.767Z",
-    "contributors": [
-      "raecillacastellana",
-      "pekechis"
-    ]
-  },
   "Web/HTML/Inline_elements": {
     "modified": "2019-03-23T22:46:15.359Z",
     "contributors": [
@@ -20480,13 +20473,6 @@
       "jorge_castro"
     ]
   },
-  "Web/SVG/Index": {
-    "modified": "2019-01-16T22:36:49.773Z",
-    "contributors": [
-      "jwhitlock",
-      "ComplementosMozilla"
-    ]
-  },
   "Web/SVG/SVG_1.1_Support_in_Firefox": {
     "modified": "2019-03-23T23:43:25.545Z",
     "contributors": [
@@ -21559,6 +21545,13 @@
       "wbamberg"
     ]
   },
+  "conflicting/Web/HTML": {
+    "modified": "2019-01-16T22:12:02.767Z",
+    "contributors": [
+      "raecillacastellana",
+      "pekechis"
+    ]
+  },
   "conflicting/Web/HTML/Element": {
     "modified": "2020-01-21T22:36:54.135Z",
     "contributors": [
@@ -21823,6 +21816,13 @@
       "totopizzahn"
     ]
   },
+  "conflicting/Web/SVG": {
+    "modified": "2019-01-16T22:36:49.773Z",
+    "contributors": [
+      "jwhitlock",
+      "ComplementosMozilla"
+    ]
+  },
   "conflicting/Web/Web_Components/Using_custom_elements": {
     "modified": "2019-03-23T22:21:51.809Z",
     "contributors": [
diff --git a/files/es/web/html/index/index.html b/files/es/conflicting/web/html/index.html
index 388b7b4d96..f99a5c972d 100644
--- a/files/es/web/html/index/index.html
+++ b/files/es/conflicting/web/html/index.html
@@ -1,9 +1,9 @@
 ---
 title: Índice de la documentación HTML
-slug: Web/HTML/Index
+slug: conflicting/Web/HTML
 tags:
   - HTML
 translation_of: Web/HTML/Index
-original_slug: Web/HTML/Índice
+original_slug: Web/HTML/Index
 ---
 <p>{{Index("/es/docs/Web/HTML")}}</p>
diff --git a/files/es/web/svg/index/index.html b/files/es/conflicting/web/svg/index.html
index a9cf2d3736..274e4ad49c 100644
--- a/files/es/web/svg/index/index.html
+++ b/files/es/conflicting/web/svg/index.html
@@ -1,6 +1,7 @@
 ---
 title: SVG documentation index
-slug: Web/SVG/Index
+slug: conflicting/Web/SVG
 translation_of: Web/SVG/Index
+original_slug: Web/SVG/Index
 ---
 <p>{{Index("/en-US/docs/Web/SVG")}}</p>
diff --git a/files/es/web/api/eventsource/onopen/index.html b/files/es/web/api/eventsource/open_event/index.html
index 59ee6537dd..ea7b4d5d98 100644
--- a/files/es/web/api/eventsource/onopen/index.html
+++ b/files/es/web/api/eventsource/open_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: EventSource.onopen
-slug: Web/API/EventSource/onopen
+slug: Web/API/EventSource/open_event
 translation_of: Web/API/EventSource/onopen
+original_slug: Web/API/EventSource/onopen
 ---
 <div>{{APIRef('WebSockets API')}}</div>
 
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index 2f4624d9d5..f18598385c 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -214,7 +214,7 @@
 /fr/docs/Apprendre/HTML/Tableaux/Basics	/fr/docs/Learn/HTML/Tables/Basics
 /fr/docs/Apprendre/HTML/Tableaux/Structuring_planet_data	/fr/docs/Learn/HTML/Tables/Structuring_planet_data
 /fr/docs/Apprendre/HTML/Écrire_une_simple_page_HTML	/fr/docs/conflicting/Learn/Getting_started_with_the_web
-/fr/docs/Apprendre/Index	/fr/docs/Learn/Index
+/fr/docs/Apprendre/Index	/fr/docs/conflicting/Learn
 /fr/docs/Apprendre/Infrastructure	/fr/docs/Learn/Common_questions
 /fr/docs/Apprendre/JavaScript	/fr/docs/Learn/JavaScript
 /fr/docs/Apprendre/JavaScript/Building_blocks	/fr/docs/Learn/JavaScript/Building_blocks
@@ -1262,6 +1262,7 @@
 /fr/docs/Firefox_8_for_developers	/fr/docs/Mozilla/Firefox/Releases/8
 /fr/docs/Firefox_9_for_developers	/fr/docs/Mozilla/Firefox/Releases/9
 /fr/docs/Firefox_pour_les_développeurs	/fr/docs/Mozilla/Firefox/Releases
+/fr/docs/Games/Index	/fr/docs/conflicting/Games
 /fr/docs/Games/Workflows	/fr/docs/Games/Tutorials
 /fr/docs/Games/Workflows/2D_Breakout_game_pure_JavaScript	/fr/docs/Games/Tutorials/2D_Breakout_game_pure_JavaScript
 /fr/docs/Games/Workflows/2D_Breakout_game_pure_JavaScript/Build_the_brick_field	/fr/docs/Games/Tutorials/2D_Breakout_game_pure_JavaScript/Build_the_brick_field
@@ -1473,7 +1474,7 @@
 /fr/docs/Glossaire/Identificateur	/fr/docs/Glossary/Identifier
 /fr/docs/Glossaire/Image_matricielle	/fr/docs/Glossary/Raster_image
 /fr/docs/Glossaire/Immuable	/fr/docs/Glossary/Immutable
-/fr/docs/Glossaire/Index	/fr/docs/Glossary/Index
+/fr/docs/Glossaire/Index	/fr/docs/conflicting/Glossary
 /fr/docs/Glossaire/IndexedDB	/fr/docs/Glossary/IndexedDB
 /fr/docs/Glossaire/Injection_SQL	/fr/docs/Glossary/SQL_Injection
 /fr/docs/Glossaire/Input_method_editor	/fr/docs/Glossary/Input_method_editor
@@ -1747,6 +1748,7 @@
 /fr/docs/Glossary/Client_hints	/fr/docs/Web/HTTP/Client_hints
 /fr/docs/Glossary/Gaia	/fr/docs/orphaned/Glossary/Gaia
 /fr/docs/Glossary/Gonk	/fr/docs/orphaned/Glossary/Gonk
+/fr/docs/Glossary/Index	/fr/docs/conflicting/Glossary
 /fr/docs/Glossary/Modern_web_apps	/fr/docs/orphaned/Glossary/Modern_web_apps
 /fr/docs/Glossary/Node/réseau	/fr/docs/Glossary/Node/networking
 /fr/docs/Glossary/Origine	/fr/docs/Glossary/Origin
@@ -2014,7 +2016,7 @@
 /fr/docs/HTTP/Headers/Vary	/fr/docs/Web/HTTP/Headers/Vary
 /fr/docs/HTTP/Headers/WWW-Authenticate	/fr/docs/Web/HTTP/Headers/WWW-Authenticate
 /fr/docs/HTTP/Headers/X-Frame-Options	/fr/docs/Web/HTTP/Headers/X-Frame-Options
-/fr/docs/HTTP/Index	/fr/docs/Web/HTTP/Index
+/fr/docs/HTTP/Index	/fr/docs/conflicting/Web/HTTP
 /fr/docs/HTTP/Méthode	/fr/docs/Web/HTTP/Methods
 /fr/docs/HTTP/Méthode/CONNECT	/fr/docs/Web/HTTP/Methods/CONNECT
 /fr/docs/HTTP/Méthode/DELETE	/fr/docs/Web/HTTP/Methods/DELETE
@@ -2964,7 +2966,7 @@
 /fr/docs/Jeux	/fr/docs/Games
 /fr/docs/Jeux/Anatomie	/fr/docs/Games/Anatomy
 /fr/docs/Jeux/Exemples	/fr/docs/Games/Examples
-/fr/docs/Jeux/Index	/fr/docs/Games/Index
+/fr/docs/Jeux/Index	/fr/docs/conflicting/Games
 /fr/docs/Jeux/Introduction	/fr/docs/Games/Introduction
 /fr/docs/Jeux/Introduction_to_HTML5_Game_Gevelopment_(summary)	/fr/docs/Games/Introduction_to_HTML5_Game_Development
 /fr/docs/Jeux/Publier_jeux	/fr/docs/Games/Publishing_games
@@ -2997,6 +2999,7 @@
 /fr/docs/Learn/CSS/First_steps/Qu_est_ce_que_CSS	/fr/docs/Learn/CSS/First_steps/What_is_CSS
 /fr/docs/Learn/CSS/Styling_text/Mise_en_forme_des_liens	/fr/docs/Learn/CSS/Styling_text/Styling_links
 /fr/docs/Learn/CSS/Styling_text/initiation-mise-en-forme-du-texte	/fr/docs/Learn/CSS/Styling_text/Fundamentals
+/fr/docs/Learn/Index	/fr/docs/conflicting/Learn
 /fr/docs/Learn/JavaScript/Asynchronous/Async_await	/fr/docs/conflicting/Learn/JavaScript/Asynchronous/Promises
 /fr/docs/Learn/JavaScript/Asynchronous/Choosing_the_right_approach	/fr/docs/conflicting/Learn/JavaScript/Asynchronous
 /fr/docs/Learn/JavaScript/Asynchronous/Concepts	/fr/docs/conflicting/Learn/JavaScript/Asynchronous/Introducing
@@ -3083,6 +3086,7 @@
 /fr/docs/Mozilla/Add-ons/WebExtensions/Differences_entre_les_implementations_api	/fr/docs/Mozilla/Add-ons/WebExtensions/Differences_between_API_implementations
 /fr/docs/Mozilla/Add-ons/WebExtensions/Exemples	/fr/docs/Mozilla/Add-ons/WebExtensions/Examples
 /fr/docs/Mozilla/Add-ons/WebExtensions/Incompatibilités_Chrome	/fr/docs/Mozilla/Add-ons/WebExtensions/Chrome_incompatibilities
+/fr/docs/Mozilla/Add-ons/WebExtensions/Index	/fr/docs/conflicting/Mozilla/Add-ons/WebExtensions
 /fr/docs/Mozilla/Add-ons/WebExtensions/Intercepter_requêtes_HTTP	/fr/docs/Mozilla/Add-ons/WebExtensions/Intercept_HTTP_requests
 /fr/docs/Mozilla/Add-ons/WebExtensions/Travailler_avec_l_API_Tabs	/fr/docs/Mozilla/Add-ons/WebExtensions/Working_with_the_Tabs_API
 /fr/docs/Mozilla/Add-ons/WebExtensions/Using_the_JavaScript_APIs	/fr/docs/Mozilla/Add-ons/WebExtensions/API
@@ -3219,7 +3223,7 @@
 /fr/docs/Outils/Eyedropper	/fr/docs/Tools/Eyedropper
 /fr/docs/Outils/Firefox_OS_Simulator_clone	/fr/docs/Tools/Firefox_OS_Simulator_clone
 /fr/docs/Outils/Frise_chronologique	/fr/docs/conflicting/Tools/Performance/Waterfall
-/fr/docs/Outils/Index	/fr/docs/Tools/Index
+/fr/docs/Outils/Index	/fr/docs/conflicting/Tools
 /fr/docs/Outils/Inspecteur	/fr/docs/Tools/Page_Inspector
 /fr/docs/Outils/Inspecteur/3-pane_mode	/fr/docs/Tools/Page_Inspector/3-pane_mode
 /fr/docs/Outils/Inspecteur/Comment	/fr/docs/Tools/Page_Inspector/How_to
@@ -3404,6 +3408,7 @@
 /fr/docs/Tools/Debugger/How_to/Break_on_a_DOM_event	/fr/docs/Tools/Debugger/Break_on_DOM_mutation
 /fr/docs/Tools/Debugger/How_to/Examine,_modify,_and_watch_variables	/fr/docs/conflicting/Tools/Debugger/How_to/Set_Watch_Expressions
 /fr/docs/Tools/Debugger/Keyboard_shortcuts	/fr/docs/orphaned/Tools/Debugger/Keyboard_shortcuts
+/fr/docs/Tools/Index	/fr/docs/conflicting/Tools
 /fr/docs/Tools/Page_Inspector/How_to/Examiner_et_éditer_le_code_HTML	/fr/docs/Tools/Page_Inspector/How_to/Examine_and_edit_HTML
 /fr/docs/Tools/Page_Inspector/Keyboard_shortcuts	/fr/docs/orphaned/Tools/Page_Inspector/Keyboard_shortcuts
 /fr/docs/Tools/Web_Console/Keyboard_shortcuts	/fr/docs/orphaned/Tools/Web_Console/Keyboard_shortcuts
@@ -3646,6 +3651,7 @@
 /fr/docs/Web/API/Event.stopPropagation	/fr/docs/Web/API/Event/stopPropagation
 /fr/docs/Web/API/Event/Comparaison_des_cibles_d_évènements	/fr/docs/Web/API/Event/Comparison_of_Event_Targets
 /fr/docs/Web/API/Event/createEvent	/fr/docs/conflicting/Web/API/Document/createEvent
+/fr/docs/Web/API/EventSource/onopen	/fr/docs/Web/API/EventSource/open_event
 /fr/docs/Web/API/EventTarget/attachEvent	/fr/docs/Web/API/EventTarget/addEventListener
 /fr/docs/Web/API/EventTarget/detachEvent	/fr/docs/Web/API/EventTarget/removeEventListener
 /fr/docs/Web/API/EventTarget/fireEvent	/fr/docs/Web/API/EventTarget/dispatchEvent
@@ -4504,6 +4510,7 @@
 /fr/docs/Web/HTML/HTML5/Liste_des_éléments_HTML5	/fr/docs/conflicting/Web/HTML/Element
 /fr/docs/Web/HTML/Image_avec_ressources_origines_multiples_CORS_activees	/fr/docs/Web/HTML/CORS_enabled_image
 /fr/docs/Web/HTML/Images_avec_le_contrôle_d_accès_HTTP	/fr/docs/Web/HTML/CORS_enabled_image
+/fr/docs/Web/HTML/Index	/fr/docs/conflicting/Web/HTML
 /fr/docs/Web/HTML/Inline_elemente	/fr/docs/Web/HTML/Inline_elements
 /fr/docs/Web/HTML/Introduction	/fr/docs/Learn/HTML/Introduction_to_HTML
 /fr/docs/Web/HTML/Introduction_to_HTML5	/fr/docs/orphaned/Web/Guide/HTML/HTML5/Introduction_to_HTML5
@@ -4534,6 +4541,7 @@
 /fr/docs/Web/HTTP/Detection_du_navigateur_en_utilisant_le_user_agent	/fr/docs/Web/HTTP/Browser_detection_using_the_user_agent
 /fr/docs/Web/HTTP/FAQ_sur_le_préchargement_des_liens	/fr/docs/Web/HTTP/Link_prefetching_FAQ
 /fr/docs/Web/HTTP/Headers/Serveur	/fr/docs/Web/HTTP/Headers/Server
+/fr/docs/Web/HTTP/Index	/fr/docs/conflicting/Web/HTTP
 /fr/docs/Web/HTTP/Méthode	/fr/docs/Web/HTTP/Methods
 /fr/docs/Web/HTTP/Méthode/CONNECT	/fr/docs/Web/HTTP/Methods/CONNECT
 /fr/docs/Web/HTTP/Méthode/DELETE	/fr/docs/Web/HTTP/Methods/DELETE
@@ -5498,6 +5506,7 @@
 /fr/docs/Web/MathML/Exemples	/fr/docs/Web/MathML/Examples
 /fr/docs/Web/MathML/Exemples/Dériver_la_Formule_Quadratique	/fr/docs/Web/MathML/Examples/Deriving_the_Quadratic_Formula
 /fr/docs/Web/MathML/Exemples/MathML_Theoreme_de_Pythagore	/fr/docs/Web/MathML/Examples/MathML_Pythagorean_Theorem
+/fr/docs/Web/MathML/Index	/fr/docs/conflicting/Web/MathML
 /fr/docs/Web/Media/Formats/Questions_sur_le_soutien	/fr/docs/Web/Media/Formats/Support_issues
 /fr/docs/Web/Media/Formats/Types_des_images	/fr/docs/Web/Media/Formats/Image_types
 /fr/docs/Web/Performance/Budgets_de_performance	/fr/docs/Web/Performance/Performance_budgets
@@ -5517,6 +5526,7 @@
 /fr/docs/Web/Reference/API	/fr/docs/orphaned/Web/Reference/API
 /fr/docs/Web/SVG/Application_d_effets_SVG_a_du_contenu_HTML	/fr/docs/Web/SVG/Applying_SVG_effects_to_HTML_content
 /fr/docs/Web/SVG/Element/cercle	/fr/docs/Web/SVG/Element/circle
+/fr/docs/Web/SVG/Index	/fr/docs/conflicting/Web/SVG
 /fr/docs/Web/SVG/SVG_en_tant_qu_image	/fr/docs/Web/SVG/SVG_as_an_Image
 /fr/docs/Web/SVG/Sources_compatibilite	/fr/docs/Web/SVG/Compatibility_sources
 /fr/docs/Web/SVG/Tutoriel	/fr/docs/Web/SVG/Tutorial
@@ -5594,6 +5604,7 @@
 /fr/docs/Web/XPath/Fonctions/translate	/fr/docs/Web/XPath/Functions/translate
 /fr/docs/Web/XPath/Fonctions/true	/fr/docs/Web/XPath/Functions/true
 /fr/docs/Web/XPath/Fonctions/unparsed-entity-url	/fr/docs/Web/XPath/Functions/unparsed-entity-url
+/fr/docs/Web/XSLT/Index	/fr/docs/conflicting/Web/XSLT
 /fr/docs/Web/XSLT/Interface_XSLT_JS_dans_Gecko	/fr/docs/Web/XSLT/XSLT_JS_interface_in_Gecko
 /fr/docs/Web/XSLT/Interface_XSLT_JS_dans_Gecko/Définition_de_paramètres	/fr/docs/Web/XSLT/XSLT_JS_interface_in_Gecko/Setting_Parameters
 /fr/docs/Web/XSLT/Interface_XSLT_JS_dans_Gecko/Exemple_avancé	/fr/docs/Web/XSLT/XSLT_JS_interface_in_Gecko/Advanced_Example
@@ -5607,7 +5618,7 @@
 /fr/docs/Web/XSLT/L'interface_XSLT_JavaScript_dans_Gecko/Les_liaisons_JavaScript_XSLT	/fr/docs/Web/XSLT/XSLT_JS_interface_in_Gecko/JavaScript_XSLT_Bindings
 /fr/docs/Web/XSLT/L'interface_XSLT_JavaScript_dans_Gecko/Ressources	/fr/docs/Web/XSLT/XSLT_JS_interface_in_Gecko/Resources
 /fr/docs/Web/XSLT/Paramètres_des_instructions_de_traitement	/fr/docs/Web/XSLT/PI_Parameters
-/fr/docs/Web/XSLT/Sommaire	/fr/docs/Web/XSLT/Index
+/fr/docs/Web/XSLT/Sommaire	/fr/docs/conflicting/Web/XSLT
 /fr/docs/Web/XSLT/Transformations_XML_avec_XSLT	/fr/docs/Web/XSLT/Transforming_XML_with_XSLT
 /fr/docs/Web/XSLT/Transformations_XML_avec_XSLT/Autres_ressources	/fr/docs/Web/XSLT/Transforming_XML_with_XSLT/For_Further_Reading
 /fr/docs/Web/XSLT/Transformations_XML_avec_XSLT/La_référence_XSLT_XPath_de_Netscape	/fr/docs/Web/XSLT/Transforming_XML_with_XSLT/The_Netscape_XSLT_XPath_Reference
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index 7032f73e7a..db7fabbb59 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -29,13 +29,6 @@
       "BNedry"
     ]
   },
-  "Games/Index": {
-    "modified": "2019-01-16T21:55:43.323Z",
-    "contributors": [
-      "wbamberg",
-      "xdelatour"
-    ]
-  },
   "Games/Introduction": {
     "modified": "2019-04-23T09:34:16.784Z",
     "contributors": [
@@ -1715,12 +1708,6 @@
       "xdelatour"
     ]
   },
-  "Glossary/Index": {
-    "modified": "2019-01-16T21:55:44.075Z",
-    "contributors": [
-      "xdelatour"
-    ]
-  },
   "Glossary/IndexedDB": {
     "modified": "2019-03-23T22:46:35.134Z",
     "contributors": [
@@ -4794,12 +4781,6 @@
       "tonybengue"
     ]
   },
-  "Learn/Index": {
-    "modified": "2020-07-16T22:33:36.900Z",
-    "contributors": [
-      "SphinxKnight"
-    ]
-  },
   "Learn/JavaScript": {
     "modified": "2020-07-16T22:29:38.759Z",
     "contributors": [
@@ -9328,12 +9309,6 @@
       "RoyalPanda"
     ]
   },
-  "Mozilla/Add-ons/WebExtensions/Index": {
-    "modified": "2019-03-18T21:01:44.832Z",
-    "contributors": [
-      "hellosct1"
-    ]
-  },
   "Mozilla/Add-ons/WebExtensions/Interact_with_the_clipboard": {
     "modified": "2019-07-03T05:46:49.789Z",
     "contributors": [
@@ -10666,13 +10641,6 @@
       "xdelatour"
     ]
   },
-  "Tools/Index": {
-    "modified": "2020-07-16T22:36:03.885Z",
-    "contributors": [
-      "wbamberg",
-      "xdelatour"
-    ]
-  },
   "Tools/JSON_viewer": {
     "modified": "2020-07-16T22:36:31.458Z",
     "contributors": [
@@ -15556,7 +15524,7 @@
       "Plotisateur"
     ]
   },
-  "Web/API/EventSource/onopen": {
+  "Web/API/EventSource/open_event": {
     "modified": "2020-10-15T22:17:18.152Z",
     "contributors": [
       "SphinxKnight",
@@ -32084,13 +32052,6 @@
       "SphinxKnight"
     ]
   },
-  "Web/HTML/Index": {
-    "modified": "2019-01-16T18:47:13.379Z",
-    "contributors": [
-      "SphinxKnight",
-      "tregagnon"
-    ]
-  },
   "Web/HTML/Inline_elements": {
     "modified": "2019-04-06T13:04:18.081Z",
     "contributors": [
@@ -32917,14 +32878,6 @@
       "mmahouachi"
     ]
   },
-  "Web/HTTP/Index": {
-    "modified": "2019-03-23T22:26:53.499Z",
-    "contributors": [
-      "tonybengue",
-      "SphinxKnight",
-      "xdelatour"
-    ]
-  },
   "Web/HTTP/Link_prefetching_FAQ": {
     "modified": "2019-03-23T23:46:22.581Z",
     "contributors": [
@@ -40091,12 +40044,6 @@
       "Powlow"
     ]
   },
-  "Web/MathML/Index": {
-    "modified": "2019-01-16T22:05:50.107Z",
-    "contributors": [
-      "xdelatour"
-    ]
-  },
   "Web/Media": {
     "modified": "2019-03-18T21:32:54.694Z",
     "contributors": [
@@ -41020,12 +40967,6 @@
       "Nothus"
     ]
   },
-  "Web/SVG/Index": {
-    "modified": "2019-01-16T21:57:35.980Z",
-    "contributors": [
-      "xdelatour"
-    ]
-  },
   "Web/SVG/SVG_animation_with_SMIL": {
     "modified": "2019-08-24T09:55:45.297Z",
     "contributors": [
@@ -42141,12 +42082,6 @@
       "Fredchat"
     ]
   },
-  "Web/XSLT/Index": {
-    "modified": "2019-06-17T11:21:18.591Z",
-    "contributors": [
-      "Arzak656"
-    ]
-  },
   "Web/XSLT/PI_Parameters": {
     "modified": "2019-03-23T23:44:06.266Z",
     "contributors": [
@@ -42318,6 +42253,19 @@
       "dattaz"
     ]
   },
+  "conflicting/Games": {
+    "modified": "2019-01-16T21:55:43.323Z",
+    "contributors": [
+      "wbamberg",
+      "xdelatour"
+    ]
+  },
+  "conflicting/Glossary": {
+    "modified": "2019-01-16T21:55:44.075Z",
+    "contributors": [
+      "xdelatour"
+    ]
+  },
   "conflicting/Glossary/Chrome": {
     "modified": "2019-03-23T23:48:48.795Z",
     "contributors": [
@@ -42351,7 +42299,7 @@
     ]
   },
   "conflicting/Learn": {
-    "modified": "2020-07-16T22:22:13.196Z",
+    "modified": "2020-07-16T22:33:36.900Z",
     "contributors": [
       "SphinxKnight"
     ]
@@ -42744,6 +42692,12 @@
       "Sheppy"
     ]
   },
+  "conflicting/Mozilla/Add-ons/WebExtensions": {
+    "modified": "2019-03-18T21:01:44.832Z",
+    "contributors": [
+      "hellosct1"
+    ]
+  },
   "conflicting/Mozilla/Add-ons/WebExtensions/API/menus/overrideContext": {
     "modified": "2019-07-03T07:58:27.877Z",
     "contributors": [
@@ -42756,6 +42710,13 @@
       "hellosct1"
     ]
   },
+  "conflicting/Tools": {
+    "modified": "2020-07-16T22:36:03.885Z",
+    "contributors": [
+      "wbamberg",
+      "xdelatour"
+    ]
+  },
   "conflicting/Tools/Debugger/How_to/Set_Watch_Expressions": {
     "modified": "2020-07-16T22:35:12.981Z",
     "contributors": [
@@ -43481,6 +43442,13 @@
       "Fredchat"
     ]
   },
+  "conflicting/Web/HTML": {
+    "modified": "2019-01-16T18:47:13.379Z",
+    "contributors": [
+      "SphinxKnight",
+      "tregagnon"
+    ]
+  },
   "conflicting/Web/HTML/Element": {
     "modified": "2019-03-23T23:39:45.493Z",
     "contributors": [
@@ -43499,6 +43467,14 @@
       "xdelatour"
     ]
   },
+  "conflicting/Web/HTTP": {
+    "modified": "2019-03-23T22:26:53.499Z",
+    "contributors": [
+      "tonybengue",
+      "SphinxKnight",
+      "xdelatour"
+    ]
+  },
   "conflicting/Web/HTTP/Basics_of_HTTP/MIME_types": {
     "modified": "2020-04-19T02:52:23.292Z",
     "contributors": [
@@ -43878,6 +43854,12 @@
       "SphinxKnight"
     ]
   },
+  "conflicting/Web/MathML": {
+    "modified": "2019-01-16T22:05:50.107Z",
+    "contributors": [
+      "xdelatour"
+    ]
+  },
   "conflicting/Web/Progressive_web_apps": {
     "modified": "2019-03-18T20:52:18.657Z",
     "contributors": [
@@ -43935,6 +43917,12 @@
       "JeffD"
     ]
   },
+  "conflicting/Web/SVG": {
+    "modified": "2019-01-16T21:57:35.980Z",
+    "contributors": [
+      "xdelatour"
+    ]
+  },
   "conflicting/Web/Web_Components": {
     "modified": "2020-10-15T22:12:01.555Z",
     "contributors": [
@@ -43951,6 +43939,12 @@
       "Fredchat"
     ]
   },
+  "conflicting/Web/XSLT": {
+    "modified": "2019-06-17T11:21:18.591Z",
+    "contributors": [
+      "Arzak656"
+    ]
+  },
   "orphaned/Glossary/Gaia": {
     "modified": "2019-03-23T22:42:05.161Z",
     "contributors": [
diff --git a/files/fr/games/index/index.md b/files/fr/conflicting/games/index.md
index e71dad980f..a2f1287d53 100644
--- a/files/fr/games/index/index.md
+++ b/files/fr/conflicting/games/index.md
@@ -1,10 +1,10 @@
 ---
 title: Index
-slug: Games/Index
+slug: conflicting/Games
 tags:
   - Meta
 translation_of: Games/Index
-original_slug: Jeux/Index
+original_slug: Games/Index
 ---
 {{GamesSidebar}}{{IncludeSubnav("/fr/docs/Jeux")}}
 
diff --git a/files/fr/glossary/index/index.md b/files/fr/conflicting/glossary/index.md
index 4cdb0f3a01..84c7e9bb13 100644
--- a/files/fr/glossary/index/index.md
+++ b/files/fr/conflicting/glossary/index.md
@@ -1,11 +1,11 @@
 ---
 title: Index
-slug: Glossary/Index
+slug: conflicting/Glossary
 tags:
   - Glossaire
   - Index
   - Navigation
 translation_of: Glossary/Index
-original_slug: Glossaire/Index
+original_slug: Glossary/Index
 ---
 {{Index("/fr/docs/Glossaire")}}
diff --git a/files/fr/learn/index/index.md b/files/fr/conflicting/learn/index.md
index 9edb6a5134..71cdb8736f 100644
--- a/files/fr/learn/index/index.md
+++ b/files/fr/conflicting/learn/index.md
@@ -1,12 +1,12 @@
 ---
 title: Index
-slug: Learn/Index
+slug: conflicting/Learn
 tags:
   - Index
   - Learn
   - MDN
   - Meta
 translation_of: Learn/Index
-original_slug: Apprendre/Index
+original_slug: Learn/Index
 ---
 {{Index("/fr/docs/Apprendre")}}
diff --git a/files/fr/mozilla/add-ons/webextensions/index/index.md b/files/fr/conflicting/mozilla/add-ons/webextensions/index.md
index 1631e2d620..7236a454ab 100644
--- a/files/fr/mozilla/add-ons/webextensions/index/index.md
+++ b/files/fr/conflicting/mozilla/add-ons/webextensions/index.md
@@ -1,10 +1,11 @@
 ---
 title: Index
-slug: Mozilla/Add-ons/WebExtensions/Index
+slug: conflicting/Mozilla/Add-ons/WebExtensions
 tags:
   - Add-ons
   - Index
   - WebExtensions
 translation_of: Mozilla/Add-ons/WebExtensions/Index
+original_slug: Mozilla/Add-ons/WebExtensions/Index
 ---
 {{AddonSidebar}}{{Index("/fr/Add-ons/WebExtensions")}}
diff --git a/files/fr/tools/index/index.html b/files/fr/conflicting/tools/index.html
index 427a08ab27..afaa168566 100644
--- a/files/fr/tools/index/index.html
+++ b/files/fr/conflicting/tools/index.html
@@ -1,9 +1,9 @@
 ---
 title: Index
-slug: Tools/Index
+slug: conflicting/Tools
 tags:
   - Outils
 translation_of: Tools/Index
-original_slug: Outils/Index
+original_slug: Tools/Index
 ---
 <div>{{ToolsSidebar}}</div><p>{{Index("/fr/docs/Outils")}}</p>
diff --git a/files/fr/web/html/index/index.md b/files/fr/conflicting/web/html/index.md
index 73f68028a6..14022f7307 100644
--- a/files/fr/web/html/index/index.md
+++ b/files/fr/conflicting/web/html/index.md
@@ -1,9 +1,10 @@
 ---
 title: Index de la documentation HTML
-slug: Web/HTML/Index
+slug: conflicting/Web/HTML
 tags:
   - HTML
   - Index
 translation_of: Web/HTML/Index
+original_slug: Web/HTML/Index
 ---
 {{Index("/fr/docs/Web/HTML")}}
diff --git a/files/fr/web/http/index/index.md b/files/fr/conflicting/web/http/index.md
index da1d0de1ff..655176157f 100644
--- a/files/fr/web/http/index/index.md
+++ b/files/fr/conflicting/web/http/index.md
@@ -1,10 +1,11 @@
 ---
 title: Index
-slug: Web/HTTP/Index
+slug: conflicting/Web/HTTP
 tags:
   - HTTP
   - Index
 translation_of: Web/HTTP/Index
+original_slug: Web/HTTP/Index
 ---
 {{HTTPSidebar}}
 
diff --git a/files/fr/web/mathml/index/index.md b/files/fr/conflicting/web/mathml/index.md
index 36ce8ae063..f3bb5bd189 100644
--- a/files/fr/web/mathml/index/index.md
+++ b/files/fr/conflicting/web/mathml/index.md
@@ -1,8 +1,9 @@
 ---
 title: Index de la documentation MathML
-slug: Web/MathML/Index
+slug: conflicting/Web/MathML
 tags:
   - MathML
 translation_of: Web/MathML/Index
+original_slug: Web/MathML/Index
 ---
 {{Index("/fr/docs/Web/MathML")}}
diff --git a/files/fr/web/svg/index/index.md b/files/fr/conflicting/web/svg/index.md
index 50edd31d3b..b645f9da52 100644
--- a/files/fr/web/svg/index/index.md
+++ b/files/fr/conflicting/web/svg/index.md
@@ -1,8 +1,9 @@
 ---
 title: Index de la documentation SVG
-slug: Web/SVG/Index
+slug: conflicting/Web/SVG
 tags:
   - SVG
 translation_of: Web/SVG/Index
+original_slug: Web/SVG/Index
 ---
 {{Index("/fr/docs/Web/SVG")}}
diff --git a/files/fr/web/xslt/index/index.md b/files/fr/conflicting/web/xslt/index.md
index 0e4fb850a3..9c09d87728 100644
--- a/files/fr/web/xslt/index/index.md
+++ b/files/fr/conflicting/web/xslt/index.md
@@ -1,8 +1,8 @@
 ---
 title: Sommaire
-slug: Web/XSLT/Index
+slug: conflicting/Web/XSLT
 translation_of: Web/XSLT/Index
-original_slug: Web/XSLT/Sommaire
+original_slug: Web/XSLT/Index
 ---
 {{XSLTRef}}{{QuickLinksWithSubpages("/fr/docs/Web/XSLT")}}
 
diff --git a/files/fr/web/api/eventsource/onopen/index.md b/files/fr/web/api/eventsource/open_event/index.md
index 8cd75bbcb1..44b9be5821 100644
--- a/files/fr/web/api/eventsource/onopen/index.md
+++ b/files/fr/web/api/eventsource/open_event/index.md
@@ -1,6 +1,6 @@
 ---
 title: EventSource.onopen
-slug: Web/API/EventSource/onopen
+slug: Web/API/EventSource/open_event
 tags:
   - API
   - Event Handler
@@ -8,6 +8,7 @@ tags:
   - Propriété
   - Reference
 translation_of: Web/API/EventSource/onopen
+original_slug: Web/API/EventSource/onopen
 ---
 {{APIRef('Server Sent Events')}}
 
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index f4b7a44b99..3bd3759ed7 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -1869,6 +1869,7 @@
 /ja/docs/Firefox_9_for_developers	/ja/docs/Mozilla/Firefox/Releases/9
 /ja/docs/Focus_management_in_HTML	/ja/docs/Web/API/Document/hasFocus
 /ja/docs/Full_page_zoom	/ja/docs/Mozilla/Firefox/Releases/3/Full_page_zoom
+/ja/docs/Games/Index	/ja/docs/conflicting/Games
 /ja/docs/Games/Introduction_to_HTML5_Game_Gevelopment_(summary)	/ja/docs/Games/Introduction_to_HTML5_Game_Development
 /ja/docs/Games/Workflows	/ja/docs/Games/Tutorials
 /ja/docs/Games/Workflows/2D_Breakout_game_pure_JavaScript	/ja/docs/Games/Tutorials/2D_Breakout_game_pure_JavaScript
@@ -1891,6 +1892,7 @@
 /ja/docs/Glossary/DTD	/ja/docs/Glossary/Doctype
 /ja/docs/Glossary/Global_attribute	/ja/docs/Web/HTML/Global_attributes
 /ja/docs/Glossary/Header	/ja/docs/Glossary/HTTP_header
+/ja/docs/Glossary/Index	/ja/docs/conflicting/Glossary
 /ja/docs/Glossary/POP3	/ja/docs/Glossary/POP
 /ja/docs/Glossary/SSL_Glossary	/ja/docs/Glossary/SSL
 /ja/docs/Glossary/Signature/セキュリティ	/ja/docs/Glossary/Signature/Security
@@ -2693,6 +2695,7 @@
 /ja/docs/Learn/HTML/Forms/Your_first_HTML_form	/ja/docs/Learn/Forms/Your_first_form
 /ja/docs/Learn/HTML/Forms/Your_first_HTML_form/Example	/ja/docs/Learn/Forms/Your_first_form/Example
 /ja/docs/Learn/HTML/Introduction_to_HTML/高度なテキスト成型	/ja/docs/Learn/HTML/Introduction_to_HTML/Advanced_text_formatting
+/ja/docs/Learn/Index	/ja/docs/conflicting/Learn
 /ja/docs/Learn/JavaScript/Asynchronous/Concepts	/ja/docs/Learn/JavaScript/Asynchronous/Introducing
 /ja/docs/Learn/JavaScript/Objects/Inheritance	/ja/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
 /ja/docs/Learn/JavaScript/Objects/Object-oriented_JS	/ja/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
@@ -2785,6 +2788,7 @@
 /ja/docs/Mozilla/Add-ons/WebExtensions/API/devtools.inspectedWindow/tabId	/ja/docs/Mozilla/Add-ons/WebExtensions/API/devtools/inspectedWindow/tabId
 /ja/docs/Mozilla/Add-ons/WebExtensions/API/devtools.network	/ja/docs/Mozilla/Add-ons/WebExtensions/API/devtools/network
 /ja/docs/Mozilla/Add-ons/WebExtensions/API/devtools.panels	/ja/docs/Mozilla/Add-ons/WebExtensions/API/devtools/panels
+/ja/docs/Mozilla/Add-ons/WebExtensions/Index	/ja/docs/conflicting/Mozilla/Add-ons/WebExtensions
 /ja/docs/Mozilla/Add-ons/WebExtensions/ThunderbirdにおけるWebExtensionsによるアドイン開発	/ja/docs/Mozilla/Add-ons/WebExtensions/Developing_WebExtensions_for_Thunderbird
 /ja/docs/Mozilla/Add-ons/WebExtensions/Using_the_JavaScript_APIs	/ja/docs/Mozilla/Add-ons/WebExtensions/API
 /ja/docs/Mozilla/Add-ons/WebExtensions/Walkthrough	/ja/docs/Mozilla/Add-ons/WebExtensions/Your_second_WebExtension
@@ -2938,6 +2942,7 @@
 /ja/docs/Tools/Debugger_(before_Firefox_52)/Keyboard_shortcuts	/ja/docs/orphaned/Tools/Debugger_(before_Firefox_52)/Keyboard_shortcuts
 /ja/docs/Tools/Debugger_(before_Firefox_52)/Settings	/ja/docs/orphaned/Tools/Debugger_(before_Firefox_52)/Settings
 /ja/docs/Tools/Debugger_(before_Firefox_52)/UI_Tour	/ja/docs/orphaned/Tools/Debugger_(before_Firefox_52)/UI_Tour
+/ja/docs/Tools/Index	/ja/docs/conflicting/Tools
 /ja/docs/Tools/Memory/Comparing_heap_snapshots	/ja/docs/Tools/Memory/Basic_operations
 /ja/docs/Tools/Memory/Open_the_Memory_tool	/ja/docs/Tools/Memory/Basic_operations
 /ja/docs/Tools/Memory/Take_a_heap_snapshot	/ja/docs/Tools/Memory/Basic_operations
@@ -3098,6 +3103,8 @@
 /ja/docs/Web/API/Event/button	/ja/docs/Web/API/MouseEvent/button
 /ja/docs/Web/API/Event/createEvent	/ja/docs/Web/API/Document/createEvent
 /ja/docs/Web/API/EventHandler	/ja/docs/Web/Events/Event_handlers
+/ja/docs/Web/API/EventSource/onerror	/ja/docs/Web/API/EventSource/error_event
+/ja/docs/Web/API/EventSource/onmessage	/ja/docs/Web/API/EventSource/message_event
 /ja/docs/Web/API/EventTarget.addEventListener	/ja/docs/Web/API/EventTarget/addEventListener
 /ja/docs/Web/API/EventTarget.dispatchEvent	/ja/docs/Web/API/EventTarget/dispatchEvent
 /ja/docs/Web/API/EventTarget.removeEventListener	/ja/docs/Web/API/EventTarget/removeEventListener
@@ -3180,6 +3187,7 @@
 /ja/docs/Web/API/IndexedDB_API/Basic_Concepts_Behind_IndexedDB	/ja/docs/Web/API/IndexedDB_API/Basic_Terminology
 /ja/docs/Web/API/MediaCapabilitiesInfo	/ja/docs/Web/API/MediaCapabilities/encodingInfo
 /ja/docs/Web/API/MediaDevices/ondevicechange	/ja/docs/Web/API/MediaDevices/devicechange_event
+/ja/docs/Web/API/MediaQueryList/onchange	/ja/docs/Web/API/MediaQueryList/change_event
 /ja/docs/Web/API/MediaRecorder_API	/ja/docs/Web/API/MediaStream_Recording_API
 /ja/docs/Web/API/MediaStreamConstraints	/ja/docs/conflicting/Web/API/MediaDevices/getUserMedia
 /ja/docs/Web/API/MouseEvent/which	/ja/docs/Web/API/UIEvent/which
@@ -3634,6 +3642,7 @@
 /ja/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_checkbox_role	/ja/docs/Web/Accessibility/ARIA/Roles/checkbox_role
 /ja/docs/Web/Accessibility/ARIA/widgets/overview	/ja/docs/Web/Accessibility/ARIA/widgets
 /ja/docs/Web/Accessibility/Accessibility_FAQ	/ja/docs/Web/Accessibility/FAQ
+/ja/docs/Web/Accessibility/Index	/ja/docs/conflicting/Web/Accessibility
 /ja/docs/Web/Apps/Build/Manipulating_media	/ja/docs/Web/Guide/Audio_and_video_delivery
 /ja/docs/Web/Apps/Build/Manipulating_media/Adding_captions_and_subtitles_to_HTML5_video	/ja/docs/Web/Guide/Audio_and_video_delivery/Adding_captions_and_subtitles_to_HTML5_video
 /ja/docs/Web/Apps/Build/Manipulating_media/Live_streaming_web_audio_and_video	/ja/docs/Web/Guide/Audio_and_video_delivery/Live_streaming_web_audio_and_video
@@ -4008,6 +4017,7 @@
 /ja/docs/Web/Guide/HTML/Introduction	/ja/docs/Learn/HTML/Introduction_to_HTML
 /ja/docs/Web/Guide/HTML/Obsolete_things_to_avoid	/ja/docs/Learn/HTML/Introduction_to_HTML
 /ja/docs/Web/Guide/HTML/Using_HTML_sections_and_outlines	/ja/docs/orphaned/Web/Guide/HTML/Using_HTML_sections_and_outlines
+/ja/docs/Web/Guide/Index	/ja/docs/conflicting/Web/Guide
 /ja/docs/Web/Guide/Localizations_and_character_encodings	/ja/docs/orphaned/Web/Guide/Localizations_and_character_encodings
 /ja/docs/Web/Guide/Performance/Using_web_workers	/ja/docs/Web/API/Web_Workers_API/Using_web_workers
 /ja/docs/Web/Guide/User_experience/Using_the_Page_Visibility_API	/ja/docs/Web/API/Page_Visibility_API
@@ -4111,6 +4121,7 @@
 /ja/docs/Web/HTML/HTML_Elements/strong	/ja/docs/Web/HTML/Element/strong
 /ja/docs/Web/HTML/HTML_Elements/title	/ja/docs/Web/HTML/Element/title
 /ja/docs/Web/HTML/HTML_Elements/var	/ja/docs/Web/HTML/Element/var
+/ja/docs/Web/HTML/Index	/ja/docs/conflicting/Web/HTML
 /ja/docs/Web/HTML/Introduction	/ja/docs/Learn/HTML/Introduction_to_HTML
 /ja/docs/Web/HTML/Introduction_to_HTML5	/ja/docs/orphaned/Web/Guide/HTML/HTML5/Introduction_to_HTML5
 /ja/docs/Web/HTML/Optimizing_your_pages_for_speculative_parsing	/ja/docs/Glossary/speculative_parsing
@@ -4141,6 +4152,7 @@
 /ja/docs/Web/HTTP/HTTP_response_codes	/ja/docs/Web/HTTP/Status
 /ja/docs/Web/HTTP/Headers/Feature-Policy/vr	/ja/docs/Web/HTTP/Headers/Feature-Policy/xr-spatial-tracking
 /ja/docs/Web/HTTP/Headers/Feature-Policy/xr	/ja/docs/conflicting/Web/HTTP/Headers/Feature-Policy/xr-spatial-tracking
+/ja/docs/Web/HTTP/Index	/ja/docs/conflicting/Web/HTTP
 /ja/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_(PAC)_file	/ja/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_PAC_file
 /ja/docs/Web/HTTP/Response_codes	/ja/docs/Web/HTTP/Status
 /ja/docs/Web/HTTP/Response_codes/204	/ja/docs/Web/HTTP/Status/204
@@ -4398,6 +4410,7 @@
 /ja/docs/Web/JavaScript/Typed_arrays/Uint32Array	/ja/docs/Web/JavaScript/Reference/Global_objects/Uint32Array
 /ja/docs/Web/JavaScript/Typed_arrays/Uint8Array	/ja/docs/Web/JavaScript/Reference/Global_objects/Uint8Array
 /ja/docs/Web/Manifest/serviceworker	/ja/docs/orphaned/Web/Manifest/serviceworker
+/ja/docs/Web/MathML/Index	/ja/docs/conflicting/Web/MathML
 /ja/docs/Web/Progressive_web_apps/Advantages	/ja/docs/Web/Progressive_web_apps/Introduction
 /ja/docs/Web/Progressive_web_apps/Responsive	/ja/docs/Web/Progressive_web_apps
 /ja/docs/Web/Progressive_web_apps/Responsive/Media_types	/ja/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
@@ -4435,6 +4448,7 @@
 /ja/docs/Web/Reference/Events/vrdisplayconnected	/ja/docs/Web/API/Window/vrdisplayconnect_event
 /ja/docs/Web/Reference/Events/vrdisplaydisconnected	/ja/docs/Web/API/Window/vrdisplaydisconnect_event
 /ja/docs/Web/Reference/Events/vrdisplaypresentchange	/ja/docs/Web/API/Window/vrdisplaypresentchange_event
+/ja/docs/Web/SVG/Index	/ja/docs/conflicting/Web/SVG
 /ja/docs/Web/Security/CSP	/ja/docs/Web/HTTP/CSP
 /ja/docs/Web/Security/CSP/CSP_policy_directives	/ja/docs/Web/HTTP/Headers/Content-Security-Policy
 /ja/docs/Web/Security/CSP/Default_CSP_restrictions	/ja/docs/Web/HTTP/Headers/Content-Security-Policy
@@ -4467,6 +4481,7 @@
 /ja/docs/Web/Web_Components/Custom_Elements	/ja/docs/Web/Web_Components/Using_custom_elements
 /ja/docs/Web/Web_Components/HTML_Imports	/ja/docs/conflicting/Web/Web_Components
 /ja/docs/Web/Web_Components/Status_in_Firefox	/ja/docs/orphaned/Web/Web_Components/Status_in_Firefox
+/ja/docs/Web/XPath/Index	/ja/docs/conflicting/Web/XPath
 /ja/docs/Web/XSLT/Elements	/ja/docs/Web/XSLT/Element
 /ja/docs/Web/XSLT/Elements/apply-imports	/ja/docs/Web/XSLT/Element/apply-imports
 /ja/docs/Web/XSLT/Elements/apply-templates	/ja/docs/Web/XSLT/Element/apply-templates
@@ -4503,6 +4518,7 @@
 /ja/docs/Web/XSLT/Elements/variable	/ja/docs/Web/XSLT/Element/variable
 /ja/docs/Web/XSLT/Elements/when	/ja/docs/Web/XSLT/Element/when
 /ja/docs/Web/XSLT/Elements/with-param	/ja/docs/Web/XSLT/Element/with-param
+/ja/docs/Web/XSLT/Index	/ja/docs/conflicting/Web/XSLT
 /ja/docs/Web/XSLT/The_XSLT_JavaScript_Interface_in_Gecko	/ja/docs/Web/XSLT/XSLT_JS_interface_in_Gecko
 /ja/docs/Web/XSLT/The_XSLT_JavaScript_Interface_in_Gecko/Advanced_Example	/ja/docs/Web/XSLT/XSLT_JS_interface_in_Gecko/Advanced_Example
 /ja/docs/Web/XSLT/The_XSLT_JavaScript_Interface_in_Gecko/Basic_Example	/ja/docs/Web/XSLT/XSLT_JS_interface_in_Gecko/Basic_Example
@@ -4521,6 +4537,7 @@
 /ja/docs/WebAPI/Proximity	/ja/docs/Web/API/Proximity_Events
 /ja/docs/WebAPI/Using_Web_Notifications	/ja/docs/Web/API/Notifications_API/Using_the_Notifications_API
 /ja/docs/WebAPI/Using_geolocation	/ja/docs/Web/API/Geolocation_API
+/ja/docs/WebAssembly/Index	/ja/docs/conflicting/WebAssembly
 /ja/docs/WebGL	/ja/docs/Web/API/WebGL_API
 /ja/docs/WebGL/Adding_2D_content_to_a_WebGL_context	/ja/docs/Web/API/WebGL_API/Tutorial/Adding_2D_content_to_a_WebGL_context
 /ja/docs/WebGL/Animating_objects_with_WebGL	/ja/docs/Web/API/WebGL_API/Tutorial/Animating_objects_with_WebGL
@@ -4617,7 +4634,7 @@
 /ja/docs/XPath/Functions/translate	/ja/docs/Web/XPath/Functions/translate
 /ja/docs/XPath/Functions/true	/ja/docs/Web/XPath/Functions/true
 /ja/docs/XPath/Functions/unparsed-entity-url	/ja/docs/Web/XPath/Functions/unparsed-entity-url
-/ja/docs/XPath/Index	/ja/docs/Web/XPath/Index
+/ja/docs/XPath/Index	/ja/docs/conflicting/Web/XPath
 /ja/docs/XPath/Snippets	/ja/docs/Web/XPath/Snippets
 /ja/docs/XPath:Axes	/ja/docs/Web/XPath/Axes
 /ja/docs/XPath:Functions	/ja/docs/Web/XPath/Functions
@@ -4687,7 +4704,7 @@
 /ja/docs/XSLT/Elements/variable	/ja/docs/Web/XSLT/Element/variable
 /ja/docs/XSLT/Elements/when	/ja/docs/Web/XSLT/Element/when
 /ja/docs/XSLT/Elements/with-param	/ja/docs/Web/XSLT/Element/with-param
-/ja/docs/XSLT/Index	/ja/docs/Web/XSLT/Index
+/ja/docs/XSLT/Index	/ja/docs/conflicting/Web/XSLT
 /ja/docs/XSLT/PI_Parameters	/ja/docs/Web/XSLT/PI_Parameters
 /ja/docs/XSLT/The_XSLT_JavaScript_Interface_in_Gecko	/ja/docs/Web/XSLT/XSLT_JS_interface_in_Gecko
 /ja/docs/XSLT/The_XSLT_JavaScript_Interface_in_Gecko/Advanced_Example	/ja/docs/Web/XSLT/XSLT_JS_interface_in_Gecko/Advanced_Example
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index e42e93574b..6b0e4a264b 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -29,13 +29,6 @@
       "Uemmra3"
     ]
   },
-  "Games/Index": {
-    "modified": "2019-01-16T21:55:46.834Z",
-    "contributors": [
-      "wbamberg",
-      "Marsf"
-    ]
-  },
   "Games/Introduction": {
     "modified": "2019-03-23T22:51:04.568Z",
     "contributors": [
@@ -1821,13 +1814,6 @@
       "Wind1808"
     ]
   },
-  "Glossary/Index": {
-    "modified": "2019-01-16T21:36:54.645Z",
-    "contributors": [
-      "mfuji09",
-      "x2357"
-    ]
-  },
   "Glossary/IndexedDB": {
     "modified": "2019-03-18T21:40:55.276Z",
     "contributors": [
@@ -5140,12 +5126,6 @@
       "karaage-kun"
     ]
   },
-  "Learn/Index": {
-    "modified": "2020-07-16T22:33:38.849Z",
-    "contributors": [
-      "silverskyvicto"
-    ]
-  },
   "Learn/JavaScript": {
     "modified": "2020-12-12T21:01:57.465Z",
     "contributors": [
@@ -7517,12 +7497,6 @@
       "kyokutyo"
     ]
   },
-  "Mozilla/Add-ons/WebExtensions/Index": {
-    "modified": "2020-03-07T04:25:12.950Z",
-    "contributors": [
-      "mfuji09"
-    ]
-  },
   "Mozilla/Add-ons/WebExtensions/Interact_with_the_clipboard": {
     "modified": "2019-05-20T05:14:06.954Z",
     "contributors": [
@@ -9230,13 +9204,6 @@
       "silverskyvicto"
     ]
   },
-  "Tools/Index": {
-    "modified": "2020-07-16T22:36:05.417Z",
-    "contributors": [
-      "wbamberg",
-      "Marsf"
-    ]
-  },
   "Tools/JSON_viewer": {
     "modified": "2020-07-16T22:36:31.583Z",
     "contributors": [
@@ -14440,13 +14407,13 @@
       "k-kuwahara"
     ]
   },
-  "Web/API/EventSource/onerror": {
+  "Web/API/EventSource/error_event": {
     "modified": "2020-10-15T22:22:24.575Z",
     "contributors": [
       "k-kuwahara"
     ]
   },
-  "Web/API/EventSource/onmessage": {
+  "Web/API/EventSource/message_event": {
     "modified": "2020-10-15T22:22:24.577Z",
     "contributors": [
       "k-kuwahara"
@@ -17951,22 +17918,22 @@
       "ethertank"
     ]
   },
-  "Web/API/MediaQueryList/matches": {
-    "modified": "2020-10-15T21:59:32.651Z",
+  "Web/API/MediaQueryList/change_event": {
+    "modified": "2020-10-15T21:59:30.222Z",
     "contributors": [
       "mfuji09",
       "Marsf"
     ]
   },
-  "Web/API/MediaQueryList/media": {
-    "modified": "2020-10-15T21:59:28.975Z",
+  "Web/API/MediaQueryList/matches": {
+    "modified": "2020-10-15T21:59:32.651Z",
     "contributors": [
       "mfuji09",
       "Marsf"
     ]
   },
-  "Web/API/MediaQueryList/onchange": {
-    "modified": "2020-10-15T21:59:30.222Z",
+  "Web/API/MediaQueryList/media": {
+    "modified": "2020-10-15T21:59:28.975Z",
     "contributors": [
       "mfuji09",
       "Marsf"
@@ -26493,12 +26460,6 @@
       "Marsf"
     ]
   },
-  "Web/Accessibility/Index": {
-    "modified": "2019-03-23T22:41:12.085Z",
-    "contributors": [
-      "Marsf"
-    ]
-  },
   "Web/Accessibility/Keyboard-navigable_JavaScript_widgets": {
     "modified": "2019-09-04T08:46:02.292Z",
     "contributors": [
@@ -33354,14 +33315,6 @@
       "Wind1808"
     ]
   },
-  "Web/Guide/Index": {
-    "modified": "2020-12-07T13:42:04.312Z",
-    "contributors": [
-      "peterbe",
-      "mfuji09",
-      "silverskyvicto"
-    ]
-  },
   "Web/Guide/Introduction_to_Web_development": {
     "modified": "2020-05-04T12:39:54.645Z",
     "contributors": [
@@ -35214,13 +35167,6 @@
       "eltociear"
     ]
   },
-  "Web/HTML/Index": {
-    "modified": "2020-09-19T11:13:50.506Z",
-    "contributors": [
-      "mfuji09",
-      "Marsf"
-    ]
-  },
   "Web/HTML/Inline_elements": {
     "modified": "2019-04-15T20:58:44.936Z",
     "contributors": [
@@ -36521,12 +36467,6 @@
       "kurimaru"
     ]
   },
-  "Web/HTTP/Index": {
-    "modified": "2019-03-18T21:35:45.067Z",
-    "contributors": [
-      "mfuji09"
-    ]
-  },
   "Web/HTTP/Link_prefetching_FAQ": {
     "modified": "2020-01-12T13:11:34.893Z",
     "contributors": [
@@ -46124,12 +46064,6 @@
       "cosmology233"
     ]
   },
-  "Web/MathML/Index": {
-    "modified": "2019-01-16T21:55:31.944Z",
-    "contributors": [
-      "Marsf"
-    ]
-  },
   "Web/Media": {
     "modified": "2020-10-24T14:12:13.318Z",
     "contributors": [
@@ -46858,12 +46792,6 @@
       "teoli"
     ]
   },
-  "Web/SVG/Index": {
-    "modified": "2019-01-16T21:55:52.943Z",
-    "contributors": [
-      "Marsf"
-    ]
-  },
   "Web/SVG/Namespaces_Crash_Course": {
     "modified": "2019-03-23T23:49:34.244Z",
     "contributors": [
@@ -47714,13 +47642,6 @@
       "silverskyvicto"
     ]
   },
-  "Web/XPath/Index": {
-    "modified": "2019-03-30T15:46:42.224Z",
-    "contributors": [
-      "silverskyvicto",
-      "ExE-Boss"
-    ]
-  },
   "Web/XPath/Introduction_to_using_XPath_in_JavaScript": {
     "modified": "2019-03-23T23:54:12.896Z",
     "contributors": [
@@ -48019,13 +47940,6 @@
       "silverskyvicto"
     ]
   },
-  "Web/XSLT/Index": {
-    "modified": "2019-03-18T20:50:34.547Z",
-    "contributors": [
-      "mfuji09",
-      "silverskyvicto"
-    ]
-  },
   "Web/XSLT/PI_Parameters": {
     "modified": "2019-03-18T20:50:34.245Z",
     "contributors": [
@@ -48198,12 +48112,6 @@
       "ukyo"
     ]
   },
-  "WebAssembly/Index": {
-    "modified": "2019-03-18T21:24:03.527Z",
-    "contributors": [
-      "silverskyvicto"
-    ]
-  },
   "WebAssembly/Loading_and_running": {
     "modified": "2019-03-23T22:13:00.551Z",
     "contributors": [
@@ -48256,12 +48164,32 @@
       "silverskyvicto"
     ]
   },
+  "conflicting/Games": {
+    "modified": "2019-01-16T21:55:46.834Z",
+    "contributors": [
+      "wbamberg",
+      "Marsf"
+    ]
+  },
+  "conflicting/Glossary": {
+    "modified": "2019-01-16T21:36:54.645Z",
+    "contributors": [
+      "mfuji09",
+      "x2357"
+    ]
+  },
   "conflicting/Glossary/Plugin": {
     "modified": "2019-03-18T21:35:38.258Z",
     "contributors": [
       "momdo"
     ]
   },
+  "conflicting/Learn": {
+    "modified": "2020-07-16T22:33:38.849Z",
+    "contributors": [
+      "silverskyvicto"
+    ]
+  },
   "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": {
     "modified": "2020-12-06T14:17:48.495Z",
     "contributors": [
@@ -48285,6 +48213,19 @@
       "Uemmra3"
     ]
   },
+  "conflicting/Mozilla/Add-ons/WebExtensions": {
+    "modified": "2020-03-07T04:25:12.950Z",
+    "contributors": [
+      "mfuji09"
+    ]
+  },
+  "conflicting/Tools": {
+    "modified": "2020-07-16T22:36:05.417Z",
+    "contributors": [
+      "wbamberg",
+      "Marsf"
+    ]
+  },
   "conflicting/Web/API/AudioTrackList/addtrack_event": {
     "modified": "2020-10-15T22:19:07.769Z",
     "contributors": [
@@ -48541,6 +48482,12 @@
       "Wind1808"
     ]
   },
+  "conflicting/Web/Accessibility": {
+    "modified": "2019-03-23T22:41:12.085Z",
+    "contributors": [
+      "Marsf"
+    ]
+  },
   "conflicting/Web/Accessibility/ARIA/Roles/alert_role": {
     "modified": "2019-03-18T21:24:32.583Z",
     "contributors": [
@@ -48584,6 +48531,27 @@
       "mfuji09"
     ]
   },
+  "conflicting/Web/Guide": {
+    "modified": "2020-12-07T13:42:04.312Z",
+    "contributors": [
+      "peterbe",
+      "mfuji09",
+      "silverskyvicto"
+    ]
+  },
+  "conflicting/Web/HTML": {
+    "modified": "2020-09-19T11:13:50.506Z",
+    "contributors": [
+      "mfuji09",
+      "Marsf"
+    ]
+  },
+  "conflicting/Web/HTTP": {
+    "modified": "2019-03-18T21:35:45.067Z",
+    "contributors": [
+      "mfuji09"
+    ]
+  },
   "conflicting/Web/HTTP/Headers/Feature-Policy/xr-spatial-tracking": {
     "modified": "2020-08-12T12:42:41.854Z",
     "contributors": [
@@ -48591,12 +48559,44 @@
       "tamura4278"
     ]
   },
+  "conflicting/Web/MathML": {
+    "modified": "2019-01-16T21:55:31.944Z",
+    "contributors": [
+      "Marsf"
+    ]
+  },
+  "conflicting/Web/SVG": {
+    "modified": "2019-01-16T21:55:52.943Z",
+    "contributors": [
+      "Marsf"
+    ]
+  },
   "conflicting/Web/Web_Components": {
     "modified": "2020-10-15T22:23:11.378Z",
     "contributors": [
       "reodog"
     ]
   },
+  "conflicting/Web/XPath": {
+    "modified": "2019-03-30T15:46:42.224Z",
+    "contributors": [
+      "silverskyvicto",
+      "ExE-Boss"
+    ]
+  },
+  "conflicting/Web/XSLT": {
+    "modified": "2019-03-18T20:50:34.547Z",
+    "contributors": [
+      "mfuji09",
+      "silverskyvicto"
+    ]
+  },
+  "conflicting/WebAssembly": {
+    "modified": "2019-03-18T21:24:03.527Z",
+    "contributors": [
+      "silverskyvicto"
+    ]
+  },
   "orphaned/Building_a_Mozilla_Distribution": {
     "modified": "2019-03-23T23:49:07.062Z",
     "contributors": [
diff --git a/files/ja/games/index/index.html b/files/ja/conflicting/games/index.html
index 6879d6d0ef..f0d8b472be 100644
--- a/files/ja/games/index/index.html
+++ b/files/ja/conflicting/games/index.html
@@ -1,10 +1,11 @@
 ---
 title: ゲーム開発関連ドキュメントの索引
-slug: Games/Index
+slug: conflicting/Games
 tags:
   - Games
   - Index
 translation_of: Games/Index
+original_slug: Games/Index
 ---
 <div>{{GamesSidebar}}</div><div>{{IncludeSubnav("/ja/docs/Games")}}</div>
 
diff --git a/files/ja/glossary/index/index.html b/files/ja/conflicting/glossary/index.html
index 57b963f40b..acdc1de061 100644
--- a/files/ja/glossary/index/index.html
+++ b/files/ja/conflicting/glossary/index.html
@@ -1,11 +1,12 @@
 ---
 title: 索引
-slug: Glossary/Index
+slug: conflicting/Glossary
 tags:
   - Glossary
   - Index
   - MDN Meta
   - Navigation
 translation_of: Glossary/Index
+original_slug: Glossary/Index
 ---
 <p>{{Index("/ja/docs/Glossary")}}</p>
diff --git a/files/ja/learn/index/index.html b/files/ja/conflicting/learn/index.html
index 0c842ca444..9c78d9dcac 100644
--- a/files/ja/learn/index/index.html
+++ b/files/ja/conflicting/learn/index.html
@@ -1,10 +1,11 @@
 ---
 title: インデックス
-slug: Learn/Index
+slug: conflicting/Learn
 tags:
   - MDN Meta
   - インデックス
   - 学習
 translation_of: Learn/Index
+original_slug: Learn/Index
 ---
 <p>{{Index("/ja/docs/Learn")}}</p>
diff --git a/files/ja/mozilla/add-ons/webextensions/index/index.html b/files/ja/conflicting/mozilla/add-ons/webextensions/index.html
index ec4a9066f7..06b5e82b73 100644
--- a/files/ja/mozilla/add-ons/webextensions/index/index.html
+++ b/files/ja/conflicting/mozilla/add-ons/webextensions/index.html
@@ -1,6 +1,6 @@
 ---
 title: 索引
-slug: Mozilla/Add-ons/WebExtensions/Index
+slug: conflicting/Mozilla/Add-ons/WebExtensions
 tags:
   - Add-ons
   - Index
@@ -8,6 +8,7 @@ tags:
   - アドオン
   - 索引
 translation_of: Mozilla/Add-ons/WebExtensions/Index
+original_slug: Mozilla/Add-ons/WebExtensions/Index
 ---
 <div>{{AddonSidebar}}</div>
 
diff --git a/files/ja/tools/index/index.html b/files/ja/conflicting/tools/index.html
index 092c03076e..1d1bad64e0 100644
--- a/files/ja/tools/index/index.html
+++ b/files/ja/conflicting/tools/index.html
@@ -1,9 +1,10 @@
 ---
 title: 開発ツール関連ドキュメントの索引
-slug: Tools/Index
+slug: conflicting/Tools
 tags:
   - Index
   - Tools
 translation_of: Tools/Index
+original_slug: Tools/Index
 ---
 <div>{{ToolsSidebar}}</div><p>{{Index("/ja/docs/Tools")}}</p>
diff --git a/files/ja/web/accessibility/index/index.html b/files/ja/conflicting/web/accessibility/index.html
index 3e2035d320..93a56991bc 100644
--- a/files/ja/web/accessibility/index/index.html
+++ b/files/ja/conflicting/web/accessibility/index.html
@@ -1,10 +1,11 @@
 ---
 title: アクセシビリティ関連ドキュメントの索引
-slug: Web/Accessibility/Index
+slug: conflicting/Web/Accessibility
 tags:
   - Accessibility
   - Index
 translation_of: Web/Accessibility/Index
+original_slug: Web/Accessibility/Index
 ---
 <p class="summary"><span class="seoSummary">このドキュメントは、Mozilla Developer Network サイト上の、すべてのアクセシビリティの記事へのリンクの一覧を提供します。</span></p>
 
diff --git a/files/ja/web/guide/index/index.html b/files/ja/conflicting/web/guide/index.html
index 9f0d683123..a5d6cd1488 100644
--- a/files/ja/web/guide/index/index.html
+++ b/files/ja/conflicting/web/guide/index.html
@@ -1,10 +1,11 @@
 ---
 title: 索引
-slug: Web/Guide/Index
+slug: conflicting/Web/Guide
 tags:
   - Index
   - ガイド
 translation_of: Web/Guide/Index
+original_slug: Web/Guide/Index
 ---
 <div>{{MDNSidebar}}{{IncludeSubnav("/ja/docs/MDN")}}</div>
 
diff --git a/files/ja/web/html/index/index.html b/files/ja/conflicting/web/html/index.html
index eadaa1c4d0..5f9ada989f 100644
--- a/files/ja/web/html/index/index.html
+++ b/files/ja/conflicting/web/html/index.html
@@ -1,10 +1,11 @@
 ---
 title: HTML ドキュメントの索引
-slug: Web/HTML/Index
+slug: conflicting/Web/HTML
 tags:
   - HTML
   - Index
   - MDN Meta
 translation_of: Web/HTML/Index
+original_slug: Web/HTML/Index
 ---
 <p>{{Index("/ja/docs/Web/HTML")}} <span class="seoSummary">利用可能なすべての HTML に関する文書の包括的な索引リストです。</span></p>
diff --git a/files/ja/web/http/index/index.html b/files/ja/conflicting/web/http/index.html
index acbf54eb38..aa400e86e2 100644
--- a/files/ja/web/http/index/index.html
+++ b/files/ja/conflicting/web/http/index.html
@@ -1,10 +1,11 @@
 ---
 title: 索引
-slug: Web/HTTP/Index
+slug: conflicting/Web/HTTP
 tags:
   - HTTP
   - Index
 translation_of: Web/HTTP/Index
+original_slug: Web/HTTP/Index
 ---
 <div>{{HTTPSidebar}}</div>
 
diff --git a/files/ja/web/mathml/index/index.html b/files/ja/conflicting/web/mathml/index.html
index a32dfa6b75..06d9c020b2 100644
--- a/files/ja/web/mathml/index/index.html
+++ b/files/ja/conflicting/web/mathml/index.html
@@ -1,9 +1,10 @@
 ---
 title: MathML 関連ドキュメントの索引
-slug: Web/MathML/Index
+slug: conflicting/Web/MathML
 tags:
   - Index
   - MathML
 translation_of: Web/MathML/Index
+original_slug: Web/MathML/Index
 ---
 <p>{{Index("/ja/docs/Web/MathML")}}</p>
diff --git a/files/ja/web/svg/index/index.html b/files/ja/conflicting/web/svg/index.html
index 84bc4161f7..e0b02812c4 100644
--- a/files/ja/web/svg/index/index.html
+++ b/files/ja/conflicting/web/svg/index.html
@@ -1,9 +1,10 @@
 ---
 title: SVG 関連ドキュメントの索引
-slug: Web/SVG/Index
+slug: conflicting/Web/SVG
 tags:
   - Index
   - SVG
 translation_of: Web/SVG/Index
+original_slug: Web/SVG/Index
 ---
 <p>{{Index("/ja/docs/Web/SVG")}}</p>
diff --git a/files/ja/web/xpath/index/index.html b/files/ja/conflicting/web/xpath/index.html
index e90e8fb344..dbe896db2c 100644
--- a/files/ja/web/xpath/index/index.html
+++ b/files/ja/conflicting/web/xpath/index.html
@@ -1,12 +1,13 @@
 ---
 title: Index
-slug: Web/XPath/Index
+slug: conflicting/Web/XPath
 tags:
   - Index
   - Reference
   - XPath
   - XSLT
 translation_of: Web/XPath/Index
+original_slug: Web/XPath/Index
 ---
 <p>{{Index("/ja/docs/Web/XPath")}}</p>
 
diff --git a/files/ja/web/xslt/index/index.html b/files/ja/conflicting/web/xslt/index.html
index 91bb5362a3..6cec119901 100644
--- a/files/ja/web/xslt/index/index.html
+++ b/files/ja/conflicting/web/xslt/index.html
@@ -1,11 +1,12 @@
 ---
 title: Index
-slug: Web/XSLT/Index
+slug: conflicting/Web/XSLT
 tags:
   - Index
   - XSLT
   - リファレンス
 translation_of: Web/XSLT/Index
+original_slug: Web/XSLT/Index
 ---
 <p>{{XSLTRef}}{{QuickLinksWithSubpages("/ja/docs/Web/XSLT")}}</p>
 
diff --git a/files/ja/webassembly/index/index.html b/files/ja/conflicting/webassembly/index.html
index dd2f92d0e9..cb88ce4a63 100644
--- a/files/ja/webassembly/index/index.html
+++ b/files/ja/conflicting/webassembly/index.html
@@ -1,10 +1,11 @@
 ---
 title: Index
-slug: WebAssembly/Index
+slug: conflicting/WebAssembly
 tags:
   - Index
   - WebAssembly
 translation_of: WebAssembly/Index
+original_slug: WebAssembly/Index
 ---
 <div>{{WebAssemblySidebar}}</div>
 
diff --git a/files/ja/web/api/eventsource/onerror/index.html b/files/ja/web/api/eventsource/error_event/index.html
index 1629027780..31df170d43 100644
--- a/files/ja/web/api/eventsource/onerror/index.html
+++ b/files/ja/web/api/eventsource/error_event/index.html
@@ -1,6 +1,6 @@
 ---
 title: EventSource.onerror
-slug: Web/API/EventSource/onerror
+slug: Web/API/EventSource/error_event
 tags:
   - API
   - EventSource
@@ -9,6 +9,7 @@ tags:
   - プロパティ
   - リファレンス
 translation_of: Web/API/EventSource/onerror
+original_slug: Web/API/EventSource/onerror
 ---
 <div>{{APIRef('WebSockets API')}}</div>
 
diff --git a/files/ja/web/api/eventsource/onmessage/index.html b/files/ja/web/api/eventsource/message_event/index.html
index 0b0f8c7c6b..6b35ddf7d2 100644
--- a/files/ja/web/api/eventsource/onmessage/index.html
+++ b/files/ja/web/api/eventsource/message_event/index.html
@@ -1,6 +1,6 @@
 ---
 title: EventSource.onmessage
-slug: Web/API/EventSource/onmessage
+slug: Web/API/EventSource/message_event
 tags:
   - API
   - EventSource
@@ -10,6 +10,7 @@ tags:
   - プロパティ
   - リファレンス
 translation_of: Web/API/EventSource/onmessage
+original_slug: Web/API/EventSource/onmessage
 ---
 <div>{{APIRef('WebSockets API')}}</div>
 
diff --git a/files/ja/web/api/mediaquerylist/onchange/index.html b/files/ja/web/api/mediaquerylist/change_event/index.html
index 5539cdd3c7..388dad93d3 100644
--- a/files/ja/web/api/mediaquerylist/onchange/index.html
+++ b/files/ja/web/api/mediaquerylist/change_event/index.html
@@ -1,6 +1,6 @@
 ---
 title: MediaQueryList.onchange
-slug: Web/API/MediaQueryList/onchange
+slug: Web/API/MediaQueryList/change_event
 tags:
   - API
   - CSSOM View
@@ -13,6 +13,7 @@ tags:
   - プロパティ
   - メディアクエリ
 translation_of: Web/API/MediaQueryList/onchange
+original_slug: Web/API/MediaQueryList/onchange
 ---
 <p>{{APIRef("CSSOM")}}</p>
 
diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt
index a69d0e95b6..80407fb56b 100644
--- a/files/ko/_redirects.txt
+++ b/files/ko/_redirects.txt
@@ -196,6 +196,7 @@
 /ko/docs/Firefox_3_for_developers	/ko/docs/Mozilla/Firefox/Releases/3
 /ko/docs/Focus_management_in_HTML	/ko/docs/Web/API/Document/hasFocus
 /ko/docs/Full_page_zoom	/ko/docs/Mozilla/Firefox/Releases/3/Full_page_zoom
+/ko/docs/Games/Index	/ko/docs/conflicting/Games
 /ko/docs/Games/Tutorials/2D_breakout_game_Phaser/득점	/ko/docs/Games/Tutorials/2D_breakout_game_Phaser/The_score
 /ko/docs/Games/Tutorials/순수한_자바스크립트를_이용한_2D_벽돌깨기_게임	/ko/docs/Games/Tutorials/2D_Breakout_game_pure_JavaScript
 /ko/docs/Games/Tutorials/순수한_자바스크립트를_이용한_2D_벽돌깨기_게임/Bounce_off_the_walls	/ko/docs/Games/Tutorials/2D_Breakout_game_pure_JavaScript/Bounce_off_the_walls
@@ -210,6 +211,7 @@
 /ko/docs/Games/Tutorials/순수한_자바스크립트를_이용한_2D_벽돌깨기_게임/캔버스_생성과_그리기	/ko/docs/Games/Tutorials/2D_Breakout_game_pure_JavaScript/Create_the_Canvas_and_draw_on_it
 /ko/docs/Glossary/Client_hints	/ko/docs/Web/HTTP/Client_hints
 /ko/docs/Glossary/Header	/ko/docs/Glossary/HTTP_header
+/ko/docs/Glossary/Index	/ko/docs/conflicting/Glossary
 /ko/docs/Glossary/Transmission_Control_Protocol_(TCP)	/ko/docs/conflicting/Glossary/TCP
 /ko/docs/Glossary/동적_프로그래밍_언어	/ko/docs/Glossary/Dynamic_programming_language
 /ko/docs/Glossary/배열	/ko/docs/Glossary/array
@@ -313,6 +315,7 @@
 /ko/docs/Learn/HTML/Forms/Your_first_HTML_form	/ko/docs/Learn/Forms/Your_first_form
 /ko/docs/Learn/HTML/Howto/데이터_속성_사용하기	/ko/docs/Learn/HTML/Howto/Use_data_attributes
 /ko/docs/Learn/HTML/Multimedia_and_embedding/ideo_and_audio_content	/ko/docs/Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
+/ko/docs/Learn/Index	/ko/docs/conflicting/Learn
 /ko/docs/Learn/JavaScript/Asynchronous/Async_await	/ko/docs/conflicting/Learn/JavaScript/Asynchronous/Promises
 /ko/docs/Learn/JavaScript/Asynchronous/Concepts	/ko/docs/conflicting/Learn/JavaScript/Asynchronous/Introducing
 /ko/docs/Learn/JavaScript/Asynchronous/Timeouts_and_intervals	/ko/docs/conflicting/Learn/JavaScript/Asynchronous
@@ -612,6 +615,7 @@
 /ko/docs/Web/Guide/HTML/폼/HTML_폼_구성_방법	/ko/docs/Learn/Forms/How_to_structure_a_web_form
 /ko/docs/Web/Guide/HTML/폼/My_first_HTML_form	/ko/docs/Learn/Forms/Your_first_form
 /ko/docs/Web/Guide/HTML/폼/Sending_and_retrieving_form_data	/ko/docs/Learn/Forms/Sending_and_retrieving_form_data
+/ko/docs/Web/Guide/Index	/ko/docs/conflicting/Web/Guide
 /ko/docs/Web/Guide/XML_파싱_및_직렬화	/ko/docs/Web/Guide/Parsing_and_serializing_XML
 /ko/docs/Web/Guide/그래픽	/ko/docs/Web/Guide/Graphics
 /ko/docs/Web/HTML/Canvas	/ko/docs/Web/API/Canvas_API
@@ -642,11 +646,13 @@
 /ko/docs/Web/HTML/Global_attributes/클래스	/ko/docs/Web/HTML/Global_attributes/class
 /ko/docs/Web/HTML/HTML5/HTML5_element_list	/ko/docs/Web/HTML/Element
 /ko/docs/Web/HTML/HTML에서_폼	/ko/docs/Learn/Forms
+/ko/docs/Web/HTML/Index	/ko/docs/conflicting/Web/HTML
 /ko/docs/Web/HTML/Introduction	/ko/docs/Learn/HTML/Introduction_to_HTML
 /ko/docs/Web/HTTP/Access_control_CORS	/ko/docs/Web/HTTP/CORS
 /ko/docs/Web/HTTP/Access_control_CORS/Errors	/ko/docs/Web/HTTP/CORS/Errors
 /ko/docs/Web/HTTP/Access_control_CORS/Errors/CORSDidNotSucceed	/ko/docs/Web/HTTP/CORS/Errors/CORSDidNotSucceed
 /ko/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Complete_list_of_MIME_types	/ko/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
+/ko/docs/Web/HTTP/Index	/ko/docs/conflicting/Web/HTTP
 /ko/docs/Web/HTTP/User_agent를_이용한_브라우저_감지	/ko/docs/Web/HTTP/Browser_detection_using_the_user_agent
 /ko/docs/Web/HTTP/상태_코드	/ko/docs/Web/HTTP/Status
 /ko/docs/Web/JavaScript/About	/ko/docs/Web/JavaScript/About_JavaScript
diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json
index 6c67d4c18d..b811cae08e 100644
--- a/files/ko/_wikihistory.json
+++ b/files/ko/_wikihistory.json
@@ -13,12 +13,6 @@
       "kom2727"
     ]
   },
-  "Games/Index": {
-    "modified": "2020-12-05T03:39:50.081Z",
-    "contributors": [
-      "movegun1027"
-    ]
-  },
   "Games/Introduction": {
     "modified": "2019-06-03T20:16:02.213Z",
     "contributors": [
@@ -574,12 +568,6 @@
       "HyunSeob"
     ]
   },
-  "Glossary/Index": {
-    "modified": "2019-05-26T04:17:19.834Z",
-    "contributors": [
-      "alattalatta"
-    ]
-  },
   "Glossary/Internet": {
     "modified": "2019-10-29T12:34:29.654Z",
     "contributors": [
@@ -1867,12 +1855,6 @@
       "byoung_hyun"
     ]
   },
-  "Learn/Index": {
-    "modified": "2020-07-16T22:33:40.026Z",
-    "contributors": [
-      "alattalatta"
-    ]
-  },
   "Learn/JavaScript": {
     "modified": "2020-12-01T10:05:39.249Z",
     "contributors": [
@@ -9915,13 +9897,6 @@
       "gblue1223"
     ]
   },
-  "Web/Guide/Index": {
-    "modified": "2020-12-07T13:40:57.143Z",
-    "contributors": [
-      "peterbe",
-      "alattalatta"
-    ]
-  },
   "Web/Guide/Mobile": {
     "modified": "2019-05-30T06:59:50.297Z",
     "contributors": [
@@ -11092,12 +11067,6 @@
       "alattalatta"
     ]
   },
-  "Web/HTML/Index": {
-    "modified": "2020-01-19T02:45:39.384Z",
-    "contributors": [
-      "alattalatta"
-    ]
-  },
   "Web/HTML/Inline_elements": {
     "modified": "2020-02-12T03:45:21.056Z",
     "contributors": [
@@ -11717,12 +11686,6 @@
       "Simtu"
     ]
   },
-  "Web/HTTP/Index": {
-    "modified": "2020-02-05T12:28:02.372Z",
-    "contributors": [
-      "alattalatta"
-    ]
-  },
   "Web/HTTP/Messages": {
     "modified": "2019-03-18T20:59:38.193Z",
     "contributors": [
@@ -17342,6 +17305,18 @@
       "limkukhyun"
     ]
   },
+  "conflicting/Games": {
+    "modified": "2020-12-05T03:39:50.081Z",
+    "contributors": [
+      "movegun1027"
+    ]
+  },
+  "conflicting/Glossary": {
+    "modified": "2019-05-26T04:17:19.834Z",
+    "contributors": [
+      "alattalatta"
+    ]
+  },
   "conflicting/Glossary/TCP": {
     "modified": "2020-01-12T14:32:05.700Z",
     "contributors": [
@@ -17349,10 +17324,9 @@
     ]
   },
   "conflicting/Learn": {
-    "modified": "2020-07-16T22:22:13.258Z",
+    "modified": "2020-07-16T22:33:40.026Z",
     "contributors": [
-      "Netaras",
-      "KwanHong_Lee66"
+      "alattalatta"
     ]
   },
   "conflicting/Learn/CSS/Building_blocks": {
@@ -17581,13 +17555,22 @@
     ]
   },
   "conflicting/Web/Guide": {
-    "modified": "2019-03-23T23:41:47.329Z",
+    "modified": "2020-12-07T13:40:57.143Z",
     "contributors": [
-      "teoli",
-      "Jiyoon",
-      "Unixcruiser",
-      "Netaras",
-      "Sebuls"
+      "peterbe",
+      "alattalatta"
+    ]
+  },
+  "conflicting/Web/HTML": {
+    "modified": "2020-01-19T02:45:39.384Z",
+    "contributors": [
+      "alattalatta"
+    ]
+  },
+  "conflicting/Web/HTTP": {
+    "modified": "2020-02-05T12:28:02.372Z",
+    "contributors": [
+      "alattalatta"
     ]
   },
   "conflicting/Web/JavaScript/Guide": {
diff --git a/files/ko/games/index/index.html b/files/ko/conflicting/games/index.html
index 5d36376f6e..88c9158fdc 100644
--- a/files/ko/games/index/index.html
+++ b/files/ko/conflicting/games/index.html
@@ -1,9 +1,10 @@
 ---
 title: Index
-slug: Games/Index
+slug: conflicting/Games
 tags:
   - Meta
 translation_of: Games/Index
+original_slug: Games/Index
 ---
 <div>{{GamesSidebar}}</div>
 
diff --git a/files/ko/glossary/index/index.html b/files/ko/conflicting/glossary/index.html
index f7edc11916..e27f7b7ce2 100644
--- a/files/ko/glossary/index/index.html
+++ b/files/ko/conflicting/glossary/index.html
@@ -1,11 +1,12 @@
 ---
 title: Index
-slug: Glossary/Index
+slug: conflicting/Glossary
 tags:
   - Glossary
   - Index
   - MDN Meta
   - Navigation
 translation_of: Glossary/Index
+original_slug: Glossary/Index
 ---
 <p>{{Index("/ko/docs/Glossary")}}</p>
diff --git a/files/ko/learn/index/index.html b/files/ko/conflicting/learn/index.html
index ef35585b45..828ba7b7fa 100644
--- a/files/ko/learn/index/index.html
+++ b/files/ko/conflicting/learn/index.html
@@ -1,10 +1,11 @@
 ---
 title: Index
-slug: Learn/Index
+slug: conflicting/Learn
 tags:
   - Index
   - Learn
   - MDN Meta
 translation_of: Learn/Index
+original_slug: Learn/Index
 ---
 <p>{{Index("/ko/docs/Learn")}}</p>
diff --git a/files/ko/web/guide/index/index.html b/files/ko/conflicting/web/guide/index.html
index 1d121dfb94..2ae329dcdc 100644
--- a/files/ko/web/guide/index/index.html
+++ b/files/ko/conflicting/web/guide/index.html
@@ -1,10 +1,11 @@
 ---
 title: Index
-slug: Web/Guide/Index
+slug: conflicting/Web/Guide
 tags:
   - Guide
   - Index
 translation_of: Web/Guide/Index
+original_slug: Web/Guide/Index
 ---
 <div>{{MDNSidebar}}{{IncludeSubnav("/ko/docs/MDN")}}</div>
 
diff --git a/files/ko/web/html/index/index.html b/files/ko/conflicting/web/html/index.html
index dde859c07d..98a0225d2a 100644
--- a/files/ko/web/html/index/index.html
+++ b/files/ko/conflicting/web/html/index.html
@@ -1,10 +1,11 @@
 ---
 title: HTML documentation index
-slug: Web/HTML/Index
+slug: conflicting/Web/HTML
 tags:
   - HTML
   - Index
   - MDN Meta
 translation_of: Web/HTML/Index
+original_slug: Web/HTML/Index
 ---
 <p>{{Index("/ko/docs/Web/HTML")}} <span class="seoSummary">전체 HTML 문서의 목록입니다.</span></p>
diff --git a/files/ko/web/http/index/index.html b/files/ko/conflicting/web/http/index.html
index ffd7a593f4..b52d63cc82 100644
--- a/files/ko/web/http/index/index.html
+++ b/files/ko/conflicting/web/http/index.html
@@ -1,10 +1,11 @@
 ---
 title: HTTP 색인
-slug: Web/HTTP/Index
+slug: conflicting/Web/HTTP
 tags:
   - HTTP
   - Index
 translation_of: Web/HTTP/Index
+original_slug: Web/HTTP/Index
 ---
 <div>{{HTTPSidebar}}</div>
 
diff --git a/files/pt-br/_redirects.txt b/files/pt-br/_redirects.txt
index 3363b351ae..91690e911a 100644
--- a/files/pt-br/_redirects.txt
+++ b/files/pt-br/_redirects.txt
@@ -517,6 +517,7 @@
 /pt-BR/docs/Web/API/Element/accessKey	/pt-BR/docs/Web/API/HTMLElement/accessKey
 /pt-BR/docs/Web/API/Element/addEventListener	/pt-BR/docs/Web/API/EventTarget/addEventListener
 /pt-BR/docs/Web/API/Event/Comparativo_entre_Event_Targets	/pt-BR/docs/Web/API/Event/Comparison_of_Event_Targets
+/pt-BR/docs/Web/API/EventSource/onerror	/pt-BR/docs/Web/API/EventSource/error_event
 /pt-BR/docs/Web/API/Fetch_API/Uso_de_busca_Cross-global	/pt-BR/docs/Web/API/Fetch_API/Cross-global_fetch_usage
 /pt-BR/docs/Web/API/FileReader/onload	/pt-BR/docs/Web/API/FileReader/load_event
 /pt-BR/docs/Web/API/FullscreenOptions	/pt-BR/docs/orphaned/Web/API/FullscreenOptions
diff --git a/files/pt-br/_wikihistory.json b/files/pt-br/_wikihistory.json
index c050bf05f2..6041ed758b 100644
--- a/files/pt-br/_wikihistory.json
+++ b/files/pt-br/_wikihistory.json
@@ -5001,7 +5001,7 @@
       "ronrother"
     ]
   },
-  "Web/API/EventSource/onerror": {
+  "Web/API/EventSource/error_event": {
     "modified": "2019-03-18T21:30:45.574Z",
     "contributors": [
       "ronrother"
diff --git a/files/pt-br/web/api/eventsource/onerror/index.html b/files/pt-br/web/api/eventsource/error_event/index.html
index 6221e01bd0..9f0407f3f4 100644
--- a/files/pt-br/web/api/eventsource/onerror/index.html
+++ b/files/pt-br/web/api/eventsource/error_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: EventSource.onerror
-slug: Web/API/EventSource/onerror
+slug: Web/API/EventSource/error_event
 translation_of: Web/API/EventSource/onerror
+original_slug: Web/API/EventSource/onerror
 ---
 <div>{{APIRef('WebSockets API')}}</div>
 
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index 377cf27043..076f9409bb 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -290,6 +290,7 @@
 /ru/docs/Sample_.htaccess_file	/ru/docs/Learn/Server-side/Apache_Configuration_htaccess
 /ru/docs/Tools/Debugger/How_to/Отладка_кода_внутри_eval	/ru/docs/Tools/Debugger/How_to/Debug_eval_sources
 /ru/docs/Tools/Debugger/How_to/Работа_с_минифицированным_кодом	/ru/docs/Tools/Debugger/How_to/Pretty-print_a_minified_file
+/ru/docs/Tools/Index	/ru/docs/conflicting/Tools
 /ru/docs/Tools/Page_Inspector/How_to/Otkrytie_Inspektora	/ru/docs/Tools/Page_Inspector/How_to/Open_the_Inspector
 /ru/docs/Tools/Page_Inspector/How_to/Vybor_elementa	/ru/docs/Tools/Page_Inspector/How_to/Select_an_element
 /ru/docs/Tools/Page_Inspector/How_to/Исследовать_event_listeners	/ru/docs/Tools/Page_Inspector/How_to/Examine_event_listeners
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index d6c88836f4..a348d4fe1e 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -5037,14 +5037,6 @@
       "vm10111957r"
     ]
   },
-  "Tools/Index": {
-    "modified": "2020-07-16T22:36:06.095Z",
-    "contributors": [
-      "wbamberg",
-      "Aleksej",
-      "Mingun"
-    ]
-  },
   "Tools/Keyboard_shortcuts": {
     "modified": "2020-11-06T04:42:55.218Z",
     "contributors": [
@@ -24053,6 +24045,14 @@
       "uleming"
     ]
   },
+  "conflicting/Tools": {
+    "modified": "2020-07-16T22:36:06.095Z",
+    "contributors": [
+      "wbamberg",
+      "Aleksej",
+      "Mingun"
+    ]
+  },
   "conflicting/Tools/Performance": {
     "modified": "2020-07-16T22:35:29.176Z",
     "contributors": [
diff --git a/files/ru/tools/index/index.html b/files/ru/conflicting/tools/index.html
index b9d3f33dbb..6af7016701 100644
--- a/files/ru/tools/index/index.html
+++ b/files/ru/conflicting/tools/index.html
@@ -1,8 +1,9 @@
 ---
 title: Индекс
-slug: Tools/Index
+slug: conflicting/Tools
 tags:
   - инструменты
 translation_of: Tools/Index
+original_slug: Tools/Index
 ---
 <div>{{ToolsSidebar}}</div><p>{{Index("/ru/docs/Tools")}}</p>
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 5724992b1b..73596ab89d 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1191,8 +1191,8 @@
 /zh-CN/docs/Server-sent_events/EventSource	/zh-CN/docs/Web/API/EventSource
 /zh-CN/docs/Server-sent_events/EventSource/EventSource	/zh-CN/docs/Web/API/EventSource/EventSource
 /zh-CN/docs/Server-sent_events/EventSource/close	/zh-CN/docs/Web/API/EventSource/close
-/zh-CN/docs/Server-sent_events/EventSource/onerror	/zh-CN/docs/Web/API/EventSource/onerror
-/zh-CN/docs/Server-sent_events/EventSource/onopen	/zh-CN/docs/Web/API/EventSource/onopen
+/zh-CN/docs/Server-sent_events/EventSource/onerror	/zh-CN/docs/Web/API/EventSource/error_event
+/zh-CN/docs/Server-sent_events/EventSource/onopen	/zh-CN/docs/Web/API/EventSource/open_event
 /zh-CN/docs/Server-sent_events/Using_server-sent_events	/zh-CN/docs/Web/API/Server-sent_events/Using_server-sent_events
 /zh-CN/docs/Site_Compatibility_for_Firefox_19	/zh-CN/docs/Mozilla/Firefox/Releases/19/Site_compatibility
 /zh-CN/docs/Site_Compatibility_for_Firefox_21	/zh-CN/docs/Mozilla/Firefox/Releases/21/Site_compatibility
@@ -1333,6 +1333,8 @@
 /zh-CN/docs/Web/API/Event/isChar	/zh-CN/docs/Web/API/UIEvent/isChar
 /zh-CN/docs/Web/API/Event/pageY	/zh-CN/docs/conflicting/Web/API/MouseEvent/pageY
 /zh-CN/docs/Web/API/Event/禁用时间冒泡	/zh-CN/docs/Web/API/Event/cancelBubble
+/zh-CN/docs/Web/API/EventSource/onerror	/zh-CN/docs/Web/API/EventSource/error_event
+/zh-CN/docs/Web/API/EventSource/onopen	/zh-CN/docs/Web/API/EventSource/open_event
 /zh-CN/docs/Web/API/EventTarget.dispatchEvent	/zh-CN/docs/Web/API/EventTarget/dispatchEvent
 /zh-CN/docs/Web/API/EventTarget.removeEventListener	/zh-CN/docs/Web/API/EventTarget/removeEventListener
 /zh-CN/docs/Web/API/FetchController	/zh-CN/docs/Web/API/AbortController
@@ -2014,6 +2016,7 @@
 /zh-CN/docs/Web/HTML/Global_attributes/x-ms-加速装置键	/zh-CN/docs/Web/HTML/Global_attributes/x-ms-acceleratorkey
 /zh-CN/docs/Web/HTML/Global_attributes/x-ms-格式-检测	/zh-CN/docs/Web/HTML/Global_attributes/x-ms-format-detection
 /zh-CN/docs/Web/HTML/Global_attributes/摩缺	/zh-CN/docs/Web/HTML/Global_attributes/accesskey
+/zh-CN/docs/Web/HTML/Index	/zh-CN/docs/conflicting/Web/HTML
 /zh-CN/docs/Web/HTML/Inline_elemente	/zh-CN/docs/Web/HTML/Inline_elements
 /zh-CN/docs/Web/HTML/Introduction	/zh-CN/docs/learn/HTML/Introduction_to_HTML
 /zh-CN/docs/Web/HTML/Optimizing_your_pages_for_speculative_parsing	/zh-CN/docs/Glossary/speculative_parsing
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 81df0cfbad..3fd874797f 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -12997,13 +12997,13 @@
       "Char-Ten"
     ]
   },
-  "Web/API/EventSource/onerror": {
+  "Web/API/EventSource/error_event": {
     "modified": "2019-03-23T22:09:23.181Z",
     "contributors": [
       "Char-Ten"
     ]
   },
-  "Web/API/EventSource/onopen": {
+  "Web/API/EventSource/open_event": {
     "modified": "2019-03-23T22:16:16.621Z",
     "contributors": [
       "kameii"
@@ -32750,13 +32750,6 @@
       "pans9"
     ]
   },
-  "Web/HTML/Index": {
-    "modified": "2019-03-21T11:52:09.419Z",
-    "contributors": [
-      "RainSlide",
-      "xcffl"
-    ]
-  },
   "Web/HTML/Inline_elements": {
     "modified": "2020-08-05T19:04:54.777Z",
     "contributors": [
@@ -47559,6 +47552,13 @@
       "wbamberg"
     ]
   },
+  "conflicting/Web/HTML": {
+    "modified": "2019-03-21T11:52:09.419Z",
+    "contributors": [
+      "RainSlide",
+      "xcffl"
+    ]
+  },
   "conflicting/Web/HTML/Element": {
     "modified": "2020-01-10T02:18:08.432Z",
     "contributors": [
diff --git a/files/zh-cn/web/html/index/index.html b/files/zh-cn/conflicting/web/html/index.html
index baae41e64c..0329d96704 100644
--- a/files/zh-cn/web/html/index/index.html
+++ b/files/zh-cn/conflicting/web/html/index.html
@@ -1,9 +1,10 @@
 ---
 title: HTML 文档索引
-slug: Web/HTML/Index
+slug: conflicting/Web/HTML
 tags:
   - HTML
   - 索引
 translation_of: Web/HTML/Index
+original_slug: Web/HTML/Index
 ---
 <p>{{Index("/zh-CN/docs/Web/HTML")}} 所有可用的 HTML 文档的综合索引列表。</p>
diff --git a/files/zh-cn/web/api/eventsource/onerror/index.html b/files/zh-cn/web/api/eventsource/error_event/index.html
index 991d194795..eb69418af9 100644
--- a/files/zh-cn/web/api/eventsource/onerror/index.html
+++ b/files/zh-cn/web/api/eventsource/error_event/index.html
@@ -1,8 +1,8 @@
 ---
 title: EventSource.onerror
-slug: Web/API/EventSource/onerror
+slug: Web/API/EventSource/error_event
 translation_of: Web/API/EventSource/onerror
-original_slug: Server-sent_events/EventSource/onerror
+original_slug: Web/API/EventSource/onerror
 ---
 <div>{{APIRef('WebSockets API')}}</div>
 
diff --git a/files/zh-cn/web/api/eventsource/onopen/index.html b/files/zh-cn/web/api/eventsource/open_event/index.html
index 20ca54d1f4..64214dbd2f 100644
--- a/files/zh-cn/web/api/eventsource/onopen/index.html
+++ b/files/zh-cn/web/api/eventsource/open_event/index.html
@@ -1,12 +1,12 @@
 ---
 title: EventSource.onopen
-slug: Web/API/EventSource/onopen
+slug: Web/API/EventSource/open_event
 tags:
   - API
   - Event Handler
   - EventSource
 translation_of: Web/API/EventSource/onopen
-original_slug: Server-sent_events/EventSource/onopen
+original_slug: Web/API/EventSource/onopen
 ---
 <div>{{APIRef('WebSockets API')}}</div>