17 files changed, 138 insertions, 108 deletions
diff --git a/files/ms/_redirects.txt b/files/ms/_redirects.txt
index 9b0dd72bf2..d619ba7169 100644
--- a/files/ms/_redirects.txt
+++ b/files/ms/_redirects.txt
@@ -1,6 +1,21 @@
 # FROM-URL	TO-URL
-/ms/docs/HTML-840092-dup	/ms/docs/HTML
-/ms/docs/HTML/Borang	/ms/docs/Learn/HTML/Forms
-/ms/docs/MDN/Contribute/Howto/Bagaimana	/ms/docs/MDN/Contribute/Howto/Bagaimana_membuat_akaun_MDN
+/ms/docs/HTML	/ms/docs/Web/HTML
+/ms/docs/HTML-840092-dup	/ms/docs/Web/HTML
+/ms/docs/HTML/Borang	/ms/docs/Learn/Forms
+/ms/docs/HTML/Canvas	/ms/docs/Web/API/Canvas_API
+/ms/docs/HTML/Canvas/Melukis_Grafik_dengan_Canvas	/ms/docs/Web/API/Canvas_API/Tutorial
+/ms/docs/HTML/Elemen	/ms/docs/Web/HTML/Element
+/ms/docs/HTML/Tip_menulis_LamanHTML_dengan_pemuatan_pantas	/ms/docs/Learn/HTML/Howto/Author_fast-loading_HTML_pages
+/ms/docs/Learn/HTML/Forms	/ms/docs/Learn/Forms
+/ms/docs/Learn/HTML/Howto/Add_responsive_image_to_a_webpage	/ms/docs/Learn/HTML/Multimedia_and_embedding/Responsive_images
+/ms/docs/Learn/Memulakan_pembelajaran_web	/ms/docs/Learn/Getting_started_with_the_web
+/ms/docs/Learn/Memulakan_pembelajaran_web/Berurusan_dengan_fail	/ms/docs/Learn/Getting_started_with_the_web/Dealing_with_files
+/ms/docs/Learn/Memulakan_pembelajaran_web/Memasang_Perisian_Asas	/ms/docs/Learn/Getting_started_with_the_web/Installing_basic_software
+/ms/docs/Learn/Soalan_lazim	/ms/docs/Learn/Common_questions
+/ms/docs/MDN/Community	/ms/docs/orphaned/MDN/Community
+/ms/docs/MDN/Contribute/Howto/Bagaimana	/ms/docs/orphaned/MDN/Contribute/Howto/Create_an_MDN_account
+/ms/docs/MDN/Contribute/Howto/Bagaimana_membuat_akaun_MDN	/ms/docs/orphaned/MDN/Contribute/Howto/Create_an_MDN_account
 /ms/docs/MDN/Getting_started	/ms/docs/MDN/Contribute/Getting_started
+/ms/docs/MDN_at_ten	/ms/docs/MDN/At_ten
+/ms/docs/Web_Development	/ms/docs/Web/Guide
 /ms/docs/en	/en-US/
diff --git a/files/ms/_wikihistory.json b/files/ms/_wikihistory.json
index 7bc5d476a1..c94ae24921 100644
--- a/files/ms/_wikihistory.json
+++ b/files/ms/_wikihistory.json
@@ -17,38 +17,6 @@
       "smhaziq"
     ]
   },
-  "HTML": {
-    "modified": "2019-03-23T23:34:09.303Z",
-    "contributors": [
-      "akifrabbani",
-      "haboqueferus",
-      "FredB"
-    ]
-  },
-  "HTML/Canvas": {
-    "modified": "2019-03-23T23:34:10.539Z",
-    "contributors": [
-      "teoli"
-    ]
-  },
-  "HTML/Canvas/Melukis_Grafik_dengan_Canvas": {
-    "modified": "2019-03-23T23:34:10.144Z",
-    "contributors": [
-      "haboqueferus"
-    ]
-  },
-  "HTML/Elemen": {
-    "modified": "2019-03-23T23:34:02.244Z",
-    "contributors": [
-      "haboqueferus"
-    ]
-  },
-  "HTML/Tip_menulis_LamanHTML_dengan_pemuatan_pantas": {
-    "modified": "2020-07-16T22:22:33.228Z",
-    "contributors": [
-      "haboqueferus"
-    ]
-  },
   "Learn": {
     "modified": "2020-07-16T22:43:44.802Z",
     "contributors": [
@@ -70,43 +38,12 @@
       "SphinxKnight"
     ]
   },
-  "Learn/HTML/Forms": {
-    "modified": "2020-07-16T22:20:59.860Z",
-    "contributors": [
-      "chrisdavidmills",
-      "haboqueferus"
-    ]
-  },
   "Learn/HTML/Howto": {
     "modified": "2020-07-16T22:22:29.770Z",
     "contributors": [
       "Jeremie"
     ]
   },
-  "Learn/HTML/Howto/Add_responsive_image_to_a_webpage": {
-    "modified": "2020-07-16T22:24:36.680Z",
-    "contributors": [
-      "QA8500"
-    ]
-  },
-  "Learn/Memulakan_pembelajaran_web": {
-    "modified": "2020-07-16T22:33:54.574Z",
-    "contributors": [
-      "arerifx"
-    ]
-  },
-  "Learn/Memulakan_pembelajaran_web/Berurusan_dengan_fail": {
-    "modified": "2020-07-16T22:34:35.698Z",
-    "contributors": [
-      "arerifx"
-    ]
-  },
-  "Learn/Memulakan_pembelajaran_web/Memasang_Perisian_Asas": {
-    "modified": "2020-07-16T22:34:09.294Z",
-    "contributors": [
-      "arerifx"
-    ]
-  },
   "Learn/Server-side": {
     "modified": "2020-07-16T22:36:00.436Z",
     "contributors": [
@@ -125,12 +62,6 @@
       "chrisdavidmills"
     ]
   },
-  "Learn/Soalan_lazim": {
-    "modified": "2020-07-16T22:35:25.604Z",
-    "contributors": [
-      "arerifx"
-    ]
-  },
   "MDN": {
     "modified": "2020-02-19T18:00:19.588Z",
     "contributors": [
@@ -152,14 +83,6 @@
       "esah"
     ]
   },
-  "MDN/Community": {
-    "modified": "2019-09-11T08:02:08.941Z",
-    "contributors": [
-      "SphinxKnight",
-      "wbamberg",
-      "Othman"
-    ]
-  },
   "MDN/Contribute": {
     "modified": "2019-01-16T20:36:13.861Z",
     "contributors": [
@@ -184,31 +107,108 @@
       "klez"
     ]
   },
-  "MDN/Contribute/Howto/Bagaimana_membuat_akaun_MDN": {
-    "modified": "2019-01-16T21:20:18.582Z",
+  "Web": {
+    "modified": "2020-01-07T09:44:39.115Z",
+    "contributors": [
+      "nikahmadz",
+      "SphinxKnight",
+      "syahlani",
+      "manxmensch",
+      "teoli"
+    ]
+  },
+  "Web/API/Canvas_API": {
+    "modified": "2019-03-23T23:34:10.539Z",
     "contributors": [
-      "wbamberg",
-      "shufay",
       "teoli"
     ]
   },
-  "MDN_at_ten": {
+  "Web/HTML/Element": {
+    "modified": "2019-03-23T23:34:02.244Z",
+    "contributors": [
+      "haboqueferus"
+    ]
+  },
+  "Learn/HTML/Howto/Author_fast-loading_HTML_pages": {
+    "modified": "2020-07-16T22:22:33.228Z",
+    "contributors": [
+      "haboqueferus"
+    ]
+  },
+  "Learn/Forms": {
+    "modified": "2020-07-16T22:20:59.860Z",
+    "contributors": [
+      "chrisdavidmills",
+      "haboqueferus"
+    ]
+  },
+  "Learn/HTML/Multimedia_and_embedding/Responsive_images": {
+    "modified": "2020-07-16T22:24:36.680Z",
+    "contributors": [
+      "QA8500"
+    ]
+  },
+  "Learn/Getting_started_with_the_web/Dealing_with_files": {
+    "modified": "2020-07-16T22:34:35.698Z",
+    "contributors": [
+      "arerifx"
+    ]
+  },
+  "Learn/Getting_started_with_the_web": {
+    "modified": "2020-07-16T22:33:54.574Z",
+    "contributors": [
+      "arerifx"
+    ]
+  },
+  "Learn/Getting_started_with_the_web/Installing_basic_software": {
+    "modified": "2020-07-16T22:34:09.294Z",
+    "contributors": [
+      "arerifx"
+    ]
+  },
+  "Learn/Common_questions": {
+    "modified": "2020-07-16T22:35:25.604Z",
+    "contributors": [
+      "arerifx"
+    ]
+  },
+  "MDN/At_ten": {
     "modified": "2019-01-16T21:24:37.324Z",
     "contributors": [
       "azrolabidin"
     ]
   },
-  "Web": {
-    "modified": "2020-01-07T09:44:39.115Z",
+  "orphaned/MDN/Community": {
+    "modified": "2019-09-11T08:02:08.941Z",
     "contributors": [
-      "nikahmadz",
       "SphinxKnight",
-      "syahlani",
-      "manxmensch",
+      "wbamberg",
+      "Othman"
+    ]
+  },
+  "orphaned/MDN/Contribute/Howto/Create_an_MDN_account": {
+    "modified": "2019-01-16T21:20:18.582Z",
+    "contributors": [
+      "wbamberg",
+      "shufay",
       "teoli"
     ]
   },
-  "Web_Development": {
+  "Web/API/Canvas_API/Tutorial": {
+    "modified": "2019-03-23T23:34:10.144Z",
+    "contributors": [
+      "haboqueferus"
+    ]
+  },
+  "Web/HTML": {
+    "modified": "2019-03-23T23:34:09.303Z",
+    "contributors": [
+      "akifrabbani",
+      "haboqueferus",
+      "FredB"
+    ]
+  },
+  "Web/Guide": {
     "modified": "2019-03-23T23:34:05.696Z",
     "contributors": [
       "ethertank"
diff --git a/files/ms/learn/common_questions/index.html b/files/ms/learn/common_questions/index.html
index b7fbc07a0f..21b8cc542c 100644
--- a/files/ms/learn/common_questions/index.html
+++ b/files/ms/learn/common_questions/index.html
@@ -1,7 +1,8 @@
 ---
 title: Soalan-soalan lazim
-slug: Learn/Soalan_lazim
+slug: Learn/Common_questions
 translation_of: Learn/Common_questions
+original_slug: Learn/Soalan_lazim
 ---
 <div>{{LearnSidebar}}</div>
 
diff --git a/files/ms/learn/forms/index.html b/files/ms/learn/forms/index.html
index 10e84875de..d17b7e3ff5 100644
--- a/files/ms/learn/forms/index.html
+++ b/files/ms/learn/forms/index.html
@@ -1,7 +1,8 @@
 ---
 title: Panduan Borang HTML
-slug: Learn/HTML/Forms
+slug: Learn/Forms
 translation_of: Learn/Forms
+original_slug: Learn/HTML/Forms
 ---
 <p>Welcome to the Guide to HTML Forms. This guide is a series of articles that will help you master HTML Forms. HTML Forms are a very powerful tool to interact with a user; however, due to historical and technical reasons, it's not always obvious how you use them to their full potential. In this guide, we'll cover all aspects of HTML Forms, from structure to styling, from data handling to custom widgets. You'll learn to enjoy the great power they offer!</p>
 <h2 id="Articles">Articles</h2>
diff --git a/files/ms/learn/getting_started_with_the_web/dealing_with_files/index.html b/files/ms/learn/getting_started_with_the_web/dealing_with_files/index.html
index 41e06b9599..65d1408b3a 100644
--- a/files/ms/learn/getting_started_with_the_web/dealing_with_files/index.html
+++ b/files/ms/learn/getting_started_with_the_web/dealing_with_files/index.html
@@ -1,6 +1,6 @@
 ---
 title: Berurusan dengan fail
-slug: Learn/Memulakan_pembelajaran_web/Berurusan_dengan_fail
+slug: Learn/Getting_started_with_the_web/Dealing_with_files
 tags:
   - Beginner
   - CodingScripting
@@ -10,6 +10,7 @@ tags:
   - theory
   - website
 translation_of: Learn/Getting_started_with_the_web/Dealing_with_files
+original_slug: Learn/Memulakan_pembelajaran_web/Berurusan_dengan_fail
 ---
 <div>{{LearnSidebar}}</div>
 
diff --git a/files/ms/learn/getting_started_with_the_web/index.html b/files/ms/learn/getting_started_with_the_web/index.html
index fd07a2d78a..222f386c30 100644
--- a/files/ms/learn/getting_started_with_the_web/index.html
+++ b/files/ms/learn/getting_started_with_the_web/index.html
@@ -1,6 +1,6 @@
 ---
 title: Memulakan pembelajaran Web
-slug: Learn/Memulakan_pembelajaran_web
+slug: Learn/Getting_started_with_the_web
 tags:
   - Beginner
   - CSS
@@ -11,6 +11,7 @@ tags:
   - publishing
   - theory
 translation_of: Learn/Getting_started_with_the_web
+original_slug: Learn/Memulakan_pembelajaran_web
 ---
 <div>{{LearnSidebar}}</div>
 
diff --git a/files/ms/learn/getting_started_with_the_web/installing_basic_software/index.html b/files/ms/learn/getting_started_with_the_web/installing_basic_software/index.html
index 2363f77c32..a6a77dd217 100644
--- a/files/ms/learn/getting_started_with_the_web/installing_basic_software/index.html
+++ b/files/ms/learn/getting_started_with_the_web/installing_basic_software/index.html
@@ -1,6 +1,6 @@
 ---
 title: Memasang Perisian Asas
-slug: Learn/Memulakan_pembelajaran_web/Memasang_Perisian_Asas
+slug: Learn/Getting_started_with_the_web/Installing_basic_software
 tags:
   - Beginner
   - Browser
@@ -10,6 +10,7 @@ tags:
   - WebMechanics
   - text editor
 translation_of: Learn/Getting_started_with_the_web/Installing_basic_software
+original_slug: Learn/Memulakan_pembelajaran_web/Memasang_Perisian_Asas
 ---
 <div>{{LearnSidebar}}</div>
 
diff --git a/files/ms/learn/html/howto/author_fast-loading_html_pages/index.html b/files/ms/learn/html/howto/author_fast-loading_html_pages/index.html
index 3fd36727fd..8f122791ac 100644
--- a/files/ms/learn/html/howto/author_fast-loading_html_pages/index.html
+++ b/files/ms/learn/html/howto/author_fast-loading_html_pages/index.html
@@ -1,7 +1,8 @@
 ---
 title: Tip menulis Laman HTML dengan pemuatan pantas
-slug: HTML/Tip_menulis_LamanHTML_dengan_pemuatan_pantas
+slug: Learn/HTML/Howto/Author_fast-loading_HTML_pages
 translation_of: Learn/HTML/Howto/Author_fast-loading_HTML_pages
+original_slug: HTML/Tip_menulis_LamanHTML_dengan_pemuatan_pantas
 ---
 <p>These tips are based upon common knowledge and experimentation.</p>
 <p>An optimized web page not only provides for a more responsive site for your visitors, but also reduces the load on your web servers and Internet connection. This can be crucial for high volume sites or sites which have a spike in traffic due to unusual circumstances such as breaking news stories.</p>
diff --git a/files/ms/learn/html/multimedia_and_embedding/responsive_images/index.html b/files/ms/learn/html/multimedia_and_embedding/responsive_images/index.html
index 0589cda2d8..ef91b7d478 100644
--- a/files/ms/learn/html/multimedia_and_embedding/responsive_images/index.html
+++ b/files/ms/learn/html/multimedia_and_embedding/responsive_images/index.html
@@ -1,7 +1,8 @@
 ---
 title: Add responsive images to a webpage
-slug: Learn/HTML/Howto/Add_responsive_image_to_a_webpage
+slug: Learn/HTML/Multimedia_and_embedding/Responsive_images
 translation_of: Learn/HTML/Multimedia_and_embedding/Responsive_images
+original_slug: Learn/HTML/Howto/Add_responsive_image_to_a_webpage
 ---
 <div class="summary">
 <p><span class="seoSummary">Learn about HTML features you can use to adapt your site's images to various screen sizes and display resolutions.</span></p>
diff --git a/files/ms/mdn/at_ten/index.html b/files/ms/mdn/at_ten/index.html
index 740ba0c4e2..2248ba9766 100644
--- a/files/ms/mdn/at_ten/index.html
+++ b/files/ms/mdn/at_ten/index.html
@@ -1,7 +1,8 @@
 ---
 title: MDN at 10
-slug: MDN_at_ten
+slug: MDN/At_ten
 translation_of: MDN_at_ten
+original_slug: MDN_at_ten
 ---
 <div class="summary"><span class="seoSummary">Celebrate 10 years of documenting your Web.</span></div>
 
diff --git a/files/ms/orphaned/mdn/community/index.html b/files/ms/orphaned/mdn/community/index.html
index 723ce60e71..ac44d37ee2 100644
--- a/files/ms/orphaned/mdn/community/index.html
+++ b/files/ms/orphaned/mdn/community/index.html
@@ -1,7 +1,8 @@
 ---
 title: Join the MDN community
-slug: MDN/Community
+slug: orphaned/MDN/Community
 translation_of: MDN/Community
+original_slug: MDN/Community
 ---
 <div>{{MDNSidebar}}</div>
 
diff --git a/files/ms/orphaned/mdn/contribute/howto/create_an_mdn_account/index.html b/files/ms/orphaned/mdn/contribute/howto/create_an_mdn_account/index.html
index f8099f109f..59a16f6ee4 100644
--- a/files/ms/orphaned/mdn/contribute/howto/create_an_mdn_account/index.html
+++ b/files/ms/orphaned/mdn/contribute/howto/create_an_mdn_account/index.html
@@ -1,12 +1,13 @@
 ---
 title: Bagaimana Membuat Akaun MDN
-slug: MDN/Contribute/Howto/Bagaimana_membuat_akaun_MDN
+slug: orphaned/MDN/Contribute/Howto/Create_an_MDN_account
 tags:
   - MDN
   - Panduan
   - Pemula
   - Projek MDC
 translation_of: MDN/Contribute/Howto/Create_an_MDN_account
+original_slug: MDN/Contribute/Howto/Bagaimana_membuat_akaun_MDN
 ---
 <div>{{MDNSidebar}}</div><p><span class="seoSummary">Untuk membuat apa-apa perubahan kepada isi MDN (dengan menyunting laman web atau menyumbang suatu demo), anda memerlukan satu profil MDN. Jangan bimbang, anda tidak perlu profil jika anda hanya ingin membaca dan mencari isi MDN! Panduan tersebut akan membantu anda mendirikan akaun MDN anda.</span></p>
 
diff --git a/files/ms/web/api/canvas_api/index.html b/files/ms/web/api/canvas_api/index.html
index bfd9cd5f2b..4510a6c375 100644
--- a/files/ms/web/api/canvas_api/index.html
+++ b/files/ms/web/api/canvas_api/index.html
@@ -1,14 +1,15 @@
 ---
 title: Canvas
-slug: HTML/Canvas
+slug: Web/API/Canvas_API
 tags:
   - HTML
-  - 'HTML:Canvas'
-  - 'HTML:Element'
+  - HTML:Canvas
+  - HTML:Element
   - NeedsTranslation
   - References
   - TopicStub
 translation_of: Web/API/Canvas_API
+original_slug: HTML/Canvas
 ---
 <p>Added in <a href="/en-US/docs/HTML/HTML5" title="/en-US/docs/HTML/HTML5">HTML5</a>, the <strong>HTML {{HTMLElement("canvas")}} element</strong> is an element which can be used to draw graphics via scripting (usually <a href="/en-US/docs/JavaScript" title="JavaScript">JavaScript</a>). For example, it can be used to draw graphs, make photo compositions, create animations or even do real-time video processing.</p>
 <p>Mozilla applications gained support for <code>&lt;canvas&gt;</code> starting with Gecko 1.8 (i.e. <a href="/en-US/docs/Firefox_1.5_for_developers" title="Firefox_1.5_for_developers">Firefox 1.5</a>). The element was originally introduced by Apple for the OS X <a class="external" href="http://www.apple.com/macosx/features/dashboard/">Dashboard</a> and Safari. Internet Explorer supports <code>&lt;canvas&gt;</code> from version 9 onwards; for earlier versions of IE, a page can effectively add support for <code>&lt;canvas&gt;</code> by including a script from Google's <a class="external" href="http://excanvas.sourceforge.net/">Explorer Canvas</a> project. Google Chrome and Opera 9 also support <code>&lt;canvas&gt;</code>.</p>
diff --git a/files/ms/web/api/canvas_api/tutorial/index.html b/files/ms/web/api/canvas_api/tutorial/index.html
index 2e656a8d46..6ac64a23ed 100644
--- a/files/ms/web/api/canvas_api/tutorial/index.html
+++ b/files/ms/web/api/canvas_api/tutorial/index.html
@@ -1,8 +1,9 @@
 ---
 title: Melukis Grafik dengan Canvas
-slug: HTML/Canvas/Melukis_Grafik_dengan_Canvas
+slug: Web/API/Canvas_API/Tutorial
 translation_of: Web/API/Canvas_API/Tutorial
 translation_of_original: Web/API/Canvas_API/Drawing_graphics_with_canvas
+original_slug: HTML/Canvas/Melukis_Grafik_dengan_Canvas
 ---
 <div class="note">
   <p>Most of this content (but not the documentation on drawWindow) has been rolled into the more expansive <a href="/en/Canvas_tutorial" title="en/Canvas_tutorial">Canvas tutorial</a>, this page should probably be redirected there as it's now redundant.</p>
diff --git a/files/ms/web/guide/index.html b/files/ms/web/guide/index.html
index 051accb9a5..6c86346fa7 100644
--- a/files/ms/web/guide/index.html
+++ b/files/ms/web/guide/index.html
@@ -1,12 +1,13 @@
 ---
 title: Web Development
-slug: Web_Development
+slug: Web/Guide
 tags:
   - NeedsTranslation
   - TopicStub
   - Web Development
 translation_of: Web/Guide
 translation_of_original: Web_Development
+original_slug: Web_Development
 ---
 <p><strong>Web development</strong> comprises all aspects of developing a web site or web application.</p>
 <p>Learn how to create anything from a simple web site to complex, highly interactive web sites featuring the latest Web technologies by perusing the articles you'll find here.</p>
diff --git a/files/ms/web/html/element/index.html b/files/ms/web/html/element/index.html
index 038d44abd8..af004939b4 100644
--- a/files/ms/web/html/element/index.html
+++ b/files/ms/web/html/element/index.html
@@ -1,7 +1,8 @@
 ---
 title: Elemen-Elemen HTML
-slug: HTML/Elemen
+slug: Web/HTML/Element
 translation_of: Web/HTML/Element
+original_slug: HTML/Elemen
 ---
 <p>This HTML reference lists all <strong>HTML elements</strong>, defined in HTML5 or in a previous specification. When enclosed within angle brackets, they form <em>HTML tags</em>: <code>&lt;elementname&gt;.</code> Elements are entities specifying how HTML documents should be built, and what kind of content should be placed in what part of an <a href="/en-US/docs/HTML" title="/en-US/docs/HTML">HTML</a> document.</p>
 <p>This page lists all standard HTML5 tags, but also older, obsolete and deprecated ones, as well as non-standard ones that browsers may support. Elements that were introduced in <a href="/en-US/docs/HTML/HTML5" title="/en-US/docs/HTML/HTML5">HTML5</a> are often referred as the new HTML5 elements, even though the other standard elements also are valid in HTML5.</p>
diff --git a/files/ms/web/html/index.html b/files/ms/web/html/index.html
index 9bc6c1add7..e68817d040 100644
--- a/files/ms/web/html/index.html
+++ b/files/ms/web/html/index.html
@@ -1,8 +1,9 @@
 ---
 title: HTML
-slug: HTML
+slug: Web/HTML
 translation_of: Web/HTML
 translation_of_original: HTML
+original_slug: HTML
 ---
 <div class="callout-box">
   <div style="font: normal 20px 'Bebas Neue','League Gothic',Haettenschweiler,Impact,'Arial Narrow',sans-serif; text-transform: uppercase;">