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

Author: roygara

articles/azure-government/documentation-government-cognitiveservices.md

@@ -623,9 +623,10 @@ For more information, please see [public documentation](../cognitive-services/Fa
     
 ### Variations
 * The URI for accessing the Text Translation API in Azure Government is: 
-  - `https://dev.microsofttranslator.us/translate?api-version=3.0`
-    ### Text Translation Method
-    This sample will use the [Text Translation - Translate method](../cognitive-services/translator/reference/v3-0-translate.md) to translate a string of text from a language into another specified language. There are multiple [language codes](https://api.cognitive.microsofttranslator.com/languages?api-version=3.0&scope=translation,dictionary,transliteration) that can be used with the Text Translation API. 
+  - `https://api.cognitive.microsofttranslator.us`
+* There are 2 regions `USGovVirginia` and `USGovArizona`
+### Text Translation Method
+The below example uses [Text Translation - Translate method](../cognitive-services/translator/reference/v3-0-translate.md) to translate a string of text from a language into another specified language. There are multiple [language codes](https://api.cognitive.microsofttranslator.com/languages?api-version=3.0&scope=translation) that can be used with the Text Translation API. 
 
 ### Text Translation C# example request
 
@@ -634,8 +635,9 @@ The sample is written in C#.
 1. Create a new Console solution in Visual Studio.
 2. Replace Program.cs with the corresponding code below.
 3. Replace the `subscriptionKey` value with the key value that you retrieved above.
-4. Replace the `text` value with text that you want to translate.
-5. Run the program.
+4. Replace the `region` value with the region value where you created your translator resource.
+5. Replace the `text` value with text that you want to translate.
+6. Run the program.
 
 You can also test out different languages and texts by replacing the "text", "from", and "to" variables in Program.cs. 
 
@@ -657,7 +659,7 @@ namespace TextTranslator
 {
     class Program
     {
-        static string host = "https://dev.microsofttranslator.us";
+        static string host = "https://api.cognitive.microsofttranslator.us";
         static string path = "/translate?api-version=3.0";
         // Translate to German.
         static string params_ = "&to=de";
@@ -666,7 +668,10 @@ namespace TextTranslator
 
         // NOTE: Replace this example key with a valid subscription key.
         static string key = "PASTE KEY HERE";
-
+        
+        // NOTE: Replace this example region with a valid region.
+        static string region = "PASTE REGION HERE";
+         
         static string text = "Hello world!";
 
         async static void Translate()
@@ -681,6 +686,7 @@ namespace TextTranslator
                 request.RequestUri = new Uri(uri);
                 request.Content = new StringContent(requestBody, Encoding.UTF8, "application/json");
                 request.Headers.Add("Ocp-Apim-Subscription-Key", key);
+                request.Headers.Add("Ocp-Apim-Subscription-Region", region);
 
                 var response = await client.SendAsync(request);
                 var responseBody = await response.Content.ReadAsStringAsync();

articles/azure-government/documentation-government-services-aiandcognitiveservices.md

@@ -113,7 +113,9 @@ See details of supported locales by features in [Language and region support for
 Variations in Azure Government:
 
 - Endpoint:  https://api.cognitive.microsofttranslator.us
-- Auth Token Service: https://virginia.api.cognitive.microsoft.us/sts/v1.0/issueToken
+- Auth Token Service: 
+     - https://usgovvirginia.api.cognitive.microsoft.us/sts/v1.0/issueToken
+     - https://usgovarizona.api.cognitive.microsoft.us/sts/v1.0/issueToken
 - Available SKUs: S1
 - Custom Translator and Translator Hub are not supported.
 

articles/cognitive-services/Content-Moderator/content-moderator-encryption-of-data-at-rest.md

@@ -0,0 +1,40 @@
+---
+title: Content Moderator encryption of data at rest
+titleSuffix: Azure Cognitive Services
+description: Content Moderator encryption of data at rest.
+author: erindormier
+manager: venkyv
+
+ms.service: cognitive-services
+ms.subservice: content-moderator
+ms.topic: conceptual
+ms.date: 03/13/2020
+ms.author: egeaney
+#Customer intent: As a user of the Content Moderator service, I want to learn how encryption at rest works.
+---
+
+# Content Moderator encryption of data at rest
+
+Content Moderator automatically encrypts your data when it is persisted to the cloud, helping to meet your organizational security and compliance goals.
+
+[!INCLUDE [cognitive-services-about-encryption](../../../includes/cognitive-services-about-encryption.md)]
+
+> [!IMPORTANT]
+> Customer-managed keys are only available on the E0 pricing tier. To request the ability to use customer-managed keys, fill out and submit the [Content Moderator Customer-Managed Key Request Form](https://aka.ms/cogsvc-cmk). It will take approximately 3-5 business days to hear back on the status of your request. Depending on demand, you may be placed in a queue and approved as space becomes available. Once approved for using CMK with the Content Moderator service, you will need to create a new Content Moderator resource and select E0 as the Pricing Tier. Once your Content Moderator resource with the E0 pricing tier is created, you can use Azure Key Vault to set up your managed identity.
+
+[!INCLUDE [cognitive-services-cmk](../../../includes/cognitive-services-cmk-regions.md)]
+
+[!INCLUDE [cognitive-services-cmk](../../../includes/cognitive-services-cmk.md)]
+
+## Enable data encryption for your Content Moderator Team
+
+To enable data encryption for your Content Moderator Review Team, see the [Quickstart: Try Content Moderator on the web](quick-start.md#create-a-review-team).  
+
+> [!NOTE]
+> You'll need to provide a _Resource ID_ with the Content Moderator E0 pricing tier.
+
+
+## Next steps
+
+* [Content Moderator Customer-Managed Key Request Form](https://aka.ms/cogsvc-cmk)
+* [Learn more about Azure Key Vault](https://docs.microsoft.com/azure/key-vault/key-vault-overview)

articles/cognitive-services/Content-Moderator/toc.yml

@@ -134,3 +134,5 @@
     href: https://azure.microsoft.com/global-infrastructure/services/?products=cognitive-services
   - name: Compliance
     href: https://azure.microsoft.com/support/legal/cognitive-services-compliance-and-privacy/
+  - name: Encryption
+    href: content-moderator-encryption-of-data-at-rest.md

articles/cognitive-services/Encryption/cognitive-services-encryption-keys-portal.md

@@ -0,0 +1,107 @@
+---
+title: Use the Azure portal to configure customer-managed keys
+titleSuffix: Cognitive Services
+description: Learn how to use the Azure portal to configure customer-managed keys with Azure Key Vault. Customer-managed keys enable you to create, rotate, disable, and revoke access controls.
+services: cognitive-services
+author: erindormier
+
+ms.service: cognitive-services
+ms.topic: include
+ms.date: 03/11/2020
+ms.author: egeaney
+---
+
+# Configure customer-managed keys with Azure Key Vault by using the Azure portal
+
+You must use Azure Key Vault to store your customer-managed keys. You can either create your own keys and store them in a key vault, or you can use the Azure Key Vault APIs to generate keys. The Cognitive Services resource and the key vault must be in the same region and in the same Azure Active Directory (Azure AD) tenant, but they can be in different subscriptions. For more information about Azure Key Vault, see [What is Azure Key Vault?](https://docs.microsoft.com/azure/key-vault/key-vault-overview).
+
+This article shows how to configure an Azure Key Vault with customer-managed keys using the [Azure portal](https://portal.azure.com/). To learn how to create a key vault using the Azure portal, see [Quickstart: Set and retrieve a secret from Azure Key Vault using the Azure portal](../../key-vault/quick-create-portal.md).
+
+## Configure Azure Key Vault
+
+Using customer-managed keys requires that two properties be set on the key vault, **Soft Delete** and **Do Not Purge**. These properties are not enabled by default, but can be enabled using either PowerShell or Azure CLI on a new or existing key vault.
+
+> [!IMPORTANT]
+> If you do not have the **Soft Delete** and **Do Not Purge** properties enabled and you delete your key, you won't be able to recover the data in your Cognitive Service resource.
+
+To learn how to enable these properties on an existing key vault, see the sections titled **Enabling soft-delete** and **Enabling Purge Protection** in one of the following articles:
+
+- [How to use soft-delete with PowerShell](https://docs.microsoft.com/azure/key-vault/key-vault-soft-delete-powershell).
+- [How to use soft-delete with CLI](https://docs.microsoft.com/azure/key-vault/key-vault-soft-delete-cli).
+
+Only RSA keys of size 2048 are supported with Azure Storage encryption. For more information about keys, see **Key Vault keys** in [About Azure Key Vault keys, secrets and certificates](https://docs.microsoft.com/azure/key-vault/about-keys-secrets-and-certificates#key-vault-keys).
+
+## Enable customer-managed keys
+
+To enable customer-managed keys in the Azure portal, follow these steps:
+
+1. Navigate to your Cognitive Services resource.
+1. On the **Settings** blade for your Cognitive Services resource, click **Encryption**. Select the **Customer Managed Keys** option, as shown in the following figure.
+
+    ![Screenshot showing how to select Customer Managed Keys](../media/cognitive-services-encryption/selectcmk.png)
+
+## Specify a key
+
+After you enable customer-managed keys, you'll have the opportunity to specify a key to associate with the Cognitive Services resource.
+
+### Specify a key as a URI
+
+To specify a key as a URI, follow these steps:
+
+1. To locate the key URI in the Azure portal, navigate to your key vault, and select the **Keys** setting. Select the desired key, then click the key to view its versions. Select a key version to view the settings for that version.
+1. Copy the value of the **Key Identifier** field, which provides the URI.
+
+    ![Screenshot showing key vault key URI](../media/cognitive-services-encryption/key-uri-portal.png)
+
+1. In the **Encryption** settings for your storage account, choose the **Enter key URI** option.
+1. Paste the URI that you copied into the **Key URI** field.
+
+   ![Screenshot showing how to enter key URI](../media/cognitive-services-encryption/ssecmk2.png)
+
+1. Specify the subscription that contains the key vault.
+1. Save your changes.
+
+### Specify a key from a key vault
+
+To specify a key from a key vault, first make sure that you have a key vault that contains a key. To specify a key from a key vault, follow these steps:
+
+1. Choose the **Select from Key Vault** option.
+1. Select the key vault containing the key you want to use.
+1. Select the key from the key vault.
+
+   ![Screenshot showing customer-managed key option](../media/cognitive-services-encryption/ssecmk3.png)
+
+1. Save your changes.
+
+## Update the key version
+
+When you create a new version of a key, update the Cognitive Services resource to use the new version. Follow these steps:
+
+1. Navigate to your Cognitive Services resource and display the **Encryption** settings.
+1. Enter the URI for the new key version. Alternately, you can select the key vault and the key again to update the version.
+1. Save your changes.
+
+## Use a different key
+
+To change the key used for encryption, follow these steps:
+
+1. Navigate to your Cognitive Services resource and display the **Encryption** settings.
+1. Enter the URI for the new key. Alternately, you can select the key vault and choose a new key.
+1. Save your changes.
+
+## Disable customer-managed keys
+
+When you disable customer-managed keys, your Cognitive Services resource is then encrypted with Microsoft-managed keys. To disable customer-managed keys, follow these steps:
+
+1. Navigate to your Cognitive Services resource and display the **Encryption** settings.
+1. Deselect the checkbox next to the **Use your own key** setting.
+
+## Next steps
+
+* [What is Azure Key Vault](https://docs.microsoft.com/azure/key-vault/key-vault-overview)?
+* [Cognitive Services Customer-Managed Key Request Form](https://aka.ms/cogsvc-cmk)
+* [Face Services encryption of data at rest](../Face/face-encryption-of-data-at-rest.md)
+* [QnA Maker encryption of data at rest](../QnAMaker/qna-maker-encryption-of-data-at-rest.md)
+* [Language Understanding service encryption of data at rest](../LUIS/luis-encryption-of-data-at-rest.md)
+* [Content Moderator encryption of data at rest](../Content-Moderator/content-moderator-encryption-of-data-at-rest.md)
+* [Translator encryption of data at rest](../translator/translator-encryption-of-data-at-rest.md)

articles/cognitive-services/Face/face-encryption-of-data-at-rest.md

@@ -0,0 +1,34 @@
+---
+title: Face service encryption of data at rest
+titleSuffix: Azure Cognitive Services
+description: Face service encryption of data at rest.
+author: erindormier
+manager: venkyv
+
+ms.service: cognitive-services
+ms.subservice: face-api
+ms.topic: conceptual
+ms.date: 03/11/2020
+ms.author: egeaney
+#Customer intent: As a user of the Face service, I want to learn how encryption at rest works.
+---
+
+# Face service encryption of data at rest
+
+The Face service automatically encrypts your data when persisted it to the cloud. The Face service encryption protects your data and to help you to meet your organizational security and compliance commitments.
+
+[!INCLUDE [cognitive-services-about-encryption](../../../includes/cognitive-services-about-encryption.md)]
+
+> [!IMPORTANT]
+> Customer-managed keys are only available on the E0 pricing tier. To request the ability to use customer-managed keys, fill out and submit the [Face Service Customer-Managed Key Request Form](https://aka.ms/cogsvc-cmk). It will take approximately 3-5 business days to hear back on the status of your request. Depending on demand, you may be placed in a queue and approved as space becomes available. Once approved for using CMK with the Face service, you will need to create a new Face resource and select E0 as the Pricing Tier. Once your Face resource with the E0 pricing tier is created, you can use Azure Key Vault to set up your managed identity.
+
+[!INCLUDE [cognitive-services-cmk](../../../includes/cognitive-services-cmk-regions.md)]
+
+[!INCLUDE [cognitive-services-cmk](../../../includes/cognitive-services-cmk.md)]
+
+## Next steps
+
+* [Face Service Customer-Managed Key Request Form](https://aka.ms/cogsvc-cmk)
+* [Learn more about Azure Key Vault](https://docs.microsoft.com/azure/key-vault/key-vault-overview)
+
+

articles/cognitive-services/Face/toc.yml

@@ -114,6 +114,8 @@
   - name: Regional availability
     href: https://azure.microsoft.com/global-infrastructure/services/?products=cognitive-services
   - name: Compliance
-    href: https://azure.microsoft.com/support/legal/cognitive-services-compliance-and-privacy/
+    href: https://azure.microsoft.com/support/legal/cognitive-services-compliance-and-privacy/    
+  - name: Encryption
+    href: face-encryption-of-data-at-rest.md
   - name: Release notes
     href: ReleaseNotes.md