Skip to content

Commit 2b5f87e

Browse files
committed
Merge branch 'main' into szuber/deploy-vsan-stretched-clusters
2 parents dceedb5 + 89b1ed9 commit 2b5f87e

File tree

1,927 files changed

+56446
-23117
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,927 files changed

+56446
-23117
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,12 @@
955955
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
956956
"branch": "main",
957957
"branch_mapping": {}
958+
},
959+
{
960+
"path_to_root": "reusable-content",
961+
"url": "https://github.com/MicrosoftDocs/reusable-content",
962+
"branch": "main",
963+
"branch_mapping": {}
958964
}
959965
],
960966
"branch_target_mapping": {

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10895,6 +10895,11 @@
1089510895
"source_path_from_root": "/articles/active-directory/fundamentals/support-help-options.md",
1089610896
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
1089710897
"redirect_document_id": false
10898+
},
10899+
{
10900+
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-playbook.md",
10901+
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-user-guide",
10902+
"redirect_document_id": false
1089810903
}
1089910904
]
1090010905
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5441,5 +5441,11 @@
54415441
"redirect_url": "/azure/azure-sql/database/sql-insights-troubleshoot",
54425442
"redirect_document_id": false
54435443
}
5444+
,
5445+
{
5446+
"source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-virtual-machine-scale-sets.md",
5447+
"redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-template",
5448+
"redirect_document_id": false
5449+
}
54445450
]
54455451
}

.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: 109 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-dotnet-legacy.md",
5+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-dotnet",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-java-legacy.md",
10+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-java",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-python-legacy.md",
15+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-python",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-xamarin.md",
20+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-dotnet",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/site-recovery/deploy-vmware-azure-replication-appliance-preview.md",
25+
"redirect_url": "/azure/site-recovery/deploy-vmware-azure-replication-appliance-modernized",
26+
"redirect_document_id": false
27+
},
328
{
429
"source_path": "articles/iot-hub/iot-hub-rm-template.md",
530
"redirect_url": "/azure/iot-hub/iot-hub-rm-template-powershell",
@@ -11,14 +36,39 @@
1136
"redirect_document_id": false
1237
},
1338
{
14-
"source_path": "articles/visual-studio/vs-storage-cloud-services-getting-started-queues.md",
15-
"redirect_url": "/previous-versions/azure/visual-studio/vs-storage-cloud-services-getting-started-queues",
16-
"redirect_document_id": false
39+
"source_path": "articles/site-recovery/failover-failback-overview-preview.md",
40+
"redirect_url": "/azure/site-recovery/failover-failback-overview-modernized",
41+
"redirect_document_id": false
1742
},
1843
{
19-
"source_path": "articles/visual-studio/vs-storage-cloud-services-getting-started-tables.md",
20-
"redirect_url": "/previous-versions/azure/visual-studio/vs-storage-cloud-services-getting-started-tables",
21-
"redirect_document_id": false
44+
"source_path": "articles/site-recovery/switch-replication-appliance-preview.md",
45+
"redirect_url": "/azure/site-recovery/switch-replication-appliance-modernized",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/site-recovery/upgrade-mobility-service-preview.md",
50+
"redirect_url": "/azure/site-recovery/upgrade-mobility-service-modernized",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/site-recovery/vmware-azure-set-up-replication-tutorial-preview.md",
55+
"redirect_url": "/azure/site-recovery/vmware-azure-set-up-replication-tutorial-modernized",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/site-recovery/vmware-azure-architecture-preview.md",
60+
"redirect_url": "/azure/site-recovery/vmware-azure-architecture-modernized",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/physical-server-azure-architecture-preview.md",
65+
"redirect_url": "/azure/physical-server-azure-architecture-modernized",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/vmware-azure-tutorial-failover-failback-preview.md",
70+
"redirect_url": "/azure/vmware-azure-tutorial-failover-failback-modernized",
71+
"redirect_document_id": false
2272
},
2373
{
2474
"source_path": "articles/automanage/automanage-virtual-machines.md",
@@ -6223,6 +6273,56 @@
62236273
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
62246274
"redirect_document_id": false
62256275
},
6276+
{
6277+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-attributes.md",
6278+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-attributes",
6279+
"redirect_document_id": false
6280+
},
6281+
{
6282+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-cli.md",
6283+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-cli",
6284+
"redirect_document_id": false
6285+
},
6286+
{
6287+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-examples.md",
6288+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-examples",
6289+
"redirect_document_id": false
6290+
},
6291+
{
6292+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-portal.md",
6293+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-portal",
6294+
"redirect_document_id": false
6295+
},
6296+
{
6297+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-powershell.md",
6298+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-powershell",
6299+
"redirect_document_id": false
6300+
},
6301+
{
6302+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-security.md",
6303+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-security",
6304+
"redirect_document_id": false
6305+
},
6306+
{
6307+
"source_path_from_root": "/articles/storage/common/storage-auth-abac.md",
6308+
"redirect_url": "/azure/storage/blobs/storage-auth-abac",
6309+
"redirect_document_id": false
6310+
},
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+
},
62266326
{
62276327
"source_path_from_root": "/articles/storage/storage-client-side-encryption.md",
62286328
"redirect_url": "/azure/storage/common/storage-client-side-encryption",
@@ -21186,12 +21286,12 @@
2118621286
{
2118721287
"source_path_from_root": "/articles/storage/vs-storage-cloud-services-getting-started-queues.md",
2118821288
"redirect_url": "/azure/visual-studio/vs-storage-cloud-services-getting-started-queues",
21189-
"redirect_document_id": true
21289+
"redirect_document_id": false
2119021290
},
2119121291
{
2119221292
"source_path_from_root": "/articles/storage/vs-storage-cloud-services-getting-started-tables.md",
2119321293
"redirect_url": "/azure/visual-studio/vs-storage-cloud-services-getting-started-tables",
21194-
"redirect_document_id": true
21294+
"redirect_document_id": false
2119521295
},
2119621296
{
2119721297
"source_path_from_root": "/articles/storage/vs-storage-cloud-services-what-happened.md",
@@ -28806,3 +28906,4 @@
2880628906
}
2880728907
]
2880828908
}
28909+

articles/active-directory-b2c/configure-authentication-sample-ios-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Update the following class members:
148148

149149
## Step 6: Run and test the mobile app
150150

151-
1. Build and run the project with a [simulator of a connected iOS device](https://developer.apple.com/documentation/xcode/running-your-app-in-the-simulator-or-on-a-device).
151+
1. Build and run the project with a [simulator of a connected iOS device](https://developer.apple.com/documentation/xcode/running-your-app-in-simulator-or-on-a-device).
152152

153153
1. Select **Sign In**, and then sign up or sign in with your Azure AD B2C local or social account.
154154

articles/active-directory-b2c/enable-authentication-ios-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ To learn how to configure your iOS Swift app, see [Configure authentication in a
100100

101101
## Step 5: Run and test the mobile app
102102

103-
1. Build and run the project with a [simulator of a connected iOS device](https://developer.apple.com/documentation/xcode/running-your-app-in-the-simulator-or-on-a-device).
103+
1. Build and run the project with a [simulator of a connected iOS device](https://developer.apple.com/documentation/xcode/running-your-app-in-simulator-or-on-a-device).
104104
1. Select **Sign In**, and then sign up or sign in with your Azure AD B2C local or social account.
105105
1. After you've authenticated successfully, you'll see your display name in the navigation bar.
106106

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)