Merge branch 'MicrosoftDocs:main' into deploy-arc-data-ad

Author: MikeRayMSFT

articles/active-directory/governance/create-access-review.md

@@ -73,7 +73,7 @@ For more information, see [License requirements](access-reviews-overview.md#lice
     > [!NOTE]  
     > If you selected **All Microsoft 365 groups with guest users**, your only option is to review **Guest users only**.
 
-1. Or if you are conducting group membership review, you can create access reviews only for inactive users in the group (preview). In the *Users scope* section, check the box next to **Inactive users (on tenant level)**. If you check the box, the scope of the review will focus on inactive users only. Then, specify **Days inactive**  with a number of days inactive up to 730 days (two years). Users in the group inactive for the specified number of days will be the only users in the review.
+1. Or if you are conducting group membership review, you can create access reviews for only the inactive users in the group (preview). In the *Users scope* section, check the box next to **Inactive users (on tenant level)**. If you check the box, the scope of the review will focus on inactive users only, those who have not signed in either interactively or non-interactively to the tenant. Then, specify **Days inactive**  with a number of days inactive up to 730 days (two years). Users in the group inactive for the specified number of days will be the only users in the review.
 
 1. Select **Next: Reviews**.
 

articles/azure-app-configuration/TOC.yml

@@ -37,9 +37,12 @@
           href: quickstart-feature-flag-azure-functions-csharp.md
         - name: Java Spring
           href: quickstart-feature-flag-spring-boot.md
+    - name: Bicep
+      href: quickstart-bicep.md
+      displayName: ARM, Resource Manager, Template
     - name: ARM template
       href: quickstart-resource-manager.md
-      displayName: ARM, azure resource manager template
+      displayName: Resource Manager
     - name: .NET App in Visual Studio
       href: /visualstudio/azure/vs-azure-tools-connected-services-app-configuration
 - name: Tutorials

articles/azure-app-configuration/quickstart-bicep.md

@@ -0,0 +1,121 @@
+---
+title: Create an Azure App Configuration store using Bicep
+titleSuffix: Azure App Configuration
+description: Learn how to create an Azure App Configuration store using Bicep.
+author: schaffererin
+ms.author: v-eschaffer
+ms.date: 05/06/2022
+ms.service: azure-app-configuration
+ms.topic: quickstart
+ms.custom: subject-armqs, devx-track-azurepowershell, mode-arm
+---
+
+# Quickstart: Create an Azure App Configuration store using Bicep
+
+This quickstart describes how you can use Bicep to:
+
+- Deploy an App Configuration store.
+- Create key-values in an App Configuration store.
+- Read key-values in an App Configuration store.
+
+[!INCLUDE [About Bicep](../../includes/resource-manager-quickstart-bicep-introduction.md)]
+
+## Prerequisites
+
+If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
+
+## Review the Bicep file
+
+The Bicep file used in this quickstart is from [Azure Quickstart Templates](https://azure.microsoft.com/resources/templates/app-configuration-store-kv/).
+
+:::code language="bicep" source="~/quickstart-templates/quickstarts/microsoft.appconfiguration/app-configuration-store-kv/main.bicep":::
+
+Two Azure resources are defined in the Bicep file:
+
+- [Microsoft.AppConfiguration/configurationStores](/azure/templates/microsoft.appconfiguration/2020-07-01-preview/configurationstores): create an App Configuration store.
+- [Microsoft.AppConfiguration/configurationStores/keyValues](/azure/templates/microsoft.appconfiguration/2020-07-01-preview/configurationstores/keyvalues): create a key-value inside the App Configuration store.
+
+With this Bicep file, we create one key with two different values, one of which has a unique label.
+
+## Deploy the Bicep file
+
+1. Save the Bicep file as **main.bicep** to your local computer.
+1. Deploy the Bicep file using either Azure CLI or Azure PowerShell.
+
+    # [CLI](#tab/CLI)
+
+    ```azurecli
+    az group create --name exampleRG --location eastus
+    az deployment group create --resource-group exampleRG --template-file main.bicep --parameters configStoreName=<store-name>
+    ```
+
+    # [PowerShell](#tab/PowerShell)
+
+    ```azurepowershell
+    New-AzResourceGroup -Name exampleRG -Location eastus
+    New-AzResourceGroupDeployment -ResourceGroupName exampleRG -TemplateFile ./main.bicep -configStoreName "<store-name>"
+    ```
+
+    ---
+
+    > [!NOTE]
+    > Replace **\<store-name\>** with the name of the App Configuration store.
+
+    When the deployment finishes, you should see a message indicating the deployment succeeded.
+
+## Review deployed resources
+
+Use Azure CLI or Azure PowerShell to list the deployed resources in the resource group.
+
+# [CLI](#tab/CLI)
+
+```azurecli-interactive
+az resource list --resource-group exampleRG
+```
+
+# [PowerShell](#tab/PowerShell)
+
+```azurepowershell-interactive
+Get-AzResource -ResourceGroupName exampleRG
+```
+
+---
+
+You can also use the Azure portal to list the resources:
+
+1. Sign in to the Azure portal.
+1. In the search box, enter *App Configuration*, then select **App Configuration** from the list.
+1. Select the newly created App Configuration resource.
+1. Under **Operations**, select **Configuration explorer**.
+1. Verify that two key-values exist.
+
+## Clean up resources
+
+When no longer needed, use Azure CLI or Azure PowerShell to delete the resource group and its resources.
+
+# [CLI](#tab/CLI)
+
+```azurecli-interactive
+az group delete --name exampleRG
+```
+
+# [PowerShell](#tab/PowerShell)
+
+```azurepowershell-interactive
+Remove-AzResourceGroup -Name exampleRG
+```
+
+---
+
+You can also use the Azure portal to delete the resource group:
+
+1. Navigate to your resource group.
+1. Select **Delete resource group**.
+1. A tab will appear. Enter the resource group name and select **Delete**.
+
+## Next steps
+
+To learn about adding feature flag and Key Vault reference to an App Configuration store, check out the ARM template examples.
+
+- [app-configuration-store-ff](https://azure.microsoft.com/resources/templates/app-configuration-store-ff/)
+- [app-configuration-store-keyvaultref](https://azure.microsoft.com/resources/templates/app-configuration-store-keyvaultref/)

articles/azure-resource-manager/bicep/toc.yml

@@ -93,6 +93,8 @@
       href: ../../dms/create-dms-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
   - name: DevOps
     items:
+    - name: App Configuration
+      href: ../../azure-app-configuration/quickstart-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
     - name: DevTest Labs
       href: ../../devtest-labs/create-lab-windows-vm-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
   - name: Integration

articles/azure-resource-manager/management/resource-name-rules.md

@@ -2,7 +2,9 @@
 title: Resource naming restrictions
 description: Shows the rules and restrictions for naming Azure resources.
 ms.topic: conceptual
-ms.date: 04/28/2022
+author: tfitzmac
+ms.author: tomfitz
+ms.date: 05/06/2022
 ---
 
 # Naming rules and restrictions for Azure resources
@@ -731,7 +733,7 @@ In the following tables, the term alphanumeric refers to:
 > | servers / databases | server | 1-128 | Can't use:<br>`<>*%&:\/?` or control characters<br><br>Can't end with period or space. |
 > | servers / databases / syncGroups | database | 1-150 | Alphanumerics, hyphens, and underscores. |
 > | servers / elasticPools | server | 1-128 | Can't use:<br>`<>*%&:\/?` or control characters<br><br>Can't end with period or space. |
-> | servers / failoverGroups | global |  1-63 | Lowercase letters, numbers, and hyphens.<br><br>Can't start or end with hyphen. <br><br> Can't have hyphen twice in both third and fourth place. For example, `ab--cde` is not allowed. |
+> | servers / failoverGroups | global |  1-63 | Lowercase letters, numbers, and hyphens.<br><br>Can't start or end with hyphen. |
 > | servers / firewallRules | server | 1-128 | Can't use:<br>`<>*%&:;\/?` or control characters<br><br>Can't end with period. |
 > | servers / keys | server |  | Must be in format:<br>`VaultName_KeyName_KeyVersion`. |
 

articles/cognitive-services/Computer-vision/overview-ocr.md

@@ -63,14 +63,14 @@ The Read API includes the following features.
 * Select pages and page ranges from large, multi-page documents
 * Natural reading order option for text line output (Latin only)
 * Handwriting classification for text lines (Latin only)
-* Available as Distroless Docker container for on-premise deployment
+* Available as Distroless Docker container for on-premises deployment
 
 Learn [how to use the OCR features](./vision-api-how-to-topics/call-read-api.md).
 
-## Use the cloud API or deploy on-premise
+## Use the cloud API or deploy on-premises
 The Read 3.x cloud APIs are the preferred option for most customers because of ease of integration and fast productivity out of the box. Azure and the Computer Vision service handle scale, performance, data security, and compliance needs while you focus on meeting your customers' needs.
 
-For on-premise deployment, the [Read Docker container (preview)](./computer-vision-how-to-install-containers.md) enables you to deploy the new OCR capabilities in your own local environment. Containers are great for specific security and data governance requirements.
+For on-premises deployment, the [Read Docker container (preview)](./computer-vision-how-to-install-containers.md) enables you to deploy the new OCR capabilities in your own local environment. Containers are great for specific security and data governance requirements.
 
 > [!WARNING]
 > The Computer Vision [RecognizeText](https://westus.dev.cognitive.microsoft.com/docs/services/5cd27ec07268f6c679a3e641/operations/587f2c6a1540550560080311) and [ocr](https://westus.dev.cognitive.microsoft.com/docs/services/computer-vision-v3-2/operations/56f91f2e778daf14a499f20d) operations are no longer maintained, and are in the process of being deprecated in favor of the new [Read API](#read-api) covered in this article. Existing customers should [transition to using Read operations](upgrade-api-versions.md).

articles/cognitive-services/Speech-Service/captioning-concepts.md

@@ -10,7 +10,7 @@ ms.subservice: speech-service
 ms.topic: conceptual
 ms.date: 04/12/2022
 ms.author: eur
-zone_pivot_groups: programming-languages-speech-sdk
+zone_pivot_groups: programming-languages-speech-sdk-cli
 ---
 
 # Captioning with speech to text
@@ -27,12 +27,37 @@ The following are aspects to consider when using captioning:
 * Center captions horizontally on the screen, in a large and prominent font. 
 * Consider whether to use partial results, when to start displaying captions, and how many words to show at a time. 
 * Learn about captioning protocols such as [SMPTE-TT](https://ieeexplore.ieee.org/document/7291854). 
-* Consider output formats such as SRT (SubRip Subtitle) and WebVTT (Web Video Text Tracks). These can be loaded onto most video players such as VLC, automatically adding the captions on to your video.
+* Consider output formats such as SRT (SubRip Text) and WebVTT (Web Video Text Tracks). These can be loaded onto most video players such as VLC, automatically adding the captions on to your video.
 
 > [!TIP]
 > Try the [Azure Video Indexer](/azure/azure-video-indexer/video-indexer-overview) as a demonstration of how you can get captions for videos that you upload. 
 
-Captioning can accompany real time or pre-recorded speech. Whether you're showing captions in real time or with a recording, you can use the [Speech SDK](speech-sdk.md) to recognize speech and get transcriptions. You can also use the [Batch transcription API](batch-transcription.md) for pre-recorded video. 
+Captioning can accompany real time or pre-recorded speech. Whether you're showing captions in real time or with a recording, you can use the [Speech SDK](speech-sdk.md) or [Speech CLI](spx-overview.md) to recognize speech and get transcriptions. You can also use the [Batch transcription API](batch-transcription.md) for pre-recorded video. 
+
+## Caption output format
+
+The Speech service supports output formats such as SRT (SubRip Text) and WebVTT (Web Video Text Tracks). These can be loaded onto most video players such as VLC, automatically adding the captions on to your video.
+
+The [SRT](https://docs.fileformat.com/video/srt/) (SubRip Text) timespan output format is `hh:mm:ss,fff`. 
+
+```srt
+1
+00:00:00,180 --> 00:00:03,230
+Welcome to applied Mathematics course 201.
+```
+
+The [WebVTT](https://www.w3.org/TR/webvtt1/#introduction) (Web Video Text Tracks) timespan output format is `hh:mm:ss,fff`. 
+
+```
+WEBVTT
+
+00:00:00.180 --> 00:00:03.230
+Welcome to applied Mathematics course 201.
+{
+  "ResultId": "8e89437b4b9349088a933f8db4ccc263",
+  "Duration": "00:00:03.0500000"
+}
+```
 
 ## Input audio to the Speech service
 
@@ -61,7 +86,7 @@ For captioning of prerecorded speech or wherever latency isn't a concern, you co
 
 Real time captioning presents tradeoffs with respect to latency versus accuracy. You could show the text from each `Recognizing` event as soon as possible. However, if you can accept some latency, you can improve the accuracy of the caption by displaying the text from the `Recognized` event. There's also some middle ground, which is referred to as "stable partial results". 
 
-You can request that the Speech service return fewer `Recognizing` events that are more accurate. This is done by setting the `SpeechServiceResponse_StablePartialResultThreshold` property to a value between `0` and `2147483647`. The value that you set is the number of times a word has to be recognized before the Speech service returns a `Recognizing` event. For example, if you set the `SpeechServiceResponse_StablePartialResultThreshold` value to `5`, the Speech service will affirm recognition of a word at least five times before returning the partial results to you with a `Recognizing` event.
+You can request that the Speech service return fewer `Recognizing` events that are more accurate. This is done by setting the `SpeechServiceResponse_StablePartialResultThreshold` property to a value between `0` and `2147483647`. The value that you set is the number of times a word has to be recognized before the Speech service returns a `Recognizing` event. For example, if you set the `SpeechServiceResponse_StablePartialResultThreshold` property value to `5`, the Speech service will affirm recognition of a word at least five times before returning the partial results to you with a `Recognizing` event.
 
 ::: zone pivot="programming-language-csharp"
 ```csharp
@@ -103,6 +128,11 @@ self.speechConfig!.setPropertyTo(5, by: SPXPropertyId.speechServiceResponseStabl
 speech_config.set_property(property_id = speechsdk.PropertyId.SpeechServiceResponse_StablePartialResultThreshold, value = 5)
 ```
 ::: zone-end
+::: zone pivot="programming-language-cli"
+```console
+spx recognize --file caption.this.mp4 --format any --property SpeechServiceResponse_StablePartialResultThreshold=5 --output vtt file - --output srt file -
+```
+::: zone-end
 
 Requesting more stable partial results will reduce the "flickering" or changing text, but it can increase latency as you wait for higher confidence results. 
 
@@ -183,6 +213,11 @@ self.speechConfig!.setProfanityOptionTo(SPXSpeechConfigProfanityOption_Profanity
 speech_config.set_profanity(speechsdk.ProfanityOption.Removed)
 ```
 ::: zone-end
+::: zone pivot="programming-language-cli"
+```console
+spx recognize --file caption.this.mp4 --format any --profanity masked --output vtt file - --output srt file -
+```
+::: zone-end
 
 Profanity filter is applied to the result `Text` and `MaskedNormalizedForm` properties. Profanity filter isn't applied to the result `LexicalForm` and `NormalizedForm` properties. Neither is the filter applied to the word level results.
 
@@ -204,5 +239,5 @@ There are some situations where [training a custom model](custom-speech-overview
 
 ## Next steps
 
-* [Get started with speech to text](get-started-speech-to-text.md)
+* [Captioning quickstart](captioning-quickstart.md)
 * [Get speech recognition results](get-speech-recognition-results.md)

articles/cognitive-services/Speech-Service/captioning-quickstart.md

@@ -0,0 +1,58 @@
+---
+title: "Create captions with speech to text quickstart - Speech service"
+titleSuffix: Azure Cognitive Services
+description: In this quickstart, you convert speech to text as captions.
+services: cognitive-services
+author: eric-urban
+manager: nitinme
+ms.service: cognitive-services
+ms.subservice: speech-service
+ms.topic: quickstart
+ms.date: 04/23/2022
+ms.author: eur
+ms.devlang: cpp, csharp
+zone_pivot_groups: programming-languages-speech-sdk-cli
+---
+
+# Quickstart: Create captions with speech to text
+
+::: zone pivot="programming-language-csharp"
+[!INCLUDE [C# include](includes/quickstarts/captioning/csharp.md)]
+::: zone-end
+
+::: zone pivot="programming-language-cpp"
+[!INCLUDE [C++ include](includes/quickstarts/captioning/cpp.md)]
+::: zone-end
+
+::: zone pivot="programming-language-go"
+[!INCLUDE [Go include](includes/quickstarts/captioning/go.md)]
+::: zone-end
+
+::: zone pivot="programming-language-java"
+[!INCLUDE [Java include](includes/quickstarts/captioning/java.md)]
+::: zone-end
+
+::: zone pivot="programming-language-javascript"
+[!INCLUDE [JavaScript include](includes/quickstarts/captioning/javascript.md)]
+::: zone-end
+
+::: zone pivot="programming-language-objectivec"
+[!INCLUDE [ObjectiveC include](includes/quickstarts/captioning/objectivec.md)]
+::: zone-end
+
+::: zone pivot="programming-language-swift"
+[!INCLUDE [Swift include](includes/quickstarts/captioning/swift.md)]
+::: zone-end
+
+::: zone pivot="programming-language-python"
+[!INCLUDE [Python include](./includes/quickstarts/captioning/python.md)]
+::: zone-end
+
+::: zone pivot="programming-language-cli"
+[!INCLUDE [CLI include](includes/quickstarts/captioning/cli.md)]
+::: zone-end
+
+## Next steps
+
+> [!div class="nextstepaction"]
+> [Learn more about speech recognition](how-to-recognize-speech.md)

articles/cognitive-services/Speech-Service/get-speech-recognition-results.md

@@ -11,7 +11,7 @@ ms.topic: how-to
 ms.date: 03/31/2022
 ms.author: eur
 ms.devlang: cpp, csharp, golang, java, javascript, objective-c, python
-zone_pivot_groups: programming-languages-speech-sdk
+zone_pivot_groups: programming-languages-speech-sdk-cli
 keywords: speech to text, speech to text software
 ---
 
@@ -49,6 +49,10 @@ keywords: speech to text, speech to text software
 [!INCLUDE [Python include](./includes/how-to/recognize-speech-results/python.md)]
 ::: zone-end
 
+::: zone pivot="programming-language-cli"
+[!INCLUDE [CLI include](./includes/how-to/recognize-speech-results/cli.md)]
+::: zone-end
+
 ## Next steps
 
 * [Try the speech to text quickstart](get-started-speech-to-text.md)

articles/cognitive-services/Speech-Service/improve-accuracy-phrase-list.md

@@ -53,11 +53,11 @@ Now try Speech Studio to see how phrase list can improve recognition accuracy.
 1. Sign in to [Speech Studio](https://speech.microsoft.com/). 
 1. Select **Real-time Speech-to-text**.
 1. You test speech recognition by uploading an audio file or recording audio with a microphone. For example, select **record audio with a microphone** and then say "Hi Rehaan, this is Jessie from Contoso bank. " Then select the red button to stop recording. 
-1. You should see the transcription result in the **Test results** text box. If "Rehaan", "Jesse", or "Contoso" were recognized incorrectly, you can add the terms to a phrase list in the next step.
+1. You should see the transcription result in the **Test results** text box. If "Rehaan", "Jessie", or "Contoso" were recognized incorrectly, you can add the terms to a phrase list in the next step.
 1. Select **Show advanced options** and turn on **Phrase list**. 
 1. Enter "Contoso;Jessie;Rehaan" in the phrase list text box. Note that multiple phrases need to be separated by a semicolon.
     :::image type="content" source="./media/custom-speech/phrase-list-after-zoom.png" alt-text="Screenshot of a phrase list applied in Speech Studio." lightbox="./media/custom-speech/phrase-list-after-full.png":::
-1. Use the microphone to test recognition again. Otherwise you can select the retry arrow next to your audio file to re-run your audio. The terms "Rehaan", "Jesse", or "Contoso" should be recognized. 
+1. Use the microphone to test recognition again. Otherwise you can select the retry arrow next to your audio file to re-run your audio. The terms "Rehaan", "Jessie", or "Contoso" should be recognized. 
 
 ## Implement phrase list