Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-quickfix

HeidiSteen · HeidiSteen · commit f5743c475a23 · 2021-09-06T20:39:34.000-07:00
diff --git a/articles/cognitive-services/Face/build-enrollment-app.md b/articles/cognitive-services/Face/build-enrollment-app.md
@@ -61,15 +61,16 @@ For example, you may want to add situation-specific information on your consent
 > [!div class="mx-imgBorder"]
 > ![app consent page](./media/enrollment-app/1-consent-1.jpg)
 
-The service provides image quality checks to help you make the choice of whether the image is of sufficient quality to add the customer or attempt face recognition. This app demonstrates how to access frames from the device's camera, select the highest-quality frames, and add the detected face into the Face API service. 
-
 Many face recognition issues are caused by low-quality reference images. Some factors that can degrade model performance are:
 * Face size (faces that are distant from the camera)
 * Face orientation (faces turned or tilted away from camera)
 * Poor lighting conditions (either low light or backlighting) where the image may be poorly exposed or have too much noise
 * Occlusion (partially hidden or obstructed faces) including accessories like hats or thick-rimmed glasses)
 * Blur (such as by rapid face movement when the photograph was taken). 
 
+The service provides image quality checks to help you make the choice of whether the image is of sufficient quality based on the above factors to add the customer or attempt face recognition. This app demonstrates how to access frames from the device's camera, detect quality and show user interface messages to the user to help them capture a higher quality image, select the highest-quality frames, and add the detected face into the Face API service. 
+
+
 > [!div class="mx-imgBorder"]
 > ![app image capture instruction page](./media/enrollment-app/4-instruction.jpg)
 
@@ -102,4 +103,4 @@ When you're ready to release your app for production, you'll build an archive of
 
 ## Next steps  
 
-In this guide, you learned how to set up your development environment and get started with the sample app. If you're new to React Native, you can read their [getting started docs](https://reactnative.dev/docs/getting-started) to learn more background information. It also may be helpful to familiarize yourself with [Face API](Overview.md). Read the other sections on adding users before you begin development.
+In this guide, you learned how to set up your development environment and get started with the sample app. If you're new to React Native, you can read their [getting started docs](https://reactnative.dev/docs/getting-started) to learn more background information. It also may be helpful to familiarize yourself with [Face API](Overview.md). Read the other sections on adding users before you begin development.
diff --git a/articles/data-factory/connector-salesforce.md b/articles/data-factory/connector-salesforce.md
@@ -8,7 +8,7 @@ ms.service: data-factory
 ms.subservice: data-movement
 ms.topic: conceptual
 ms.custom: synapse
-ms.date: 08/30/2021
+ms.date: 09/03/2021
 ---
 
 # Copy data from and to Salesforce using Azure Data Factory or Azure Synapse Analytics
@@ -35,7 +35,7 @@ Specifically, this Salesforce connector supports:
 - Salesforce Developer, Professional, Enterprise, or Unlimited editions.
 - Copying data from and to Salesforce production, sandbox, and custom domain.
 
-The Salesforce connector is built on top of the Salesforce REST/Bulk API. By default, when copying data from Salesforce, the connector uses [v45](https://developer.salesforce.com/docs/atlas.en-us.218.0.api_rest.meta/api_rest/dome_versions.htm) and automatically chooses between REST and Bulk APIs based on the data size – when the result set is large, Bulk API is used for better performance; when writing data to Salesforce, the connector uses [v40](https://developer.salesforce.com/docs/atlas.en-us.208.0.api_asynch.meta/api_asynch/asynch_api_intro.htm) of Bulk API. You can also explicitly set the API version used to read/write data via [`apiVersion` property](#linked-service-properties) in linked service.
+The Salesforce connector is built on top of the Salesforce REST/Bulk API. When copying data from Salesforce, the connector automatically chooses between REST and Bulk APIs based on the data size – when the result set is large, Bulk API is used for better performance; You can explicitly set the API version used to read/write data via [`apiVersion` property](#linked-service-properties) in linked service.
 
 ## Prerequisites
 
@@ -91,7 +91,7 @@ The following properties are supported for the Salesforce linked service.
 | username |Specify a user name for the user account. |Yes |
 | password |Specify a password for the user account.<br/><br/>Mark this field as a SecureString to store it securely, or [reference a secret stored in Azure Key Vault](store-credentials-in-key-vault.md). |Yes |
 | securityToken |Specify a security token for the user account. <br/><br/>To learn about security tokens in general, see [Security and the API](https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_concepts_security.htm). The security token can be skipped only if you add the Integration Runtime's IP to the [trusted IP address list](https://developer.salesforce.com/docs/atlas.en-us.securityImplGuide.meta/securityImplGuide/security_networkaccess.htm) on Salesforce. When using Azure IR, refer to [Azure Integration Runtime IP addresses](azure-integration-runtime-ip-addresses.md).<br/><br/>For instructions on how to get and reset a security token, see [Get a security token](https://help.salesforce.com/apex/HTViewHelpDoc?id=user_security_token.htm). Mark this field as a SecureString to store it securely, or [reference a secret stored in Azure Key Vault](store-credentials-in-key-vault.md). |No |
-| apiVersion | Specify the Salesforce REST/Bulk API version to use, e.g. `48.0`. By default, the connector uses [v45](https://developer.salesforce.com/docs/atlas.en-us.218.0.api_rest.meta/api_rest/dome_versions.htm) to copy data from Salesforce, and uses [v40](https://developer.salesforce.com/docs/atlas.en-us.208.0.api_asynch.meta/api_asynch/asynch_api_intro.htm) to copy data to Salesforce. | No |
+| apiVersion | Specify the Salesforce REST/Bulk API version to use, e.g. `52.0`. | No |
 | connectVia | The [integration runtime](concepts-integration-runtime.md) to be used to connect to the data store. If not specified, it uses the default Azure Integration Runtime. | No |
 
 **Example: Store credentials**
diff --git a/articles/marketplace/co-sell-configure.md b/articles/marketplace/co-sell-configure.md
@@ -4,10 +4,10 @@ description: The information you provide on the Co-sell with Microsoft tab for y
 ms.service: marketplace 
 ms.subservice: partnercenter-marketplace-publisher
 ms.topic: how-to
-author: palanis-MSFT
-ms.author: palanis
+author: sharath-satish-msft
+ms.author: shsatish
 ms.reviewer: stmummer
-ms.date: 07/13/2021
+ms.date: 09/03/2021
 ---
 
 # Configure co-sell for a commercial marketplace offer
@@ -74,11 +74,11 @@ Solution types help define the scenarios that your offer is designed to address.
 
 ### Select solution areas
 
-Solution areas help to further define your solution. This helps Microsoft sales teams find and understand your solution’s value proposition. You must select at least one and up to a maximum of three solution areas for your offer. For each solution area, you can further choose up to two solution sub-areas.
+Solution areas help to further define your solution. This helps Microsoft sales teams find and understand your solution’s value proposition. You must select at least one and up to a maximum of five solution areas for your offer. For each solution area, you can further choose up to five solution sub-areas.
 
-1. Select the **+ Add solution area (3 Max)** link.
+1. Select the **+ Add solution area (5 Max)** link.
 1. Select a solution area from the drop-down list that appears.
-1. Select at least one and up to two solution sub-areas. To select multiple sub-areas, use the `Ctrl` key (on Windows) or `Command` key (on macOS).
+1. Select at least one and up to five solution sub-areas. To select multiple sub-areas, use the `Ctrl` key (on Windows) or `Command` key (on macOS).
 1. To add another solution area, repeat steps 1 through 3.
 
 ## Upload documents
@@ -173,4 +173,4 @@ Your contact information lets Microsoft sales teams and channel resellers reques
 ## Next steps
 
 - For details about republishing an offer, see [How to review and publish an offer to the commercial marketplace](review-publish-offer.md).
-- For information about commercial marketplace rewards and technical benefits, see [Your commercial marketplace benefits](gtm-your-marketplace-benefits.md).
+- For information about commercial marketplace rewards and technical benefits, see [Your commercial marketplace benefits](gtm-your-marketplace-benefits.md).
diff --git a/articles/virtual-network/public-ip-addresses.md b/articles/virtual-network/public-ip-addresses.md
@@ -56,7 +56,6 @@ Standard SKU public IP addresses:
 
 - Always use static allocation method.
 - Have an adjustable inbound originated flow idle timeout of 4-30 minutes, with a default of 4 minutes, and fixed outbound originated flow idle timeout of 4 minutes.
-- Used with network interfaces, standard public load balancers, or Application Gateways.
 - Designed to align with the "secure by default" model and be closed to inbound traffic when used as a frontend.  Allowlisting data plane traffic with [network security group](./network-security-groups-overview.md#network-security-groups) (NSG) is required (for example, on the NIC of a virtual machine with a Standard SKU Public IP attached).
 - Can be zone-redundant (which is advertised from all three zones), zonal (which is guaranteed in a specific pre-selected availability zone), or "no-zone" (which isn't associated with a specific pre-selected availability zone). To learn more about availability zones, see [Availability zones overview](../availability-zones/az-overview.md?toc=%2fazure%2fvirtual-network%2ftoc.json) and [Standard Load Balancer and Availability Zones](../load-balancer/load-balancer-standard-availability-zones.md?toc=%2fazure%2fvirtual-network%2ftoc.json). **Zone redundant IPs can only be created in [regions where three availability zones](../availability-zones/az-region.md) are live.** IPs created before zones are live won't be zone redundant.
 - Can be utilized with the [routing preference](routing-preference-overview.md) to enable more granular control of how traffic is routed between Azure and the Internet.
diff --git a/includes/virtual-machines-n-series-linux-support.md b/includes/virtual-machines-n-series-linux-support.md
@@ -28,7 +28,7 @@ The GRID drivers redistributed by Azure do not work on non-NV series VMs like NC
 
 |Distribution|Driver|
 | --- | -- |
-|Ubuntu 18.04 LTS<br/><br/>Ubuntu 16.04 LTS<br/><br/>Red Hat Enterprise Linux 7.7 to 7.9, 8.0, 8.1<br/><br/>SUSE Linux Enterprise Server 12 SP2 <br/><br/>SUSE Linux Enterprise Server 15 SP2 | NVIDIA GRID 12.2, driver branch [R460](https://go.microsoft.com/fwlink/?linkid=874272)(.exe)|
+|Ubuntu 18.04 LTS<br/><br/>Ubuntu 16.04 LTS<br/><br/>Red Hat Enterprise Linux 7.7 to 7.9, 8.0, 8.1<br/><br/>SUSE Linux Enterprise Server 12 SP2 <br/><br/>SUSE Linux Enterprise Server 15 SP2 | NVIDIA GRID 13, driver branch [R470](https://go.microsoft.com/fwlink/?linkid=874272)(.exe)|
 
 Visit [GitHub](https://github.com/Azure/azhpc-extensions/blob/master/NvidiaGPU/resources.json) for the complete list of all previous Nvidia GRID driver links.
 
diff --git a/includes/virtual-machines-n-series-windows-support.md b/includes/virtual-machines-n-series-windows-support.md
@@ -36,12 +36,12 @@ The NC-Series with Nvidia K80 GPUs do not support GRID/graphics applications.
 Please note that the Nvidia extension will always install the latest driver. We provide links to the previous version here for customers, who have dependency on an older version.
 
 For Windows Server 2019, Windows Server 2016 1607, 1709, and Windows 10(up to build 20H2):
-- [GRID 12.2 (462.31)](https://go.microsoft.com/fwlink/?linkid=874181) (.exe)
-- [GRID 12.1 (461.33)](https://download.microsoft.com/download/9/7/e/97e1be73-d24b-410b-9c08-cc98c7becfa3/461.33_grid_win10_server2016_server2019_64bit_azure_swl.exe) (.exe) 
+- [GRID 13 (471.68)](https://go.microsoft.com/fwlink/?linkid=874181) (.exe)
+- [GRID 12.2 (462.31)](https://download.microsoft.com/download/0/0/1/001f0edf-d852-4297-9cb7-10b31b1abf45/462.31_grid_win10_server2016_server2019_64bit_azure_swl.exe) (.exe) 
 
 For Windows Server 2012 R2: 
-- [GRID 12.2 (462.31)](https://download.microsoft.com/download/1/2/0/120551f5-cc05-4911-bd29-88fb2747213c/462.31_grid_server2012R2_64bit_azure_swl.exe) (.exe)
-- [GRID 12.1 (461.33)](https://download.microsoft.com/download/9/9/c/99caf5c6-af9f-48b2-bcb0-af5ec64b8592/461.33_grid_server2012R2_64bit_azure_swl.exe) (.exe) 
+- [GRID 13 (471.68)](https://download.microsoft.com/download/9/b/4/9b4d4f8d-7962-4a67-839b-37cc95756759/471.68_grid_winserver2012R2_64bit_azure_swl.exe) (.exe)
+- [GRID 12.2 (462.31)](https://download.microsoft.com/download/1/2/0/120551f5-cc05-4911-bd29-88fb2747213c/462.31_grid_server2012R2_64bit_azure_swl.exe) (.exe) 
 
 
 For the complete list of all previous Nvidia GRID driver links please visit [GitHub](https://github.com/Azure/azhpc-extensions/blob/master/NvidiaGPU/resources.json)
diff --git a/includes/virtual-wan-ipsec-custom-include.md b/includes/virtual-wan-ipsec-custom-include.md
@@ -29,4 +29,4 @@ When working with custom IPsec policies, keep in mind the following requirements
 | IPsec Encryption | GCMAES256, GCMAES128, AES256, AES128, None |
 | IPsec Integrity | GCMAES256, GCMAES128, SHA256 |
 | PFS Group | ECP384, ECP256, PFS24, PFS14, None |
-| SA Lifetime |integer; min. 300/ default 27000 seconds |
+| SA Lifetime |integer; min. 300/ default 3600 seconds |
