fixed so much formatting

_src/android/android-enterprise-faq.md

@@ -188,17 +188,13 @@ There are a few options available:
 **Connect the device to ADB** if the profile still won’t delete. This requires enabling ADB debugging on the device via Developer options and a working ADB setup on a computer. A Google search will assist in getting this setup if necessary. Once the computer can detect the device over ADB, run the following:
 
 ```
-<pre class="wp-block-preformatted"> ```
 adb shell pm list users
-```<br></br>
 ```
 
 This should return a list of active users where user 0 is the parent (device/default) user, and any other number (10, 13, 200 etc) is the work profile. To remove the work profile run:
 
 ```
-<pre class="wp-block-preformatted">```
-adb shell pm remove-user <strong>13</strong>
-```
+adb shell pm remove-user 13
 ```
 
 Making sure of course the number reflects the returned value in the previous command.

_src/android/android-enterprise-provisioning-guides.md

@@ -41,39 +41,59 @@ Generic
 
 ### Fully managed
 
-<div class="wp-block-columns has-2-columns"><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/AE_FM_NFC_9.0_Generic-banner.jpg)](/download/doc/ae-guides/AE_FM_NFC_9.0_Generic.pdf)</figure></div><div class="wp-block-column"></div></div>
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/AE_FM_NFC_9.0_Generic-banner.jpg)](/download/doc/ae-guides/AE_FM_NFC_9.0_Generic.pdf)
 
 MobileIron Core
 ---------------
 
 ### Work profile
 
-<div class="wp-block-columns has-2-columns"><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/Android-enterprise-WP-Fac-Reset-MICore.png)](/download/doc/ae-guides/Android-enterprise_WP-Fac-Reset-MICore.pdf)</figure></div><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/Android-enterprise-WP-Non-Reset-MICore-1.png)](/download/doc/ae-guides/Android-enterprise_WP-Non-Reset-MICore.pdf)</figure></div></div>
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/Android-enterprise-WP-Fac-Reset-MICore.png)](/download/doc/ae-guides/Android-enterprise_WP-Fac-Reset-MICore.pdf)
+
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/Android-enterprise-WP-Non-Reset-MICore-1.png)](/download/doc/ae-guides/Android-enterprise_WP-Non-Reset-MICore.pdf)
 
 ### Fully managed
 
-<div class="wp-block-columns has-2-columns"><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/android_ae_nfc-1.png)](/download/doc/ae-guides/Android-enterprise_WM-NFC-MICore.pdf)</figure><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/android_ae_wt-2.png)](/download/doc/ae-guides/Android-enterprise_WM-WT-MICore.pdf)</figure></div><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/android_ae_qr-2.png)](/download/doc/ae-guides/Android-enterprise_WM-QR-MICore.pdf)</figure><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/android_ae_zt2-1.png)](/download/doc/ae-guides/Android-enterprise_WM-ZT-MICore.pdf)</figure></div></div>
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/android_ae_nfc-1.png)](/download/doc/ae-guides/Android-enterprise_WM-NFC-MICore.pdf)
+
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/android_ae_wt-2.png)](/download/doc/ae-guides/Android-enterprise_WM-WT-MICore.pdf)
+
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/android_ae_qr-2.png)](/download/doc/ae-guides/Android-enterprise_WM-QR-MICore.pdf)
+
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/android_ae_zt2-1.png)](/download/doc/ae-guides/Android-enterprise_WM-ZT-MICore.pdf)
 
 ### Fully managed work profile
 
 #### Sony UI
 
-<div class="wp-block-columns has-2-columns"><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-zt-sony.png)](/download/doc/ae-guides/Android-enterprise_WMWP-ZT-MICore_Sony.pdf)</figure><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-nfc-sony.png)](/download/doc/ae-guides/Android-enterprise_WMWP-NFC-MICore_Sony.pdf)</figure></div><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-qr-sony.png)](/download/doc/ae-guides/Android-enterprise_WMWP-QR-MICore_Sony.pdf)</figure></div></div>
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-zt-sony.png)](/download/doc/ae-guides/Android-enterprise_WMWP-ZT-MICore_Sony.pdf)
+
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-nfc-sony.png)](/download/doc/ae-guides/Android-enterprise_WMWP-NFC-MICore_Sony.pdf)
+
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-qr-sony.png)](/download/doc/ae-guides/Android-enterprise_WMWP-QR-MICore_Sony.pdf)
 
 #### Vanilla UI
 
-<div class="wp-block-columns has-2-columns"><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-zt-aone.png)](/download/doc/ae-guides/Android-enterprise_WMWP-ZT-MICore_AOne.pdf)</figure><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-nfc-aone.png)](/download/doc/ae-guides/Android-enterprise_WMWP-NFC-MICore_AOne.pdf)</figure></div><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-qr-aone.png)](/download/doc/ae-guides/Android-enterprise_WMWP-QR-MICore_AOne.pdf)</figure></div></div>
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-zt-aone.png)](/download/doc/ae-guides/Android-enterprise_WMWP-ZT-MICore_AOne.pdf)
+
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-nfc-aone.png)](/download/doc/ae-guides/Android-enterprise_WMWP-NFC-MICore_AOne.pdf)
+
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/wmwp-qr-aone.png)](/download/doc/ae-guides/Android-enterprise_WMWP-QR-MICore_AOne.pdf)
 
 AirWatch
 --------
 
 ### Fully managed
 
-<div class="wp-block-columns has-2-columns"><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/ae_wt_aw-1.png)](/download/doc/ae-guides/Android-enterprise_WM-WT-AirWatch.pdf)</figure><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/ae_nfc_aw.png)](/download/doc/ae-guides/Android-enterprise_WM-NFC-AirWatch.pdf)</figure></div><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/ae_qr_aw.png)](/download/doc/ae-guides/Android-enterprise_WM-QR-AirWatch.pdf)</figure></div></div>
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/ae_wt_aw-1.png)](/download/doc/ae-guides/Android-enterprise_WM-WT-AirWatch.pdf)
+
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/ae_nfc_aw.png)](/download/doc/ae-guides/Android-enterprise_WM-NFC-AirWatch.pdf)
+
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/ae_qr_aw.png)](/download/doc/ae-guides/Android-enterprise_WM-QR-AirWatch.pdf)
 
 Legacy enrolment
 ----------------
 
 Reference guide(s) for legacy enrolment, enabling direct comparison with Android Enterprise enrolment documented above.
 
-<div class="wp-block-columns has-2-columns"><div class="wp-block-column"><figure class="wp-block-image">[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/android_legacy-1.png)](/download/doc/ae-guides/Legacy-enrolment_Nexus.pdf)</figure></div><div class="wp-block-column"></div></div>
+[![](https://r2_worker.bayton.workers.dev/uploads/2017/08/android_legacy-1.png)](/download/doc/ae-guides/Legacy-enrolment_Nexus.pdf)

_src/android/android-enterprise-vs-device-administrator-legacy-enrolment.md

@@ -58,7 +58,10 @@ Some OEMs have over the years implemented their own APIs for various capabilitie
 
 When EMMs do implement these bespoke APIs, in addition to having to request *device administrator* permissions for the EMM agent, it’s highly likely the EMM would also require an additional, per-OEM, application installed on the device to better utilise them; SOTI is most notable for having over 170 of OEM plugins, but the act of installing one involves enabling unknown sources and sideloading APKs. [Not very secure](/android/why-you-shouldnt-install-apps-from-unknown-sources/).
 
-<div class="wp-block-image wp-image-4768 size-full"><figure class="alignleft">![](https://r2_worker.bayton.workers.dev/uploads/2017/10/apisupport-e1507840615305.png)<figcaption>*AirWatch restriction support by different OEMs*</figcaption></figure></div>Beyond basic security policies and perhaps a simple email/WiFi/etc configuration then, outside of the bigger OEMs (Samsung, Huawei, Sony, others to a lesser degree), there’s not a lot administrators can manipulate and control with a legacy-managed Android device, which already makes them rather unappealing for use in an enterprise setting.
+![](https://r2_worker.bayton.workers.dev/uploads/2017/10/apisupport-e1507840615305.png)
+*AirWatch restriction support by different OEMs*
+
+Beyond basic security policies and perhaps a simple email/WiFi/etc configuration then, outside of the bigger OEMs (Samsung, Huawei, Sony, others to a lesser degree), there’s not a lot administrators can manipulate and control with a legacy-managed Android device, which already makes them rather unappealing for use in an enterprise setting.
 
 The exception, as mentioned above, is Samsung. When a Samsung device is enrolled normally (as in, not via Knox Premium), EMM administrators have management over the device to a degree similar to that of an Android Enterprise [fully managed](/android/what-is-android-enterprise-and-why-is-it-used/#diving-deeper-with-work-managed-devices) device; there are an abundance of restrictions available and excellent visibility of device posture. Samsung’s DA offering isn’t perfect however, and encounters many of the other shortfalls of DA.
 
@@ -121,7 +124,7 @@ How Android Enterprise compares
 -------------------------------
 
 - Consistent, reliable management
-- Flexible, simple &amp; safe application management
+- Flexible, simple & safe application management
 - Zero-day support for new features and functionality
 - Secure by default
 - A solid foundation on which to build

_src/android/android-enterprise-zero-touch-console-device-guide.md

@@ -32,7 +32,9 @@ Zero-touch enrolment has been covered in depth in [What is Android zero-touch en
 
 There are two scenarios for which the zero-touch console is used, as an organisation or as a reseller. This guide targets the former, a good resource for resellers can be found [here](https://developers.google.com/zero-touch/guides/portal/).
 
-</div>Prerequisites
+</div>
+
+Prerequisites
 -------------
 
 In order to gain access to the zero-touch console and configure devices, you must:
@@ -46,14 +48,9 @@ Any of the above steps not completed will result in an inability to configure de
 Getting started
 ---------------
 
-<div class="wp-caption alignnone" id="attachment_4838" style="width: 1150px">
-
 ![](https://r2_worker.bayton.workers.dev/uploads/2017/10/ScreenShot2017-10-18at3.45.10PM.png)
-
 *The simple zero-touch process*
 
-</div>
-
 The zero-touch portal is designed with absolute simplicity in mind; much like the DEP portal (if you’ve ever used it) it’s basically there for you to infrequently log in, create or assign a config to managed devices and carry on with all other management via your normal EMM solution.
 
 Creating configurations

_src/android/android-version-evolution-graphics.md

@@ -20,20 +20,24 @@ discourse_permalink:
 FeaturedBackground:
     - android-gen
 ---
-<span class="ember-view" id="ember4851">I’ve created two Android evolution graphics: one that simply includes all Android versions, the second that incorporates Android Enterprise. </span>
+I’ve created two Android evolution graphics: one that simply includes all Android versions, the second that incorporates Android Enterprise.
 
-<div class="callout callout-info"> **NB:** From Android 10 there’s only one evolution graphic, which incorporates Android Enterprise. It’s super easy to remove AE references from the PPTx if desired, or grab an older version of the Android-only PPTx. </div><span class="ember-view" id="ember4856">The reasoning for this is twofold:</span>
+<div class="callout callout-info"> 
 
-1. <span class="ember-view" id="ember4856">All examples I was able to find online were out of date.</span>
-2. <span class="ember-view" id="ember4856">None incorporate Android Enterprise, which I believe is useful when presenting Android version history in an enterprise context.</span>
+**NB:** From Android 10 there’s only one evolution graphic, which incorporates Android Enterprise. It’s super easy to remove AE references from the PPTx if desired, or grab an older version of the Android-only PPTx. </div>
+
+The reasoning for this is twofold:
+
+1. All examples I was able to find online were out of date.
+2. None incorporate Android Enterprise, which I believe is useful when presenting Android version history in an enterprise context.
 
 Please feel free to use them, modify them and re-distribute them. I only request you provide credit, and share your own PPTx for others to benefit in kind! If your documentation is public, I’d love to see what you’ve created! Tweet me [@jasonbayton](https://twitter.com/jasonbayton) with the link.
 
 Future updates to this document will located on this page, feel free to come on back after the next version of Android launches!
 
 Click the image to view the PDF.
 
-<figure class="wp-block-image size-full">[![](https://r2_worker.bayton.workers.dev/uploads/2020/11/Android-Evolution-v5.jpg)](/download/doc/ae-general/AndroidEvolutionv5.pdf)</figure>
+[![](https://r2_worker.bayton.workers.dev/uploads/2020/11/Android-Evolution-v5.jpg)](/download/doc/ae-general/AndroidEvolutionv5.pdf)
 
 **Oreo:**  
 Android PPTx link: [Android\_Evolution.pptx](/download/doc/ae-general/Android_Evolution.pptx)  

_src/android/considerations-for-choosing-android-in-the-enterprise.md

@@ -33,7 +33,13 @@ Not convinced?
 
 From 2016-2019 Gartner has ranked Android higher than iOS in a number of areas, including kernel security, exploit protection, network security, workspace isolation and more; the results of which can be found in [this report](https://www.gartner.com/doc/3840064/mobile-oss-device-security-comparison) (12/2017) and [this report](https://www.gartner.com/document/3913286?ref=solrAll&refval=221750465&qid=dd391fbb8659244bf) (2019) should you have a Gartner subscription, if not here’s an overview:
 
-<figure class="wp-block-image">![](https://r2_worker.bayton.workers.dev/uploads/2019/02/image.png)<figcaption>Source: Gartner, December 2017. Thanks to [Samsung](http://s7d2.scene7.com/is/content/SamsungUS/samsungbusiness/solutions/samsung-knox/pdf/MobileDeviceSecurity-AComparisonofPlatforms-Feb12-2.pdf) for making this available on the public internet!</figcaption></figure><figure class="wp-block-image">![](https://r2_worker.bayton.workers.dev/uploads/2019/05/Gartner-Comparison-of-Security-Controls-2019.jpg)<figcaption>Source: Gartner, January 2019. Adapted from[ this source](https://youtu.be/zRhSmH4vSE0).</figcaption></figure>Let’s dive a little deeper into Android security:
+![](https://r2_worker.bayton.workers.dev/uploads/2019/02/image.png)
+*Source: Gartner, December 2017. Thanks to [Samsung](http://s7d2.scene7.com/is/content/SamsungUS/samsungbusiness/solutions/samsung-knox/pdf/MobileDeviceSecurity-AComparisonofPlatforms-Feb12-2.pdf) for making this available on the public internet!*
+
+![](https://r2_worker.bayton.workers.dev/uploads/2019/05/Gartner-Comparison-of-Security-Controls-2019.jpg)
+*Source: Gartner, January 2019. Adapted from[ this source](https://youtu.be/zRhSmH4vSE0).*
+
+Let’s dive a little deeper into Android security:
 
 ### Corporate/personal data separation
 
@@ -104,9 +110,10 @@ Organisations demand flexibility; in process, use-case, form factor and budget.
 
 Considering BYOD? Dedicated? Something in between? With four individual solution sets to choose from, Android offers a management scenario to suit all applications.
 
-<figure class="wp-block-image">![](https://r2_worker.bayton.workers.dev/uploads/2017/04/AEtypes-Page-6.png)<figcaption>
+![](https://r2_worker.bayton.workers.dev/uploads/2017/04/AEtypes-Page-6.png)
+*From: [What is Android Enterprise and why is it used?](/android/what-is-android-enterprise-and-why-is-it-used/)*
 
-From: [What is Android Enterprise and why is it used?](/android/what-is-android-enterprise-and-why-is-it-used/)</figcaption></figure>The in-depth document [What is Android Enterprise and why is it used?](/android/what-is-android-enterprise-and-why-is-it-used/#enter-android-enterprise) outlines these deployment scenarios and their applications, while this [infographic](/android/infobyte-did-you-know-android-enterprise-deployment-scenarios/) offers a deep-dive on each deployment scenario specifically.
+The in-depth document [What is Android Enterprise and why is it used?](/android/what-is-android-enterprise-and-why-is-it-used/#enter-android-enterprise) outlines these deployment scenarios and their applications, while this [infographic](/android/infobyte-did-you-know-android-enterprise-deployment-scenarios/) offers a deep-dive on each deployment scenario specifically.
 
 Whether your organisation wants to permit personal devices whilst managing corporate data on a secure, isolated, separately encrypted profile, or desires full control over the device, Android Enterprise offers all of this in a way that is quick and simple to manage.
 
@@ -160,7 +167,9 @@ Taking Gartner’s research into consideration, highlighting Android’s clear l
 
 A corporate version of Google Play permitting only applications approved by administrators; the primary Play Store on fully managed devices, or the badged Play Store for work profile-enabled devices.
 
-<div class="wp-block-image">![](https://r2_worker.bayton.workers.dev/uploads/2019/01/Screenshot_20190131-174333.png)</div>Managed Google Play offers complete control over the applications permitted on a managed device without affecting the native look and feel of the device.
+![](https://r2_worker.bayton.workers.dev/uploads/2019/01/Screenshot_20190131-174333.png)
+
+Managed Google Play offers complete control over the applications permitted on a managed device without affecting the native look and feel of the device.
 
 In conjunction with managed Google or Google Play accounts, applications can be distributed silently and simply, updated automatically, restricted from uninstallation and more.
 

_src/android/considerations-when-migrating-from-device-administrator-to-android-enterprise.md

@@ -26,7 +26,9 @@ FeaturedBackground:
 
 For information regarding Android Enterprise, including what it is, the deployment scenarios stated below and how it can benefit organisations, have a read of [What is Android Enterprise and why is it used?](/android/what-is-android-enterprise-and-why-is-it-used/)
 
-</div>A majority of organisations looking at Android Enterprise today will very likely already have a mature Android management process in place centred around the legacy *device administrator* enrolment model. With this model being [deprecated partially with Android P and fully in Android Q](/2017/12/google-is-deprecating-device-admin-in-favour-of-android-enterprise/), now is the time to start thinking about planning a migration.
+</div>
+
+A majority of organisations looking at Android Enterprise today will very likely already have a mature Android management process in place centred around the legacy *device administrator* enrolment model. With this model being [deprecated partially with Android P and fully in Android Q](/2017/12/google-is-deprecating-device-admin-in-favour-of-android-enterprise/), now is the time to start thinking about planning a migration.
 
 It is important to understand the implications of a migration from a device administrator deployment to one (or more) of the deployment scenarios available with Android Enterprise; depending on the deployment scenario chosen it *could* be very disruptive, but steps can be taken to reduce this.