Skip to content

Commit 2e7d0f9

Browse files
committed
fix include file etc
1 parent 453b5ca commit 2e7d0f9

File tree

8 files changed

+41
-31
lines changed

8 files changed

+41
-31
lines changed

articles/cognitive-services/Speech-Service/includes/containers-cstt-common-run.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ The following table represents the various `docker run` parameters and their cor
1414
|---------|---------|
1515
| `{VOLUME_MOUNT}` | The host computer [volume mount](https://docs.docker.com/storage/volumes/), which Docker uses to persist the custom model. An example is `c:\CustomSpeech` where the `c:\` drive is located on the host machine. |
1616
| `{MODEL_ID}` | The custom speech or base model ID. For more information, see [Get the model ID](#get-the-model-id). |
17-
| `{ENDPOINT_URI}` | The endpoint is required for metering and billing. For more information, see [billing arguments](speech-container-howto.md#billing-arguments). |
18-
| `{API_KEY}` | The API key is required. For more information, see [billing arguments](speech-container-howto.md#billing-arguments). |
17+
| `{ENDPOINT_URI}` | The endpoint is required for metering and billing. For more information, see [billing arguments](../speech-container-howto.md#billing-arguments). |
18+
| `{API_KEY}` | The API key is required. For more information, see [billing arguments](../speech-container-howto.md#billing-arguments). |
1919

20-
When you run the custom speech-to-text container, configure the port, memory, and CPU according to the custom speech-to-text container [requirements and recommendations](speech-container-howto.md#container-requirements-and-recommendations).
20+
When you run the custom speech-to-text container, configure the port, memory, and CPU according to the custom speech-to-text container [requirements and recommendations](../speech-container-howto.md#container-requirements-and-recommendations).
2121

2222
Here's an example `docker run` command with placeholder values. You must specify the `VOLUME_MOUNT`, `MODEL_ID`, `ENDPOINT_URI`, and `API_KEY` values:
2323

@@ -41,4 +41,4 @@ This command:
4141
* If the custom model was previously downloaded, the `ModelId` is ignored.
4242
* Automatically removes the container after it exits. The container image is still available on the host computer.
4343

44-
For more information about `docker run` with Speech containers, see [Install and run Speech containers with Docker](speech-container-howto.md#run-the-container).
44+
For more information about `docker run` with Speech containers, see [Install and run Speech containers with Docker](../speech-container-howto.md#run-the-container).

articles/cognitive-services/Speech-Service/includes/containers-speech-config-ws.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ Speech containers provide websocket-based query endpoint APIs that are accessed
1414
> When you use the Speech service with containers, be sure to use host authentication. If you configure the key and region, requests will go to the public Speech service. Results from the Speech service might not be what you expect. Requests from disconnected containers will fail.
1515
1616
::: zone pivot="programming-language-csharp"
17-
Change from using this Azure-cloud initialization call:
17+
Instead of using this Azure-cloud initialization config:
1818

1919
```csharp
2020
var config = SpeechConfig.FromSubscription(...);
2121
```
2222

23-
To using this call with the container [host](/dotnet/api/microsoft.cognitiveservices.speech.speechconfig.fromhost):
23+
Use this config with the container [host](/dotnet/api/microsoft.cognitiveservices.speech.speechconfig.fromhost):
2424

2525
```csharp
2626
var config = SpeechConfig.FromHost(
@@ -29,98 +29,98 @@ var config = SpeechConfig.FromHost(
2929
::: zone-end
3030

3131
::: zone pivot="programming-language-cpp"
32-
Change from using this Azure-cloud initialization call:
32+
Instead of using this Azure-cloud initialization config:
3333

3434
```cpp
3535
auto speechConfig = SpeechConfig::FromSubscription(...);
3636
```
3737

38-
To using this call with the container [host](/cpp/cognitive-services/speech/speechconfig#fromhost):
38+
Use this config with the container [host](/cpp/cognitive-services/speech/speechconfig#fromhost):
3939

4040
```cpp
4141
auto speechConfig = SpeechConfig::FromHost("ws://localhost:5000");
4242
```
4343
::: zone-end
4444

4545
::: zone pivot="programming-language-go"
46-
Change from using this Azure-cloud initialization call:
46+
Instead of using this Azure-cloud initialization config:
4747

4848
```go
4949
speechConfig, err := speech.NewSpeechConfigFromSubscription(...)
5050
```
5151

52-
To using this call with the container host:
52+
Use this config with the container host:
5353

5454
```go
5555
speechConfig, err := speech.NewSpeechConfigFromHost("ws://localhost:5000")
5656
```
5757
::: zone-end
5858

5959
::: zone pivot="programming-language-java"
60-
Change from using this Azure-cloud initialization call:
60+
Instead of using this Azure-cloud initialization config:
6161

6262
```java
6363
SpeechConfig speechConfig = SpeechConfig.fromSubscription(...);
6464
```
6565

66-
To using this call with the container [host](/java/api/com.microsoft.cognitiveservices.speech.speechconfig#com-microsoft-cognitiveservices-speech-speechconfig-fromhost(java-net-uri)):
66+
Use this config with the container [host](/java/api/com.microsoft.cognitiveservices.speech.speechconfig#com-microsoft-cognitiveservices-speech-speechconfig-fromhost(java-net-uri)):
6767

6868
```java
6969
SpeechConfig speechConfig = SpeechConfig.fromHost("ws://localhost:5000");
7070
```
7171
::: zone-end
7272

7373
::: zone pivot="programming-language-javascript"
74-
Change from using this Azure-cloud initialization call:
74+
Instead of using this Azure-cloud initialization config:
7575

7676
```javascript
7777
const speechConfig = sdk.SpeechConfig.fromSubscription(...);
7878
```
7979

80-
To using this call with the container [host](/javascript/api/microsoft-cognitiveservices-speech-sdk/speechconfig#microsoft-cognitiveservices-speech-sdk-speechconfig-fromhost):
80+
Use this config with the container [host](/javascript/api/microsoft-cognitiveservices-speech-sdk/speechconfig#microsoft-cognitiveservices-speech-sdk-speechconfig-fromhost):
8181

8282
```javascript
8383
const speechConfig = sdk.SpeechConfig.fromHost("ws://localhost:5000");
8484
```
8585
::: zone-end
8686

8787
::: zone pivot="programming-language-objectivec"
88-
Change from using this Azure-cloud initialization call:
88+
Instead of using this Azure-cloud initialization config:
8989

9090
```objectivec
9191
SPXSpeechConfiguration *speechConfig = [[SPXSpeechConfiguration alloc] initWithSubscription:...];
9292
```
9393
94-
To using this call with the container [host](/objectivec/cognitive-services/speech/spxspeechconfiguration#initwithhost):
94+
Use this config with the container [host](/objectivec/cognitive-services/speech/spxspeechconfiguration#initwithhost):
9595
9696
```objectivec
9797
SPXSpeechConfiguration *speechConfig = [[SPXSpeechConfiguration alloc] initWithHost:"ws://localhost:5000"];
9898
```
9999
::: zone-end
100100

101101
::: zone pivot="programming-language-swift"
102-
Change from using this Azure-cloud initialization call:
102+
Instead of using this Azure-cloud initialization config:
103103

104104
```swift
105105
let speechConfig = SPXSpeechConfiguration(subscription: "", region: "");
106106
```
107107

108-
To using this call with the container [host](/objectivec/cognitive-services/speech/spxspeechconfiguration#initwithhost):
108+
Use this config with the container [host](/objectivec/cognitive-services/speech/spxspeechconfiguration#initwithhost):
109109

110110
```swift
111111
let speechConfig = SPXSpeechConfiguration(host: "ws://localhost:5000");
112112
```
113113
::: zone-end
114114

115115
::: zone pivot="programming-language-python"
116-
Change from using this Azure-cloud initialization call:
116+
Instead of using this Azure-cloud initialization config:
117117

118118
```python
119119
speech_config = speechsdk.SpeechConfig(
120120
subscription=speech_key, region=service_region)
121121
```
122122

123-
To using this call with the container [endpoint](/python/api/azure-cognitiveservices-speech/azure.cognitiveservices.speech.speechconfig):
123+
Use this config with the container [endpoint](/python/api/azure-cognitiveservices-speech/azure.cognitiveservices.speech.speechconfig):
124124

125125
```python
126126
speech_config = speechsdk.SpeechConfig(

articles/cognitive-services/Speech-Service/speech-container-cstt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The fully qualified container image name is, `mcr.microsoft.com/azure-cognitive-
3434
| Version | Path |
3535
|-----------|------------|
3636
| Latest | `mcr.microsoft.com/azure-cognitive-services/speechservices/custom-speech-to-text:latest` |
37-
| 3.12.0 | `mcr.microsoft.com/azure-cognitive-services/speechservices/custom-speech-to-text:3.12.0-amd64` |
37+
| 3.13.0 | `mcr.microsoft.com/azure-cognitive-services/speechservices/custom-speech-to-text:3.13.0-amd64` |
3838

3939
All tags, except for `latest`, are in the following format and are case sensitive:
4040

articles/cognitive-services/Speech-Service/speech-container-lid.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@ keywords: on-premises, Docker, container
1919
The Speech language identification container detects the language spoken in audio files. You can get real-time speech or batch audio recordings with intermediate results. In this article, you'll learn how to download, install, and run a language identification container.
2020

2121
> [!NOTE]
22+
> You must [request and get approval](speech-container-overview.md#request-approval-to-run-the-container) to use a Speech container.
23+
>
2224
> The Speech language identification container is available in public preview. Containers in preview are still under development and don't meet Microsoft's stability and support requirements.
2325
26+
For more information about prerequisites, validating that a container is running, running multiple containers on the same host, and running disconnected containers, see [Install and run Speech containers with Docker](speech-container-howto.md).
27+
2428
> [!TIP]
2529
> To get the most useful results, use the Speech language identification container with the [speech-to-text](speech-container-stt.md) or [custom speech-to-text](speech-container-cstt.md) containers.
2630
27-
> [!NOTE]
28-
> You must [request and get approval](speech-container-overview.md#request-approval-to-run-the-container) to use a Speech container.
29-
30-
For more information about prerequisites, validating that a container is running, running multiple containers on the same host, and running disconnected containers, see [Install and run Speech containers with Docker](speech-container-howto.md).
31-
3231
## Container images
3332

3433
The Speech language identification container image for all supported versions and locales can be found on the [Microsoft Container Registry (MCR)](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/language-detection/tags) syndicate. It resides within the `azure-cognitive-services/speechservices/` repository and is named `language-detection`.
@@ -40,7 +39,7 @@ The fully qualified container image name is, `mcr.microsoft.com/azure-cognitive-
4039
| Version | Path |
4140
|-----------|------------|
4241
| Latest | `mcr.microsoft.com/azure-cognitive-services/speechservices/language-detection:latest` |
43-
| 3.12.0 | `mcr.microsoft.com/azure-cognitive-services/speechservices/language-detection:1.11.0-amd64-preview` |
42+
| 1.11.0 | `mcr.microsoft.com/azure-cognitive-services/speechservices/language-detection:1.11.0-amd64-preview` |
4443

4544
All tags, except for `latest`, are in the following format and are case sensitive:
4645

articles/cognitive-services/Speech-Service/speech-container-ntts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The fully qualified container image name is, `mcr.microsoft.com/azure-cognitive-
3434
| Version | Path |
3535
|-----------|------------|
3636
| Latest | `mcr.microsoft.com/azure-cognitive-services/speechservices/neural-text-to-speech:latest`<br/><br/>The `latest` tag pulls the `en-US` locale and `en-us-arianeural` voice. |
37-
| 3.12.0 | `mcr.microsoft.com/azure-cognitive-services/speechservices/neural-text-to-speech:3.12.0-amd64-mr-in` |
37+
| 2.12.0 | `mcr.microsoft.com/azure-cognitive-services/speechservices/neural-text-to-speech:2.12.0-amd64-mr-in` |
3838

3939
All tags, except for `latest`, are in the following format and are case sensitive:
4040

articles/cognitive-services/Speech-Service/speech-container-overview.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,19 @@ The Speech containers send billing information to Azure by using a Speech resour
6262
6363
Speech containers aren't licensed to run without being connected to Azure for metering. You must configure your container to communicate billing information with the metering service at all times. For more information, see [billing arguments](speech-container-howto.md#billing-arguments).
6464

65+
## Container recipes and other container services
66+
67+
You can use container recipes to create containers that can be reused. Containers can be built with some or all configuration settings so that they are not needed when the container is started. For container recipes see the following Azure Cognitive Services articles:
68+
- [Create containers for reuse](../containers/container-reuse-recipe.md)
69+
- [Deploy and run container on Azure Container Instance](../containers/azure-container-instance-recipe.md)
70+
- [Deploy a language detection container to Azure Kubernetes Service](../containers/azure-kubernetes-recipe.md)
71+
- [Use Docker Compose to deploy multiple containers](../containers/docker-compose-recipe.md)
72+
73+
For information about other container services, see the following Azure Cognitive Services articles:
74+
- [Tutorial: Create a container image for deployment to Azure Container Instances](../../container-instances/container-instances-tutorial-prepare-app.md)
75+
- [Quickstart: Create a private container registry using the Azure CLI](../../container-registry/container-registry-get-started-azure-cli.md)
76+
- [Tutorial: Prepare an application for Azure Kubernetes Service (AKS)](../../aks/tutorial-kubernetes-prepare-app.md)
77+
6578
## Next steps
6679

6780
* [Install and run Speech containers](speech-container-howto.md)

articles/cognitive-services/Speech-Service/speech-container-stt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The fully qualified container image name is, `mcr.microsoft.com/azure-cognitive-
3434
| Version | Path |
3535
|-----------|------------|
3636
| Latest | `mcr.microsoft.com/azure-cognitive-services/speechservices/speech-to-text:latest`<br/><br/>The `latest` tag pulls the latest image for the `en-US` locale. |
37-
| 3.12.0 | `mcr.microsoft.com/azure-cognitive-services/speechservices/speech-to-text:3.12.0-amd64-mr-in` |
37+
| 3.13.0 | `mcr.microsoft.com/azure-cognitive-services/speechservices/speech-to-text:3.13.0-amd64-mr-in` |
3838

3939
All tags, except for `latest`, are in the following format and are case sensitive:
4040

articles/cognitive-services/containers/container-reuse-recipe.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ ms.topic: how-to
1111
ms.date: 10/28/2021
1212
ms.author: aahi
1313
#Customer intent: As a potential customer, I want to know how to configure containers so I can reuse them.
14-
15-
# SME: Siddhartha Prasad <[email protected]>
1614
---
1715

1816
# Create containers for reuse

0 commit comments

Comments
 (0)