Merge branch 'main' into DocumentPictureInPictureEvent/window

files/es/_redirects.txt

@@ -1721,10 +1721,10 @@
 /es/docs/Web/API/WebSockets_API/Escribiendo_servidor_WebSocket	/es/docs/Web/API/WebSockets_API/Writing_WebSocket_server
 /es/docs/Web/API/WebSockets_API/Escribiendo_servidores_con_WebSocket	/es/docs/Web/API/WebSockets_API/Writing_WebSocket_servers
 /es/docs/Web/API/Web_Speech_API/Uso_de_la_Web_Speech_API	/es/docs/Web/API/Web_Speech_API/Using_the_Web_Speech_API
-/es/docs/Web/API/Window.clearTimeout	/es/docs/Web/API/clearTimeout
+/es/docs/Web/API/Window.clearTimeout	/es/docs/Web/API/Window/clearTimeout
 /es/docs/Web/API/Window.navigator	/es/docs/Web/API/Window/navigator
 /es/docs/Web/API/Window.onbeforeunload	/es/docs/Web/API/Window/beforeunload_event
-/es/docs/Web/API/Window.setTimeout	/es/docs/Web/API/setTimeout
+/es/docs/Web/API/Window.setTimeout	/es/docs/Web/API/Window/setTimeout
 /es/docs/Web/API/Window/applicationCache	/es/docs/orphaned/Web/API/Window/applicationCache
 /es/docs/Web/API/Window/dialogArguments	/es/docs/orphaned/Web/API/Window/dialogArguments
 /es/docs/Web/API/WindowBase64.atob	/es/docs/Web/API/Window/atob
@@ -1736,25 +1736,27 @@
 /es/docs/Web/API/WindowEventHandlers/onpopstate	/es/docs/Web/API/Window/popstate_event
 /es/docs/Web/API/WindowOrWorkerGlobalScope/atob	/es/docs/Web/API/Window/atob
 /es/docs/Web/API/WindowOrWorkerGlobalScope/caches	/es/docs/Web/API/Window/caches
-/es/docs/Web/API/WindowOrWorkerGlobalScope/clearInterval	/es/docs/Web/API/clearInterval
-/es/docs/Web/API/WindowOrWorkerGlobalScope/clearTimeout	/es/docs/Web/API/clearTimeout
-/es/docs/Web/API/WindowOrWorkerGlobalScope/createImageBitmap	/es/docs/Web/API/createImageBitmap
+/es/docs/Web/API/WindowOrWorkerGlobalScope/clearInterval	/es/docs/Web/API/Window/clearInterval
+/es/docs/Web/API/WindowOrWorkerGlobalScope/clearTimeout	/es/docs/Web/API/Window/clearTimeout
+/es/docs/Web/API/WindowOrWorkerGlobalScope/createImageBitmap	/es/docs/Web/API/Window/createImageBitmap
 /es/docs/Web/API/WindowOrWorkerGlobalScope/fetch	/es/docs/Web/API/Window/fetch
 /es/docs/Web/API/WindowOrWorkerGlobalScope/indexedDB	/es/docs/Web/API/Window/indexedDB
 /es/docs/Web/API/WindowOrWorkerGlobalScope/isSecureContext	/es/docs/Web/API/Window/isSecureContext
-/es/docs/Web/API/WindowOrWorkerGlobalScope/setInterval	/es/docs/Web/API/setInterval
-/es/docs/Web/API/WindowOrWorkerGlobalScope/setTimeout	/es/docs/Web/API/setTimeout
-/es/docs/Web/API/WindowTimers/clearInterval	/es/docs/Web/API/clearInterval
-/es/docs/Web/API/WindowTimers/clearTimeout	/es/docs/Web/API/clearTimeout
-/es/docs/Web/API/WindowTimers/setInterval	/es/docs/Web/API/setInterval
-/es/docs/Web/API/WindowTimers/setTimeout	/es/docs/Web/API/setTimeout
+/es/docs/Web/API/WindowOrWorkerGlobalScope/setInterval	/es/docs/Web/API/Window/setInterval
+/es/docs/Web/API/WindowOrWorkerGlobalScope/setTimeout	/es/docs/Web/API/Window/setTimeout
+/es/docs/Web/API/WindowTimers/clearInterval	/es/docs/Web/API/Window/clearInterval
+/es/docs/Web/API/WindowTimers/clearTimeout	/es/docs/Web/API/Window/clearTimeout
+/es/docs/Web/API/WindowTimers/setInterval	/es/docs/Web/API/Window/setInterval
+/es/docs/Web/API/WindowTimers/setTimeout	/es/docs/Web/API/Window/setTimeout
 /es/docs/Web/API/XMLDocument/async	/es/docs/Web/API/XMLDocument
 /es/docs/Web/API/XMLHttpRequest/FormData	/es/docs/Web/API/FormData
 /es/docs/Web/API/XMLHttpRequest/Using_XMLHttpRequest	/es/docs/Web/API/XMLHttpRequest_API/Using_XMLHttpRequest
 /es/docs/Web/API/XMLHttpRequest/onreadystatechange	/es/docs/Web/API/XMLHttpRequest/readystatechange_event
 /es/docs/Web/API/atob	/es/docs/Web/API/Window/atob
 /es/docs/Web/API/btoa	/es/docs/Web/API/Window/btoa
 /es/docs/Web/API/caches	/es/docs/Web/API/Window/caches
+/es/docs/Web/API/clearInterval	/es/docs/Web/API/Window/clearInterval
+/es/docs/Web/API/clearTimeout	/es/docs/Web/API/Window/clearTimeout
 /es/docs/Web/API/console/assert	/es/docs/Web/API/console/assert_static
 /es/docs/Web/API/console/count	/es/docs/Web/API/console/count_static
 /es/docs/Web/API/console/dir	/es/docs/Web/API/console/dir_static
@@ -1767,12 +1769,15 @@
 /es/docs/Web/API/console/timeEnd	/es/docs/Web/API/console/timeEnd_static
 /es/docs/Web/API/console/trace	/es/docs/Web/API/console/trace_static
 /es/docs/Web/API/console/warn	/es/docs/Web/API/console/warn_static
+/es/docs/Web/API/createImageBitmap	/es/docs/Web/API/Window/createImageBitmap
 /es/docs/Web/API/crypto_property	/es/docs/Web/API/Window/crypto
 /es/docs/Web/API/event.defaultPrevented	/es/docs/Web/API/Event/defaultPrevented
 /es/docs/Web/API/event.which	/es/docs/Web/API/UIEvent/which
 /es/docs/Web/API/fetch	/es/docs/Web/API/Window/fetch
 /es/docs/Web/API/indexedDB	/es/docs/Web/API/Window/indexedDB
 /es/docs/Web/API/isSecureContext	/es/docs/Web/API/Window/isSecureContext
+/es/docs/Web/API/setInterval	/es/docs/Web/API/Window/setInterval
+/es/docs/Web/API/setTimeout	/es/docs/Web/API/Window/setTimeout
 /es/docs/Web/Accesibilidad	/es/docs/Web/Accessibility
 /es/docs/Web/Accesibilidad/Comunidad	/es/docs/conflicting/Web/Accessibility
 /es/docs/Web/Accesibilidad/Understanding_WCAG	/es/docs/Web/Accessibility/Understanding_WCAG
@@ -2199,13 +2204,17 @@
 /es/docs/Web/HTML/microformatos	/es/docs/Web/HTML/microformats
 /es/docs/Web/HTML/Índice	/es/docs/Web/HTML
 /es/docs/Web/HTTP/Access_control_CORS	/es/docs/Web/HTTP/CORS
+/es/docs/Web/HTTP/Basics_of_HTTP	/es/docs/conflicting/Web/HTTP
 /es/docs/Web/HTTP/Basics_of_HTTP/Choosing_between_www_and_non-www_URLs	/es/docs/Web/URI/Authority/Choosing_between_www_and_non-www_URLs
 /es/docs/Web/HTTP/Basics_of_HTTP/Data_URIs	/es/docs/Web/URI/Schemes/data
 /es/docs/Web/HTTP/Basics_of_HTTP/Data_URLs	/es/docs/Web/URI/Schemes/data
 /es/docs/Web/HTTP/Basics_of_HTTP/Datos_URIs	/es/docs/Web/URI/Schemes/data
+/es/docs/Web/HTTP/Basics_of_HTTP/Evolution_of_HTTP	/es/docs/Web/HTTP/Evolution_of_HTTP
 /es/docs/Web/HTTP/Basics_of_HTTP/Identificación_recursos_en_la_Web	/es/docs/orphaned/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web
 /es/docs/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web	/es/docs/orphaned/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web
-/es/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Lista_completa_de_tipos_MIME	/es/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
+/es/docs/Web/HTTP/Basics_of_HTTP/MIME_types	/es/docs/Web/HTTP/MIME_types
+/es/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types	/es/docs/Web/HTTP/MIME_types/Common_types
+/es/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Lista_completa_de_tipos_MIME	/es/docs/Web/HTTP/MIME_types/Common_types
 /es/docs/Web/HTTP/Gestion_de_la_conexion_en_HTTP_1.x	/es/docs/Web/HTTP/Connection_management_in_HTTP_1.x
 /es/docs/Web/HTTP/Peticiones_condicionales	/es/docs/Web/HTTP/Conditional_requests
 /es/docs/Web/HTTP/Sesión	/es/docs/Web/HTTP/Session

files/es/_wikihistory.json

@@ -5460,6 +5460,14 @@
     "modified": "2019-03-23T22:30:46.211Z",
     "contributors": ["khrizenriquez"]
   },
+  "Web/API/Window/clearInterval": {
+    "modified": "2019-03-23T22:56:16.485Z",
+    "contributors": ["Guitxo"]
+  },
+  "Web/API/Window/clearTimeout": {
+    "modified": "2019-06-18T10:20:27.972Z",
+    "contributors": ["AlePerez92", "fscholz", "basemnassar11", "VictorArias"]
+  },
   "Web/API/Window/close": {
     "modified": "2020-10-15T21:37:07.614Z",
     "contributors": ["SphinxKnight", "dgrizzla", "Siro_Diaz"]
@@ -5472,6 +5480,10 @@
     "modified": "2019-03-23T22:45:47.266Z",
     "contributors": ["julian3xl"]
   },
+  "Web/API/Window/createImageBitmap": {
+    "modified": "2020-10-15T22:14:17.553Z",
+    "contributors": ["Bumxu"]
+  },
   "Web/API/Window/crypto": {
     "modified": "2020-02-12T20:26:38.795Z",
     "contributors": ["joseluisq", "AlePerez92", "victorjavierss"]
@@ -5635,6 +5647,21 @@
     "modified": "2019-03-23T22:57:50.655Z",
     "contributors": ["svera", "pedromagnus", "develasquez"]
   },
+  "Web/API/Window/setInterval": {
+    "modified": "2020-08-24T18:02:23.092Z",
+    "contributors": ["mastertrooper", "Makinita", "Klius", "claudionebbia"]
+  },
+  "Web/API/Window/setTimeout": {
+    "modified": "2019-03-23T23:17:29.378Z",
+    "contributors": [
+      "BubuAnabelas",
+      "vltamara",
+      "nauj27",
+      "fscholz",
+      "AshfaqHossain",
+      "VictorArias"
+    ]
+  },
   "Web/API/Window/showModalDialog": {
     "modified": "2019-03-18T20:58:55.311Z",
     "contributors": ["SphinxKnight", "BubuAnabelas", "Grijander81"]
@@ -5707,14 +5734,6 @@
       "inma_610"
     ]
   },
-  "Web/API/clearInterval": {
-    "modified": "2019-03-23T22:56:16.485Z",
-    "contributors": ["Guitxo"]
-  },
-  "Web/API/clearTimeout": {
-    "modified": "2019-06-18T10:20:27.972Z",
-    "contributors": ["AlePerez92", "fscholz", "basemnassar11", "VictorArias"]
-  },
   "Web/API/console": {
     "modified": "2019-08-30T08:42:12.082Z",
     "contributors": ["ajuanjojjj", "fcanellas", "vlguerrero", "chrisdavidmills"]
@@ -5767,10 +5786,6 @@
     "modified": "2020-10-15T21:53:36.780Z",
     "contributors": ["juanluisrp", "oderflaj"]
   },
-  "Web/API/createImageBitmap": {
-    "modified": "2020-10-15T22:14:17.553Z",
-    "contributors": ["Bumxu"]
-  },
   "Web/API/notification/icon": {
     "modified": "2019-03-23T22:59:32.492Z",
     "contributors": ["joxhker"]
@@ -5783,21 +5798,6 @@
     "modified": "2019-03-23T22:50:37.341Z",
     "contributors": ["MarkelCuesta", "jezdez", "Davdriver"]
   },
-  "Web/API/setInterval": {
-    "modified": "2020-08-24T18:02:23.092Z",
-    "contributors": ["mastertrooper", "Makinita", "Klius", "claudionebbia"]
-  },
-  "Web/API/setTimeout": {
-    "modified": "2019-03-23T23:17:29.378Z",
-    "contributors": [
-      "BubuAnabelas",
-      "vltamara",
-      "nauj27",
-      "fscholz",
-      "AshfaqHossain",
-      "VictorArias"
-    ]
-  },
   "Web/Accessibility": {
     "modified": "2020-09-22T14:24:03.363Z",
     "contributors": [
@@ -9415,34 +9415,6 @@
       "DavidPeniafiel"
     ]
   },
-  "Web/HTTP/Basics_of_HTTP": {
-    "modified": "2020-04-20T02:59:31.392Z",
-    "contributors": [
-      "obed3113",
-      "sanxofon",
-      "Sergio_Gonzalez_Collado",
-      "cissoid"
-    ]
-  },
-  "Web/HTTP/Basics_of_HTTP/Evolution_of_HTTP": {
-    "modified": "2019-03-23T22:10:11.567Z",
-    "contributors": ["Sergio_Gonzalez_Collado", "ChrisMHM"]
-  },
-  "Web/HTTP/Basics_of_HTTP/MIME_types": {
-    "modified": "2019-11-18T08:03:54.325Z",
-    "contributors": [
-      "IsaacAaron",
-      "sanxofon",
-      "Sergio_Gonzalez_Collado",
-      "kevinmont",
-      "juanrarodriguez18",
-      "strattadb"
-    ]
-  },
-  "Web/HTTP/Basics_of_HTTP/MIME_types/Common_types": {
-    "modified": "2020-02-28T13:10:45.613Z",
-    "contributors": ["chrisdavidmills", "sanxofon", "franklevel", "gabrielnoe"]
-  },
   "Web/HTTP/CORS": {
     "modified": "2020-08-10T16:23:20.546Z",
     "contributors": [
@@ -9521,6 +9493,10 @@
       "omertafox"
     ]
   },
+  "Web/HTTP/Evolution_of_HTTP": {
+    "modified": "2019-03-23T22:10:11.567Z",
+    "contributors": ["Sergio_Gonzalez_Collado", "ChrisMHM"]
+  },
   "Web/HTTP/Headers": {
     "modified": "2019-12-10T13:29:15.931Z",
     "contributors": [
@@ -9719,6 +9695,21 @@
     "modified": "2020-10-15T21:59:06.897Z",
     "contributors": ["JulioMoreyra", "francinysalles", "tonialfaro"]
   },
+  "Web/HTTP/MIME_types": {
+    "modified": "2019-11-18T08:03:54.325Z",
+    "contributors": [
+      "IsaacAaron",
+      "sanxofon",
+      "Sergio_Gonzalez_Collado",
+      "kevinmont",
+      "juanrarodriguez18",
+      "strattadb"
+    ]
+  },
+  "Web/HTTP/MIME_types/Common_types": {
+    "modified": "2020-02-28T13:10:45.613Z",
+    "contributors": ["chrisdavidmills", "sanxofon", "franklevel", "gabrielnoe"]
+  },
   "Web/HTTP/Messages": {
     "modified": "2019-11-12T11:40:26.816Z",
     "contributors": [
@@ -14288,6 +14279,15 @@
       "Nukeador"
     ]
   },
+  "conflicting/Web/HTTP": {
+    "modified": "2020-04-20T02:59:31.392Z",
+    "contributors": [
+      "obed3113",
+      "sanxofon",
+      "Sergio_Gonzalez_Collado",
+      "cissoid"
+    ]
+  },
   "conflicting/Web/HTTP/Basics_of_HTTP/MIME_types": {
     "modified": "2019-01-16T15:43:53.805Z",
     "contributors": [

files/es/web/http/basics_of_http/index.md → files/es/conflicting/web/http/index.md

@@ -1,6 +1,7 @@
 ---
 title: Conceptos básicos de HTTP
-slug: Web/HTTP/Basics_of_HTTP
+slug: conflicting/Web/HTTP
+original_slug: Web/HTTP/Basics_of_HTTP
 ---
 
 {{HTTPSidebar}}

files/es/web/api/clearinterval/index.md → files/es/web/api/window/clearinterval/index.md

@@ -1,6 +1,7 @@
 ---
 title: WindowTimers.clearInterval()
-slug: Web/API/clearInterval
+slug: Web/API/Window/clearInterval
+original_slug: Web/API/clearInterval
 ---
 
 {{APIRef("HTML DOM")}}

files/es/web/api/cleartimeout/index.md → files/es/web/api/window/cleartimeout/index.md

@@ -1,6 +1,7 @@
 ---
 title: window.clearTimeout
-slug: Web/API/clearTimeout
+slug: Web/API/Window/clearTimeout
+original_slug: Web/API/clearTimeout
 ---
 
 {{ApiRef}}

files/es/web/api/createimagebitmap/index.md → files/es/web/api/window/createimagebitmap/index.md

@@ -1,6 +1,7 @@
 ---
 title: self.createImageBitmap()
-slug: Web/API/createImageBitmap
+slug: Web/API/Window/createImageBitmap
+original_slug: Web/API/createImageBitmap
 ---
 
 {{APIRef("Canvas API")}}

files/es/web/api/setinterval/index.md → files/es/web/api/window/setinterval/index.md

@@ -1,6 +1,7 @@
 ---
 title: setInterval()
-slug: Web/API/setInterval
+slug: Web/API/Window/setInterval
+original_slug: Web/API/setInterval
 l10n:
   sourceCommit: 0717d1c0a7528b2dd44d065fe90d860e3bdc2e6a
 ---

files/es/web/api/settimeout/index.md → files/es/web/api/window/settimeout/index.md

@@ -1,6 +1,7 @@
 ---
 title: setTimeout()
-slug: Web/API/setTimeout
+slug: Web/API/Window/setTimeout
+original_slug: Web/API/setTimeout
 l10n:
   sourceCommit: 4ba12fec878a1f941492ada3edd467bfd76532cf
 ---

files/es/web/http/basics_of_http/evolution_of_http/index.md → files/es/web/http/evolution_of_http/index.md

@@ -1,6 +1,7 @@
 ---
 title: Evolución del protocolo HTTP
-slug: Web/HTTP/Basics_of_HTTP/Evolution_of_HTTP
+slug: Web/HTTP/Evolution_of_HTTP
+original_slug: Web/HTTP/Basics_of_HTTP/Evolution_of_HTTP
 ---
 
 {{HTTPSidebar}}

files/es/web/http/basics_of_http/mime_types/common_types/index.md → files/es/web/http/mime_types/common_types/index.md

@@ -1,6 +1,7 @@
 ---
 title: Lista completa de tipos MIME
-slug: Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
+slug: Web/HTTP/MIME_types/Common_types
+original_slug: Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
 ---
 
 {{HTTPSidebar}}

files/es/web/http/basics_of_http/mime_types/index.md → files/es/web/http/mime_types/index.md

@@ -1,6 +1,7 @@
 ---
 title: Tipos MIME
-slug: Web/HTTP/Basics_of_HTTP/MIME_types
+slug: Web/HTTP/MIME_types
+original_slug: Web/HTTP/Basics_of_HTTP/MIME_types
 ---
 
 {{HTTPSidebar}}

files/fr/learn/javascript/objects/basics/index.md

@@ -77,7 +77,7 @@ var personne = {
 };
 ```
 
-Après avoir sauvegardé et rafraîchit la page, essayez d'entrer les lignes suivantes dans le champ de saisie `input` :
+Après avoir sauvegardé et rafraîchi la page, essayez d'entrer les lignes suivantes dans le champ de saisie `input` :
 
 ```js
 personne.nom;