unslug zh-cn: modify

22 files changed, 50 insertions, 25 deletions

diff --git a/files/zh-cn/conflicting/learn/common_questions/index.html b/files/zh-cn/conflicting/learn/common_questions/index.html
index 53aac91402..0eefb8f643 100644
--- a/files/zh-cn/conflicting/learn/common_questions/index.html
+++ b/files/zh-cn/conflicting/learn/common_questions/index.html
@@ -1,10 +1,11 @@
 ---
 title: Web 工程学
-slug: learn/Web_Mechanics
+slug: conflicting/Learn/Common_questions
 tags:
   - Web 工程学
   - 初学者
 translation_of: Learn/Common_questions
 translation_of_original: Learn/Web_Mechanics
+original_slug: learn/Web_Mechanics
 ---
 <p>请访问 <a class="redirect" href="/zh-CN/docs/learn/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98">常见问题</a></p>
diff --git a/files/zh-cn/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html b/files/zh-cn/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
index e5a3bae8a0..a5ab6d1ebe 100644
--- a/files/zh-cn/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
+++ b/files/zh-cn/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
@@ -1,8 +1,9 @@
 ---
 title: 层叠和继承
-slug: Web/Guide/CSS/Getting_started/Cascading_and_inheritance
+slug: conflicting/Learn/CSS/Building_blocks/Cascade_and_inheritance
 translation_of: Learn/CSS/Building_blocks/Cascade_and_inheritance
 translation_of_original: Web/Guide/CSS/Getting_started/Cascading_and_inheritance
+original_slug: Web/Guide/CSS/Getting_started/Cascading_and_inheritance
 ---
 <p>{{ CSSTutorialTOC() }}</p>
 
diff --git a/files/zh-cn/conflicting/learn/css/building_blocks/index.html b/files/zh-cn/conflicting/learn/css/building_blocks/index.html
index 0bfb7e2ed5..9c20acc77b 100644
--- a/files/zh-cn/conflicting/learn/css/building_blocks/index.html
+++ b/files/zh-cn/conflicting/learn/css/building_blocks/index.html
@@ -1,8 +1,9 @@
 ---
 title: 盒模型
-slug: Web/Guide/CSS/Getting_started/Boxes
+slug: conflicting/Learn/CSS/Building_blocks
 translation_of: Learn/CSS/Building_blocks
 translation_of_original: Web/Guide/CSS/Getting_started/Boxes
+original_slug: Web/Guide/CSS/Getting_started/Boxes
 ---
 <p>{{ CSSTutorialTOC() }}</p>
 
diff --git a/files/zh-cn/conflicting/learn/css/building_blocks/selectors/index.html b/files/zh-cn/conflicting/learn/css/building_blocks/selectors/index.html
index 69f0700b19..1ab629b72f 100644
--- a/files/zh-cn/conflicting/learn/css/building_blocks/selectors/index.html
+++ b/files/zh-cn/conflicting/learn/css/building_blocks/selectors/index.html
@@ -1,8 +1,9 @@
 ---
 title: 选择器
-slug: Web/Guide/CSS/Getting_started/Selectors
+slug: conflicting/Learn/CSS/Building_blocks/Selectors
 translation_of: Learn/CSS/Building_blocks/Selectors
 translation_of_original: Web/Guide/CSS/Getting_started/Selectors
+original_slug: Web/Guide/CSS/Getting_started/Selectors
 ---
 <p>{{ CSSTutorialTOC() }}</p>
 
diff --git a/files/zh-cn/conflicting/learn/css/building_blocks/styling_tables/index.html b/files/zh-cn/conflicting/learn/css/building_blocks/styling_tables/index.html
index b6b4859e99..091b9458f9 100644
--- a/files/zh-cn/conflicting/learn/css/building_blocks/styling_tables/index.html
+++ b/files/zh-cn/conflicting/learn/css/building_blocks/styling_tables/index.html
@@ -1,8 +1,9 @@
 ---
 title: 表格
-slug: Web/Guide/CSS/Getting_started/Tables
+slug: conflicting/Learn/CSS/Building_blocks/Styling_tables
 translation_of: Learn/CSS/Building_blocks/Styling_tables
 translation_of_original: Web/Guide/CSS/Getting_started/Tables
+original_slug: Web/Guide/CSS/Getting_started/Tables
 ---
 <p>{{CSSTutorialTOC}}{{previousPage("/zh-CN/docs/Web/Guide/CSS/Getting_Started/Layout", "布局")}}</p>
 
diff --git a/files/zh-cn/conflicting/learn/css/building_blocks/values_and_units/index.html b/files/zh-cn/conflicting/learn/css/building_blocks/values_and_units/index.html
index a9348bd9bd..680e46c676 100644
--- a/files/zh-cn/conflicting/learn/css/building_blocks/values_and_units/index.html
+++ b/files/zh-cn/conflicting/learn/css/building_blocks/values_and_units/index.html
@@ -1,8 +1,9 @@
 ---
 title: Color
-slug: Web/Guide/CSS/Getting_started/Color
+slug: conflicting/Learn/CSS/Building_blocks/Values_and_units
 translation_of: Learn/CSS/Introduction_to_CSS/Values_and_units#Colors
 translation_of_original: Web/Guide/CSS/Getting_started/Color
+original_slug: Web/Guide/CSS/Getting_started/Color
 ---
 <p>{{ CSSTutorialTOC() }}</p>
 
diff --git a/files/zh-cn/conflicting/learn/css/css_layout/index.html b/files/zh-cn/conflicting/learn/css/css_layout/index.html
index ecd91f80e1..6e5cc4ae53 100644
--- a/files/zh-cn/conflicting/learn/css/css_layout/index.html
+++ b/files/zh-cn/conflicting/learn/css/css_layout/index.html
@@ -1,8 +1,9 @@
 ---
 title: 布局
-slug: Web/Guide/CSS/Getting_started/Layout
+slug: conflicting/Learn/CSS/CSS_layout
 translation_of: Learn/CSS/CSS_layout
 translation_of_original: Web/Guide/CSS/Getting_started/Layout
+original_slug: Web/Guide/CSS/Getting_started/Layout
 ---
 <p>{{ CSSTutorialTOC() }}</p>
 
diff --git a/files/zh-cn/conflicting/learn/css/first_steps/how_css_is_structured/index.html b/files/zh-cn/conflicting/learn/css/first_steps/how_css_is_structured/index.html
index 17553c5013..7f731ee088 100644
--- a/files/zh-cn/conflicting/learn/css/first_steps/how_css_is_structured/index.html
+++ b/files/zh-cn/conflicting/learn/css/first_steps/how_css_is_structured/index.html
@@ -1,8 +1,9 @@
 ---
 title: 创建可读性良好的CSS
-slug: Web/Guide/CSS/Getting_started/Readable_CSS
+slug: conflicting/Learn/CSS/First_steps/How_CSS_is_structured
 translation_of: Learn/CSS/Introduction_to_CSS/Syntax#Beyond_syntax_make_CSS_readable
 translation_of_original: Web/Guide/CSS/Getting_started/Readable_CSS
+original_slug: Web/Guide/CSS/Getting_started/Readable_CSS
 ---
 <p>{{ CSSTutorialTOC() }}</p>
 
diff --git a/files/zh-cn/conflicting/learn/css/first_steps/how_css_works/index.html b/files/zh-cn/conflicting/learn/css/first_steps/how_css_works/index.html
index fce3091715..5bf2a3b516 100644
--- a/files/zh-cn/conflicting/learn/css/first_steps/how_css_works/index.html
+++ b/files/zh-cn/conflicting/learn/css/first_steps/how_css_works/index.html
@@ -1,8 +1,9 @@
 ---
 title: CSS如何工作
-slug: Web/Guide/CSS/Getting_started/How_CSS_works
+slug: conflicting/Learn/CSS/First_steps/How_CSS_works
 translation_of: Learn/CSS/First_steps/How_CSS_works
 translation_of_original: Web/Guide/CSS/Getting_started/How_CSS_works
+original_slug: Web/Guide/CSS/Getting_started/How_CSS_works
 ---
 <p>{{ CSSTutorialTOC() }}</p>
 
diff --git a/files/zh-cn/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html b/files/zh-cn/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html
index ca5092f2af..918372bd48 100644
--- a/files/zh-cn/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html
+++ b/files/zh-cn/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html
@@ -1,12 +1,14 @@
 ---
 title: 为何使用CSS？
-slug: Web/Guide/CSS/Getting_started/Why_use_CSS
+slug: >-
+  conflicting/Learn/CSS/First_steps/How_CSS_works_64ba4331a7a5f4319c6e06b06ccdd521
 tags:
   - CSS
-  - 'CSS:入门'
+  - CSS:入门
   - NeedsLiveSample
 translation_of: Learn/CSS/First_steps/How_CSS_works
 translation_of_original: Web/Guide/CSS/Getting_started/Why_use_CSS
+original_slug: Web/Guide/CSS/Getting_started/Why_use_CSS
 ---
 <p>{{ CSSTutorialTOC() }}</p>
 
diff --git a/files/zh-cn/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html b/files/zh-cn/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html
index 7fcb01c0b0..973ec37d71 100644
--- a/files/zh-cn/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html
+++ b/files/zh-cn/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html
@@ -1,8 +1,10 @@
 ---
 title: What is CSS
-slug: Web/Guide/CSS/Getting_started/What_is_CSS
+slug: >-
+  conflicting/Learn/CSS/First_steps/How_CSS_works_b66915031fb62b5fee1201086144e209
 translation_of: Learn/CSS/First_steps/How_CSS_works
 translation_of_original: Web/Guide/CSS/Getting_started/What_is_CSS
+original_slug: Web/Guide/CSS/Getting_started/What_is_CSS
 ---
 <div>{{CSSTutorialTOC}}</div>
 
diff --git a/files/zh-cn/conflicting/learn/css/first_steps/index.html b/files/zh-cn/conflicting/learn/css/first_steps/index.html
index 585243aa2a..d18a052149 100644
--- a/files/zh-cn/conflicting/learn/css/first_steps/index.html
+++ b/files/zh-cn/conflicting/learn/css/first_steps/index.html
@@ -1,9 +1,9 @@
 ---
 title: CSS入门教程
-slug: Web/Guide/CSS/Getting_started
+slug: conflicting/Learn/CSS/First_steps
 tags:
   - CSS
-  - 'CSS:Getting_Started'
+  - CSS:Getting_Started
   - CSS入门
   - CSS教程
   - Web
@@ -11,6 +11,7 @@ tags:
   - 教程
 translation_of: Learn/CSS/First_steps
 translation_of_original: Web/Guide/CSS/Getting_started
+original_slug: Web/Guide/CSS/Getting_started
 ---
 <p> </p>
 
diff --git a/files/zh-cn/conflicting/learn/css/styling_text/fundamentals/index.html b/files/zh-cn/conflicting/learn/css/styling_text/fundamentals/index.html
index fd67fc382c..730c8cbca6 100644
--- a/files/zh-cn/conflicting/learn/css/styling_text/fundamentals/index.html
+++ b/files/zh-cn/conflicting/learn/css/styling_text/fundamentals/index.html
@@ -1,11 +1,12 @@
 ---
 title: 理解下划线
-slug: Understanding_Underlines
+slug: conflicting/Learn/CSS/Styling_text/Fundamentals
 tags:
-  - 'CSS:Articles'
+  - CSS:Articles
 translation_of: >-
   Learn/CSS/Styling_text/Fundamentals#Font_style_font_weight_text_transform_and_text_decoration
 translation_of_original: Understanding_Underlines
+original_slug: Understanding_Underlines
 ---
 <p>对于 Web 设计者来说, 想移除其设计中某些 (或全部) 超链接的下划线是相当常见的事情。但是由于在过去浏览器中的一些不标准的行为, 一些人在删除超链接中下划线的正确方法方面存在一些问题。最常见的错误是这样做：</p>
 
diff --git a/files/zh-cn/conflicting/learn/css/styling_text/fundamentals_5a3f2ce7cc4f23ec431e57a447af0711/index.html b/files/zh-cn/conflicting/learn/css/styling_text/fundamentals_5a3f2ce7cc4f23ec431e57a447af0711/index.html
index f7d1d38b23..128204ecbc 100644
--- a/files/zh-cn/conflicting/learn/css/styling_text/fundamentals_5a3f2ce7cc4f23ec431e57a447af0711/index.html
+++ b/files/zh-cn/conflicting/learn/css/styling_text/fundamentals_5a3f2ce7cc4f23ec431e57a447af0711/index.html
@@ -1,8 +1,10 @@
 ---
 title: 文本样式
-slug: Web/Guide/CSS/Getting_started/Text_styles
+slug: >-
+  conflicting/Learn/CSS/Styling_text/Fundamentals_5a3f2ce7cc4f23ec431e57a447af0711
 translation_of: Learn/CSS/Styling_text/Fundamentals
 translation_of_original: Web/Guide/CSS/Getting_started/Text_styles
+original_slug: Web/Guide/CSS/Getting_started/Text_styles
 ---
 <p>{{ CSSTutorialTOC() }}</p>
 
diff --git a/files/zh-cn/conflicting/learn/css/styling_text/styling_lists/index.html b/files/zh-cn/conflicting/learn/css/styling_text/styling_lists/index.html
index 8a85655517..61655596da 100644
--- a/files/zh-cn/conflicting/learn/css/styling_text/styling_lists/index.html
+++ b/files/zh-cn/conflicting/learn/css/styling_text/styling_lists/index.html
@@ -1,8 +1,9 @@
 ---
 title: Lists
-slug: Web/Guide/CSS/Getting_started/Lists
+slug: conflicting/Learn/CSS/Styling_text/Styling_lists
 translation_of: Learn/CSS/Styling_text/Styling_lists
 translation_of_original: Web/Guide/CSS/Getting_started/Lists
+original_slug: Web/Guide/CSS/Getting_started/Lists
 ---
 <p>{{ CSSTutorialTOC() }}</p>
 
diff --git a/files/zh-cn/conflicting/learn/getting_started_with_the_web/javascript_basics/index.html b/files/zh-cn/conflicting/learn/getting_started_with_the_web/javascript_basics/index.html
index 67056c679b..45171f78c7 100644
--- a/files/zh-cn/conflicting/learn/getting_started_with_the_web/javascript_basics/index.html
+++ b/files/zh-cn/conflicting/learn/getting_started_with_the_web/javascript_basics/index.html
@@ -1,10 +1,11 @@
 ---
 title: 起步(Javascript 教程)
-slug: Web/JavaScript/Getting_Started
+slug: conflicting/Learn/Getting_started_with_the_web/JavaScript_basics
 tags:
   - bug-840092
 translation_of: Learn/Getting_started_with_the_web/JavaScript_basics
 translation_of_original: Web/JavaScript/Getting_Started
+original_slug: Web/JavaScript/Getting_Started
 ---
 <h2 id="Why_JavaScript.3F" name="Why_JavaScript.3F">JavaScript是什么?</h2>
 
diff --git a/files/zh-cn/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html b/files/zh-cn/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html
index fd51ef502f..81d56d0055 100644
--- a/files/zh-cn/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html
+++ b/files/zh-cn/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html
@@ -1,6 +1,6 @@
 ---
 title: Email links
-slug: Web/Guide/HTML/Email_links
+slug: conflicting/Learn/HTML/Introduction_to_HTML/Creating_hyperlinks
 tags:
   - HTML5
   - SEO
@@ -9,6 +9,7 @@ tags:
   - mailto
 translation_of: Learn/HTML/Introduction_to_HTML/Creating_hyperlinks#E-mail_links
 translation_of_original: Web/Guide/HTML/Email_links
+original_slug: Web/Guide/HTML/Email_links
 ---
 <p>这往往是有益的Web站点能够创建链接或按钮，点击后，打开一个新的出站电子邮件。例如，这可能会创造一个“联系我们”按钮时使用。这是使用完成<span class="seoSummary">{{HTMLElement("a")}} </span>元素和mailto URL方案。<span class="seoSummary">.</span></p>
 
diff --git a/files/zh-cn/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html b/files/zh-cn/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
index f1ebacd184..b2537fe024 100644
--- a/files/zh-cn/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
+++ b/files/zh-cn/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
@@ -1,6 +1,6 @@
 ---
 title: 使用 HTML5 音频和视频
-slug: Web/Guide/HTML/Using_HTML5_audio_and_video
+slug: conflicting/Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
 tags:
   - Flash
   - HTML
@@ -17,6 +17,7 @@ tags:
   - 音频
 translation_of: Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
 translation_of_original: Web/Guide/HTML/Using_HTML5_audio_and_video
+original_slug: Web/Guide/HTML/Using_HTML5_audio_and_video
 ---
 <p>HTML5 通过HTML标签“audio”和“video”来支持嵌入式的媒体，使开发者能够方便地将媒体嵌入到HTML文档中。</p>
 
diff --git a/files/zh-cn/conflicting/learn/index.html b/files/zh-cn/conflicting/learn/index.html
index 9e2e40d682..33efe52747 100644
--- a/files/zh-cn/conflicting/learn/index.html
+++ b/files/zh-cn/conflicting/learn/index.html
@@ -1,8 +1,9 @@
 ---
 title: 如何建设一个网站
-slug: Learn/tutorial/How_to_build_a_web_site
+slug: conflicting/Learn
 translation_of: Learn
 translation_of_original: Learn/tutorial/How_to_build_a_web_site
+original_slug: Learn/tutorial/How_to_build_a_web_site
 ---
 <p>  当我们在学习网页设计时，许多人都希望尽快建设一个属于自己的网站。为了让你建站之路更平坦，我们已经缩小了你所需要的最低限度的知识。</p>
 
diff --git a/files/zh-cn/conflicting/learn/javascript/client-side_web_apis/manipulating_documents/index.html b/files/zh-cn/conflicting/learn/javascript/client-side_web_apis/manipulating_documents/index.html
index 1f53ff70ba..91b8d79a01 100644
--- a/files/zh-cn/conflicting/learn/javascript/client-side_web_apis/manipulating_documents/index.html
+++ b/files/zh-cn/conflicting/learn/javascript/client-side_web_apis/manipulating_documents/index.html
@@ -1,8 +1,9 @@
 ---
 title: JavaScript 与 CSS
-slug: Web/Guide/CSS/Getting_started/JavaScript
+slug: conflicting/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
 translation_of: Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
 translation_of_original: Web/Guide/CSS/Getting_started/JavaScript
+original_slug: Web/Guide/CSS/Getting_started/JavaScript
 ---
 <p>{{ CSSTutorialTOC() }}</p>
 
diff --git a/files/zh-cn/conflicting/learn/javascript/objects/index.html b/files/zh-cn/conflicting/learn/javascript/objects/index.html
index 1ae4554c63..9ae0bde819 100644
--- a/files/zh-cn/conflicting/learn/javascript/objects/index.html
+++ b/files/zh-cn/conflicting/learn/javascript/objects/index.html
@@ -1,6 +1,6 @@
 ---
 title: JavaScript面向对象简介
-slug: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript
+slug: conflicting/Learn/JavaScript/Objects
 tags:
   - JavaScript
   - OOP
@@ -13,6 +13,7 @@ tags:
   - 面向对象
 translation_of: Learn/JavaScript/Objects
 translation_of_original: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript
+original_slug: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript
 ---
 <div>{{jsSidebar("Introductory")}}</div>
 
diff --git a/files/zh-cn/conflicting/learn/server-side/django/index.html b/files/zh-cn/conflicting/learn/server-side/django/index.html
index 95ec82f251..86ecd5bb6c 100644
--- a/files/zh-cn/conflicting/learn/server-side/django/index.html
+++ b/files/zh-cn/conflicting/learn/server-side/django/index.html
@@ -1,11 +1,12 @@
 ---
 title: Python
-slug: Python
+slug: conflicting/Learn/Server-side/Django
 tags:
   - Python
   - Services
 translation_of: Learn/Server-side/Django
 translation_of_original: Python
+original_slug: Python
 ---
 <p><a class="external" href="http://www.python.org">Python</a> 是一款直译式脚本语言，支持包括 Linux、Mac OS X 和 Microsoft Windows 在内的多种平台。</p>