Merge "Update markdown for OnePlus X"
diff --git a/_devices/leecole2.markdown b/_devices/leecole2.markdown
new file mode 100644
index 0000000..320807a
--- /dev/null
+++ b/_devices/leecole2.markdown
@@ -0,0 +1,23 @@
+---
+layout: device
+title: "LeEco Le 2"
+codename: s2
+downloadfolder: s2
+supportstatus: Current
+maintainer: Rishabh Rao
+oem: LeEco
+devicetree: https://github.com/TeamWin/android_device_leeco_s2
+xdathread: http://http://forum.xda-developers.com/le-2/development/twrp-3-0-2-0-s2-built-source-custom-t3512723
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_devices/samsunggalaxygrandprime.markdown b/_devices/samsunggalaxygrandprime.markdown
new file mode 100644
index 0000000..14f9ad4
--- /dev/null
+++ b/_devices/samsunggalaxygrandprime.markdown
@@ -0,0 +1,26 @@
+---
+layout: device
+title: "Samsung Galaxy Grand Prime"
+codename: fortuna3g
+downloadfolder: fortuna3g
+supportstatus: Current
+maintainer: Carlos Arriaga
+oem: Samsung
+ddof: "/dev/block/mmcblk0p17"
+devicetree: https://github.com/TeamWin/android_device_samsung_fortuna3g.git
+xdathread: http://forum.xda-developers.com/grand-prime/development/twrp-twrp-3-0-2-r4-fortunaxx3g-t3486433
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_devices/samsunggalaxytabs105.markdown b/_devices/samsunggalaxytabs105.markdown
index 36c1024..75825fb 100644
--- a/_devices/samsunggalaxytabs105.markdown
+++ b/_devices/samsunggalaxytabs105.markdown
@@ -1,11 +1,11 @@
---
layout: device
-title: "Samsung Galaxy Tab S 10.5 Wi-Fi"
+title: "Samsung Galaxy Tab S 10.5 WiFi"
codename: chagallwifi
downloadfolder: chagallwifi
oldurl: http://teamw.in/project/twrp2/239
supportstatus: Current
-maintainer: deadman96385
+maintainer: jcadduono
oem: Samsung
ddof: "/dev/block/platform/dw_mmc.0/by-name/RECOVERY"
devicetree: "https://github.com/TeamWin/android_device_samsung_chagallwifi"
@@ -16,6 +16,8 @@
{% include supportstatus.html %}
+<p class="text">Note: Exynos models only. Your device model will be determined from your bootloader version.</p>
+
{% include appinstall.html %}
{% include download.html %}
diff --git a/_devices/samsunggalaxytabs105lte.markdown b/_devices/samsunggalaxytabs105lte.markdown
index f7a4ca7..701bea5 100644
--- a/_devices/samsunggalaxytabs105lte.markdown
+++ b/_devices/samsunggalaxytabs105lte.markdown
@@ -1,10 +1,10 @@
---
layout: device
-title: "Samsung Galaxy Tab S 10.5 LTE"
+title: "Samsung Galaxy Tab S 10.5 LTE"
codename: chagalllte
downloadfolder: chagalllte
supportstatus: Current
-maintainer: deadman96385
+maintainer: jcadduono
oem: Samsung
ddof: "/dev/block/platform/dw_mmc.0/by-name/RECOVERY"
devicetree: "https://github.com/TeamWin/android_device_samsung_chagalllte"
@@ -15,6 +15,8 @@
{% include supportstatus.html %}
+<p class="text">Note: Exynos models only. Your device model will be determined from your bootloader version.</p>
+
{% include appinstall.html %}
{% include download.html %}
diff --git a/_devices/samsunggalaxytabs84.markdown b/_devices/samsunggalaxytabs84.markdown
index 0c5deb0..e8e75fd 100644
--- a/_devices/samsunggalaxytabs84.markdown
+++ b/_devices/samsunggalaxytabs84.markdown
@@ -1,11 +1,11 @@
---
layout: device
-title: "Samsung Galaxy Tab S 8.4 Wi-Fi"
+title: "Samsung Galaxy Tab S 8.4 WiFi"
codename: klimtwifi
downloadfolder: klimtwifi
oldurl: http://teamw.in/project/twrp2/238
supportstatus: Current
-maintainer: deadman96385
+maintainer: jcadduono
oem: Samsung
ddof: "/dev/block/platform/dw_mmc.0/by-name/RECOVERY"
devicetree: "https://github.com/TeamWin/android_device_samsung_klimtwifi"
@@ -16,6 +16,8 @@
{% include supportstatus.html %}
+<p class="text">Note: Exynos models only. Your device model will be determined from your bootloader version.</p>
+
{% include appinstall.html %}
{% include download.html %}
diff --git a/_devices/samsunggalaxytabs84lte.markdown b/_devices/samsunggalaxytabs84lte.markdown
index b1dc077..5b4f86b 100644
--- a/_devices/samsunggalaxytabs84lte.markdown
+++ b/_devices/samsunggalaxytabs84lte.markdown
@@ -1,10 +1,10 @@
---
layout: device
-title: "Samsung Galaxy Tab S 8.4 LTE"
+title: "Samsung Galaxy Tab S 8.4 LTE"
codename: klimtlte
downloadfolder: klimtlte
supportstatus: Current
-maintainer: deadman96385
+maintainer: jcadduono
oem: Samsung
ddof: "/dev/block/platform/dw_mmc.0/by-name/RECOVERY"
devicetree: "https://github.com/TeamWin/android_device_samsung_klimtlte"
@@ -15,6 +15,8 @@
{% include supportstatus.html %}
+<p class="text">Note: Exynos models only. Your device model will be determined from your bootloader version.</p>
+
{% include appinstall.html %}
{% include download.html %}
diff --git a/_faq/pgpkeys.markdown b/_faq/pgpkeys.markdown
new file mode 100644
index 0000000..722b18f
--- /dev/null
+++ b/_faq/pgpkeys.markdown
@@ -0,0 +1,21 @@
+---
+layout: post
+title: "How do I verify TWRP files with PGP?"
+---
+
+Recently we implemented signing TWRP files with OpenPGP for security minded people who want to verify
+the non-repudiation of twrp.me files. You can read more about OpenPGP <a href="http://openpgp.org/about/">here</a>
+
+To verify a file, you will need to install our <a href="https://dl.twrp.me/public.asc">public key</a> into
+your keyring. The public key is also listed on each device's download page. Please download the key to a new file.
+When you click on the page, you will see a link for the PGP verification file as
+"Download PGP Signature twrp-device-version.type.asc". This file is in binary format and is created using our
+private key the first time the download page is created for the file. You can then perform
+the following steps to verify non-repudiation (Linux steps only):
+
+<ol>
+<li><pre>gpg --import twrp-public.asc</pre></li>
+<li><pre>gpg --verify twrp-device-version.type.asc twrp-device-version.type</pre></li>
+</ol>
+
+For Windows, please find a OpenPGP implementation and read the documentation to perform these steps.