Merge branch 'master' into safer_uninstall

_pages/en_US/ctrtransfer.txt

@@ -17,7 +17,7 @@ You MUST have already installed Luma3DS and boot9strap to use this.
 
 ### What You Need
 
-* The v1.9.2pre1 release of [GodMode9](https://github.com/d0k3/GodMode9/releases/tag/v1.9.2pre1)
+* The latest release of [GodMode9](https://github.com/d0k3/GodMode9/releases/latest)
 * The latest release of [FBI](https://github.com/Steveice10/FBI/releases/latest) *(the`.3dsx` file)*
 * The 11.5.0 CTRTransfer image for your device and region     
 *(if your device is not from one of these regions, just pick one that matches your device type)*:    

_pages/en_US/f3-(linux).txt

@@ -56,7 +56,7 @@ Average Reading speed: 9.42 MB/s
 
 ___
 
-If the test shows the result `Data LOST: 0.00 Byte (0 sectors)` your SD card is good and you can delete all `.h2w` files on your SD card
+If the test shows the result `Data LOST: 0.00 Byte (0 sectors)`, your SD card is good and you can delete all `.h2w` files on your SD card
 {: .notice--success}
 
 If the test shows any other results, your SD card may be corrupted or damaged and you may have to replace it!

_pages/en_US/f3x-(mac).txt

@@ -12,6 +12,9 @@ Depending on the size of your SD card and the speed of your computer, this proce
 
 This page is for Mac users only. If you are not on Mac, check out the [H2testw (windows)](h2testw-(windows)) or [F3 (Linux)](f3-(linux)) pages.
 
+If you're using a Mac on macOS 10.13 (High Sierra) and above, follow [F3XSwift (Mac)](f3xswift-(mac)) instead.
+{: .notice--primary}
+
 ### What You Need
 
 * The latest release of [F3X](https://github.com/insidegui/F3X/releases/latest)

_pages/en_US/f3xswift-(mac).txt

@@ -0,0 +1,38 @@
+---
+title: "F3XSwift (Mac)"
+---
+
+{% include toc title="Table of Contents" %}
+
+### Required Reading
+
+This is an add-on section for checking your SD card for errors using F3XSwift.
+
+Depending on the size of your SD card and the speed of your computer, this process can take up to several hours!
+
+This page is for Mac users only. If you are not on Mac, check out the [H2testw (Windows)](h2testw-(windows)) or [F3 (Linux)](f3-(linux)) pages.
+
+F3XSwift is only compatible with macOS 10.13 (High Sierra) and above. If you have an older version of macOS, follow [F3X (Mac)](f3x-(mac)) instead.
+{: .notice--primary}
+
+### What You Need
+
+* The latest release of [F3XSwift](https://github.com/vrunkel/F3XSwift/releases/latest)
+
+### Instructions
+
+1. Insert your SD card into your computer
+1. Run the F3XSwift app
+1. Select your SD card from the list of volumes
+1. Click "Test"
+1. Click "Open" to confirm writing to your SD card
+1. Wait until the process is complete
+
+If the test shows the result `Success! Your card is ok!`, your SD card is good and you can delete all .h2w files on your SD card
+{: .notice--success}
+
+If the test shows any other results, your SD card may be corrupted or damaged and you may have to replace it!
+{: .notice--danger}
+
+### Return to [Get Started](get-started)
+{: .notice--primary}

_pages/en_US/finalizing-setup.txt

@@ -27,7 +27,7 @@ During this process, we also setup programs such as the following:
 * The latest release of [Checkpoint](https://github.com/FlagBrew/Checkpoint/releases/latest) *(the `.cia` file)*
 * The latest release of [Universal-Updater](https://github.com/Universal-Team/Universal-Updater/releases/latest) *(the `.cia` file)*
 * The latest release of [Homebrew Launcher Wrapper](https://github.com/mariohackandglitch/homebrew_launcher_dummy/releases/latest)
-* The v1.9.2pre1 release of [GodMode9](https://github.com/d0k3/GodMode9/releases/tag/v1.9.2pre1)
+* The latest release of [GodMode9](https://github.com/d0k3/GodMode9/releases/latest)
 * The latest release of [DSP1](https://github.com/zoogie/DSP1/releases/latest) *(the `.cia` file)*
 * The latest release of [FBI](https://github.com/Steveice10/FBI/releases/latest) *(the `.cia` and `.3dsx` files)*
 * The latest release of [ctr-no-timeoffset](https://github.com/ihaveamac/ctr-no-timeoffset/releases/latest)
@@ -104,6 +104,7 @@ If, before following this guide, you already had an EmuNAND setup and would like
 
 1. Power off your device
 1. Press and hold (Start), and while holding (Start), power on your device. This will launch GodMode9
+  + If you do not boot into GodMode9, ensure that `GodMode9.firm` is in `/luma/payloads/` and that `payloads` is correctly spelled
 1. If you are prompted to create an essential files backup, press (A) to do so, then press (A) to continue once it has completed
 1. If you are prompted to fix the RTC date&time, press (A) to do so, then set the date and time, then press (A) to continue
 1. Press (Home) to bring up the action menu

_pages/en_US/get-started.txt

@@ -13,9 +13,11 @@ Different device models, versions, and regions will require different steps to a
 
 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.
 
-
 Click the image of your device to take you to the appropriate page.
 
+Before starting, you may want to check your SD card for errors using [H2testw (Windows)](h2testw-(windows)), [F3 (Linux)](f3-(linux)), or [F3XSwift (Mac)](f3xswift-(mac))!
+{: .notice--warning}
+
 | New 3DS or New 2DS | Old 3DS or Old 2DS |
 |:-:|:-:|
 | [![New 3DS](/images/new3ds.png)](get-started-(new-3ds)) &nbsp;&nbsp; [![New 3DS XL](/images/new3dsxl.png)](get-started-(new-3ds)) <br><br> [![New 2DS XL](/images/new2dsxl.png)](get-started-(new-3ds)) | [![Old 3DS](/images/old3ds.png)](get-started-(old-3ds)) &nbsp;&nbsp; [![Old 3DS XL](/images/old3dsxl.png)](get-started-(old-3ds)) <br><br> [![2DS](/images/2ds.png)](get-started-(old-3ds)) |

_pages/en_US/godmode9-usage.txt

@@ -22,7 +22,7 @@ Some of the instructions below are only applicable to the latest version of GodM
 
 ### What You Need
 
-* The v1.9.2pre1 release of [GodMode9](https://github.com/d0k3/GodMode9/releases/tag/v1.9.2pre1)
+* The latest release of [GodMode9](https://github.com/d0k3/GodMode9/releases/latest)
 
 ### Instructions
 

_pages/en_US/h2testw-(windows).txt

@@ -14,7 +14,7 @@ This page is for Windows users only. If you are not on windows, check out the [F
 
 ### What You Need
 
-* The latest version of [h2testw](http://www.heise.de/ct/Redaktion/bo/downloads/h2testw_1.4.zip)
+* The latest version of [h2testw](https://www.heise.de/ct/Redaktion/bo/downloads/h2testw_1.4.zip)
 
 ### Instructions
 

_pages/en_US/installing-boot9strap-(soundhax).txt

@@ -46,6 +46,7 @@ Soundhax (when combined with universal-otherapp) is compatible with versions 1.0
 1. Go to `/SDCARD`, then play "<3 nedwill 2016"
   + This may take many tries
   + If it freezes, force the console to power off by holding the power button, then try again
+  + If your console displays a red and white screen *and* your console is on system version 9.4.0, 9.5.0, or 9.6.0, try following [Homebrew Launcher (Soundhax)](homebrew-launcher-(soundhax))
 
     ![]({{ "/images/screenshots/soundhax-launch.png" | absolute_url }})
     {: .notice--info}

_pages/en_US/move-emunand.txt

@@ -16,7 +16,7 @@ You MUST have already installed Luma3DS and boot9strap to use this.
 ### What You Need
 
 * An existing EmuNAND
-* The v1.9.2pre1 release of [GodMode9](https://github.com/d0k3/GodMode9/releases/tag/v1.9.2pre1)
+* The latest release of [GodMode9](https://github.com/d0k3/GodMode9/releases/latest)
 * The latest release of [FBI](https://github.com/Steveice10/FBI/releases/latest)
 
 ### Instructions

_pages/en_US/region-changing.txt

@@ -29,7 +29,7 @@ You MUST have already installed Luma3DS and boot9strap to use this.
 
 ### What You Need
 
-* The v1.9.2pre1 release of [GodMode9](https://github.com/d0k3/GodMode9/releases/tag/v1.9.2pre1)
+* The latest release of [GodMode9](https://github.com/d0k3/GodMode9/releases/latest)
 * The latest release of [FBI](https://github.com/Steveice10/FBI/releases/latest) *(the`.3dsx` file)*
 * The 11.5.0 CTRTransfer image for your device and the region that you want to change to:
   +    <i class="fa fa-magnet" aria-hidden="true" title="This is a magnet link. Use a torrent client to download the file."></i> - [New 3DS or 2DS - 11.5.0 - EUR - CTRTransfer](magnet:?xt=urn:btih:465f1048f81e8e5c651ce2a4d9df48fec88d1099&dn=11.5.0-38E_ctrtransfer_n3ds.zip&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fbt.xxx-tracker.com%3A2710%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fmgtracker.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Fpublic.popcorn-tracker.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fthetracker.org%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.cypherpunks.ru%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.ds.is%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.mg64.net%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.open-internet.nl%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.port443.xyz%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.qt.is%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.vanitycore.co%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker-2.msm8916.com%3A6969%2Fannounce)

_pages/en_US/site-navigation.txt

@@ -27,6 +27,7 @@ sitemap: false
 + [Donations](donations)
 + [F3 (Linux)](f3-(linux))
 + [F3X (Mac)](f3x-(mac))
++ [F3XSwift (Mac)](f3xswift-(mac))
 + [FAQ](faq)
 + [File Extensions (Windows)](file-extensions-(windows))
 + [Finalizing Setup](finalizing-setup)

_pages/en_US/uninstall-cfw.txt

@@ -20,9 +20,9 @@ Note that if you have any payload files other than `GodMode9.firm` in the `/luma
 
 ### What You Need
 
-* The v1.9.2pre1 release of [GodMode9](https://github.com/d0k3/GodMode9/releases/tag/v1.9.2pre1)
+* The latest release of [GodMode9](https://github.com/d0k3/GodMode9/releases/latest)
-+ The latest release of [DSiWare Uninstaller](https://github.com/MechanicalDragon0687/DSiWare-Uninstaller/releases/latest)
+* The latest release of [DSiWare Uninstaller](https://github.com/MechanicalDragon0687/DSiWare-Uninstaller/releases/latest)
-* [safety_test.gm9](../../gm9_scripts/safety_test.gm9)
+* [safety_test.gm9]({{ base_path }}/gm9_scripts/safety_test.gm9)
 
 ### Instructions
 

assets/js/_main.js

@@ -111,7 +111,7 @@ $(document).ready(function(){
   }
 
   var sidebar_shown = true;
-  var sidebar_hidden_pages = ["404", "a9lh-to-b9s", "credits", "donations", "f3-(linux)", "f3x-(mac)", "faq",
+  var sidebar_hidden_pages = ["404", "a9lh-to-b9s", "credits", "donations", "f3-(linux)", "f3xswift-(mac)", "faq",
                               "file-extensions-(windows)", "get-started", "godmode9-usage", "h2testw-(windows)",
                               "region-changing", "site-navigation", "troubleshooting", "uninstall-cfw",
                               "updating-b9s", "why-ads", "privacy-policy", "checking-for-cfw"];