edited FAQ, removed excessive line from choosing cfw environment page and fixed some links

Author: DefenderOfHyrule

Diff for: docs/faq.md

@@ -15,7 +15,7 @@ See <a href="https://gbatemp.net/threads/switch-informations-by-serial-number.48
 
 To launch CFW through the fusee-gelee, the Switch needs to be in "ReCovery Mode"(RCM).
 The easiest way to enter RCM is by grounding pin 10 in the right joycon rail and holding VOL+ on boot.
-Several methods and designs to do this exist, see [our guide](/user_guide/emummc/entering_rcm) for more information.
+Several methods and designs to do this exist, see [our guide](user_guide/rcm/entering_rcm.md) for more information.
 Once the Switch is in RCM it needs to be connected to either a computer, phone or dongle to send the exploit and the payload.
 
 This procedure needs to happen every time the Switch boots from a completely "off" state, otherwise the Switch will boot into the stock firmware.
@@ -134,7 +134,7 @@ These microSD cards are often fake and do not have the advertised amount of stor
 Amazon has had some problems with fake microSD cards, so we recommend buying them at a physical store. Even on trustworthy sites, *always, always check reviews on a product before buying!!*
 
 
-If you suspect your microSD card is fake or damaged, see the instructions <a href="https://3ds.eiphax.tech/sd.html" target="_blank">here</a> to verify the integrity of your microSD card.
+If you suspect your microSD card is fake or damaged, see the instructions <a href="https://wiki.hacks.guide/wiki/Checking_SD_card_integrity" target="_blank">here</a> to verify the integrity of your microSD card.
 
 
 
@@ -143,21 +143,11 @@ If you suspect your microSD card is fake or damaged, see the instructions <a hre
 
 This is an issue primarily affecting macOS users, but may occur on other devices as well. If you are able to launch the homebrew menu, but you are not seeing some or any of your Homebrew apps, you may need to unset the archive bit with Hekate.
 
-<<<<<<< HEAD
 1. Inject the Hekate payload using your favorite payload injector.
     - If you have a modchipped Switch, place the Hekate payload on the root of your microSD card and rename it to payload.bin, reinsert your microSD card into your Switch and turn it on.
-2. Click on `Tools` on the top menu bar.
-3. In the bottom left corner click on `Arch Bit • AutoRCM • Touch • Pkg1/2`.
-4. Click on `Fix Archive bit` - this might take a while.
+2. Press `Tools` on the top menu bar.
+3. In the bottom right corner, press `Arch Bit • AutoRCM • Touch • Pkg1/2`.
+4. Press `Fix Archive bit` - this might take a while.
 5. Press `Close` in the top right corner.
 6. Press `Home` in the top menu bar to get back from where you started.
-7. Follow the instructions at the Launching CFW page [here](user_guide/all/launching_cfw.md/) to launch Atmosphere.
-=======
-1. Send the Hekate payload to your Switch by following these instructions: [here](/user_guide/emummc/sending_payload/)
-2. Click on `Tools` on the top menu bar
-3. In the bottom left corner click on `Arch Bit • AutoRCM • Touch • Pkg1/2`
-4. Click on `Fix Archive bit` - this might take a while
-5. Press `Close` in the top right corner
-6. Press `Home` in the top menu bar to get back from where you started
-7. Follow the instructions at the Launching CFW page [here](/user_guide/emummc/launching_cfw/) to launch Atmosphere.
->>>>>>> b114b20 (Remove more remnants of old nh-server.github.io links)
+7. Follow the instructions at the Launching CFW page [here](user_guide/all/launching_cfw.md) to launch Atmosphere.

Diff for: docs/user_guide/all/cfw_environment.md

@@ -70,13 +70,12 @@ For more information on terminology, please refer to the [glossary](../../extras
 
     * A brick risk for risky behaviors, especially for modchip users [[info]](#modchip-instability)
     * A Nintendo server ban risk for misbehavior [[info]](https://nx.eiphax.tech/ban.html)
-    * No custom app installations on the HOME Menu (guaranteed ban)
     * No possibility of custom profile pictures (guaranteed ban)
 
     #### **In particular, here are just *some* popular use-cases for sysCFW:**
 
     * Enjoying CFW features such as custom sysmodules and homebrew apps
-    * Dumping eShop games, saves, and encryption keys for preservation or installation on emuMMC or external Switch emulators
+    * Dumping eShop games, save data, and encryption keys for preservation or installation on emuMMC or external Switch emulators
     * Restoring modified save data for many games
     * Custom fonts and home menu theming
     * Modifying and cheating in most offline games (and some online games; [[info]](../../homebrew/edizon.md))