aboutsummaryrefslogtreecommitdiff
path: root/files/ja
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2021-11-12 00:51:11 +0000
committerMDN <actions@users.noreply.github.com>2021-11-12 00:51:11 +0000
commitdaa80a45b41e91e2621c41f36f18a01861598332 (patch)
tree991d79f61baf68904c3a056c932b77592600f223 /files/ja
parentdd9698b636ee28ef98dd628a5b4377852f49faea (diff)
downloadtranslated-content-daa80a45b41e91e2621c41f36f18a01861598332.tar.gz
translated-content-daa80a45b41e91e2621c41f36f18a01861598332.tar.bz2
translated-content-daa80a45b41e91e2621c41f36f18a01861598332.zip
[CRON] sync translated content
Diffstat (limited to 'files/ja')
-rw-r--r--files/ja/_redirects.txt5
-rw-r--r--files/ja/_wikihistory.json20
-rw-r--r--files/ja/conflicting/mdn/contribute/markdown_in_mdn/index.html (renamed from files/ja/mdn/guidelines/css_style_guide/index.html)3
3 files changed, 15 insertions, 13 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 799f06be84..1214001898 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -2712,13 +2712,13 @@
/ja/docs/MDN/Community/Working_in_community /ja/docs/orphaned/MDN/Community/Working_in_community
/ja/docs/MDN/Contribute/Content /ja/docs/MDN/Guidelines
/ja/docs/MDN/Contribute/Content/Best_practices /ja/docs/MDN/Guidelines/Conventions_definitions
-/ja/docs/MDN/Contribute/Content/CSS_style_guide /ja/docs/MDN/Guidelines/CSS_style_guide
+/ja/docs/MDN/Contribute/Content/CSS_style_guide /ja/docs/conflicting/MDN/Contribute/Markdown_in_MDN
/ja/docs/MDN/Contribute/Content/Does_this_belong_on_MDN /ja/docs/MDN/Guidelines/Does_this_belong_on_MDN
/ja/docs/MDN/Contribute/Content/Writing_style_guide /ja/docs/MDN/Guidelines/Writing_style_guide
/ja/docs/MDN/Contribute/FAQ /ja/docs/MDN/Contribute
/ja/docs/MDN/Contribute/Guidelines /ja/docs/MDN/Guidelines
/ja/docs/MDN/Contribute/Guidelines/Best_practices /ja/docs/MDN/Guidelines/Conventions_definitions
-/ja/docs/MDN/Contribute/Guidelines/CSS_style_guide /ja/docs/MDN/Guidelines/CSS_style_guide
+/ja/docs/MDN/Contribute/Guidelines/CSS_style_guide /ja/docs/conflicting/MDN/Contribute/Markdown_in_MDN
/ja/docs/MDN/Contribute/Guidelines/Code_guidelines /ja/docs/MDN/Guidelines/Code_guidelines
/ja/docs/MDN/Contribute/Guidelines/Code_guidelines/CSS /ja/docs/MDN/Guidelines/Code_guidelines/CSS
/ja/docs/MDN/Contribute/Guidelines/Code_guidelines/General /ja/docs/MDN/Guidelines/Code_guidelines/General
@@ -2756,6 +2756,7 @@
/ja/docs/MDN/Contribute/Tools/Sample_server /ja/docs/MDN/Tools/Sample_server
/ja/docs/MDN/Feedback /ja/docs/MDN/Contribute/Feedback
/ja/docs/MDN/Getting_started /ja/docs/MDN/Contribute/Getting_started
+/ja/docs/MDN/Guidelines/CSS_style_guide /ja/docs/conflicting/MDN/Contribute/Markdown_in_MDN
/ja/docs/MDN/Kuma /ja/docs/MDN/Yari
/ja/docs/MDN/Structures/API_references /ja/docs/orphaned/MDN/Structures/API_references
/ja/docs/MDN/Structures/API_references/API_reference_sidebars /ja/docs/MDN/Contribute/Howto/Write_an_API_reference/Sidebars
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index fa823b71c6..98095b7958 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -6237,16 +6237,6 @@
"hamasaki"
]
},
- "MDN/Guidelines/CSS_style_guide": {
- "modified": "2020-09-30T15:30:25.061Z",
- "contributors": [
- "chrisdavidmills",
- "mfuji09",
- "silverskyvicto",
- "wbamberg",
- "Uemmra3"
- ]
- },
"MDN/Guidelines/Code_guidelines": {
"modified": "2020-09-30T15:30:24.568Z",
"contributors": [
@@ -48529,6 +48519,16 @@
"silverskyvicto"
]
},
+ "conflicting/MDN/Contribute/Markdown_in_MDN": {
+ "modified": "2020-09-30T15:30:25.061Z",
+ "contributors": [
+ "chrisdavidmills",
+ "mfuji09",
+ "silverskyvicto",
+ "wbamberg",
+ "Uemmra3"
+ ]
+ },
"conflicting/Web/API/Blob/size": {
"modified": "2020-09-25T16:46:05.461Z",
"contributors": [
diff --git a/files/ja/mdn/guidelines/css_style_guide/index.html b/files/ja/conflicting/mdn/contribute/markdown_in_mdn/index.html
index 6aa8dff5e9..f888931063 100644
--- a/files/ja/mdn/guidelines/css_style_guide/index.html
+++ b/files/ja/conflicting/mdn/contribute/markdown_in_mdn/index.html
@@ -1,6 +1,6 @@
---
title: MDN のコンテンツで使われるクラスとスタイルのガイド
-slug: MDN/Guidelines/CSS_style_guide
+slug: conflicting/MDN/Contribute/Markdown_in_MDN
tags:
- Guide
- MDN
@@ -10,6 +10,7 @@ tags:
- クラス
- スタイル
translation_of: MDN/Guidelines/CSS_style_guide
+original_slug: MDN/Guidelines/CSS_style_guide
---
<p>{{MDNSidebar}}</p>