Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-nsgflow

Author: halkazwini

.openpublishing.redirection.json

@@ -1,5 +1,30 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/cdn/cdn-caching-rules.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-caching-rules",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-dynamic-site-acceleration.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-dynamic-site-acceleration",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-caching-policy.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-caching-policy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-manage-expiration-of-blob-content.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-manage-expiration-of-blob-content",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-manage-expiration-of-cloud-service-content.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-manage-expiration-of-cloud-service-content",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cdn/cdn-http-variables.md",
       "redirect_url": "/previous-versions/azure/cdn/cdn-http-variables",
@@ -6777,7 +6802,12 @@
     {
       "source_path": "articles/defender-for-iot/organizations/extra-deploy-enterprise-iot.md",
       "redirect_url": "/azure/defender-for-iot/organizations/eiot-defender-for-endpoint",
-           "redirect_document_id": false
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cyclecloud/how-to/slurm-cloud-bursting-setup.md",
+      "redirect_url": "/azure/cyclecloud/how-to/bursting/slurm-cloud-bursting-setup",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/sentinel/work-with-styx-objects-indicators.md",

ThirdPartyNotices.md

@@ -7,9 +7,9 @@ see the [LICENSE](LICENSE) file, and grant you a license to any code in the repo
 Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
 may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
 The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
-Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
+You can find Microsoft general trademark guidelines at [Microsoft Trademark and Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks).
 
-Privacy information can be found at https://privacy.microsoft.com/en-us/
+For privacy information, see [privacy at Microsoft](https://privacy.microsoft.com/en-us/).
 
 Microsoft and any contributors reserve all other rights, whether under their respective copyrights, patents,
 or trademarks, whether by implication, estoppel, or otherwise.

articles/api-management/api-management-gateways-overview.md

@@ -79,19 +79,20 @@ The following tables compare features available in the following API Management
 | [Virtual network injection](virtual-network-concepts.md)  |  Developer, Premium | Premium v2 | ❌ | ✔️<sup>1,2</sup> | ✔️ |
 | [Inbound private endpoints](private-endpoint.md)  |  Developer, Basic, Standard, Premium | Standard v2 | ❌ | ❌ | ❌ |
 | [Outbound virtual network integration](integrate-vnet-outbound.md)  | ❌ | Standard  v2, Premium v2  |  ❌ | ❌ | ✔️ |
-| [Availability zones](zone-redundancy.md)  |  Premium | ❌  | ❌ | ✔️<sup>1</sup> | ✔️<sup>3</sup> |
+| [Availability zones](zone-redundancy.md)  |  Premium | ✔️<sup>3</sup>  | ❌ | ✔️<sup>1</sup> | ✔️<sup>3</sup> |
 | [Multi-region deployment](api-management-howto-deploy-multi-region.md) |  Premium | ❌ |  ❌ | ✔️<sup>1</sup> | ❌ |
-| [CA root certificates](api-management-howto-ca-certificates.md) for certificate validation |  ✔️ | ✔️ | ❌ | ✔️<sup>3</sup> |  ❌ |
+| [CA root certificates](api-management-howto-ca-certificates.md) for certificate validation |  ✔️ | ✔️ | ❌ | ✔️<sup>4</sup> |  ❌ |
 | [Managed domain certificates](configure-custom-domain.md?tabs=managed#domain-certificate-options) |  Developer, Basic, Standard, Premium | ❌ | ✔️ | ❌ | ❌ |
 | [TLS settings](api-management-howto-manage-protocols-ciphers.md) |  ✔️ | ✔️ | ✔️ | ✔️ | ❌ |
-| **HTTP/2** (Client-to-gateway) | ✔️<sup>4</sup> | ✔️<sup>4</sup> |❌ | ✔️ | ❌ |
+| **HTTP/2** (Client-to-gateway) | ✔️<sup>5</sup> | ✔️<sup>5</sup> |❌ | ✔️ | ❌ |
 | **HTTP/2** (Gateway-to-backend) |  ❌ | ❌ | ❌ | ✔️ | ❌ |
 | API threat detection with [Defender for APIs](protect-with-defender-for-apis.md) | ✔️ | ✔️ |  ❌ | ❌ | ❌ |
 
 <sup>1</sup> Depends on how the gateway is deployed, but is the responsibility of the customer.<br/>
 <sup>2</sup> Connectivity to the self-hosted gateway v2 [configuration endpoint](self-hosted-gateway-overview.md#fqdn-dependencies) requires DNS resolution of the endpoint hostname.<br/>
-<sup>3</sup> CA root certificates for self-hosted gateway are managed separately per gateway<br/>
-<sup>4</sup> Client protocol needs to be enabled.
+<sup>3</sup> Two zones are enabled by default; not configurable.<br/>
+<sup>4</sup> CA root certificates for self-hosted gateway are managed separately per gateway<br/>
+<sup>5</sup> Client protocol needs to be enabled.
 
 ### Backend APIs
 

articles/api-management/api-management-howto-api-inspector.md

@@ -97,7 +97,7 @@ Detailed steps follow.
 
     ```json
     {
-        "credentialsExpireAfter": PT1H,
+        "credentialsExpireAfter": "PT1H",
         "apiId": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
         "purposes": ["tracing"]
     }