Skip to content

Commit 1a86543

Browse files
seesharprunseesharprun
authored
Merge branch 'MicrosoftDocs:main' into cosmos-nosql-quickstart-nodejs-typescript
2 parents c39f47d + 21555e7 commit 1a86543

File tree

1,041 files changed

+2624
-6018
lines changed

Some content is hidden

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

1,041 files changed

+2624
-6018
lines changed

‎.openpublishing.redirection.json

Lines changed: 127 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/network-watcher/network-watcher-connectivity-rest.md",
5+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-connectivity-rest",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/application-gateway/resource-manager-template-samples.md",
510
"redirect_url": "/previous-versions/azure/application-gateway/resource-manager-template-samples",
@@ -4895,7 +4900,127 @@
48954900
"redirect_url":"/azure/operational-excellence/relocation-container-registry",
48964901
"redirect_document_id":false
48974902
},
4898-
{
4903+
{
4904+
"source_path": "articles/data-catalog/data-catalog-developer-concepts.md",
4905+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-developer-concepts",
4906+
"redirect_document_id": false
4907+
},
4908+
{
4909+
"source_path": "articles/data-catalog/data-catalog-dsr.md",
4910+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-dsr",
4911+
"redirect_document_id": false
4912+
},
4913+
{
4914+
"source_path": "articles/data-catalog/data-catalog-frequently-asked-questions.yml",
4915+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-frequently-asked-questions",
4916+
"redirect_document_id": false
4917+
},
4918+
{
4919+
"source_path": "articles/data-catalog/data-catalog-get-started.md",
4920+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-get-started",
4921+
"redirect_document_id": false
4922+
},
4923+
{
4924+
"source_path": "articles/data-catalog/data-catalog-how-to-annotate.md",
4925+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-annotate",
4926+
"redirect_document_id": false
4927+
},
4928+
{
4929+
"source_path": "articles/data-catalog/data-catalog-how-to-big-data.md",
4930+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-big-data",
4931+
"redirect_document_id": false
4932+
},
4933+
{
4934+
"source_path": "articles/data-catalog/data-catalog-how-to-business-glossary.md",
4935+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-business-glossary",
4936+
"redirect_document_id": false
4937+
},
4938+
{
4939+
"source_path": "articles/data-catalog/data-catalog-how-to-connect.md",
4940+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-connect",
4941+
"redirect_document_id": false
4942+
},
4943+
{
4944+
"source_path": "articles/data-catalog/data-catalog-how-to-data-profile.md",
4945+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-data-profile",
4946+
"redirect_document_id": false
4947+
},
4948+
{
4949+
"source_path": "articles/data-catalog/data-catalog-how-to-discover.md",
4950+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-discover",
4951+
"redirect_document_id": false
4952+
},
4953+
{
4954+
"source_path": "articles/data-catalog/data-catalog-how-to-documentation.md",
4955+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-documentation",
4956+
"redirect_document_id": false
4957+
},
4958+
{
4959+
"source_path": "articles/data-catalog/data-catalog-how-to-manage.md",
4960+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-manage",
4961+
"redirect_document_id": false
4962+
},
4963+
{
4964+
"source_path": "articles/data-catalog/data-catalog-how-to-register.md",
4965+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-register",
4966+
"redirect_document_id": false
4967+
},
4968+
{
4969+
"source_path": "articles/data-catalog/data-catalog-how-to-save-pin.md",
4970+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-save-pin",
4971+
"redirect_document_id": false
4972+
},
4973+
{
4974+
"source_path": "articles/data-catalog/data-catalog-how-to-secure-catalog.md",
4975+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-secure-catalog",
4976+
"redirect_document_id": false
4977+
},
4978+
{
4979+
"source_path": "articles/data-catalog/data-catalog-how-to-view-related-data-assets.md",
4980+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-how-to-view-related-data-assets",
4981+
"redirect_document_id": false
4982+
},
4983+
{
4984+
"source_path": "articles/data-catalog/data-catalog-keyboard-shortcuts.md",
4985+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-keyboard-shortcuts",
4986+
"redirect_document_id": false
4987+
},
4988+
{
4989+
"source_path": "articles/data-catalog/data-catalog-migration-to-microsoft-purview.md",
4990+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-migration-to-microsoft-purview",
4991+
"redirect_document_id": false
4992+
},
4993+
{
4994+
"source_path": "articles/data-catalog/data-catalog-samples.md",
4995+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-samples",
4996+
"redirect_document_id": false
4997+
},
4998+
{
4999+
"source_path": "articles/data-catalog/data-catalog-terminology.md",
5000+
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-terminology",
5001+
"redirect_document_id": false
5002+
},
5003+
{
5004+
"source_path": "articles/data-catalog/index.yml",
5005+
"redirect_url": "/previous-versions/azure/data-catalog/index",
5006+
"redirect_document_id": false
5007+
},
5008+
{
5009+
"source_path": "articles/data-catalog/overview.md",
5010+
"redirect_url": "/previous-versions/azure/data-catalog/overview",
5011+
"redirect_document_id": false
5012+
},
5013+
{
5014+
"source_path": "articles/data-catalog/register-data-assets-tutorial.md",
5015+
"redirect_url": "/previous-versions/azure/data-catalog/register-data-assets-tutorial",
5016+
"redirect_document_id": false
5017+
},
5018+
{
5019+
"source_path": "articles/data-catalog/troubleshoot-policy-configuration.md",
5020+
"redirect_url": "/previous-versions/azure/data-catalog/troubleshoot-policy-configuration",
5021+
"redirect_document_id": false
5022+
},
5023+
{
48995024
"source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-powershell.md",
49005025
"redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6--portal",
49015026
"redirect_document_id": false
@@ -4904,7 +5029,6 @@
49045029
"source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-cli.md",
49055030
"redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6--portal",
49065031
"redirect_document_id": false
4907-
}
4908-
5032+
}
49095033
]
49105034
}

‎CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Codeowners file
2+
# Each line is a file pattern followed by one or more owners.
3+
4+
# Specify owners for the aks folder
5+
/articles/aks @tynevi @thomps23

‎articles/ai-services/computer-vision/includes/identity-sensitive-attributes.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ ms.author: pafarley
1111
---
1212

1313
> [!CAUTION]
14-
> Microsoft has retired facial recognition capabilities that can be used to try to infer emotional states and identity attributes which, if misused, can subject people to stereotyping, discrimination or unfair denial of services. These include capabilities that predict emotion, gender, age, smile, facial hair, hair and makeup. Read more about this decision [here](https://azure.microsoft.com/blog/responsible-ai-investments-and-safeguards-for-facial-recognition/).
15-
14+
> Microsoft has retired or limited facial recognition capabilities that can be used to try to infer emotional states and identity attributes which, if misused, can subject people to stereotyping, discrimination or unfair denial of services. The retired capabilities are emotion and gender. The limited capabilities are age, smile, facial hair, hair and makeup. Email [Azure Face API](mailto:[email protected]) if you have a responsible use case that would benefit from the use of any of the limited capabilities. Read more about this decision [here](https://azure.microsoft.com/blog/responsible-ai-investments-and-safeguards-for-facial-recognition/).

‎articles/ai-services/custom-vision-service/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ landingContent:
101101
- linkListType: reference
102102
links:
103103
- text: Training API
104-
url: https://go.microsoft.com/fwlink/?linkid=865446
104+
url: /rest/api/customvision/train-project
105105
- text: Prediction API
106-
url: https://go.microsoft.com/fwlink/?linkid=865445
106+
url: /rest/api/customvision/operation-groups
107107
- text: .NET SDK
108108
url: /dotnet/api/overview/azure/custom-vision
109109
- text: Python SDK

0 commit comments

Comments
 (0)