Merge branch 'production' into max/gw/csv

Author: maxvp

src/assets/images/style-guide/video/too_dark.png

@@ -4,7 +4,7 @@ pcx_content_type: how-to
 
 ---
 
-Enterprise customers can set cache time-to-live (TTL) based on the response status from the origin web server. Cache TTL refers to the duration of a resource in the Cloudflare network before being marked as `STALE` or discarded from cache. Status codes are returned by a resource’s origin.
+Customers can set cache time-to-live (TTL) based on the response status from the origin web server. Cache TTL refers to the duration of a resource in the Cloudflare network before being marked as `STALE` or discarded from cache. Status codes are returned by a resource's origin.
 
 Setting cache TTL based on response status overrides the [default cache behavior (standard caching)](/cache/concepts/default-cache-behavior/) for static files and overrides cache instructions sent by the origin web server. To cache non-static assets, set a [Cache Level of Cache Everything using a Cache Rule](/cache/how-to/cache-rules/create-api/#example-requests). Setting `no-store` **Cache-Control** or a low TTL (using `max-age`/`s-maxage`) increases requests to origin web servers and decreases performance.
 

src/assets/images/style-guide/video/too_warm_cool_1.png

@@ -6,6 +6,8 @@ sidebar:
 
 ---
 
+This guide covers how to deploy the Cloudflare WARP client using Microsoft Intune.
+
 ## Windows
 
 ### Prerequisites
@@ -44,4 +46,79 @@ Intune allows you to insert [predefined variables](https://learn.microsoft.com/e
 
 ## Android
 
-Refer to the [generic instructions for Android](/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/#android).
+To deploy WARP on Android devices:
+
+1. Log in to your Microsoft Intune account.
+2. Go to **Apps** > **Android** >**Add**.
+3. In **App type**, select _Managed Google Play app_.
+4. Add the **Cloudflare One Agent** app from the Google Play store. Its application ID is `com.cloudflare.cloudflareoneagent`.
+5. Go to **Apps** > **App Configuration policies** > **Add**.
+6. Select _Managed devices_.
+7. In **Name**, enter `Cloudflare One Agent`.
+8. For **Platform**, select _Android Enterprise_.
+9. Choose your desired  **Profile Type**.
+10. For **Targeted app**, select **Cloudflare One Agent**. Select **Next**.
+11. For **Configuration settings format**, select _Enter JSON data_. Enter your desired [deployment parameters](/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/parameters/) in the `managedProperty` field. For example:
+
+	```json
+	{
+		"kind": "androidenterprise#managedConfiguration",
+		"productId": "app:com.cloudflare.cloudflareoneagent",
+		"managedProperty": [
+			{
+				"key": "app_config_bundle_list",
+				"valueBundleArray": [
+					{
+						"managedProperty": [
+							{
+								"key": "organization",
+								"valueString": "your-team-name"
+							},
+							{
+								"key": "display_name",
+								"valueString": "Production environment"
+							},
+							{
+								"key": "service_mode",
+								"valueString": "warp"
+							},
+							{
+								"key": "onboarding",
+								"valueBool": false
+							},
+							{
+								"key": "support_url",
+								"valueString": "https://support.example.com/"
+							}
+						]
+					},
+					{
+						"managedProperty": [
+							{
+								"key": "organization",
+								"valueString": "test-org"
+							},
+							{
+								"key": "display_name",
+								"valueString": "Test environment"
+							}
+						]
+					}
+				]
+			}
+		]
+	}
+	```
+
+    Alternatively, if you do not want to copy and paste the JSON data, you can change **Configuration settings format** to _Use configuration designer_ and manually configure each deployment parameter.
+
+    Once you have configured the deployment parameters, select **Next**.
+
+12. Assign users or groups to this policy and select **Next**.
+13. Save the app configuration policy.
+14. Assign users or groups to the application:
+    1. Go to **Apps** > **Android** > **Cloudflare One Agent** > **Manage Properties**.
+    2. Select **Edit** and add users or groups.
+    3. Select **Review + save** > **Save**.
+
+Intune will now deploy the Cloudflare One Agent to user devices.

src/assets/images/style-guide/video/too_warm_cool_2.png

@@ -13,7 +13,7 @@ The descriptions below detail the fields available for `firewall_events`.
 
 Type: `string`
 
-The code of the first-class action the Cloudflare Firewall took on this request. <br />Possible actions are <em>unknown</em> \| <em>allow</em> \| <em>block</em> \| <em>challenge</em> \| <em>jschallenge</em> \| <em>log</em> \| <em>connectionclose</em> \| <em>challengesolved</em> \| <em>challengefailed</em> \| <em>challengebypassed</em> \| <em>jschallengesolved</em> \| <em>jschallengefailed</em> \| <em>jschallengebypassed</em> \| <em>bypass</em> \| <em>managedchallenge</em> \| <em>managedchallengeskipped</em> \| <em>managedchallengenoninteractivesolved</em> \| <em>managedchallengeinteractivesolved</em> \| <em>managedchallengebypassed</em>.
+The code of the first-class action the Cloudflare Firewall took on this request. <br />Possible actions are <em>unknown</em> \| <em>allow</em> \| <em>block</em> \| <em>challenge</em> \| <em>jschallenge</em> \| <em>log</em> \| <em>connectionclose</em> \| <em>challengesolved</em> \| <em>challengebypassed</em> \| <em>jschallengesolved</em> \| <em>jschallengebypassed</em> \| <em>bypass</em> \| <em>managedchallenge</em> \| <em>managedchallengenoninteractivesolved</em> \| <em>managedchallengeinteractivesolved</em> \| <em>managedchallengebypassed</em>.
 
 ## ClientASN
 

src/assets/images/style-guide/video/too_warm_cool_3.png

@@ -481,7 +481,7 @@ Action of the security rule that triggered a terminating action, if any.
 
 Type: `array[string]`
 
-Array of actions the Cloudflare security products performed on this request. The individual security products associated with this action be found in SecuritySources and their respective rule Ids can be found in SecurityRuleIDs. The length of the array is the same as SecurityRuleIDs and SecuritySources. <br />Possible actions are <em>unknown</em> \| <em>allow</em> \| <em>block</em> \| <em>challenge</em> \| <em>jschallenge</em> \| <em>log</em> \| <em>connectionClose</em> \| <em>challengeSolved</em> \| <em>challengeFailed</em> \| <em>challengeBypassed</em> \| <em>jschallengeSolved</em> \| <em>jschallengeFailed</em> \| <em>jschallengeBypassed</em> \| <em>bypass</em> \| <em>managedChallenge</em> \| <em>managedChallengeSkipped</em> \| <em>managedChallengeNonInteractiveSolved</em> \| <em>managedChallengeInteractiveSolved</em> \| <em>managedChallengeBypassed</em> \| <em>rewrite</em> \| <em>forceConnectionClose</em> \| <em>skip</em> \| <em>managedChallengeFailed</em>.
+Array of actions the Cloudflare security products performed on this request. The individual security products associated with this action be found in SecuritySources and their respective rule Ids can be found in SecurityRuleIDs. The length of the array is the same as SecurityRuleIDs and SecuritySources. <br />Possible actions are <em>unknown</em> \| <em>allow</em> \| <em>block</em> \| <em>challenge</em> \| <em>jschallenge</em> \| <em>log</em> \| <em>connectionClose</em> \| <em>challengeSolved</em> \| <em>challengeBypassed</em> \| <em>jschallengeSolved</em> \| <em>jschallengeBypassed</em> \| <em>bypass</em> \| <em>managedChallenge</em> \| <em>managedChallengeNonInteractiveSolved</em> \| <em>managedChallengeInteractiveSolved</em> \| <em>managedChallengeBypassed</em> \| <em>rewrite</em> \| <em>forceConnectionClose</em> \| <em>skip</em>.
 
 ## SecurityRuleDescription