Skip to content

Commit 3e7a65e

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into tutorial-tenant-model
2 parents 59407b0 + 7df0806 commit 3e7a65e

File tree

68 files changed

+1323
-977
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1323
-977
lines changed

articles/azure-government/compliance/secure-azure-computing-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ We recommend this architecture because it meets SCCA requirements. It’s highly
152152

153153
## Automated SACA deployment options
154154

155-
As previously mentioned, Microsoft has partnered with two vendors to create an automated SACA infrastructure template. Both templates deploy the following Azure components:
155+
As previously mentioned, Microsoft has partnered with two vendors to create an automated SACA infrastructure template. Both templates deploy the following Azure components:
156156

157157
- SACA virtual network
158158
- Management subnet

articles/azure-netapp-files/azure-netapp-files-create-volumes.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: conceptual
16-
ms.date: 11/08/2019
16+
ms.date: 12/01/2019
1717
ms.author: b-juche
1818
---
1919
# Create an NFS volume for Azure NetApp Files
@@ -28,9 +28,6 @@ A subnet must be delegated to Azure NetApp Files.
2828

2929
## Considerations
3030

31-
> [!IMPORTANT]
32-
> Access to the NFSv4.1 feature requires whitelisting. To request whitelisting, submit a request to <[email protected]>.
33-
3431
* Deciding which NFS version to use
3532
NFSv3 can handle a wide variety of use cases and is commonly deployed in most enterprise applications. You should validate what version (NFSv3 or NFSv4.1) your application requires and create your volume using the appropriate version. For example, if you use [Apache ActiveMQ](https://activemq.apache.org/shared-file-system-master-slave), file locking with NFSv4.1 is recommended over NFSv3.
3633

articles/azure-netapp-files/azure-netapp-files-quickstart-set-up-account-create-volumes.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: quickstart
16-
ms.date: 10/12/2019
16+
ms.date: 12/01/2019
1717
ms.author: b-juche
1818
#Customer intent: As an IT admin new to Azure NetApp Files, I want to quickly set up Azure NetApp Files and create a volume.
1919
---
@@ -253,9 +253,6 @@ This how-to article requires the Azure PowerShell module Az version 2.6.0 or lat
253253
* Select the NFS version (**NFSv3** or **NFSv4.1**) for the volume.
254254
See [considerations](azure-netapp-files-create-volumes.md#considerations) and [best practice](azure-netapp-files-create-volumes.md#best-practice) about NFS versions.
255255
256-
> [!IMPORTANT]
257-
> Access to the NFSv4.1 feature requires whitelisting. To request whitelisting, submit a request to <[email protected]>.
258-
259256
![Specify NFS protocol for quickstart](../media/azure-netapp-files/azure-netapp-files-quickstart-protocol-nfs.png)
260257
261258
5. Click **Review + create**.

articles/bastion/bastion-nsg.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ If you create and apply an NSG to ***AzureBastionSubnet***, make sure you have a
5353
* **Diagnostics logging and others:** Outbound on 443 to AzureCloud. Regional tags within this service tag are not supported yet.
5454
* **Target VM:** Outbound for 3389 and 22 to VirtualNetwork
5555

56-
An NSG rule example is available for reference in this [quickstart template](https://github.com/Azure/azure-quickstart-templates/tree/master/101-azure-bastion).
56+
An NSG rule example is available for reference in this [quickstart template](https://github.com/Azure/azure-quickstart-templates/tree/master/101-azure-bastion-nsg).
5757

5858
## Next steps
5959

60-
For more information about Azure Bastion, see the [FAQ](bastion-faq.md).
60+
For more information about Azure Bastion, see the [FAQ](bastion-faq.md).
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
title: Audio input format
3+
titleSuffix: Azure Cognitive Services
4+
services: cognitive-services
5+
author: markamos
6+
manager: nitinme
7+
8+
ms.service: cognitive-services
9+
ms.topic: include
10+
ms.date: 11/20/2019
11+
ms.author: erhopf
12+
---
13+
14+
## Supported audio input format
15+
16+
The Speech SDK uses the following format for audio input.
17+
18+
| Format | Codec | Bitrate | Sample Rate | Channels |
19+
|--------|-------|---------|-------------|----------|
20+
| WAV | PCM | 16-bit | 8 kHz or 16 kHz | 1 (mono) |

articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/cpp/linux.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Before you get started, make sure to:
2121
> * [Setup your development environment](../../../../quickstarts/setup-platform.md?tabs=linux)
2222
> * [Create an empty sample project](../../../../quickstarts/create-project.md?tabs=linux)
2323
24+
[!INCLUDE [Audio input format](~/articles/cognitive-services/speech-service/includes/audio-input-format-chart.md)]
25+
2426
## Add sample code
2527

2628
1. Create a C++ source file named `helloworld.cpp`, and paste the following code into it.
@@ -75,6 +77,9 @@ Before you get started, make sure to:
7577
7678
1. Replace the string `whatstheweatherlike.wav` with your own filename.
7779
80+
> [!NOTE]
81+
> The Speech SDK will default to recognizing using en-us for the language, see [Specify source language for speech to text](../../../../how-to-specify-source-language.md) for information on choosing the source language.
82+
7883
## Build the app
7984
8085
> [!NOTE]

articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/cpp/macos.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Before you get started, make sure to:
2121
> * [Setup your development environment](../../../../quickstarts/setup-platform.md?tabs=macos)
2222
> * [Create an empty sample project](../../../../quickstarts/create-project.md?tabs=macos)
2323
24+
[!INCLUDE [Audio input format](~/articles/cognitive-services/speech-service/includes/audio-input-format-chart.md)]
25+
2426
## Add sample code
2527

2628
1. Create a C++ source file named `helloworld.cpp`, and paste the following code into it.
@@ -75,6 +77,8 @@ Before you get started, make sure to:
7577
7678
1. Replace the string `whatstheweatherlike.wav` with your own filename.
7779
80+
> [!NOTE]
81+
> The Speech SDK will default to recognizing using en-us for the language, see [Specify source language for speech to text](../../../../how-to-specify-source-language.md) for information on choosing the source language.
7882
7983
## Build the app
8084

articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/cpp/windows.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Before you get started, make sure to:
2121
> * [Setup your development environment](../../../../quickstarts/setup-platform.md?tabs=windows)
2222
> * [Create an empty sample project](../../../../quickstarts/create-project.md?tabs=windows)
2323
24+
[!INCLUDE [Audio input format](~/articles/cognitive-services/speech-service/includes/audio-input-format-chart.md)]
25+
2426
## Add sample code
2527

2628
1. Open the source file **helloworld.cpp**.
@@ -79,6 +81,9 @@ Before you get started, make sure to:
7981
8082
1. From the menu bar, choose **File** > **Save All**.
8183
84+
> [!NOTE]
85+
> The Speech SDK will default to recognizing using en-us for the language, see [Specify source language for speech to text](../../../../how-to-specify-source-language.md) for information on choosing the source language.
86+
8287
## Build and run the application
8388
8489
1. From the menu bar, select **Build** > **Build Solution** to build the application. The code should compile without errors now.

articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/csharp/dotnet.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Before you get started, make sure to:
2121
> * [Setup your development environment](../../../../quickstarts/setup-platform.md?tabs=dotnet)
2222
> * [Create an empty sample project](../../../../quickstarts/create-project.md?tabs=dotnet)
2323
24+
[!INCLUDE [Audio input format](~/articles/cognitive-services/speech-service/includes/audio-input-format-chart.md)]
25+
2426
## Open your project in Visual Studio
2527

2628
The first step is to make sure that you have your project open in Visual Studio.
@@ -61,6 +63,7 @@ Before you can initialize a `SpeechRecognizer` object, you need to create a conf
6163

6264
> [!NOTE]
6365
> This sample uses the `FromSubscription()` method to build the `SpeechConfig`. For a full list of available methods, see [SpeechConfig Class](https://docs.microsoft.com/dotnet/api/microsoft.cognitiveservices.speech.speechconfig?view=azure-dotnet).
66+
> The Speech SDK will default to recognizing using en-us for the language, see [Specify source language for speech to text](../../../../how-to-specify-source-language.md) for information on choosing the source language.
6467
6568
````C#
6669
var config = SpeechConfig.FromSubscription("YourSubscriptionKey", "YourServiceRegion");

articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/java/jre.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ ms.author: erhopf
1313
> * [Setup your development environment](../../../../quickstarts/setup-platform.md?tabs=jre)
1414
> * [Create an empty sample project](../../../../quickstarts/create-project.md?tabs=jre)
1515
16+
[!INCLUDE [Audio input format](~/articles/cognitive-services/speech-service/includes/audio-input-format-chart.md)]
17+
1618
## Add sample code
1719

1820
1. To add a new empty class to your Java project, select **File** > **New** > **Class**.
@@ -104,6 +106,9 @@ ms.author: erhopf
104106

105107
1. Save changes to the project.
106108

109+
> [!NOTE]
110+
> The Speech SDK will default to recognizing using en-us for the language, see [Specify source language for speech to text](../../../../how-to-specify-source-language.md) for information on choosing the source language.
111+
107112
## Build and run the app
108113

109114
Press F11, or select **Run** > **Debug**.

0 commit comments

Comments
 (0)