merge get-started pages as they no longer require separate steps

_data/navigation/en_US.yml

@@ -122,8 +122,8 @@ sidebar_pages:
     title: Installing boot9strap (ntrboot)
     url: installing-boot9strap-(ntrboot)
   -
-    title: NAND Restore
+    title: Installing boot9strap (Soundhax)
-    url: godmode9-usage#restoring-a-nand-backup
+    url: installing-boot9strap-(soundhax)
   -
     title: Finalizing Setup
     url: finalizing-setup

_pages/en_US/finalizing-setup.txt

@@ -61,7 +61,7 @@ During this process, we also setup programs such as the following:
 
 #### Section II - Updating the System
 
-If, while following a previous version of this guide, you CTRTransfered your *New 3DS* to 2.1.0, now is the time to [restore your NAND backup](godmode9-usage#restoring-a-nand-backup) before doing this section.
+If, while following a previous version of this guide, you CTRTransfered your *New 3DS* to 2.1.0, you should now [restore your NAND backup](godmode9-usage#restoring-a-nand-backup) before doing this section.
 {: .notice--danger}
 
 If, before following this guide, you already had an EmuNAND setup and would like to move the contents of your previous EmuNAND to your new SysNAND CFW, now is the time to [follow Move EmuNAND](move-emunand) before doing this section.

_pages/en_US/get-started-(new-3ds).txt

@@ -1,68 +0,0 @@
----
-title: "Get Started (New 3DS)"
----
-
-{% include toc title="Table of Contents" %}
-
-### Required Reading
-
-Select the appropriate page for your version from the chart below. Note that the "from" and "to" fields are inclusive. This means that, for example, the "from 9.0.0 to 9.2.0" row includes 9.0.0, 9.1.0, and 9.2.0.
-
-Additionally, note that the last number of your system version (which is preceded by a dash) refers to your browser version. Currently, the browser version is irrelevant to the New 3DS in this guide.
-
-**If you are unable to follow the instructions corresponding to your specific version due to missing prerequisites, then you should see the "All Versions" row for methods that work regardless of system version.**
-
-For all versions you can also [Cartridge Update](cart-update) (or use a standard system update) to get to a higher version in the same column to follow its instructions.
-
-Your device version can be found at the bottom right of the top screen of the System Settings.
-
-![]({{ "/images/screenshots/system-version.png" | absolute_url }})
-{: .notice--info}
-
-### Version Table
-
-<table>
-  <colgroup>
-    <col span="1" style="width: 10%;">
-    <col span="1" style="width: 10%;">
-    <col span="1" style="width: 80%;">
-  </colgroup>
-  <thead>
-    <tr>
-      <th style="text-align: center; font-weight: bold;">From</th>
-      <th style="text-align: center; font-weight: bold;">To</th>
-      <th style="text-align: center; font-weight: bold;"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td style="text-align: center; font-weight: bold;">2.1.0</td>
-      <td style="text-align: center; font-weight: bold;">2.1.0</td>
-      <td style="text-align: center; font-weight: bold;"><a href="installing-boot9strap-(2xrsa)">Installing boot9strap (2xrsa)</a></td>
-    </tr>
-    <tr>
-      <td style="text-align: center; font-weight: bold;">8.1.0</td>
-      <td style="text-align: center; font-weight: bold;">8.1.0</td>
-      <td style="text-align: center; font-weight: bold;"><a href="installing-boot9strap-(soundhax)">Installing boot9strap (Soundhax)</a></td>
-    </tr>
-    <tr>
-      <td style="text-align: center; font-weight: bold;">9.0.0</td>
-      <td style="text-align: center; font-weight: bold;">11.3.0</td>
-      <td style="text-align: center; font-weight: bold;"><a href="homebrew-launcher-(soundhax)">Homebrew Launcher (Soundhax)</a></td>
-    </tr>
-    <tr>
-      <td style="text-align: center; font-weight: bold;">11.4.0</td>
-      <td style="text-align: center; font-weight: bold;">11.7.0</td>
-      <td style="text-align: center; font-weight: bold;">Use an "All Versions" Method</td>
-    </tr>
-    <tr>
-      <td style="text-align: center; font-weight: bold;">11.8.0</td>
-      <td style="text-align: center; font-weight: bold;">11.8.0</td>
-      <td style="text-align: center; font-weight: bold;"><a href="installing-boot9strap-(dsiware)">Installing boot9strap (DSiWare)</a></td>
-    </tr>
-    <tr>
-      <td style="text-align: center; font-weight: bold;" colspan="2">ALL VERSIONS<br></td>
-      <td style="text-align: center; font-weight: bold;" colspan="2"><p style="display: inline-block; margin-top: 1.3em; width: 47%"><a href="ntrboot">ntrboot</a><br><sub>(Requires a Compatible Flashcart)</sub></p><p style="display: inline-block; margin-top: 1.3em; vertical-align: super; width: 6%">or</p><p style="display: inline-block; margin-top: 1.3em; width: 47%"><a href="installing-boot9strap-(hardmod)">Installing boot9strap (Hardmod)</a><br><sub>(Requires Soldering)</sub></p></td>
-    </tr>
-  </tbody>
-</table>

_pages/en_US/get-started-(old-3ds).txt

@@ -1,81 +0,0 @@
----
-title: "Get Started (Old 3DS)"
----
-
-{% include toc title="Table of Contents" %}
-
-### Required Reading
-
-Select the appropriate page for your version from the chart below. Note that the "from" and "to" fields are inclusive. This means that, for example, the "from 9.0.0 to 9.2.0" row includes 9.0.0, 9.1.0, and 9.2.0.
-
-Additionally, note that the last two columns of the chart refer to the last number of your version (which corresponds to the browser version installed to the system). If the version is -0 then you do not have a browser, while any number above -0 indicates a browser is installed.
-
-In the case of "5.0.0-0U" for example, you would follow the "No Browser" column and 5.0.0 to 5.1.0 row because the system is on the a system version in that range and has no browser installed.
-
-**If you are unable to follow the instructions corresponding to your specific version due to missing prerequisites, then you should see the "All Versions" row for methods that work regardless of system version.**
-
-For all versions you can also [Cartridge Update](cart-update) (or use a standard system update) to get to a higher version in the same column to follow its instructions.
-
-Your device version can be found at the bottom right of the top screen of the System Settings.
-
-![]({{ "/images/screenshots/system-version.png" | absolute_url }})
-{: .notice--info}
-
-### Version Table
-
-<table>
-  <colgroup>
-    <col span="1" style="width: 10%;">
-    <col span="1" style="width: 10%;">
-    <col span="1" style="width: 40%;">
-  </colgroup>
-  <thead>
-    <tr>
-      <th style="text-align: center">From</th>
-      <th style="text-align: center">To</th>
-      <th style="text-align: center">No Browser</th>
-      <th style="text-align: center">Browser</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td style="text-align: center; font-weight: bold;">1.0.0</td>
-      <td style="text-align: center; font-weight: bold;">2.0.0</td>
-      <td style="text-align: center; font-weight: bold;" colspan="2">Use an "All Versions" Method</td>
-    </tr>
-    <tr>
-      <td style="text-align: center; font-weight: bold;">2.1.0</td>
-      <td style="text-align: center; font-weight: bold;">2.1.0</td>
-      <td style="text-align: center; font-weight: bold;">Use an "All Versions" Method</td>
-      <td style="text-align: center; font-weight: bold;"><a href="installing-boot9strap-(2xrsa)">Installing boot9strap (2xrsa)</a></td>
-    </tr>
-    <tr>
-      <td style="text-align: center; font-weight: bold;">2.2.0</td>
-      <td style="text-align: center; font-weight: bold;">2.2.0</td>
-      <td style="text-align: center; font-weight: bold;" colspan="2">Use an "All Versions" Method</td>
-    </tr>
-    <tr>
-      <td style="text-align: center; font-weight: bold;">3.0.0</td>
-      <td style="text-align: center; font-weight: bold;">8.1.0</td>
-      <td style="text-align: center; font-weight: bold;" colspan="2"><a href="installing-boot9strap-(soundhax)">Installing boot9strap (Soundhax)</a></td>
-    </tr>
-    <tr>
-      <td style="text-align: center; font-weight: bold;">9.0.0</td>
-      <td style="text-align: center; font-weight: bold;">11.3.0</td>
-      <td style="text-align: center; font-weight: bold;" colspan="2"><a href="homebrew-launcher-(soundhax)">Homebrew Launcher (Soundhax)</a></td>
-    </tr><tr>
-      <td style="text-align: center; font-weight: bold;">11.4.0</td>
-      <td style="text-align: center; font-weight: bold;">11.7.0</td>
-      <td style="text-align: center; font-weight: bold;" colspan="2">Use an "All Versions" Method</td>
-    </tr>
-    <tr>
-      <td style="text-align: center; font-weight: bold;">11.8.0</td>
-      <td style="text-align: center; font-weight: bold;">11.8.0</td>
-      <td style="text-align: center; font-weight: bold;" colspan="2"><a href="installing-boot9strap-(dsiware)">Installing boot9strap (DSiWare)</a></td>
-    </tr>
-    <tr>
-      <td style="text-align: center; font-weight: bold;" colspan="2">ALL VERSIONS<br></td>
-      <td style="text-align: center; font-weight: bold;" colspan="2"><p style="display: inline-block; margin-top: 1.3em; width: 47%"><a href="ntrboot">ntrboot</a><br><sub>(Requires a Compatible Flashcart)</sub></p><p style="display: inline-block; margin-top: 1.3em; vertical-align: super; width: 6%">or</p><p style="display: inline-block; margin-top: 1.3em; width: 47%"><a href="installing-boot9strap-(hardmod)">Installing boot9strap (Hardmod)</a><br><sub>(Requires Soldering)</sub></p></td>
-    </tr>
-  </tbody>
-</table>

_pages/en_US/get-started.txt

@@ -6,9 +6,20 @@ title: "Get Started"
 
 ### Required Reading
 
-Different device models and versions will require different steps to achieve the end goal of boot9strap Custom Firmware. This page will help you find where to start for your device.
+Select the appropriate page for your version from the chart below. Note that the "from" and "to" fields are inclusive. This means that, for example, the "from 9.0.0 to 9.2.0" row includes 9.0.0, 9.1.0, and 9.2.0.
 
-Click the image of your device to take you to the appropriate page. The colors of the devices in the image may vary, but note the button placement and features of each device carefully to ensure you select the correct one.
+Additionally, note that the last two columns of the chart refer to the last number of your version (which corresponds to the browser version installed to the system). If the version is -0 then you do not have a browser, while any number above -0 indicates a browser is installed.
+
+In the case of "5.0.0-0U" for example, you would follow the "No Browser" column and 5.0.0 to 5.1.0 row because the system is on the a system version in that range and has no browser installed.
+
+Your device version can be found at the bottom right of the top screen of the System Settings.
+
+![]({{ "/images/screenshots/system-version.png" | absolute_url }})
+{: .notice--info}
+
+**If you are unable to follow the instructions corresponding to your specific version due to missing prerequisites, then you should see the "All Versions" row for methods that work regardless of system version.**
+
+For all versions you can also [Cartridge Update](cart-update) (or use a standard system update) to get to a higher version in the same column to follow its instructions.
 
 If you have already hacked your 3DS before and have an EmuNAND based CFW setup, just follow all instructions while on SysNAND. Replace any files that already exist. Your data will be transferred from EmuNAND to your new B9S install at the end. If you use menuhax, you should [clear Home Menu's extdata](troubleshooting#clear-home-menu-extdata) to remove it before beginning.
 
@@ -37,23 +48,61 @@ There have been reports of a wave of bans being handed out to CFW users by Ninte
 
 <div class="notice--danger">{{ notice-1 | markdownify }}</div>
 
-### Device Table
+### Version Table
 
 <table>
   <colgroup>
-    <col span="1" style="width: 50%;">
+    <col span="1" style="width: 10%;">
-    <col span="1" style="width: 50%;">
+    <col span="1" style="width: 10%;">
+    <col span="1" style="width: 40%;">
   </colgroup>
   <thead>
     <tr>
-      <th style="text-align: center">New 3DS or New 2DS</th>
+      <th style="text-align: center">From</th>
-      <th style="text-align: center">Old 3DS or Old 2DS</th>
+      <th style="text-align: center">To</th>
+      <th style="text-align: center">No Browser</th>
+      <th style="text-align: center">Browser</th>
     </tr>
   </thead>
   <tbody>
     <tr>
-      <td style="text-align: center"><a href="get-started-(new-3ds)"><img src="{{ base_path }}/images/new3ds.png" style="padding: 0.5em;"></a> <a href="get-started-(new-3ds)"><img src="{{ base_path }}/images/new3dsxl.png" style="padding: 0.5em;"></a> <a href="get-started-(new-3ds)"><img src="{{ base_path }}/images/new2dsxl.png" style="padding: 0.5em;"></a></td>
+      <td style="text-align: center; font-weight: bold;">1.0.0</td>
-      <td style="text-align: center"><a href="get-started-(old-3ds)"><img src="{{ base_path }}/images/old3ds.png" style="padding: 0.5em;"></a> <a href="get-started-(old-3ds)"><img src="{{ base_path }}/images/old3dsxl.png" style="padding: 0.5em;"></a> <a href="get-started-(old-3ds)"><img src="{{ base_path }}/images/2ds.png" style="padding: 0.5em;"></a></td>
+      <td style="text-align: center; font-weight: bold;">2.0.0</td>
+      <td style="text-align: center; font-weight: bold;" colspan="2">Use an "All Versions" Method</td>
+    </tr>
+    <tr>
+      <td style="text-align: center; font-weight: bold;">2.1.0</td>
+      <td style="text-align: center; font-weight: bold;">2.1.0</td>
+      <td style="text-align: center; font-weight: bold;">Use an "All Versions" Method</td>
+      <td style="text-align: center; font-weight: bold;"><a href="installing-boot9strap-(2xrsa)">Installing boot9strap (2xrsa)</a></td>
+    </tr>
+    <tr>
+      <td style="text-align: center; font-weight: bold;">2.2.0</td>
+      <td style="text-align: center; font-weight: bold;">2.2.0</td>
+      <td style="text-align: center; font-weight: bold;" colspan="2">Use an "All Versions" Method</td>
+    </tr>
+    <tr>
+      <td style="text-align: center; font-weight: bold;">3.0.0</td>
+      <td style="text-align: center; font-weight: bold;">8.1.0</td>
+      <td style="text-align: center; font-weight: bold;" colspan="2"><a href="installing-boot9strap-(soundhax)">Installing boot9strap (Soundhax)</a></td>
+    </tr>
+    <tr>
+      <td style="text-align: center; font-weight: bold;">9.0.0</td>
+      <td style="text-align: center; font-weight: bold;">11.3.0</td>
+      <td style="text-align: center; font-weight: bold;" colspan="2"><a href="homebrew-launcher-(soundhax)">Homebrew Launcher (Soundhax)</a></td>
+    </tr><tr>
+      <td style="text-align: center; font-weight: bold;">11.4.0</td>
+      <td style="text-align: center; font-weight: bold;">11.7.0</td>
+      <td style="text-align: center; font-weight: bold;" colspan="2">Use an "All Versions" Method</td>
+    </tr>
+    <tr>
+      <td style="text-align: center; font-weight: bold;">11.8.0</td>
+      <td style="text-align: center; font-weight: bold;">11.8.0</td>
+      <td style="text-align: center; font-weight: bold;" colspan="2"><a href="installing-boot9strap-(dsiware)">Installing boot9strap (DSiWare)</a></td>
+    </tr>
+    <tr>
+      <td style="text-align: center; font-weight: bold;" colspan="2">ALL VERSIONS<br></td>
+      <td style="text-align: center; font-weight: bold;" colspan="2"><p style="display: inline-block; margin-top: 1.3em; width: 47%"><a href="ntrboot">ntrboot</a><br><sub>(Requires a Compatible Flashcart)</sub></p><p style="display: inline-block; margin-top: 1.3em; vertical-align: super; width: 6%">or</p><p style="display: inline-block; margin-top: 1.3em; width: 47%"><a href="installing-boot9strap-(hardmod)">Installing boot9strap (Hardmod)</a><br><sub>(Requires Soldering)</sub></p></td>
     </tr>
   </tbody>
 </table>

_pages/en_US/installing-boot9strap-(2xrsa).txt

@@ -60,8 +60,5 @@ To extract the `.7z` files linked on this page, you will need a file archiver li
 
 ___
 
-New 3DS 2.1.0 users *must* [restore their NAND backup](godmode9-usage#nand_restore) before going to the [Finalizing Setup](finalizing-setup) page.
-{: .notice--danger}
-
 ### Continue to [Finalizing Setup](finalizing-setup)
 {: .notice--primary}

_pages/en_US/site-navigation.txt

@@ -30,8 +30,6 @@ sitemap: false
 + [Flashing ntrboot (3DS Multi System)](flashing-ntrboot-(3ds-multi-system))
 + [Flashing ntrboot (DSi)](flashing-ntrboot-(dsi))
 + [Flashing ntrboot (NDS)](flashing-ntrboot-(nds))
-+ [Get Started (New 3DS)](get-started-(new-3ds))
-+ [Get Started (Old 3DS)](get-started-(old-3ds))
 + [Get Started](get-started)
 + [GodMode9 Usage](godmode9-usage)
 + [H2testw (Windows)](h2testw-(windows))

assets/js/_main.js

@@ -122,11 +122,6 @@ $(document).ready(function(){
     }
   }
 
-  var devices = {
-    "get-started-(old-3ds)": "0",
-    "get-started-(new-3ds)": "1",
-  };
-
   var methods = {
     "installing-boot9strap-(2xrsa)": "0",
     "installing-boot9strap-(mset)": "1",
@@ -146,26 +141,20 @@ $(document).ready(function(){
     "installing-boot9strap-(hardmod)": "15",
   };
 
-  for(var device in devices){
-    if(window.location.href.indexOf("/" + device) > -1) {
-      localStorage.setItem('device', devices[device]);
-    }
-  }
-
   for(var method in methods){
     if(window.location.href.indexOf("/" + method) > -1) {
       localStorage.setItem('method', methods[method]);
     }
   }
 
-  var device, method;
+  var method;
-  if(!((device = localStorage.getItem('device')) && (method = localStorage.getItem('method')))){
+  if(!(method = localStorage.getItem('method'))){
     sidebar_shown = false;
   }
 
   if(sidebar_shown){
     var unhide = [];
-    var device_old = {
+    var route = {
       "0": ["installing-boot9strap-(2xrsa)", "finalizing-setup"],
       "1": ["installing-boot9strap-(mset)", "finalizing-setup"],
       "2": ["installing-boot9strap-(browser)", "finalizing-setup"],
@@ -175,22 +164,6 @@ $(document).ready(function(){
       "6": ["installing-boot9strap-(dsiware)", "installing-boot9strap-(dsiware-game-injection)", "finalizing-setup"],
       "7": ["installing-boot9strap-(dsiware)", "installing-boot9strap-(dsiware-save-injection)", "finalizing-setup"],
       "8": ["installing-boot9strap-(soundhax)", "finalizing-setup"],
-      "9": ["ntrboot", "installing-boot9strap-(ntrboot)", "finalizing-setup"],
-      "10": ["ntrboot", "flashing-ntrboot-(3ds-single-system)", "installing-boot9strap-(ntrboot)", "finalizing-setup"],
-      "11": ["ntrboot", "flashing-ntrboot-(3ds-multi-system)", "installing-boot9strap-(ntrboot)", "finalizing-setup"],
-      "12": ["ntrboot", "flashing-ntrboot-(dsi)", "installing-boot9strap-(ntrboot)", "finalizing-setup"],
-      "13": ["ntrboot", "flashing-ntrboot-(nds)", "installing-boot9strap-(ntrboot)", "finalizing-setup"],
-      "14": ["ntrboot", "flashing-ntrboot-(powersaves)", "installing-boot9strap-(ntrboot)", "finalizing-setup"],
-      "15": ["installing-boot9strap-(hardmod)", "finalizing-setup"],
-    };
-    var device_new = {
-      "0": ["installing-boot9strap-(2xrsa)", "godmode9-usage#restoring-a-nand-backup", "finalizing-setup"],
-      "3": ["homebrew-launcher-(soundhax)", "installing-boot9strap-(homebrew-launcher)", "finalizing-setup"],
-      "4": ["homebrew-launcher-(alternatives)", "installing-boot9strap-(homebrew-launcher)", "finalizing-setup"],
-      "5": ["installing-boot9strap-(dsiware)", "multiple-options", "finalizing-setup"],
-      "6": ["installing-boot9strap-(dsiware)", "installing-boot9strap-(dsiware-game-injection)", "finalizing-setup"],
-      "7": ["installing-boot9strap-(dsiware)", "installing-boot9strap-(dsiware-save-injection)", "finalizing-setup"],
-      "8": ["installing-boot9strap-(soundhax)", "finalizing-setup"],
       "9": ["ntrboot", "multiple-options", "installing-boot9strap-(ntrboot)", "finalizing-setup"],
       "10": ["ntrboot", "flashing-ntrboot-(3ds-single-system)", "installing-boot9strap-(ntrboot)", "finalizing-setup"],
       "11": ["ntrboot", "flashing-ntrboot-(3ds-multi-system)", "installing-boot9strap-(ntrboot)", "finalizing-setup"],
@@ -199,19 +172,10 @@ $(document).ready(function(){
       "14": ["ntrboot", "flashing-ntrboot-(powersaves)", "installing-boot9strap-(ntrboot)", "finalizing-setup"],
       "15": ["installing-boot9strap-(hardmod)", "finalizing-setup"],
     };
-    var route = {
+    unhide = unhide.concat(route[method]);
-      "0": device_old,
-      "1": device_new,
-    }
-    unhide = unhide.concat(route[device][method]);
     if(typeof unhide !== 'undefined' && unhide.length > 0){
       unhide.push("home");
       unhide.push("get-started");
-      if(device == "0"){
-        unhide.push("get-started-(old-3ds)");
-      } else if (device == "1"){
-        unhide.push("get-started-(new-3ds)");
-      }
       var ol = $('.sidebar.sticky .nav__list .nav__items ol');
       for (var i = 0; i < unhide.length; i++){
         ol.children('li[data-name="' + unhide[i] + '"]').css("display", "");
@@ -220,10 +184,10 @@ $(document).ready(function(){
         var link = $(li).find("a").attr('href');
         var name = $(li).attr('data-name');
         if((window.location.href.endsWith(link) ||
-            window.location.href.endsWith(link + "/") ||
+          window.location.href.endsWith(link + "/") ||
-            window.location.href.indexOf(link + "#") > -1 ||
+          window.location.href.indexOf(link + "#") > -1 ||
-            window.location.href.indexOf(link + ".html") > -1)
+          window.location.href.indexOf(link + ".html") > -1)
-            && name !== "home"){
+          && name !== "home"){
           $(li).addClass("active");
           return false;
         }