Merge "Fix XA2, XA2 Plus, XA2 Ultra instructions"
diff --git a/_config.yml b/_config.yml
index 4694039..8881eda 100644
--- a/_config.yml
+++ b/_config.yml
@@ -161,9 +161,6 @@
razer:
output: true
- realme:
- output: true
-
samsung:
output: true
diff --git a/_includes/fastbootabinstall.html b/_includes/fastbootabinstall.html
new file mode 100644
index 0000000..b4988fd
--- /dev/null
+++ b/_includes/fastbootabinstall.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/_oem/realme.markdown b/_oem/realme.markdown
deleted file mode 100644
index b022efc..0000000
--- a/_oem/realme.markdown
+++ /dev/null
@@ -1,4 +0,0 @@
----
-layout: device
-oem: Realme
----
diff --git a/_realme/realme2pro.markdown b/_oppo/realme2pro.markdown
similarity index 79%
rename from _realme/realme2pro.markdown
rename to _oppo/realme2pro.markdown
index 28db5e3..d4f589c 100644
--- a/_realme/realme2pro.markdown
+++ b/_oppo/realme2pro.markdown
@@ -5,8 +5,8 @@
downloadfolder: RMX1801
supportstatus: Current
maintainer: SamarV-121
-oem: Realme
-devicetree: https://github.com/TeamWin/android_device_realme_RMX1801
+oem: Oppo
+devicetree: https://github.com/TeamWin/android_device_oppo_RMX1801
---
{% include disclaimer.html %}
diff --git a/_xiaomi/xiaomimi3.markdown b/_xiaomi/xiaomimi3.markdown
index ed5ae61..825f186 100644
--- a/_xiaomi/xiaomimi3.markdown
+++ b/_xiaomi/xiaomimi3.markdown
@@ -5,7 +5,7 @@
downloadfolder: cancro
oldurl: http://teamw.in/project/twrp2/288
supportstatus: Current
-maintainer: None
+maintainer: MkfsSion
devicetree: https://github.com/TeamWin/android_device_xiaomi_cancro.git
oem: Xiaomi
---
diff --git a/_xiaomi/xiaomimi8.markdown b/_xiaomi/xiaomimi8.markdown
new file mode 100644
index 0000000..535e448
--- /dev/null
+++ b/_xiaomi/xiaomimi8.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title: "Xiaomi Mi 8"
+codename: dipper
+downloadfolder: dipper
+supportstatus: Current
+maintainer: Mauronofrio
+devicetree: https://github.com/TeamWin/android_device_xiaomi_dipper
+oem: Xiaomi
+xdathread: "https://forum.xda-developers.com/mi-8/development/recovery-unofficial-twrp-recovery-t3893823"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_xiaomi/xiaomimia2.markdown b/_xiaomi/xiaomimia2.markdown
new file mode 100644
index 0000000..5bda100
--- /dev/null
+++ b/_xiaomi/xiaomimia2.markdown
@@ -0,0 +1,24 @@
+---
+layout: device
+title: "Xiaomi Mi A2"
+codename: jasmine_sprout
+downloadfolder: jasmine_sprout
+supportstatus: Current
+maintainer: Manish4586
+devicetree: https://github.com/TeamWin/android_device_xiaomi_jasmine_sprout
+oem: Xiaomi
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootabinstall.html %}
diff --git a/_xiaomi/xiaomimimix2s.markdown b/_xiaomi/xiaomimimix2s.markdown
new file mode 100644
index 0000000..8bee231
--- /dev/null
+++ b/_xiaomi/xiaomimimix2s.markdown
@@ -0,0 +1,24 @@
+---
+layout: device
+title: "Xiaomi Mi Mix 2S"
+codename: polaris
+downloadfolder: polaris
+supportstatus: Current
+maintainer: notsyncing, simonsmh
+devicetree: https://github.com/TeamWin/android_device_xiaomi_polaris
+oem: Xiaomi
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_xiaomi/xiaomimix3.markdown b/_xiaomi/xiaomimix3.markdown
new file mode 100644
index 0000000..874c5c2
--- /dev/null
+++ b/_xiaomi/xiaomimix3.markdown
@@ -0,0 +1,25 @@
+---
+layout: device
+title: "Xiaomi Mi MIX 3"
+codename: perseus
+downloadfolder: perseus
+supportstatus: Current
+maintainer: Mauronofrio
+devicetree: https://github.com/TeamWin/android_device_xiaomi_perseus
+oem: Xiaomi
+xdathread: "https://forum.xda-developers.com/mi-mix-3/development/recovery-unofficial-twrp-recovery-t3901261"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_xiaomi/xiaomiredminote6.markdown b/_xiaomi/xiaomiredminote6.markdown
new file mode 100644
index 0000000..59bba29
--- /dev/null
+++ b/_xiaomi/xiaomiredminote6.markdown
@@ -0,0 +1,24 @@
+---
+layout: device
+title: "Xiaomi Redmi Note 6"
+codename: tulip
+downloadfolder: tulip
+supportstatus: Current
+maintainer: Mauronofrio
+devicetree: https://github.com/TeamWin/android_device_xiaomi_tulip
+oem: Xiaomi
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_zuk/zukz2.markdown b/_zuk/zukz2.markdown
index dd08702..11c56e3 100644
--- a/_zuk/zukz2.markdown
+++ b/_zuk/zukz2.markdown
@@ -4,10 +4,10 @@
codename: z2_plus
downloadfolder: z2_plus
supportstatus: Current
-maintainer: ontherunvaro
+maintainer: DD3Boh
oem: ZUK / Lenovo
devicetree: https://github.com/TeamWin/android_device_zuk_z2_plus
-xdathread: https://forum.xda-developers.com/lenovo-zuk-z2/development/recovery-official-twrp-3-1-0-zuk-z2-t3587092
+xdathread: https://forum.xda-developers.com/lenovo-zuk-z2/development/pre-official-teamwin-recovery-project-3-t3899166
---
{% include disclaimer.html %}
diff --git a/_zuk/zukz2row.markdown b/_zuk/zukz2row.markdown
index 141ad39..765ff3a 100644
--- a/_zuk/zukz2row.markdown
+++ b/_zuk/zukz2row.markdown
@@ -4,10 +4,10 @@
codename: z2_row
downloadfolder: z2_row
supportstatus: Current
-maintainer: cosmedd
+maintainer: DD3Boh
oem: ZUK
devicetree: https://github.com/TeamWin/android_device_zuk_z2_row
-xdathread: https://forum.xda-developers.com/zuk-z2-pro/development/recovery-official-twrp-zuk-z2-pro-t3714651
+xdathread: https://forum.xda-developers.com/zuk-z2-pro/development/teamwin-recovery-project-3-2-3-zuk-z2-t3903727
---
{% include disclaimer.html %}
diff --git a/oem/realme.html b/oem/realme.html
deleted file mode 100644
index b568008..0000000
--- a/oem/realme.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: oem
-title: Realme
-permalink: /Devices/Realme/
-exclude: true
----
-
-<div class="home">
-
- <hr />
- <ul class="post-list" id="post-list">
- {% for post in site.realme %}
- <p>
- <strong><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }} ({{ post.codename }})</a></strong>
- </p>
- {% endfor %}
- </ul>
-</div>