Skip to content

Commit 1090266

Browse files
mumianmumian
committed
resolve conflicts
2 parents 9b5b260 + 90be1cd commit 1090266

File tree

291 files changed

+4931
-4270
lines changed

Some content is hidden

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

291 files changed

+4931
-4270
lines changed

‎.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,12 @@
410410
"branch": "main",
411411
"branch_mapping": {}
412412
},
413+
{
414+
"path_to_root": "azure-search-static-web-app",
415+
"url": "https://github.com/Azure-Samples/azure-search-static-web-app",
416+
"branch": "main",
417+
"branch_mapping": {}
418+
},
413419
{
414420
"path_to_root": "samples-personalizer",
415421
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",

‎.openpublishing.redirection.azure-app-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
{
2929
"source_path_from_root": "/articles/azure-app-configuration/concept-github-action.md",
30-
"redirect_url": "/azure/azure-app-configuration/push-kv-github-action.md",
30+
"redirect_url": "/azure/azure-app-configuration/push-kv-github-action",
3131
"redirect_document_id": false
3232
}
3333
]

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-monitor/snapshot-debugger/snapshot-debugger-upgrade.md",
5+
"redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger#upgrading-snapshot-debugger",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/azure-monitor/snapshot-debugger/snapshot-collector-release-notes.md",
510
"redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger#release-notes-for-microsoftapplicationinsightssnapshotcollector",
@@ -6881,12 +6886,12 @@
68816886
},
68826887
{
68836888
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-private-link.md",
6884-
"redirect_url": "/previous-versions/azure/azure-monitor/containers/kubernetes-monitoring-private-link",
6889+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-private-link",
68856890
"redirect_document_id": false
68866891
},
68876892
{
68886893
"source_path_from_root": "/articles/azure-monitor/essentials/private-link-data-ingestion.md",
6889-
"redirect_url": "/previous-versions/azure/azure-monitor/containers/kubernetes-monitoring-private-link",
6894+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-private-link",
68906895
"redirect_document_id": false
68916896
}
68926897
]

‎.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4544,6 +4544,16 @@
45444544
"source_path_from_root": "/articles/virtual-network/template-samples.md",
45454545
"redirect_url": "/samples/browse/?expanded=azure&products=azure-resource-manager&terms=virtual%20network",
45464546
"redirect_document_id": false
4547+
},
4548+
{
4549+
"source_path_from_root": "/articles/virtual-network/tutorial-restrict-network-access-to-resources-cli.md",
4550+
"redirect_url": "/azure/virtual-network/tutorial-restrict-network-access-to-resources",
4551+
"redirect_document_id": false
4552+
},
4553+
{
4554+
"source_path_from_root": "/articles/virtual-network/tutorial-restrict-network-access-to-resources-powershell.md",
4555+
"redirect_url": "/azure/virtual-network/tutorial-restrict-network-access-to-resources",
4556+
"redirect_document_id": false
45474557
}
45484558
]
45494559
}

‎articles/ai-services/computer-vision/includes/environment-variables.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ In this example, write your credentials to environment variables on the local ma
1212

1313
[!INCLUDE [find key and endpoint](./find-key.md)]
1414

15-
> [!TIP]
16-
> Don't include the key directly in your code, and never post it publicly. See the Azure AI services [security](../../security-features.md) article for more authentication options like [Azure Key Vault](../../use-key-vault.md).
17-
1815
To set the environment variable for your key and endpoint, open a console window and follow the instructions for your operating system and development environment.
1916

20-
1. To set the `VISION_KEY` environment variable, replace `<your_key>` with one of the keys for your resource.
21-
2. To set the `VISION_ENDPOINT` environment variable, replace `<your_endpoint>` with the endpoint for your resource.
17+
- To set the `VISION_KEY` environment variable, replace `<your_key>` with one of the keys for your resource.
18+
- To set the `VISION_ENDPOINT` environment variable, replace `<your_endpoint>` with the endpoint for your resource.
19+
20+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
2221

2322
#### [Windows](#tab/windows)
2423

‎articles/ai-services/computer-vision/includes/face-environment-variables.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ In this example, write your credentials to environment variables on the local ma
1010

1111
[!INCLUDE [find key and endpoint](./find-key.md)]
1212

13-
> [!TIP]
14-
> Don't include the key directly in your code, and never post it publicly. See the Azure AI services [security](../../security-features.md) article for more authentication options like [Azure Key Vault](../../use-key-vault.md).
15-
1613
To set the environment variable for your key and endpoint, open a console window and follow the instructions for your operating system and development environment.
1714

18-
1. To set the `FACE_APIKEY` environment variable, replace `<your_key>` with one of the keys for your resource.
19-
2. To set the `FACE_ENDPOINT` environment variable, replace `<your_endpoint>` with the endpoint for your resource.
15+
- To set the `FACE_APIKEY` environment variable, replace `<your_key>` with one of the keys for your resource.
16+
- To set the `FACE_ENDPOINT` environment variable, replace `<your_endpoint>` with the endpoint for your resource.
17+
18+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
2019

2120
#### [Windows](#tab/windows)
2221

‎articles/ai-services/computer-vision/includes/how-to-guides/analyze-image-40-cpp.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ This guide assumes you have successfully followed the steps mentioned in the [qu
1919

2020
To authenticate against the Image Analysis service, you need a Computer Vision key and endpoint URL.
2121

22-
> [!TIP]
23-
> Don't include the key directly in your code, and never post it publicly. See the Azure AI services [security](/azure/ai-services/security-features) article for more authentication options like [Azure Key Vault](/azure/ai-services/use-key-vault).
22+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
2423

2524
The SDK example assumes that you defined the environment variables `VISION_KEY` and `VISION_ENDPOINT` with your key and endpoint.
2625

‎articles/ai-services/computer-vision/includes/how-to-guides/analyze-image-40-csharp.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ This guide assumes you've followed the steps mentioned in the [quickstart](/azur
1919

2020
To authenticate against the Image Analysis service, you need a Computer Vision key and endpoint URL. This guide assumes that you've defined the environment variables `VISION_KEY` and `VISION_ENDPOINT` with your key and endpoint.
2121

22-
> [!TIP]
23-
> Don't include the key directly in your code, and never post it publicly. See the Azure AI services [security](/azure/ai-services/security-features) article for more authentication options like [Azure Key Vault](/azure/ai-services/use-key-vault).
22+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
2423

2524
Start by creating a [ImageAnalysisClient](/dotnet/api/azure.ai.vision.imageanalysis.imageanalysisclient) object. For example:
2625

‎articles/ai-services/computer-vision/includes/how-to-guides/analyze-image-40-java.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ This guide assumes you've followed the steps in the [quickstart](/azure/ai-servi
1919

2020
To authenticate with the Image Analysis service, you need a Computer Vision key and endpoint URL. This guide assumes that you've defined the environment variables `VISION_KEY` and `VISION_ENDPOINT` with your key and endpoint.
2121

22-
> [!TIP]
23-
> Don't include the key directly in your code, and never post it publicly. See the Azure AI services [security](/azure/ai-services/security-features) article for more authentication options like [Azure Key Vault](/azure/ai-services/use-key-vault).
22+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
2423

2524
Start by creating an [ImageAnalysisClient](/java/api/com.azure.ai.vision.imageanalysis.imageanalysisclient) object. For example:
2625

‎articles/ai-services/computer-vision/includes/how-to-guides/analyze-image-40-js.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ This guide assumes you have followed the steps mentioned in the [quickstart](/az
2020

2121
To authenticate against the Image Analysis service, you need a Computer Vision key and endpoint URL. This guide assumes that you've defined the environment variables `VISION_KEY` and `VISION_ENDPOINT` with your key and endpoint.
2222

23-
> [!TIP]
24-
> Don't include the key directly in your code, and never post it publicly. See the Azure AI services [security](/azure/ai-services/security-features) article for more authentication options like [Azure Key Vault](/azure/ai-services/use-key-vault).
23+
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
2524

2625
Start by creating a **ImageAnalysisClient** object. For example:
2726

0 commit comments

Comments
 (0)