twrpme: Update installation instructions for A only & AB devices
*Updated links to platform-tools
*Moved current AB installation method as old by renaming the include & Added new method introduced in https://github.com/TeamWin/android_bootable_recovery/commit/53796e73334ac9d87d4cb5a355fc8c1d205104f6
*Misc updates
Change-Id: I10c695c9e3faab205ee206dc4e261cbc07bcffc8
diff --git a/_includes/fastbootabinstall.html b/_includes/fastbootabinstall.html
index b4988fd..6b25116 100644
--- a/_includes/fastbootabinstall.html
+++ b/_includes/fastbootabinstall.html
@@ -1,20 +1,22 @@
-<html>
<div class='page-heading'>Installation:</div>
-If you already have TWRP installed:
-Download the latest zip and install the zip using TWRP.
+WARNING: If you accidently flash TWRP to your device using fastboot instead of temporarily booting the image, you will need to download the latest factory image for your device and reflash the boot image.
-If you do not already have TWRP installed:
-Download both the img and the zip. You will need to have fastboot binaries and the correct drivers installed. Power off your device completely. Hold volume down and turn on the device. Your device should now be in the bootloader. Connect the device to your PC. Open a command window and run the following command from the proper location:
+<p class="text"><a href="https://developer.android.com/studio/releases/platform-tools">You will need the platform-tools from the Android SDK on your computer.</a> Download the platform-tools as per your operating system.</p>
-fastboot boot path/to/twrp.img
+Windows users will need proper drivers installed on their computer. You can try the <a href="https://forum.xda-developers.com/android/software-hacking/live-iso-adb-fastboot-driver-issues-t3526755" target=_blank>simple FWUL adb/fastboot ISO</a> or the <a href="http://www.xda-developers.com/universal-naked-driver-solves-your-adb-driver-problems-on-windows/">Naked ADB drivers</a> or the <a href="https://adb.clockworkmod.com/">Universal ADB drivers</a> if you don't already have a working driver installed
-This will temporarily boot TWRP on your device. Use adb to push the zip onto your device:
+Download the correct image file and copy the file into the same folder as your platform-tools as well as device's storage. Rename the image to twrp.img.
-<pre>
-adb push path/to/twrp.zip /
-</pre>
+Now reboot to fastboot/download/bootloader mode by using adb or manual key combos (Use Google to find that if you are not sure). To use adb to reboot, use the following command:
-Go to install and browse to the zip and install the zip. The zip will install TWRP to both boot slots. Installing TWRP at this time will remove root if you are currently rooted.
+<code>adb reboot bootloader</code>
-If you accidently flash TWRP to your device using fastboot instead of temporarily booting the image, you will need to download the latest factory image for your device and reflash the boot image.
-</html>
+Temporary boot the downloaded image using the following command:
+
+<code>fastboot boot twrp.img</code>
+
+Once booted, navigate to the Advanced > Install Recovery Ramdisk option. This will ask you to select the image you want to install TWRP from. Select the TWRP image you just downloaded and copied into device storage. Proceed to install this image.
+
+You also need to use the "Fix Recovery Bootloop" option present in the same Advanced Tab. Use that option after you have installed the recovery ramdisk successfully to avoid boot loops happening from installing TWRP Permanently.
+
+After this is done, you have successfully installed TWRP on your device.
diff --git a/_includes/fastbootabinstall_old.html b/_includes/fastbootabinstall_old.html
new file mode 100644
index 0000000..b4988fd
--- /dev/null
+++ b/_includes/fastbootabinstall_old.html
@@ -0,0 +1,20 @@
+<html>
+<div class='page-heading'>Installation:</div>
+If you already have TWRP installed:
+Download the latest zip and install the zip using TWRP.
+
+If you do not already have TWRP installed:
+Download both the img and the zip. You will need to have fastboot binaries and the correct drivers installed. Power off your device completely. Hold volume down and turn on the device. Your device should now be in the bootloader. Connect the device to your PC. Open a command window and run the following command from the proper location:
+
+fastboot boot path/to/twrp.img
+
+This will temporarily boot TWRP on your device. Use adb to push the zip onto your device:
+
+<pre>
+adb push path/to/twrp.zip /
+</pre>
+
+Go to install and browse to the zip and install the zip. The zip will install TWRP to both boot slots. Installing TWRP at this time will remove root if you are currently rooted.
+
+If you accidently flash TWRP to your device using fastboot instead of temporarily booting the image, you will need to download the latest factory image for your device and reflash the boot image.
+</html>
diff --git a/_includes/fastbootinstall.html b/_includes/fastbootinstall.html
index 3b9c373..4e21892 100644
--- a/_includes/fastbootinstall.html
+++ b/_includes/fastbootinstall.html
@@ -3,8 +3,8 @@
<div class='page-heading' id='fastboot-install'>Fastboot Install Method (No Root Required):</div>
<a id='fastboot'></a>
<hr />
-<p class="text"><a href="http://developer.android.com/sdk/index.html#linux-bundle-size">You will need the platform-tools from the Android SDK on your computer.</a> Find the Android command line tools section on the page linked and install the SDK tools package. From the SDK Manager, download only the platform-tools to get adb and fastboot binaries.</p>
-<p class="text">Windows users will need proper drivers installed on their computer. You can try the <a href="https://forum.xda-developers.com/android/software-hacking/live-iso-adb-fastboot-driver-issues-t3526755" target=_blank>simple FWUL adb/fastboot ISO</a> or the <a href="http://www.xda-developers.com/universal-naked-driver-solves-your-adb-driver-problems-on-windows/">Naked ADB drivers</a> or the <a href="https://adb.clockworkmod.com/">Universal ADB drivers</a> if you don't already have a working driver installed</p>
+<p class="text"><a href="https://developer.android.com/studio/releases/platform-tools">You will need the platform-tools from the Android SDK on your computer.</a> Download the platform-tools as per your operating system.</p>
+<p class="text">Windows users will need proper drivers installed on their computer. You can try the <a href="https://forum.xda-developers.com/android/software-hacking/live-iso-adb-fastboot-driver-issues-t3526755" target=_blank>simple FWUL adb/fastboot ISO</a> or the <a href="https://forum.xda-developers.com/google-nexus-5/development/adb-fb-apx-driver-universal-naked-t2513339">Naked ADB drivers</a> or the <a href="https://adb.clockworkmod.com/">Universal ADB drivers</a> if you don't already have a working driver installed</p>
<p class="text">On your device, go into Settings -> About and find the Build Number and tap on it 7 times to enable developer settings. Press back and go into Developer Options and enable USB debugging. From your computer, open a command prompt and type:</p>
<p class="code">adb reboot bootloader</p>
<p class="text">You should now be in fastboot mode.</p>
@@ -12,8 +12,8 @@
<p class="text">Your device needs to be unlocked before it can flash custom images. To unlock your device type:</p>
<p class="code">{{ fastboot }} oem unlock</p>
{% endif %}
-<p class="text">Download the correct image file and copy the file into the same folder as your adb and fastboot binaries. Rename the image to twrp.img and type:</p>
+<p class="text">Download the correct image file and copy the file into the same folder as your platform-tools. Rename the image to twrp.img and type:</p>
<p class="code">{{ fastboot }} flash recovery twrp.img</p>
<p class="code">{{ fastboot }} reboot</p>
-<p class="text">Note many devices will replace your custom recovery automatically during first boot. To prevent this, use <a href="http://www.google.com">Google</a> to find the proper key combo to enter recovery. After typing <span class="code">{{ fastboot }} reboot</span>, hold the key combo and boot to TWRP. Once TWRP is booted, TWRP will patch the stock ROM to prevent the stock ROM from replacing TWRP. If you don't follow this step, you will have to repeat the install.</p>
+<p class="text">Note many devices will replace your custom recovery automatically during first boot. To prevent this, use <a href="https://www.google.com">Google</a> to find the proper key combo to enter recovery. After typing <span class="code">{{ fastboot }} reboot</span>, hold the key combo and boot to TWRP. Once TWRP is booted, TWRP will patch the stock ROM to prevent the stock ROM from replacing TWRP. If you don't follow this step, you will have to repeat the install.</p>
</html>
diff --git a/_xiaomi/xiaomimia2.markdown b/_xiaomi/xiaomimia2.markdown
index 5bda100..74056b3 100644
--- a/_xiaomi/xiaomimia2.markdown
+++ b/_xiaomi/xiaomimia2.markdown
@@ -21,4 +21,4 @@
{% include twrpinstall.html %}
-{% include fastbootabinstall.html %}
+{% include fastbootabinstall_old.html %}