Task 1060: Update articles for using both caching rules and rules engine to enable DSA caching

Author: dksimpson

articles/cdn/cdn-caching-rules.md

@@ -1,6 +1,6 @@
 ---
-title: Control Azure Content Delivery Network caching behavior with caching rules | Microsoft Docs
-description: 'You can use CDN caching rules to set or modify default cache expiration behavior both globally and with conditions, such as a URL path and file extensions.'
+title: Control Azure CDN caching behavior with caching rules | Microsoft Docs
+description: You can use CDN caching rules to set or modify default cache expiration behavior both globally and with conditions, such as a URL path and file extensions.
 services: cdn
 documentationcenter: ''
 author: dksimpson
@@ -18,7 +18,7 @@ ms.author: v-deasim
 
 ---
 
-# Control Azure Content Delivery Network caching behavior with caching rules
+# Control Azure CDNk caching behavior with caching rules
 
 > [!NOTE] 
 > Caching rules are available only for **Azure CDN from Verizon Standard** and **Azure CDN from Akamai Standard**. For **Azure CDN from Verizon Premium**, you can use the [Azure CDN rules engine](cdn-rules-engine.md) in the **Manage** portal for similar functionality.
@@ -38,11 +38,11 @@ For information about default caching behavior and caching directive headers, se
 How to set CDN caching rules:
 
 1. Open the Azure portal, select a CDN profile, then select an endpoint.
-2. In the left pane under Settings, click **Caching rules**.
+2. In the left pane under Settings, select **Caching rules**.
 
    ![CDN Caching rules button](./media/cdn-caching-rules/cdn-caching-rules-btn.png)
 
-1. Create a global caching rule as follows:
+3. Create a global caching rule as follows:
    1. Under **Global caching rules**, set **Query string caching behavior** to **Ignore query strings**.
    2. Set **Caching behavior** to **Set if missing**.
 
@@ -60,6 +60,7 @@ How to set CDN caching rules:
 
     ![Custom caching rules](./media/cdn-caching-rules/cdn-custom-caching-rules.png)
 
+    
 > [!NOTE] 
 > Files that are cached before a rule change maintain their origin cache duration setting. To reset their cache durations, you must [purge the file](cdn-purge-endpoint.md). For **Azure CDN from Verizon** endpoints, it can take up to 90 minutes for caching rules to take effect.
 

articles/cdn/cdn-dynamic-site-acceleration.md

@@ -1,6 +1,6 @@
 ---
 title: Dynamic site acceleration via Azure CDN
-description: Dynamic site acceleration deep dive
+description: Azure CDN supports dynamic site acceleration (DSA) optimization for files with dynamic content.
 services: cdn
 documentationcenter: ''
 author: dksimpson    
@@ -148,19 +148,32 @@ With DSA, caching is turned off by default on the CDN, even when the origin incl
 
 If you have a website with a mix of static and dynamic assets, it is best to take a hybrid approach to get the best performance. 
 
-For **Azure CDN from Verizon Premium** profiles, you can turn on caching for specific cases by using the  [rules engine](cdn-rules-engine.md) for DSA endpoints. Any rules that are created affect only those endpoints of your profile that are optimized for DSA. 
+For **Azure CDN from Verizon Standard** and **Azure CDN from Akamai Standard** profiles, you can turn on caching for specific DSA endpoints by using [caching rules](cdn-caching-rules.md).
 
-To access the rules engine for DSA endpoints:
+To access caching rules:
+
+1. From the **CDN profile** page, under settings, select **Caching rules**.  
+    
+    ![CDN Caching rules button](./media/cdn-dynamic-site-acceleration/cdn-caching-rules-btn.png)
+
+    The **Caching rules** page opens.
+
+2. Create a global or custom caching rule to turn on caching for your DSA endpoint. 
+
+For **Azure CDN from Verizon Premium** profiles only, you turn on caching for specific DSA endpoints by using the [rules engine](cdn-rules-engine.md). Any rules that are created affect only those endpoints of your profile that are optimized for DSA. 
+
+To access the rules engine:
 
 1. From the **CDN profile** page, select **Manage**.  
 
-    ![CDN profile manage button](./media/cdn-rules-engine/cdn-manage-btn.png)
+    ![CDN profile manage button](./media/cdn-dynamic-site-acceleration/cdn-manage-btn.png)
 
     The CDN management portal opens.
 
 2. From the CDN management portal, select **ADN**, then select **Rules Engine**. 
 
-    ![Rules engine for DSA](./media/cdn-rules-engine/cdn-dsa-rules-engine.png)
+    ![Rules engine for DSA](./media/cdn-dynamic-site-acceleration/cdn-dsa-rules-engine.png)
+
 
 
 Alternatively, you can use two CDN endpoints: one endpoint optimized with DSA to deliver dynamic assets and another endpoint optimized with a static optimization type, such as general web delivery, to delivery cacheable assets. Modify your webpage URLs to link directly to the asset on the CDN endpoint you plan to use. 

articles/cdn/cdn-how-caching-works.md

@@ -1,6 +1,6 @@
 ---
 title: How caching works | Microsoft Docs
-description: 'Caching is the process of storing data locally so that future requests for that data can be accessed more quickly.'
+description: Caching is the process of storing data locally so that future requests for that data can be accessed more quickly.
 services: cdn
 documentationcenter: ''
 author: dksimpson
@@ -61,11 +61,11 @@ Two headers can be used to define cache freshness: `Cache-Control` and `Expires`
 ## Cache-directive headers
 
 > [!IMPORTANT]
-> By default, an Azure CDN endpoint that is optimized for DSA ignores cache-directive headers and bypasses caching. You can adjust how an Azure CDN endpoint treats these headers by using CDN caching rules to enable caching. For more information, see [Control Azure CDN caching behavior with caching rules](cdn-caching-rules.md).
+> By default, an Azure CDN endpoint that is optimized for DSA ignores cache-directive headers and bypasses caching. For **Azure CDN from Verizon Standard** and **Azure CDN from Akamai Standard** profiles, you can adjust how an Azure CDN endpoint treats these headers by using [CDN caching rules](cdn-caching-rules.md) to enable caching. For **Azure CDN from Verizon** profiles only, you use the [rules engine](cdn-rules-engine.md) to enable caching.
 
 Azure CDN supports the following HTTP cache-directive headers, which define cache duration and cache sharing: 
 
-`Cache-Control`
+**Cache-Control:**
 - Introduced in HTTP 1.1 to give web publishers more control over their content and to address the limitations of the `Expires` header.
 - Overrides the `Expires` header, if both it and `Cache-Control` are defined.
 - When used in a request header, `Cache-Control` is ignored by Azure CDN, by default.
@@ -76,37 +76,37 @@ Azure CDN supports the following HTTP cache-directive headers, which define cach
       - `no-cache`: Cache the content, but validate the content every time before delivering it from the cache. Equivalent to `Cache-Control: max-age=0`.
       - `no-store`: Never cache the content. Remove content if it has been previously stored.
 
-`Expires`
+**Expires:**
 - Legacy header introduced in HTTP 1.0; supported for backwards compatibility.
 - Uses a date-based expiration time with second precision. 
 - Similar to `Cache-Control: max-age`.
 - Used when `Cache-Control` doesn't exist.
 
-`Pragma`
+**Pragma:**
    - Not honored by Azure CDN, by default.
    - Legacy header introduced in HTTP 1.0; supported for backwards compatibility.
    - Used as a client request header with the following directive: `no-cache`. This directive instructs the server to deliver a fresh version of the resource.
    - `Pragma: no-cache` is equivalent to `Cache-Control: no-cache`.
 
 ## Validators
 
-When the cache is stale, HTTP cache validators are used to compare the cached version of a file with the version on the origin server. **Azure CDN from Verizon** supports both ETag and Last-Modified validators by default, while **Azure CDN from Akamai** supports only Last-Modified by default.
+When the cache is stale, HTTP cache validators are used to compare the cached version of a file with the version on the origin server. **Azure CDN from Verizon** supports both `ETag` and `Last-Modified` validators by default, while **Azure CDN from Akamai** supports only `Last-Modified` by default.
 
-`ETag`
+**ETag:**
 - **Azure CDN from Verizon** uses `ETag` by default while **Azure CDN from Akamai** does not.
 - `ETag` defines a string that is unique for every file and version of a file. For example, `ETag: "17f0ddd99ed5bbe4edffdd6496d7131f"`.
 - Introduced in HTTP 1.1 and is more current than `Last-Modified`. Useful when the last modified date is difficult to determine.
 - Supports both strong validation and weak validation; however, Azure CDN supports only strong validation. For strong validation, the two resource representations must be byte-for-byte identical. 
 - A cache validates a file that uses `ETag` by sending an `If-None-Match` header with one or more `ETag` validators in the request. For example, `If-None-Match: "17f0ddd99ed5bbe4edffdd6496d7131f"`. If the server’s version matches an `ETag` validator on the list, it sends status code 304 (Not Modified) in its response. If the version is different, the server responds with status code 200 (OK) and the updated resource.
 
-`Last-Modified`
-- For **Azure CDN from Verizon only**, Last-Modified is used if ETag is not part of the HTTP response. 
+**Last-Modified:**
+- For **Azure CDN from Verizon only**, `Last-Modified` is used if `ETag` is not part of the HTTP response. 
 - Specifies the date and time that the origin server has determined the resource was last modified. For example, `Last-Modified: Thu, 19 Oct 2017 09:28:00 GMT`.
 - A cache validates a file using `Last-Modified` by sending an `If-Modified-Since` header with a date and time in the request. The origin server compares that date with the `Last-Modified` header of the latest resource. If the resource has not been modified since the specified time, the server returns status code 304 (Not Modified) in its response. If the resource has been modified, the server returns status code 200 (OK) and the updated resource.
 
 ## Determining which files can be cached
 
-Not all resources can be cached. The following table shows what resources can be cached, based on the type of HTTP response. Resources delivered with HTTP responses that don't meet all of these conditions cannot be cached. For **Azure CDN from Verizon Premium** only, you can use the Rules Engine to customize some of these conditions.
+Not all resources can be cached. The following table shows what resources can be cached, based on the type of HTTP response. Resources delivered with HTTP responses that don't meet all of these conditions cannot be cached. For **Azure CDN from Verizon Premium** only, you can use the rules engine to customize some of these conditions.
 
 |                   | Azure CDN from Verizon | Azure CDN from Akamai            |
 |------------------ |------------------------|----------------------------------|