aboutsummaryrefslogtreecommitdiff
path: root/files/fr
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2021-09-28 00:50:31 +0000
committerMDN <actions@users.noreply.github.com>2021-09-28 00:50:31 +0000
commit52e48a7ac7bfc64b78c5aabb86cab4c0d7b88054 (patch)
treeda6d856de98ad3aa793cd8f3986b3fb4bb9c1c71 /files/fr
parent996ebd1c41727cdad43e5709e190132368d0bd9b (diff)
downloadtranslated-content-52e48a7ac7bfc64b78c5aabb86cab4c0d7b88054.tar.gz
translated-content-52e48a7ac7bfc64b78c5aabb86cab4c0d7b88054.tar.bz2
translated-content-52e48a7ac7bfc64b78c5aabb86cab4c0d7b88054.zip
[CRON] sync translated content
Diffstat (limited to 'files/fr')
-rw-r--r--files/fr/_redirects.txt1
-rw-r--r--files/fr/_wikihistory.json14
-rw-r--r--files/fr/conflicting/web/web_components/index.html (renamed from files/fr/web/web_components/html_imports/index.html)3
3 files changed, 10 insertions, 8 deletions
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index b429d17874..f8a1ed0fdb 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -5522,6 +5522,7 @@
/fr/docs/Web/WebGL/Commencer_avec_le_WebGL /fr/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL
/fr/docs/Web/WebGL/Using_shaders_to_apply_color_in_WebGL /fr/docs/Web/API/WebGL_API/Tutorial/Using_shaders_to_apply_color_in_WebGL
/fr/docs/Web/WebGL/Utiliser_les_textures_avec_WebGL /fr/docs/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL
+/fr/docs/Web/Web_Components/HTML_Imports /fr/docs/conflicting/Web/Web_Components
/fr/docs/Web/Web_Components/Shadow_DOM /fr/docs/Web/Web_Components/Using_shadow_DOM
/fr/docs/Web/Web_Components/Utilisation_des_templates_et_des_slots /fr/docs/Web/Web_Components/Using_templates_and_slots
/fr/docs/Web/XML/Introduction_à_XML /fr/docs/Web/XML/XML_introduction
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index d0a2f3d840..e17fdcfc2a 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -41541,13 +41541,6 @@
"Zecat"
]
},
- "Web/Web_Components/HTML_Imports": {
- "modified": "2020-10-15T22:12:01.555Z",
- "contributors": [
- "ledenis",
- "ylerjen"
- ]
- },
"Web/Web_Components/Using_custom_elements": {
"modified": "2019-03-18T21:38:08.858Z",
"contributors": [
@@ -44071,6 +44064,13 @@
"JeffD"
]
},
+ "conflicting/Web/Web_Components": {
+ "modified": "2020-10-15T22:12:01.555Z",
+ "contributors": [
+ "ledenis",
+ "ylerjen"
+ ]
+ },
"conflicting/Web/XPath/Introduction_to_using_XPath_in_JavaScript": {
"modified": "2019-01-16T14:19:09.912Z",
"contributors": [
diff --git a/files/fr/web/web_components/html_imports/index.html b/files/fr/conflicting/web/web_components/index.html
index 4f26a4cbb1..3bdbcd3339 100644
--- a/files/fr/web/web_components/html_imports/index.html
+++ b/files/fr/conflicting/web/web_components/index.html
@@ -1,9 +1,10 @@
---
title: HTML Imports
-slug: Web/Web_Components/HTML_Imports
+slug: conflicting/Web/Web_Components
tags:
- Composants Web
translation_of: Web/Web_Components/HTML_Imports
+original_slug: Web/Web_Components/HTML_Imports
---
<div>{{DefaultAPISidebar("Web Components")}}</div>