Merge pull request #207015 from MicrosoftDocs/main

Publish to Live, Friday 4AM PST, 8/5

Author: PMEds28

articles/api-management/virtual-network-reference.md

@@ -43,7 +43,8 @@ When an API Management service instance is hosted in a VNet, the ports in the fo
 | * / 443, 12000                     | Outbound           | TCP                | VirtualNetwork / AzureCloud            | Health and Monitoring Extension (optional)        | External & Internal  |
 | * / 1886, 443                     | Outbound           | TCP                | VirtualNetwork / AzureMonitor         | Publish [Diagnostics Logs and Metrics](api-management-howto-use-azure-monitor.md), [Resource Health](../service-health/resource-health-overview.md), and [Application Insights](api-management-howto-app-insights.md) (optional)                  | External & Internal  |
 | * / 25, 587, 25028                       | Outbound           | TCP                | VirtualNetwork / Internet            | Connect to SMTP Relay for sending e-mail (optional)                   | External & Internal  |
-| * / 6381 - 6383              | Inbound & Outbound | TCP                | VirtualNetwork / VirtualNetwork     | Access Redis Service for [Cache](api-management-caching-policies.md) policies between machines (optional)        | External & Internal  |
+| * / 6380             | Inbound & Outbound | TCP                | VirtualNetwork / VirtualNetwork     | Access external Azure Cache for Redis service for [caching](api-management-caching-policies.md) policies between machines (optional)        | External & Internal  |
+| * / 6381 - 6383              | Inbound & Outbound | TCP                | VirtualNetwork / VirtualNetwork     | Access internal Azure Cache for Redis service for [caching](api-management-caching-policies.md) policies between machines (optional)        | External & Internal  |
 | * / 4290              | Inbound & Outbound | UDP                | VirtualNetwork / VirtualNetwork     | Sync Counters for [Rate Limit](api-management-access-restriction-policies.md#LimitCallRateByKey) policies between machines (optional)        | External & Internal  |
 | * / 6390                       | Inbound            | TCP                | AzureLoadBalancer / VirtualNetwork | **Azure Infrastructure Load Balancer**                          | External & Internal  |
 

articles/azure-cache-for-redis/cache-best-practices-connection.md

@@ -3,9 +3,10 @@ title: Best practices for connection resilience
 titleSuffix: Azure Cache for Redis
 description: Learn how to make your Azure Cache for Redis connections resilient.
 author: flang-msft
+
 ms.service: cache
 ms.topic: conceptual
-ms.date: 11/3/2021
+ms.date: 08/03/2022
 ms.author: franlanglois
 ---
 
@@ -21,7 +22,9 @@ Test your system's resiliency to connection breaks using a [reboot](cache-admini
 
 ## TCP settings for Linux-hosted client applications
 
-Some Linux versions use optimistic TCP settings by default. The TCP settings can create a situation where a client connection to a cache cannot be reestablished for a long time when a Redis server stops responding before closing the connection gracefully. The failure to reestablish a connection can happen if the primary node of your Azure Cache For Redis becomes unavailable, for example, for unplanned maintenance.
+Some Linux versions use TCP settings that are too high by default. The higher TCP settings can create a situation where a client connection to a cache cannot be reestablished for a long time when a Redis server stops responding. The client waits too long before closing the connection gracefully.
+
+The failure to reestablish a connection can happen if the primary node of your Azure Cache For Redis becomes unavailable, for example, for unplanned maintenance.
 
 We recommend these TCP settings:
 

articles/azure-netapp-files/azacsnap-troubleshoot.md

@@ -12,7 +12,7 @@ ms.service: azure-netapp-files
 ms.workload: storage
 ms.tgt_pltfrm: na
 ms.topic: troubleshooting
-ms.date: 06/13/2022
+ms.date: 08/05/2022
 ms.author: phjensen
 ms.custom: kr2b-contr-experiment
 ---
@@ -163,6 +163,9 @@ To troubleshoot this error:
    [19/Nov/2020:18:41:10 +13:00] DEBUG: [PID:0020257:StorageANF:659] [1] Innerexception: Microsoft.IdentityModel.Clients.ActiveDirectory.AdalServiceException AADSTS7000222: The provided client secret keys are expired. Visit the Azure Portal to create new keys for your app, or consider using certificate credentials for added security: https://docs.microsoft.com/azure/active-directory/develop/active-directory-certificate-credentials
    ```
 
+> [!TIP]
+> For more information on generating a new Service Principal, refer to the section [Enable communication with Storage](azacsnap-installation.md?tabs=azure-netapp-files%2Csap-hana#enable-communication-with-storage) in the [Install Azure Application Consistent Snapshot tool](azacsnap-installation.md) guide.
+
 ## Troubleshoot failed 'test hana' command
 
 The command `azacsnap -c test --test hana` might not complete successfully.

articles/azure-resource-manager/custom-providers/index.yml

@@ -1,16 +1,16 @@
 ### YamlMime:Landing
 
 title: Azure Custom Providers documentation
-summary: Define custom APIs that extend the Azure experience
+summary: Define custom APIs that extend the Azure experience.
 
 metadata:
   title: Azure Custom Providers documentation
-  description: Azure Custom Providers is an extensibility platform to Azure that enables you define to custom APIs
+  description: Azure Custom Providers is an extensibility platform to Azure that enables you to define custom APIs.
   ms.service: azure-custom-providers
   ms.topic: landing-page
   ms.collection: na
-  author: tfitzmac
-  ms.author: tomfitz
+  author: davidsmatlak
+  ms.author: davidsmatlak
   ms.date: 01/02/2020
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
@@ -29,7 +29,7 @@ landingContent:
             url: concepts-built-in-policy.md
           - text: Resource onboarding overview
             url: concepts-resource-onboarding.md
-      
+
   # Card
   - title: Create custom providers
     linkLists:
@@ -67,5 +67,3 @@ landingContent:
             url: proxy-cache-resource-endpoint-reference.md
           - text: Custom provider RESTful endpoint reference
             url: reference-custom-providers-csharp-endpoint.md
-          
-        

articles/azure-resource-manager/managed-applications/index.yml

@@ -1,16 +1,16 @@
 ### YamlMime:Landing
 
-title: Managed Applications documentation
+title: Azure Managed Applications documentation
 summary: Offer cloud solutions that are easy for consumers to deploy and operate.
 
 metadata:
   title: Azure Managed Applications documentation
-  description: Azure managed applications enable you to offer cloud solutions that are easy for consumers to deploy and operate.
+  description: Azure Managed Applications enable you to offer cloud solutions that are easy for consumers to deploy and operate.
   ms.service: managed-applications
   ms.topic: landing-page
   ms.collection: na
-  author: tfitzmac
-  ms.author: tomfitz
+  author: davidsmatlak
+  ms.author: davidsmatlak
   ms.date: 01/02/2020
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
@@ -45,7 +45,7 @@ landingContent:
         links:
           - text: Create definition files
             url: publish-service-catalog-app.md
-          - text: Publish marketplace application 
+          - text: Publish marketplace application
             url: ../../marketplace/azure-app-offer-setup.md
           - text: Create managed application with custom provider
             url: tutorial-create-managed-app-with-custom-provider.md
@@ -94,4 +94,4 @@ landingContent:
           - text: Deploy with notifications
             url: publish-notifications.md
           - text: Update managed resources
-            url: update-managed-resources.md
+            url: update-managed-resources.md

articles/azure-resource-manager/templates/best-practices.md

@@ -189,6 +189,23 @@ The following information can be helpful when you work with [resources](./syntax
     ]
     ```
 
+   If your ARM template is stored in a `.jsonc` file, comments using the `//` syntax are supported, as shown here.
+
+    ```javascript
+    "resources": [
+      {
+        // This storage account is used to store the VM disks.
+        "name": "[variables('storageAccountName')]",
+        "type": "Microsoft.Storage/storageAccounts",
+        "apiVersion": "2019-06-01",
+        "location": "[resourceGroup().location]",
+          ...
+      }
+    ]
+    ```
+
+   For more details about comments and metadata see [Understand the structure and syntax of ARM templates](/azure/azure-resource-manager/templates/syntax#comments-and-metadata).
+
 * If you use a *public endpoint* in your template (such as an Azure Blob storage public endpoint), *don't hard-code* the namespace. Use the `reference` function to dynamically retrieve the namespace. You can use this approach to deploy the template to different public namespace environments without manually changing the endpoint in the template. Set the API version to the same version that you're using for the storage account in your template.
 
     ```json
@@ -272,6 +289,14 @@ The following information can be helpful when you work with [resources](./syntax
 
 * Specify explicit values for properties that have default values that could change over time. For example, if you're deploying an AKS cluster, you can either specify or omit the `kubernetesVersion` property. If you don't specify it, then [the cluster is defaulted to the N-1 minor version and latest patch](../../aks/supported-kubernetes-versions.md#azure-portal-and-cli-versions). When you deploy the cluster using an ARM template, this default behavior might not be what you expect. Redeploying your template may result in the cluster being upgraded to a new Kubernetes version unexpectedly. Instead, consider specifying an explicit version number and then manually changing it when you're ready to upgrade your cluster.
 
+## Comments
+
+In addition to the `comments` property, comments using the `//` syntax are supported.  For more details about comments and metadata see [Understand the structure and syntax of ARM templates](/azure/azure-resource-manager/templates/syntax#comments-and-metadata). You may choose to save JSON files that contain `//` comments using the `.jsonc` file extension, to indicate the JSON file contains comments. The ARM service will also accept comments in any JSON file including parameters files.
+
+## Visual Studio Code ARM Tools
+
+Working with ARM templates is much easier with the Azure Resource Manager (ARM) Tools for Visual Studio Code. This extension provides language support, resource snippets, and resource auto-completion to help you create and validate Azure Resource Manager templates. To learn more and install the extension, see [Azure Resource Manager (ARM) Tools](https://marketplace.visualstudio.com/items?itemName=msazurermtools.azurerm-vscode-tools).
+
 ## Use test toolkit
 
 The ARM template test toolkit is a script that checks whether your template uses recommended practices. When your template isn't compliant with recommended practices, it returns a list of warnings with suggested changes. The test toolkit can help you learn how to implement best practices in your template.

articles/azure-resource-manager/templates/deploy-cli.md

@@ -79,6 +79,8 @@ az deployment group create \
   --parameters storageAccountType=Standard_GRS
 ```
 
+The value of the `--template-file` parameter must be a Bicep file or a `.json` or `.jsonc` file. The `.jsonc` file extension indicates the file can contain `//` style comments. The ARM system accepts `//` comments in `.json` files. It does not care about the file extension. For more details about comments and metadata see [Understand the structure and syntax of ARM templates](/azure/azure-resource-manager/templates/syntax#comments-and-metadata).
+
 The Azure deployment template can take a few minutes to complete. When it finishes, you see a message that includes the result:
 
 ```output
@@ -268,9 +270,20 @@ az deployment group create \
   --parameters '@storage.parameters.json'
 ```
 
-## Handle extended JSON format
+## Comments and the extended JSON format
+
+You can include `//` style comments in your parameter file, but you must name the file with a `.jsonc` extension.
+
+```azurecli-interactive
+az deployment group create \
+  --name ExampleDeployment \
+  --resource-group ExampleGroup \
+  --template-file storage.json \
+  --parameters '@storage.parameters.jsonc'
+```
+For more details about comments and metadata see [Understand the structure and syntax of ARM templates](/azure/azure-resource-manager/templates/syntax#comments-and-metadata).
 
-To deploy a template with multi-line strings or comments using Azure CLI with version 2.3.0 or older, you must use the `--handle-extended-json-format` switch.  For example:
+If you are using Azure CLI with version 2.3.0 or older, you can deploy a template with multi-line strings or comments using the `--handle-extended-json-format` switch.  For example:
 
 ```json
 {

articles/azure-video-indexer/limited-access-features.md

@@ -22,6 +22,17 @@ Customers and partners who wish to use Limited Access features of Azure Video In
 
 The Azure Video Indexer service is made available to customers and partners under the terms governing their subscription to Microsoft Azure Services (including the [Service Specific Terms](https://www.microsoft.com/licensing/terms/productoffering/MicrosoftAzure/MCA#ServiceSpecificTerms)). Please review these terms carefully as they contain important conditions and obligations governing your use of Azure Video Indexer. 
 
+## Limited access features
+
+This section talks about limited access features in Azure Video Indexer.
+
+|When did I create the account?|Trial Account (Free)|	Paid Account <br/>(classic or ARM-based)|
+|---|---|---|
+|Existing VI accounts <br/><br/>created before June 21, 2022|Able to access face identification, customization and celebrities recognition till June 2023. <br/><br/>**Recommended**: Move to a paid account and afterward fill in the [intake form](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xUMkZIOUE1R0YwMkU0M1NMUTA0QVNXVDlKNiQlQCN0PWcu) and based on the eligibility criteria we will enable the features also after the grace period. |Able to access face identification, customization and celebrities recognition till June 2023\*.<br/><br/>**Recommended**: fill in the [intake form](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xUMkZIOUE1R0YwMkU0M1NMUTA0QVNXVDlKNiQlQCN0PWcu) and based on the eligibility criteria we will enable the features also after the grace period. <br/><br/>We proactively sent emails to these customers + AEs.|
+|New VI accounts <br/><br/>created after June 21, 2022	|Not able the access face identification, customization and celebrities recognition as of today. <br/><br/>**Recommended**: Move to a paid account and afterward fill in the [intake form](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xUMkZIOUE1R0YwMkU0M1NMUTA0QVNXVDlKNiQlQCN0PWcu). Based on the eligibility criteria we will enable the features (after max 10 days).|Azure Video Indexer disables the access face identification, customization and celebrities recognition as of today by default, but gives the option to enable it. <br/><br/>**Recommended**: Fill in the [intake form](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR7en2Ais5pxKtso_Pz4b1_xUMkZIOUE1R0YwMkU0M1NMUTA0QVNXVDlKNiQlQCN0PWcu) and based on the eligibility criteria we will enable the features (after max 10 days).|
+
+\*In Brazil South we also disabled the face detection.
+
 ## Help and support 
 
 FAQ about Limited Access can be found [here](https://aka.ms/limitedaccesscogservices).

articles/azure-vmware/enable-public-ip-nsx-edge.md

@@ -85,14 +85,15 @@ A Sourced Network Translation Service (SNAT) with Port Address Translation (PAT)
 Logging can be enabled by way of the logging slider. For more information on NSX-T NAT configuration and options, see the 
 [NSX-T NAT Administration Guide](https://docs.vmware.com/en/VMware-NSX-T-Data-Center/3.1/administration/GUID-7AD2C384-4303-4D6C-A44A-DEF45AA18A92.html)
 
-## No NAT rule for specific address ranges
+### No NAT rule for specific address ranges
 
 A No NAT rule can be used to exclude certain matches from performing Network Address Translation.  This policy can be used to allow private IP traffic to bypass the NAT rule.
 
 1. From your Azure VMware Solution private cloud, select **vCenter Credentials**.
 2.	Locate your NSX-T URL and credentials.
-3.	Log in to **VMWare NSX-T** and then select **3  NAT Rules**. 
-1. Select the T1 Router and then select **ADD NAT RULE**.         
+3.	Log in to **VMWare NSX-T** and then select **NAT Rules**. 
+1. Select the T1 Router and then select **ADD NAT RULE**.
+1. The **Source IP** is **Any** and **Destination IP** is the Azure VMware Solution reserved Public IP.         
 1. Select **SAVE**.
 
 ### Inbound Internet Access for VMs