Merge "htcu12+: update information about device specific changes"
diff --git a/_faq/OfficialMaintainer.markdown b/_faq/OfficialMaintainer.markdown
index 14887ab..3267877 100644
--- a/_faq/OfficialMaintainer.markdown
+++ b/_faq/OfficialMaintainer.markdown
@@ -1,6 +1,6 @@
 ---
 layout: post
-title:  "How Do I Become a TWRP Maintainer."
+title:  "How Do I Become a TWRP Maintainer?"
 ---
 
 <div class='page-heading'>How Do I Become a TWRP Maintainer?</div>
diff --git a/_faq/encryptionsupport.markdown b/_faq/encryptionsupport.markdown
new file mode 100644
index 0000000..aaae3ba
--- /dev/null
+++ b/_faq/encryptionsupport.markdown
@@ -0,0 +1,9 @@
+---
+layout: post
+title:  "Why doesn't TWRP support encryption on my device?"
+---
+
+<div class='page-heading'>Why doesn't TWRP support encryption on my device?</div>
+<hr />
+<p>TWRP encryption is supported in 2 phases. The first item is keeping up with the newest support from AOSP, which can require lot of changes and integration with the new AOSP release. This can take time especially if we have to wait for reference devices to test with. The second item is custom blob support and integration with device OEM firmware.</p>
+<p>Even if your device supports AOSP encryption and decryption, it usually requires custom blob support. The process of figuring this out may take time and may never be done. Some vendors such as Samsung use their own encryption techniques. Without heavy deconstruction/decompiling of custom library blobs, and successful ports by an active maintainer, this may never be done. Encryption support is a nice to have in TWRP, and not a must have support option. We feel that the ability to backup system and install custom firmware can outweigh having no TWRP support at all.</p>
diff --git a/_faq/whatistwrp.markdown b/_faq/whatistwrp.markdown
new file mode 100644
index 0000000..515bf81
--- /dev/null
+++ b/_faq/whatistwrp.markdown
@@ -0,0 +1,21 @@
+---
+layout: post
+title:  "What is TWRP?"
+---
+
+<div class='page-heading'>What is TWRP?</div>
+<hr />
+TWRP stands for TeamWin Recovery Project. It is a custom touch recovery that is GUI based.<br/><br/>
+<img src="https://twrp.me/images/home.png" alt="TWRP Home" /><br/><br/>
+TWRP allows the following features:
+<ul>
+<li>Backups of partitions in TAR or raw Image format</li>
+<li>Restore backups from internal storage, external SD storage or OTG devices</li>
+<li>Custom Firmware installation</li>
+<li>Partition wiping</li>
+<li>File deletion</li>
+<li>Terminal access</li>
+<li>ADB Root Shell</li>
+<li>Theme Support</li>
+<li>Possible decryption support depending on device</li>
+</ul>
diff --git a/_includes/head.html b/_includes/head.html
index 47057b5..158be7a 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -9,4 +9,13 @@
   <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
+
+  <link rel="preconnect" href="https://www.gstatic.com" />
+  <link rel="preconnect" href="https://ssum-sec.casalemedia.com" />
+  <link rel="preconnect" href="https://cms.quantserve.com" />
+  <link rel="preconnect" href="https://fcmatch.youtube.com" />
+  <link rel="preconnect" href="https://fonts.googleapis.com" />
+  <link rel="preconnect" href="https://odr.mookie1.com" />
+  <link rel="preconnect" href="https://encrypted-tbn3.gstatic.com" />
+  <link rel="preconnect" href="https://fcmatch.google.com" />
 </head>
diff --git a/_motorola/motorolamotog6.markdown b/_motorola/motorolamotog6.markdown
new file mode 100644
index 0000000..e5a548e
--- /dev/null
+++ b/_motorola/motorolamotog6.markdown
@@ -0,0 +1,24 @@
+---
+layout: device
+title:  "Motorola Moto G6"
+codename: ali
+downloadfolder: ali
+devicetree: https://github.com/TeamWin/android_device_motorola_ali
+supportstatus: Current
+maintainer: dejello
+oem: Motorola
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+Notes: Currently only vold decryption is working.  This image must be flashed to properly decrypt.  If you format data (Not just factory reset) after decrypting you must reboot into recovery and format again.
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_motorola/motorolamotoxforce.markdown b/_motorola/motorolamotoxforce.markdown
new file mode 100644
index 0000000..4d49b21
--- /dev/null
+++ b/_motorola/motorolamotoxforce.markdown
@@ -0,0 +1,21 @@
+---
+layout: device
+title:  "Motorola Moto X Force"
+codename: kinzie
+downloadfolder: kinzie
+supportstatus: Current
+maintainer: kaneawk
+oem: Motorola
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_nokia/nokia6.markdown b/_nokia/nokia6.markdown
new file mode 100644
index 0000000..5b21ab0
--- /dev/null
+++ b/_nokia/nokia6.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title:  "Nokia 6 (2017)"
+codename: PLE
+downloadfolder: PLE
+supportstatus: Current
+maintainer: racer123
+devicetree: https://github.com/TeamWin/android_device_nokia_PLE
+oem: Nokia
+ddof: "/dev/block/bootdevice/by-name/recovery"
+
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_nokia/nokia6_1.markdown b/_nokia/nokia6_1.markdown
new file mode 100644
index 0000000..7772894
--- /dev/null
+++ b/_nokia/nokia6_1.markdown
@@ -0,0 +1,46 @@
+---
+layout: device
+title:  "Nokia 6.1"
+codename: PL2
+downloadfolder: PL2
+supportstatus: Current
+maintainer: theimpulson
+oem: Nokia
+devicetree: https://github.com/TeamWin/android_device_nokia_PL2
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+NOTE: Monthly security updates may break decrypt in TWRP.
+
+{% include download.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.
+
+You can grab latest platform-tools (fastboot binaries) from [here]https://developer.android.com/studio/releases/platform-tools
+
+Now go in the directory where your adb/fastboot binaries exists.Connect the device to your PC.Enable USB debugging in developer options & then open a command window and run the following command from the proper location: 
+
+adb reboot bootloader
+
+Your device should now be in the bootloader.
+
+Then again from command window 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:
+
+adb push path/to/twrp.zip /
+
+Even MTP is working you can also directly copy zip from your pc and paste to your device.
+
+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.
diff --git a/_nubia/nubianx563j.markdown b/_nubia/nubianx563j.markdown
index 02df8f3..42d1362 100644
--- a/_nubia/nubianx563j.markdown
+++ b/_nubia/nubianx563j.markdown
@@ -23,6 +23,6 @@
 
 unlock bootloader and flash twrp
 
-fastboot oem nubia_unlock NUBIA_NX563J
+<p class="code">fastboot oem nubia_unlock NUBIA_NX563J</p>
 
-fastboot flash recovery twrp.img
+<p class="code">fastboot flash recovery twrp.img</p>
diff --git a/_nubia/nubianx589j.markdown b/_nubia/nubianx589j.markdown
index cb078b3..ad0b1e5 100644
--- a/_nubia/nubianx589j.markdown
+++ b/_nubia/nubianx589j.markdown
@@ -23,6 +23,6 @@
 
 unlock bootloader and flash twrp
 
-fastboot oem nubia_unlock NUBIA_NX589J
+<p class="code">fastboot oem nubia_unlcok NUBIA_NX589J</p>
 
-fastboot flash recovery twrp.img
+<p class="code">fastboot flash recovery twrp.img</p>
diff --git a/_nubia/nubianx609j.markdown b/_nubia/nubianx609j.markdown
index 9aa2a61..aaec6d4 100644
--- a/_nubia/nubianx609j.markdown
+++ b/_nubia/nubianx609j.markdown
@@ -23,6 +23,6 @@
 
 unlock bootloader and flash twrp
 
-fastboot oem nubia_unlock NUBIA_NX609J
+<p class="code">fastboot oem nubia_unlock NUBIA_NX609J</p>
 
-fastboot flash recovery twrp.img
+<p class="code">fastboot flash recovery twrp.img</p>
diff --git a/_samsung/samsunggalaxyace4.markdown b/_samsung/samsunggalaxyace4.markdown
new file mode 100644
index 0000000..75d3054
--- /dev/null
+++ b/_samsung/samsunggalaxyace4.markdown
@@ -0,0 +1,24 @@
+---
+layout: device
+title:  "Samsung Galaxy Ace 4 (SM-G316HU)"
+codename: vivalto5mve3g
+downloadfolder: vivalto5mve3g
+supportstatus: Current
+maintainer: Khalid
+oem: Samsung
+ddof: "/dev/block/platform/sprd-sdhci.3/by-name/RECOVERY"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_samsung/samsunggalaxytabs105lte.markdown b/_samsung/samsunggalaxytabs105lte.markdown
index 701bea5..71741e2 100644
--- a/_samsung/samsunggalaxytabs105lte.markdown
+++ b/_samsung/samsunggalaxytabs105lte.markdown
@@ -4,7 +4,7 @@
 codename: chagalllte
 downloadfolder: chagalllte
 supportstatus: Current
-maintainer: jcadduono
+maintainer: gellmar
 oem: Samsung
 ddof: "/dev/block/platform/dw_mmc.0/by-name/RECOVERY"
 devicetree: "https://github.com/TeamWin/android_device_samsung_chagalllte"
diff --git a/_sony/sonyxperiaxa2ultra.markdown b/_sony/sonyxperiaxa2ultra.markdown
new file mode 100644
index 0000000..019436a
--- /dev/null
+++ b/_sony/sonyxperiaxa2ultra.markdown
@@ -0,0 +1,34 @@
+---
+layout: device
+title:  "Sony Xperia XA2 Ultra"
+codename: discovery
+downloadfolder: discovery
+supportstatus: Current
+maintainer: LuK1337
+devicetree: https://github.com/TeamWin/android_device_sony_discovery.git
+oem: Sony
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+NOTE: Monthly security updates may break decrypt in TWRP. MTP does not work at this time, but you can use adb to transfer files.
+
+{% include download.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:
+
+adb push path/to/twrp.zip /
+
+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.
diff --git a/_xiaomi/xiaomimia1.markdown b/_xiaomi/xiaomimia1.markdown
index 52acd6a..6b8a61b 100644
--- a/_xiaomi/xiaomimia1.markdown
+++ b/_xiaomi/xiaomimia1.markdown
@@ -4,7 +4,7 @@
 codename: tissot

 downloadfolder: tissot

 supportstatus: Current

-maintainer: Mohan Cm(mohancm100)

+maintainer: nicknitewolf

 devicetree: "https://github.com/TeamWin/android_device_xiaomi_tissot.git"

 xdathread: "https://forum.xda-developers.com/mi-a1/development/recovery-twrp-3-1-1-0-touch-recovery-t3688472"

 oem: Xiaomi

@@ -24,4 +24,4 @@
 

 {% include fastbootinstall.html %}

 

-{% include ddinstall.html %}
\ No newline at end of file
+{% include ddinstall.html %}

diff --git a/_xiaomi/xiaomimia2lite.markdown b/_xiaomi/xiaomimia2lite.markdown
new file mode 100644
index 0000000..2563925
--- /dev/null
+++ b/_xiaomi/xiaomimia2lite.markdown
@@ -0,0 +1,30 @@
+---

+layout: device

+title:  "Xiaomi Mi A2 Lite"

+codename: daisy

+downloadfolder: daisy

+supportstatus: Current

+maintainer: Dees_Troy

+devicetree: "https://github.com/TeamWin/android_device_xiaomi_daisy.git"

+oem: Xiaomi

+---

+

+{% include disclaimer.html %}

+

+{% include supportstatus.html %}

+Note: Xiaomi's implementation of the keymaster may prevent decrypt from working using the fastboot boot images. Decrypt should work after installing TWRP.

+

+{% include download.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. Copy the zip to your device. 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. 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.

diff --git a/_xiaomi/xiaomiredmi6pro.markdown b/_xiaomi/xiaomiredmi6pro.markdown
new file mode 100644
index 0000000..99f1d9a
--- /dev/null
+++ b/_xiaomi/xiaomiredmi6pro.markdown
@@ -0,0 +1,29 @@
+---
+layout: device
+title:  "Xiaomi Redmi 6 Pro"
+codename: sakura
+downloadfolder: sakura
+supportstatus: Current
+maintainer: aragon12 (shubham)
+devicetree: https://github.com/TeamWin/android_device_xiaomi_sakura.git
+oem: Xiaomi
+ddof: "/dev/block/bootdevice/by-name/recovery"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include dmverity.html %}
+
+{% include xiaomiunlock.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_xiaomi/xiaomiredminote4.markdown b/_xiaomi/xiaomiredminote4.markdown
index 7341288..b8ee4bc 100644
--- a/_xiaomi/xiaomiredminote4.markdown
+++ b/_xiaomi/xiaomiredminote4.markdown
@@ -4,7 +4,7 @@
 codename: mido
 downloadfolder: mido
 supportstatus: Current
-maintainer: Abhishek Aggarwal
+maintainer: Mauronofrio
 devicetree: https://github.com/TeamWin/android_device_xiaomi_mido.git
 oem: Xiaomi
 ddof: "/dev/block/bootdevice/by-name/recovery"