Skip to content

Commit 9d5c035

Browse files
authored
Merge branch 'MicrosoftDocs:main' into master
2 parents 631f937 + 89aa4ae commit 9d5c035

File tree

1,481 files changed

+25913
-11465
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,481 files changed

+25913
-11465
lines changed

.github/workflows/stale.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
# start-date: '2021-03-19'
2424
stale-pr-message: >
2525
This pull request has been inactive for at least 14 days.
26-
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation?branch=main) for instructions.
26+
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.learn.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation?branch=main) for instructions.
2727
28-
[Get Help](https://review.docs.microsoft.com/help/contribute/help-options?branch=main)
28+
[Get Help](https://review.learn.microsoft.com/help/contribute/help-options?branch=main)
2929
3030
[Docs Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)
3131
32-
[Resolve Merge Conflict](https://review.docs.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)
32+
[Resolve Merge Conflict](https://review.learn.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)
3333

.openpublishing.publish.config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,12 @@
458458
"branch": "main",
459459
"branch_mapping": {}
460460
},
461+
{
462+
"path_to_root": "azureml-examples-v2samplesreorg",
463+
"url": "https://github.com/azure/azureml-examples",
464+
"branch": "v2samplesreorg",
465+
"branch_mapping": {}
466+
},
461467
{
462468
"path_to_root": "azureml-examples-sdk-preview",
463469
"url": "https://github.com/azure/azureml-examples",
@@ -949,6 +955,12 @@
949955
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
950956
"branch": "main",
951957
"branch_mapping": {}
958+
},
959+
{
960+
"path_to_root": "reusable-content",
961+
"url": "https://github.com/MicrosoftDocs/reusable-content",
962+
"branch": "main",
963+
"branch_mapping": {}
952964
}
953965
],
954966
"branch_target_mapping": {

.openpublishing.redirection.active-directory.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4178,12 +4178,12 @@
41784178
},
41794179
{
41804180
"source_path_from_root": "/articles/active-directory/active-directory-troubleshooting-support-howto.md",
4181-
"redirect_url": "/azure/active-directory/fundamentals/active-directory-troubleshooting-support-howto",
4181+
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
41824182
"redirect_document_id": false
41834183
},
41844184
{
41854185
"source_path_from_root": "/articles/active-directory/b2b/get-support.md",
4186-
"redirect_url": "/azure/active-directory/fundamentals/active-directory-troubleshooting-support-howto",
4186+
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
41874187
"redirect_document_id": false
41884188
},
41894189
{
@@ -10885,7 +10885,16 @@
1088510885
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-integrations.md",
1088610886
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management",
1088710887
"redirect_document_id": false
10888+
},
10889+
{
10890+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-troubleshooting-support-howto.md",
10891+
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
10892+
"redirect_document_id": false
10893+
},
10894+
{
10895+
"source_path_from_root": "/articles/active-directory/fundamentals/support-help-options.md",
10896+
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
10897+
"redirect_document_id": false
1088810898
}
10889-
1089010899
]
1089110900
}

.openpublishing.redirection.json

Lines changed: 40 additions & 610 deletions
Large diffs are not rendered by default.

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ articles/service-health @rboucher
7373
/articles/lighthouse/ @JnHs
7474

7575
# Healthcare APIs
76-
/articles/healthcare-apis/ @ginalee-dotcom
76+
/articles/healthcare-apis/ @ranvijaykumar @mikaelweave
7777

7878
# Configuration
7979
*.json @SyntaxC4 @snoviking

articles/active-directory-b2c/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,8 @@
528528
displayName: bulk import
529529
- name: Partner integration
530530
items:
531+
- name: Grit IAM B2B2C
532+
href: partner-grit-iam.md
531533
- name: N8identity
532534
href: partner-n8identity.md
533535
- name: Saviynt

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

1.99 KB
Loading
144 KB
Loading

0 commit comments

Comments
 (0)