Skip to content

Commit 86d19b0

Browse files
paulth1paulth1
committed
fixing merge conflict
2 parents 7d98732 + e0872c6 commit 86d19b0

File tree

864 files changed

+15316
-9689
lines changed

Some content is hidden

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

864 files changed

+15316
-9689
lines changed

‎.openpublishing.redirection.ai-services-from-cog.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,11 +1670,6 @@
16701670
"redirect_url": "/azure/ai-services/speech-service/how-to-configure-openssl-linux",
16711671
"redirect_document_id": true
16721672
},
1673-
{
1674-
"source_path_from_root": "/articles/cognitive-services/speech-service/how-to-configure-rhel-centos-7.md",
1675-
"redirect_url": "/azure/ai-services/speech-service/how-to-configure-rhel-centos-7",
1676-
"redirect_document_id": true
1677-
},
16781673
{
16791674
"source_path_from_root": "/articles/cognitive-services/speech-service/how-to-control-connections.md",
16801675
"redirect_url": "/azure/ai-services/speech-service/how-to-control-connections",

‎.openpublishing.redirection.json

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/storage/files/files-samples-dotnet-v11.md",
5+
"redirect_url": "/previous-versions/azure/storage/files/files-samples-dotnet-v11",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/storage/files/files-samples-java-v8.md",
10+
"redirect_url": "/previous-versions/azure/storage/files/files-samples-java-v8",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/storage/files/files-samples-python-v2.md",
15+
"redirect_url": "/previous-versions/azure/storage/files/files-samples-python-v2",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/storage/files/storage-c-plus-plus-how-to-use-files.md",
20+
"redirect_url": "/previous-versions/azure/storage/files/storage-c-plus-plus-how-to-use-files",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/storage/queues/queues-v11-samples-dotnet.md",
25+
"redirect_url": "/previous-versions/azure/storage/queues/queues-v11-samples-dotnet",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/storage/queues/queues-v2-samples-python.md",
30+
"redirect_url": "/previous-versions/azure/storage/queues/queues-v2-samples-python",
31+
"redirect_document_id": false
32+
},
333
{
434
"source_path": "articles/storage/files/storage-files-migration-storsimple-1200.md",
535
"redirect_url": "/previous-versions/azure/storage/files/storage-files-migration-storsimple-1200",
@@ -4805,6 +4835,11 @@
48054835
"redirect_url": "/azure/vpn-gateway/about-site-to-site-tunneling",
48064836
"redirect_document_id": false
48074837
},
4838+
{
4839+
"source_path_from_root": "/articles/vpn-gateway/openvpn-azure-ad-tenant-multi-app.md",
4840+
"redirect_url": "/azure/vpn-gateway/point-to-site-entra-users-access",
4841+
"redirect_document_id": false
4842+
},
48084843
{
48094844
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-multi-site-to-site-resource-manager-portal.md",
48104845
"redirect_url": "/azure/vpn-gateway/add-remove-site-to-site-connections",
@@ -5044,6 +5079,11 @@
50445079
"source_path_from_root": "/articles/xplat-cli-install.md",
50455080
"redirect_url": "/cli/azure/install-azure-cli",
50465081
"redirect_document_id": false
5082+
},
5083+
{
5084+
"source_path_from_root": "/articles/virtual-network/template-samples.md",
5085+
"redirect_url": "/samples/browse/?expanded=azure&products=azure-resource-manager&terms=virtual%20network",
5086+
"redirect_document_id": false
50475087
}
50485088
]
5049-
}
5089+
}

‎.openpublishing.redirection.sentinel.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
22
"redirections": [
3-
{
4-
"source_path": "articles/sentinel/cef-name-mapping.md",
5-
"redirect_url": "/azure/sentinel/cef-syslog-ama-overview",
6-
"redirect_document_id": false
7-
},
83
{
94
"source_path": "articles/sentinel/detect-threats-built-in.md#use-analytics-rule-templates",
105
"redirect_url": "/azure/sentinel/create-analytics-rule-from-template",

‎articles/ai-services/.openpublishing.redirection.ai-services.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,16 @@
384384
"source_path_from_root": "/articles/ai-services/speech-service/faq-voice-assistants.yml",
385385
"redirect_url": "/azure/ai-services/speech-service/custom-commands",
386386
"redirect_document_id": false
387+
},
388+
{
389+
"source_path_from_root": "/articles/cognitive-services/speech-service/how-to-configure-rhel-centos-7.md",
390+
"redirect_url": "/azure/ai-services/speech-service/quickstarts/setup-platform",
391+
"redirect_document_id": false
392+
},
393+
{
394+
"source_path_from_root": "/articles/ai-services/speech-service/how-to-configure-rhel-centos-7.md",
395+
"redirect_url": "/azure/ai-services/speech-service/quickstarts/setup-platform",
396+
"redirect_document_id": false
387397
}
388398

389399
]

‎articles/ai-services/Anomaly-Detector/includes/quickstarts/anomaly-detector-client-library-csharp-multivariate.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ Go to your resource in the Azure portal. The **Endpoint and Keys** can be found
7272

7373
Create and assign persistent environment variables for your key and endpoint.
7474

75+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
76+
7577
# [Command Line](#tab/command-line)
7678

7779
```CMD

‎articles/ai-services/Anomaly-Detector/includes/quickstarts/anomaly-detector-client-library-csharp.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ Go to your resource in the Azure portal. The **Endpoint and Keys** can be found
7676

7777
Create and assign persistent environment variables for your key and endpoint.
7878

79+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
80+
7981
# [Command Line](#tab/command-line)
8082

8183
```CMD
@@ -185,8 +187,7 @@ namespace anomaly_detector_quickstart
185187

186188
```
187189

188-
> [!IMPORTANT]
189-
> For production, use a secure way of storing and accessing your credentials like [Azure Key Vault](/azure/key-vault/general/overview). For more information about credential security, see the Azure AI services [security](../../../security-features.md) article.
190+
Run the application with the following command:
190191

191192
```cmd
192193
dotnet run program.cs

‎articles/ai-services/Anomaly-Detector/includes/quickstarts/anomaly-detector-client-library-javascript.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ Use the Anomaly Detector client library for JavaScript to:
2525

2626
* An Azure subscription - <a href="https://azure.microsoft.com/free/cognitive-services" target="_blank">Create one for free</a>
2727
* The current version of <a href="https://nodejs.org/" target="_blank">Node.js</a>
28-
* Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesAnomalyDetector" title="Create an Anomaly Detector resource" target="_blank">create an Anomaly Detector resource </a> in the Azure portal to get your key and endpoint. Wait for it to deploy and select the **Go to resource** button.
29-
* You'll need the key and endpoint from the resource you create to connect your application to the Anomaly Detector API. You'll use the key and endpoint to create environment variables.
30-
You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.
28+
* Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesAnomalyDetector" title="Create an Anomaly Detector resource" target="_blank">create an Anomaly Detector resource </a> in the Azure portal to get your key and endpoint. Wait for it to deploy and select the **Go to resource** button. You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.
3129

3230
## Set up
3331

@@ -76,6 +74,8 @@ Go to your resource in the Azure portal. The **Endpoint and Keys** can be found
7674

7775
Create and assign persistent environment variables for your key and endpoint.
7876

77+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
78+
7979
# [Command Line](#tab/command-line)
8080

8181
```CMD
@@ -130,7 +130,7 @@ const { AzureKeyCredential } = require("@azure/core-auth");
130130
const { parse } = require("csv-parse/sync");
131131
const fs = require("fs");
132132

133-
// You will need to set this environment variables or edit the following values
133+
// Retrieve the endpoint and key from the environment variables.
134134
const apiKey = process.env["ANOMALY_DETECTOR_API_KEY"] || "";
135135
const endpoint = process.env["ANOMALY_DETECTOR_ENDPOINT"] || "";
136136
const timeSeriesDataPath = "./request-data.csv";

‎articles/ai-services/Anomaly-Detector/includes/quickstarts/anomaly-detector-client-library-python-multivariate.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ Go to your resource in the Azure portal. The **Endpoint and Keys** can be found
7676

7777
Create and assign persistent environment variables for your key and endpoint.
7878

79+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
80+
7981
# [Command Line](#tab/command-line)
8082

8183
```CMD

‎articles/ai-services/Anomaly-Detector/includes/quickstarts/anomaly-detector-client-library-python.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ Go to your resource in the Azure portal. The **Endpoint and Keys** can be found
5252

5353
Create and assign persistent environment variables for your key and endpoint.
5454

55+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
56+
5557
# [Command Line](#tab/command-line)
5658

5759
```CMD

‎articles/ai-services/Anomaly-Detector/includes/quickstarts/anomaly-detector-rest-api.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ Go to your resource in the Azure portal. The **Endpoint and Keys** can be found
3232

3333
Create and assign persistent environment variables for your key and endpoint.
3434

35+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
36+
3537
# [Command Line](#tab/command-line)
3638

3739
```CMD

0 commit comments

Comments
 (0)