Skip to content

Commit 39910b6

Browse files
authored
Merge pull request #4 from MicrosoftDocs/main
merge from main
2 parents 936bf8f + 2198750 commit 39910b6

File tree

2,109 files changed

+59706
-26177
lines changed

Some content is hidden

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

2,109 files changed

+59706
-26177
lines changed

.openpublishing.publish.config.json

Lines changed: 3 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -128,54 +128,6 @@
128128
"branch": "master",
129129
"branch_mapping": {}
130130
},
131-
{
132-
"path_to_root": "samples-mediaservices-integration",
133-
"url": "https://github.com/Azure-Samples/media-services-dotnet-functions-integration",
134-
"branch": "main",
135-
"branch_mapping": {}
136-
},
137-
{
138-
"path_to_root": "samples-mediaservices-encryptiondrm",
139-
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-drm",
140-
"branch": "master",
141-
"branch_mapping": {}
142-
},
143-
{
144-
"path_to_root": "samples-mediaservices-encryptionfairplay",
145-
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-fairplay",
146-
"branch": "master",
147-
"branch_mapping": {}
148-
},
149-
{
150-
"path_to_root": "samples-mediaservices-encryptionaes",
151-
"url": "https://github.com/Azure-Samples/media-services-dotnet-dynamic-encryption-with-aes",
152-
"branch": "master",
153-
"branch_mapping": {}
154-
},
155-
{
156-
"path_to_root": "samples-mediaservices-copyblob",
157-
"url": "https://github.com/Azure-Samples/media-services-dotnet-copy-blob-into-asset",
158-
"branch": "master",
159-
"branch_mapping": {}
160-
},
161-
{
162-
"path_to_root": "samples-mediaservices-deliverplayready",
163-
"url": "https://github.com/Azure-Samples/media-services-dotnet-deliver-playready-widevine-licenses",
164-
"branch": "master",
165-
"branch_mapping": {}
166-
},
167-
{
168-
"path_to_root": "samples-mediaservices-livestream",
169-
"url": "https://github.com/Azure-Samples/media-services-dotnet-encode-live-stream-with-ams-clear",
170-
"branch": "master",
171-
"branch_mapping": {}
172-
},
173-
{
174-
"path_to_root": "samples-mediaservices-encoderstandard",
175-
"url": "https://github.com/Azure-Samples/media-services-dotnet-on-demand-encoding-with-media-encoder-standard",
176-
"branch": "master",
177-
"branch_mapping": {}
178-
},
179131
{
180132
"path_to_root": "azure-app-service-multi-container",
181133
"url": "https://github.com/Azure-Samples/multicontainerwordpress",
@@ -374,30 +326,6 @@
374326
"branch": "master",
375327
"branch_mapping": {}
376328
},
377-
{
378-
"path_to_root": "media-services-v3-dotnet-tutorials",
379-
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials",
380-
"branch": "main",
381-
"branch_mapping": {}
382-
},
383-
{
384-
"path_to_root": "media-services-v3-dotnet",
385-
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet",
386-
"branch": "main",
387-
"branch_mapping": {}
388-
},
389-
{
390-
"path_to_root": "media-services-v3-dotnet-core-functions-integration",
391-
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-core-functions-integration",
392-
"branch": "main",
393-
"branch_mapping": {}
394-
},
395-
{
396-
"path_to_root": "media-services-v3-python",
397-
"url": "https://github.com/Azure-Samples/media-services-v3-python",
398-
"branch": "main",
399-
"branch_mapping": {}
400-
},
401329
{
402330
"path_to_root": "samples-javascript",
403331
"url": "https://github.com/Microsoft/tsiclient",
@@ -410,24 +338,6 @@
410338
"branch": "master",
411339
"branch_mapping": {}
412340
},
413-
{
414-
"path_to_root": "media-services-v3-dotnet-core-tutorials",
415-
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-core-tutorials",
416-
"branch": "master",
417-
"branch_mapping": {}
418-
},
419-
{
420-
"path_to_root": "media-services-v3-rest-postman",
421-
"url": "https://github.com/Azure-Samples/media-services-v3-rest-postman",
422-
"branch": "master",
423-
"branch_mapping": {}
424-
},
425-
{
426-
"path_to_root": "media-services-v3-node-tutorials",
427-
"url": "https://github.com/Azure-Samples/media-services-v3-node-tutorials",
428-
"branch": "main",
429-
"branch_mapping": {}
430-
},
431341
{
432342
"path_to_root": "media-services-video-indexer",
433343
"url": "https://github.com/Azure-Samples/media-services-video-indexer",
@@ -1038,6 +948,8 @@
1038948
".openpublishing.redirection.virtual-desktop.json",
1039949
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
1040950
"articles/applied-ai-services/.openpublishing.archived.json",
1041-
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json"
951+
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
952+
".openpublishing.redirection.baremetal-infrastructure.json"
953+
1042954
]
1043955
}
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"redirections": [
3+
4+
{
5+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/about-the-public-preview.md",
6+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
7+
"redirect_document_id": false
8+
}, {
9+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/architecture.md",
10+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/faq.md",
15+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/faq",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/get-started.md",
20+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/get-started",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/nc2-baremetal-overview.md",
25+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/nc2-baremetal-overview",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/requirements.md",
30+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/requirements",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/skus.md",
35+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/skus",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/solution-design.md",
40+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/solution-design",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/supported-instances-and-regions.md",
45+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/supported-instances-and-regions",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/use-cases-and-supported-scenarios.md",
50+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/use-cases-and-supported-scenarios",
51+
"redirect_document_id": false
52+
}
53+
]
54+
}
55+

.openpublishing.redirection.healthcare-apis.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,41 @@
491491
"source_path_from_root": "/articles/healthcare-apis/fhir/bulk-importing-fhir-data.md",
492492
"redirect_url": "/azure/healthcare-apis/fhir/configure-import-data",
493493
"redirect_document_id": true
494+
},
495+
{
496+
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-azure-resource-manager-template-quickstart.md",
497+
"redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
498+
"redirect_document_id": false
499+
},
500+
{
501+
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-data-flow.md",
502+
"redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
503+
"redirect_document_id": false
504+
},
505+
{
506+
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-fhir-portal-quickstart.md",
507+
"redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
508+
"redirect_document_id": false
509+
},
510+
{
511+
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-mapping-templates.md",
512+
"redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
513+
"redirect_document_id": false
514+
},
515+
{
516+
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-metrics-diagnostics-export.md",
517+
"redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
518+
"redirect_document_id": false
519+
},
520+
{
521+
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-metrics-display.md",
522+
"redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
523+
"redirect_document_id": false
524+
},
525+
{
526+
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/iot-troubleshoot-guide.md",
527+
"redirect_url": "/azure/healthcare-apis/iot/iot-connector-overview",
528+
"redirect_document_id": false
494529
}
495530
]
496531
}

.openpublishing.redirection.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6308,6 +6308,21 @@
63086308
"redirect_url": "/azure/storage/blobs/storage-auth-abac",
63096309
"redirect_document_id": false
63106310
},
6311+
{
6312+
"source_path": "articles/storage/blobs/reference.md",
6313+
"redirect_url": "/azure/storage/blobs/storage-blobs-introduction",
6314+
"redirect_document_id": false
6315+
},
6316+
{
6317+
"source_path": "articles/storage/queues/reference.md",
6318+
"redirect_url": "/azure/storage/queues/storage-queues-introduction",
6319+
"redirect_document_id": false
6320+
},
6321+
{
6322+
"source_path": "articles/storage/files/reference.md",
6323+
"redirect_url": "/azure/storage/files/storage-files-introduction",
6324+
"redirect_document_id": false
6325+
},
63116326
{
63126327
"source_path_from_root": "/articles/storage/storage-client-side-encryption.md",
63136328
"redirect_url": "/azure/storage/common/storage-client-side-encryption",
@@ -21271,12 +21286,12 @@
2127121286
{
2127221287
"source_path_from_root": "/articles/storage/vs-storage-cloud-services-getting-started-queues.md",
2127321288
"redirect_url": "/azure/visual-studio/vs-storage-cloud-services-getting-started-queues",
21274-
"redirect_document_id": true
21289+
"redirect_document_id": false
2127521290
},
2127621291
{
2127721292
"source_path_from_root": "/articles/storage/vs-storage-cloud-services-getting-started-tables.md",
2127821293
"redirect_url": "/azure/visual-studio/vs-storage-cloud-services-getting-started-tables",
21279-
"redirect_document_id": true
21294+
"redirect_document_id": false
2128021295
},
2128121296
{
2128221297
"source_path_from_root": "/articles/storage/vs-storage-cloud-services-what-happened.md",

articles/active-directory-b2c/whats-new-docs.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "What's new in Azure Active Directory business-to-customer (B2C)"
33
description: "New and updated documentation for the Azure Active Directory business-to-customer (B2C)."
4-
ms.date: 08/01/2022
4+
ms.date: 10/04/2022
55
ms.service: active-directory
66
ms.subservice: B2C
77
ms.topic: reference
@@ -15,6 +15,12 @@ manager: CelesteDG
1515

1616
Welcome to what's new in Azure Active Directory B2C documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the B2C service, see [What's new in Azure Active Directory](../active-directory/fundamentals/whats-new.md) and [Azure AD B2C developer release notes](custom-policy-developer-notes.md)
1717

18+
## September
19+
20+
### New articles
21+
22+
- [Tutorial: Configure the Grit IAM B2B2C solution with Azure Active Directory B2C](partner-grit-iam.md)
23+
1824
## August 2022
1925

2026
### New articles

articles/active-directory-domain-services/powershell-create-instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ $replicaSetParams = @{
209209
Location = $AzureLocation
210210
SubnetId = "/subscriptions/$AzureSubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Network/virtualNetworks/$VnetName/subnets/DomainServices"
211211
}
212-
$replicaSet = New-AzADDomainServiceReplicaSet @replicaSetParams
212+
$replicaSet = New-AzADDomainServiceReplicaSetObject @replicaSetParams
213213
214214
$domainServiceParams = @{
215215
Name = $ManagedDomainName

articles/active-directory/app-provisioning/accidental-deletions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ ms.service: active-directory
88
ms.subservice: app-provisioning
99
ms.topic: how-to
1010
ms.workload: identity
11-
ms.date: 09/27/2021
11+
ms.date: 09/30/2022
1212
ms.author: kenwith
1313
ms.reviewer: arvinh
1414
---
1515

16-
# Enable accidental deletions prevention in the Azure AD provisioning service (Preview)
16+
# Enable accidental deletions prevention in the Azure AD provisioning service
1717

1818
The Azure AD provisioning service includes a feature to help avoid accidental deletions. This feature ensures that users aren't disabled or deleted in an application unexpectedly.
1919

@@ -32,7 +32,7 @@ threshold. Also, be sure the notification email address is completed. If the del
3232
When the deletion threshold is met, the job will go into quarantine and a notification email will be sent. The quarantined job can then be allowed or rejected. To learn more about quarantine behavior, see [Application provisioning in quarantine status](application-provisioning-quarantine-status.md).
3333

3434
## Recovering from an accidental deletion
35-
If you encounter an accidental deletion you'll see it on the provisioning status page. It will say **Provisioning has been quarantined. See quarantine details for more information.**.
35+
If you encounter an accidental deletion you'll see it on the provisioning status page. It will say **Provisioning has been quarantined. See quarantine details for more information**.
3636

3737
You can click either **Allow deletes** or **View provisioning logs**.
3838

articles/active-directory/app-provisioning/customize-application-attributes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ Use the steps below to provision roles for a user to your application. Note that
204204
![Add SingleAppRoleAssignment](./media/customize-application-attributes/edit-attribute-singleapproleassignment.png)
205205
- **Things to consider**
206206
- Ensure that multiple roles are not assigned to a user. We cannot guarantee which role will be provisioned.
207-
207+
- SingleAppRoleAssignments is not compatible with setting scope to "Sync All users and groups."
208208
- **Example request (POST)**
209209

210210
```json

0 commit comments

Comments
 (0)