Merge pull request #102956 from MicrosoftDocs/master

1/31 AM Publish

Author: huypub

articles/active-directory-b2c/localization-string-ids.md

@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 09/10/2018
+ms.date: 01/31/2020
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -75,7 +75,7 @@ The following example localizes the Facebook identity provider to Arabic:
 <LocalizedString ElementType="ClaimsProvider" StringId="FacebookExchange">فيس بوك</LocalizedString>
 ```
 
-## Sign-up or sign-in error messages
+### Sign-up or sign-in error messages
 
 | ID | Default value |
 | -- | ------------- |
@@ -128,7 +128,7 @@ The following are the IDs for a content definition with an ID of `api.localaccou
 | **ver_intro_msg** | Verification is necessary. Please click Send button. |
 | **ver_input** | Verification code |
 
-## Sign-up and self asserted pages error messages
+### Sign-up and self asserted pages error messages
 
 | ID | Default value |
 | -- | ------------- |
@@ -199,6 +199,29 @@ The following example shows the use of some of the user interface elements in th
 
 ![Sign-up page email verification UX elements](./media/localization-string-ids/localization-mfa2.png)
 
+## Verification display control user interface elements
+
+The following are the IDs for a [Verification display control](display-control-verification.md)
+
+| ID | Default value |
+| -- | ------------- |
+|verification_control_but_change_claims |Change |
+|verification_control_fail_send_code |Failed to send the code, please try again later. |
+|verification_control_fail_verify_code |Failed to verify the code, please try again later. |
+|verification_control_but_send_code |Send Code |
+|verification_control_but_send_new_code |Send New Code |
+|verification_control_but_verify_code |Verify Code |
+
+### Verification display control error messages
+
+| ID | Default value |
+| -- | ------------- |
+|UserMessageIfMaxRetryAttempted |One time password provided verification has exceeded maximum number of attempts |
+|UserMessageIfSessionDoesNotExist |One time password verification session has expired |
+|UserMessageIfSessionConflict |One time password verification session has conflict |
+|UserMessageIfInvalidCode |One time password provided for verification is incorrect |
+
+
 
 
 

articles/active-directory/cloud-provisioning/tutorial-pilot-aadc-aadccp.md

@@ -64,6 +64,7 @@ Azure AD Connect sync synchronizes changes occurring in your on-premises directo
 
     **Name:** Give the rule a meaningful name<br>
     **Description:** Add a meaningful description<br> 
+    
     **Connected System:** Choose the AD connector that you are writing the custom sync rule for<br>
     **Connected System Object Type:** User<br>
     **Metaverse Object Type:** Person<br>

articles/aks/azure-disk-customer-managed-keys.md

@@ -12,7 +12,7 @@ ms.author: mlearned
 
 # Bring your own keys (BYOK) with Azure disks in Azure Kubernetes Service (AKS)
 
-Azure Storage encrypts all data in a storage account at rest. By default, data is encrypted with Microsoft-managed keys. For additional control over encryption keys, you can supply [customer-managed keys][customer-managed-keys] to use for encryption of both the OS and data disks for your AKS clusters.
+Azure Storage encrypts all data in a storage account at rest. By default, data is encrypted with Microsoft-managed keys. For additional control over encryption keys, you can supply [customer-managed keys][customer-managed-keys] to use for encryption at rest for both the OS and data disks for your AKS clusters.
 
 > [!NOTE]
 > BYOK Linux and Windows based AKS clusters are available in [Azure regions][supported-regions] that support server side encryption of Azure managed disks.

articles/aks/private-clusters.md

@@ -127,7 +127,7 @@ The API server endpoint has no public IP address. Consequently, you must create
 * To use a custom DNS server, deploy an AD server with DNS to forward to this IP 168.63.129.16
 
 ## Limitations 
-* Availability Zones are not currently supported
+* Availability Zones are currently only supported for East US 2 and West US 2 regions
 * [Azure Private Link service limitations][private-link-service] apply to private clusters, Azure private endpoints, and virtual network service endpoints, which aren't currently supported in the same virtual network.
 * No support for virtual nodes in a private cluster to spin private Azure Container Instances (ACI) in a private Azure virtual network
 * No support for Azure DevOps integration out of the box with private clusters

articles/backup/backup-afs.md

@@ -1,128 +1,126 @@
 ---
 title: Back up Azure file shares in the Azure portal
-description: Learn how to use the Azure portal to back up Azure file shares in the Recovery Services Vault
+description: Learn how to use the Azure portal to back up Azure file shares in the Recovery Services vault
 ms.topic: conceptual
 ms.date: 01/20/2020
 ---
 
-# Back up Azure file shares in a Recovery Services Vault
+# Back up Azure file shares in a Recovery Services vault
 
 This article explains how to use the Azure portal to back up [Azure file shares](https://docs.microsoft.com/azure/storage/files/storage-files-introduction).
 
-In this guide, you'll learn how to:
+In this article, you'll learn how to:
 
-* Create a Recovery Services vault
-* Discover fileshares and configure backups
-* Run an on-demand backup job to create a restore point
+* Create a Recovery Services vault.
+* Discover file shares and configure backups.
+* Run an on-demand backup job to create a restore point.
 
 ## Prerequisites
 
-* Identify or create a [Recovery Services vault](#create-a-recovery-services-vault) in the same region as the storage account hosting the file share.
+* Identify or create a [Recovery Services vault](#create-a-recovery-services-vault) in the same region as the storage account that hosts the file share.
+* Ensure that the file share is present in one of the [supported storage account types](#limitations-for-azure-file-share-backup-during-preview).
 
-* Ensure that the file share is present in one of the [supported Storage Account types](#limitations-for-azure-file-share-backup-during-preview).
+## Limitations for Azure file share backup during preview
 
-## Limitations for Azure file share backup during Preview
+Backup for Azure file shares is in preview. Azure file shares in both general-purpose v1 and general-purpose v2 storage accounts are supported. Here are the limitations for backing up Azure file shares:
 
-Backup for Azure file shares is in Preview. Azure file shares in both general-purpose v1 and general-purpose v2 storage accounts are supported. These are the limitations for backing-up Azure file shares:
-
-* Support for Backup of Azure file shares in storage accounts with [zone redundant storage](https://docs.microsoft.com/azure/storage/common/storage-redundancy-zrs) (ZRS) replication is currently limited to [these regions](https://docs.microsoft.com/azure/backup/backup-azure-files-faq#in-which-geos-can-i-back-up-azure-file-shares).
+* Support for backup of Azure file shares in storage accounts with [zone-redundant storage](https://docs.microsoft.com/azure/storage/common/storage-redundancy-zrs) (ZRS) replication is currently limited to [these regions](https://docs.microsoft.com/azure/backup/backup-azure-files-faq#in-which-geos-can-i-back-up-azure-file-shares).
 * Azure Backup currently supports configuring scheduled once-daily backups of Azure file shares.
 * The maximum number of scheduled backups per day is one.
 * The maximum number of on-demand backups per day is four.
 * Use [resource locks](https://docs.microsoft.com/cli/azure/resource/lock?view=azure-cli-latest) on the storage account to prevent accidental deletion of backups in your Recovery Services vault.
-* Do not delete snapshots created by Azure Backup. Deleting snapshots can result in loss of recovery points and/or restore failures.
-* Do not delete file shares that are protected by Azure Backup. The current solution will delete all snapshots taken by Azure Backup once the file share is deleted and therefore all restore points will be lost.
+* Don't delete snapshots created by Azure Backup. Deleting snapshots can result in loss of recovery points or restore failures.
+* Don't delete file shares that are protected by Azure Backup. The current solution deletes all snapshots taken by Azure Backup after the file share is deleted, so all restore points will be lost.
 
 [!INCLUDE [How to create a Recovery Services vault](../../includes/backup-create-rs-vault.md)]
 
 ## Modify storage replication
 
 By default, vaults use [geo-redundant storage (GRS)](https://docs.microsoft.com/azure/storage/common/storage-redundancy-grs).
 
-* If the vault is your primary backup mechanism, we recommend you use GRS.
-
+* If the vault is your primary backup mechanism, we recommend that you use GRS.
 * You can use [locally redundant storage (LRS)](https://docs.microsoft.com/azure/storage/common/storage-redundancy-lrs?toc=%2fazure%2fstorage%2fblobs%2ftoc.json) as a low-cost option.
 
-Modify the storage replication type as follows:
+To modify the storage replication type:
 
-1. In the new vault, click **Properties** in the **Settings** section.
+1. In the new vault, select **Properties** under the **Settings** section.
 
-2. In **Properties**, under **Backup Configuration**, click **Update**.
+1. On the **Properties** page, under **Backup Configuration**, select **Update**.
 
-3. Select the storage replication type, and click **Save**.
+1. Select the storage replication type, and select **Save**.
 
     ![Update Backup Configuration](./media/backup-afs/backup-configuration.png)
 
 > [!NOTE]
-> You can't modify the storage replication type after the vault is set up and contains backup items. If you want to do this, you need to recreate the vault.
+> You can't modify the storage replication type after the vault is set up and contains backup items. If you want to do this, you need to re-create the vault.
 >
 
-## Discover File Shares and configure backup
+## Discover file shares and configure backup
 
 1. In the [Azure portal](https://portal.azure.com/), open the Recovery Services vault you want to use to back up the file share.
 
-2. In the **Recovery Services vault** dashboard, select  **+Backup**.
+1. In the **Recovery Services vault** dashboard, select **+Backup**.
 
-   ![Recovery Services Vault](./media/backup-afs/recovery-services-vault.png)
+   ![Recovery Services vault](./media/backup-afs/recovery-services-vault.png)
 
-   a. In **Backup Goal**, set **Where is your workload running?** to **Azure**.
+    a. In **Backup Goal**, set **Where is your workload running?** to **Azure**.
 
-    ![Choose Azure File Share as Backup goal](./media/backup-afs/backup-goal.png)
+    ![Choose Azure File Share as backup goal](./media/backup-afs/backup-goal.png)
 
-    b.    In **What do you want to backup**, select **Azure File Share** from the drop-down menu.
+    b.  In **What do you want to back up?**, select **Azure File Share** from the drop-down list.
 
-    c.    Click **Backup** to register the Azure File Share extension in the vault.
+    c.  Select **Backup** to register the Azure file share extension in the vault.
 
-      ![Click Backup to associate the Azure file share with vault](./media/backup-afs/register-extension.png)
+    ![Select Backup to associate the Azure file share with vault](./media/backup-afs/register-extension.png)
 
-3. Once you click **Backup**, the Backup blade opens and prompts you to select a Storage account from a list of discovered supported Storage accounts. They are either associated with this vault or present in the same region as the vault, but not yet associated to any Recovery Services vault.
+1. After you select **Backup**, the **Backup** pane opens and prompts you to select a storage account from a list of discovered supported storage accounts. They're either associated with this vault or present in the same region as the vault, but not yet associated to any Recovery Services vault.
 
    ![Select storage account](./media/backup-afs/select-storage-account.png)
 
-4. From the list of discovered storage accounts, select an account, and click **OK**. Azure searches the storage account for files shares that can be backed up. If you recently added your file shares and do not see them in the list, give some time for the file shares to appear.
+1. From the list of discovered storage accounts, select an account, and select **OK**. Azure searches the storage account for file shares that can be backed up. If you recently added your file shares and don't see them in the list, allow some time for the file shares to appear.
 
-    ![Discovering File Shares](./media/backup-afs/discovering-file-shares.png)
+    ![Discovering file shares](./media/backup-afs/discovering-file-shares.png)
 
-5. From the **File Shares** list, select one or more of the file shares you want to back up, and click **OK**.
+1. From the **File Shares** list, select one or more of the file shares you want to back up. Select **OK**.
 
-6. After choosing your File Shares, the **Backup** menu switches to  **Backup policy**. From this menu, either select an existing backup policy, or create a new one, and then click **Enable Backup**.
+1. After you choose your file shares, the **Backup** menu switches to **Backup policy**. From this menu, either select an existing backup policy or create a new one. Then select **Enable Backup**.
 
     ![Select Backup policy](./media/backup-afs/select-backup-policy.png)
 
-After establishing a backup policy, a snapshot of the File Shares will be taken at the scheduled time, and the recovery point is retained for the chosen period.
+After you set a backup policy, a snapshot of the file shares is taken at the scheduled time. The recovery point is also retained for the chosen period.
 
 ## Create an on-demand backup
 
-Occasionally, you may want to generate a backup snapshot, or recovery point, outside of the times scheduled in the backup policy. A common reason to generate an on-demand backup is right after you've configured the backup policy. Based on the schedule in the backup policy, it may be hours or days until a snapshot is taken. To protect your data until the backup policy engages, initiate an on-demand backup. Creating an on-demand backup is often required before you make planned changes to your file shares.
+Occasionally, you might want to generate a backup snapshot, or recovery point, outside of the times scheduled in the backup policy. A common reason to generate an on-demand backup is right after you've configured the backup policy. Based on the schedule in the backup policy, it might be hours or days until a snapshot is taken. To protect your data until the backup policy engages, initiate an on-demand backup. Creating an on-demand backup is often required before you make planned changes to your file shares.
 
-### To create an on-demand backup
+### Create a backup job on demand
 
-1. Open the Recovery Services vault you used to back up your file share, and click **Backup Items** under the **Protected Items** section of the **Overview** blade.
+1. Open the Recovery Services vault you used to back up your file share. On the **Overview** pane, select **Backup items** under the **Protected items** section.
 
-   ![Click Backup Items](./media/backup-afs/backup-items.png)
+   ![Select Backup items](./media/backup-afs/backup-items.png)
 
-2. Once you click **Backup Items**, a new blade listing all **Backup Management Types** will be displayed next to the **Overview** blade as follows:
+1. After you select **Backup items**, a new pane that lists all **Backup Management Types** appears next to the **Overview** pane.
 
    ![List of Backup Management Types](./media/backup-afs/backup-management-types.png)
 
-3. From the list of **Backup Management Types**, select **Azure Storage (Azure Files)**. You will see a list of all the file shares and the corresponding storage accounts backed up using this vault.
+1. From the **Backup Management Type** list, select **Azure Storage (Azure Files)**. You'll see a list of all the file shares and the corresponding storage accounts backed up by using this vault.
 
    ![Azure Storage (Azure Files) backup items](./media/backup-afs/azure-files-backup-items.png)
 
-4. From the list of Azure file shares, select the desired file share. The **Backup Item** details appear. From the **Backup Item** menu, click **Backup now**. Because this is an on-demand backup job, there is no retention policy associated with the recovery point.
+1. From the list of Azure file shares, select the file share you want. The **Backup Item** details appear. On the **Backup Item** menu, select **Backup now**. Because this backup job is on demand, there's no retention policy associated with the recovery point.
 
-   ![Click Backup Now](./media/backup-afs/backup-now.png)
+   ![Select Backup now](./media/backup-afs/backup-now.png)
 
-5. The **Backup Now** blade opens. Specify the last day you want to retain the recovery point. You can have a maximum retention of 10 years for an on-demand backup.
+1. The **Backup Now** pane opens. Specify the last day you want to retain the recovery point. You can have a maximum retention of 10 years for an on-demand backup.
 
    ![Choose retention date](./media/backup-afs/retention-date.png)
 
-6. Click **Ok** to confirm the on-demand backup job run.
+1. Select **OK** to confirm the on-demand backup job that runs.
 
-7. Monitor the portal notifications to keep a track of backup job run completion. You can monitor the job progress in the vault dashboard > **Backup Jobs** > **In progress**.
+1. Monitor the portal notifications to keep a track of backup job run completion. You can monitor the job progress in the vault dashboard. Select **Backup Jobs** > **In progress**.
 
 ## Next steps
 
-* Learn how to [Restore Azure file shares](restore-afs.md)
-
-* Learn how to [Manage Azure file share backups](manage-afs-backup.md)
+Learn how to:
+* [Restore Azure file shares](restore-afs.md)
+* [Manage Azure file share backups](manage-afs-backup.md)