Skip to content

Commit e4d8bc4

Browse files
authored
Merge pull request #193838 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 544d8f1 + bd368f6 commit e4d8bc4

File tree

96 files changed

+1413
-910
lines changed

Some content is hidden

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

96 files changed

+1413
-910
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16603,6 +16603,11 @@
1660316603
"redirect_url": "/azure/devtest-labs/devtest-lab-create-environment-from-arm",
1660416604
"redirect_document_id": false
1660516605
},
16606+
{
16607+
"source_path_from_root": "/articles/devtest-labs/devtest-lab-troubleshoot-artifact-failure.md",
16608+
"redirect_url": "/azure/devtest-labs/devtest-lab-troubleshoot-apply-artifacts",
16609+
"redirect_document_id": false
16610+
},
1660616611
{
1660716612
"source_path_from_root": "/articles/dns/dns-getstarted-cli-nodejs.md",
1660816613
"redirect_url": "/azure/dns/dns-getstarted-cli",

articles/active-directory/develop/v2-permissions-and-consent.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ With the Microsoft identity platform endpoint, you can ignore the static permiss
127127
Allowing an app to request permissions dynamically through the `scope` parameter gives developers full control over your user's experience. You can also front load your consent experience and ask for all permissions in one initial authorization request. If your app requires a large number of permissions, you can gather those permissions from the user incrementally as they try to use certain features of the app over time.
128128

129129
> [!IMPORTANT]
130-
> Dynamic consent can be convenient, but presents a big challenge for permissions that require admin consent, since the admin consent experience doesn't know about those permissions at consent time. If you require admin privileged permissions or if your app uses dynamic consent, you must register all of the permissions in the Azure portal (not just the subset of permissions that require admin consent). This enables tenant admins to consent on behalf of all their users.
130+
> Dynamic consent can be convenient, but presents a big challenge for permissions that require admin consent. The admin consent experience in the **App registrations** and **Enterprise applications** blades in the portal doesn't know about those dynamic permissions at consent time. We recommend that a developer list all the admin privileged permissions that are needed by the app in the portal. This enables tenant admins to consent on behalf of all their users in the portal, once. Users won't need to go through the consent experience for those permissions on sign in. The alternative is to use dynamic consent for those permissions. To grant admin consent, an individual admin signs in to the app, triggers a consent prompt for the appropriate permissions, and selects **consent for my entire org** in the consent dialogue.
131131
132132
### Admin consent
133133

134134
[Admin consent](#using-the-admin-consent-endpoint) is required when your app needs access to certain high-privilege permissions. Admin consent ensures that administrators have some additional controls before authorizing apps or users to access highly privileged data from the organization.
135135

136-
[Admin consent done on behalf of an organization](#requesting-consent-for-an-entire-tenant) still requires the static permissions registered for the app. Set those permissions for apps in the app registration portal if you need an admin to give consent on behalf of the entire organization. This reduces the cycles required by the organization admin to set up the application.
136+
[Admin consent done on behalf of an organization](#requesting-consent-for-an-entire-tenant) is highly recommended if your app has an enterprise audience. Admin consent done on behalf of an organization requires the static permissions to be registered for the app in the portal. Set those permissions for apps in the app registration portal if you need an admin to give consent on behalf of the entire organization. The admin can consent to those permissions on behalf of all users in the org, once. The users will not need to go through the consent experience for those permissions when signing in to the app. This is easier for users and reduces the cycles required by the organization admin to set up the application.
137137

138138
## Requesting individual user consent
139139

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 51 additions & 42 deletions
Large diffs are not rendered by default.
87.1 KB
Loading

articles/active-directory/enterprise-users/domains-admin-takeover.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ The supported service plans include:
9999
External admin takeover is not supported for any service that has service plans that include SharePoint, OneDrive, or Skype For Business; for example, through an Office free subscription.
100100

101101
> [!NOTE]
102-
> External admin takeover is not supported cross cloud boundaries (ex. Azure Commercial to Azure Government). In these scenarios it is recommended to perform External admin takeover into another Azure Commercial tenant, and then delete the domain from this tenant so you may verify succesfully into the destination Azure Government tenant.
102+
> External admin takeover is not supported cross cloud boundaries (ex. Azure Commercial to Azure Government). In these scenarios it is recommended to perform External admin takeover into another Azure Commercial tenant, and then delete the domain from this tenant so you may verify successfully into the destination Azure Government tenant.
103103
104104
You can optionally use the [**ForceTakeover** option](#azure-ad-powershell-cmdlets-for-the-forcetakeover-option) for removing the domain name from the unmanaged organization and verifying it on the desired organization.
105105

articles/advisor/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
href: advisor-release-notes.md
99
- name: Quickstarts
1010
items:
11+
- name: Get started with Advisor
12+
href: advisor-get-started.md
1113
- name: Configure alerts for new recommendations
1214
items:
1315
- name: Azure portal
1416
href: advisor-alerts-portal.md
15-
- name: Get started with Advisor
16-
href: advisor-get-started.md
1717
- name: ARM template
1818
displayName: Resource Manager
1919
href: advisor-alerts-arm.md

articles/applied-ai-services/form-recognizer/concept-business-card.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ See how data, including name, job title, address, email, and company name, is ex
6262
> [!div class="nextstepaction"]
6363
> [Try Form Recognizer Studio](https://formrecognizer.appliedai.azure.com/studio/prebuilt?formType=businessCard)
6464
65-
#### Sample Labeling tool
65+
#### Sample Labeling tool (API v2.1)
6666

6767
You'll need a business card document. You can use our [sample business card document](https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/businessCard.png).
6868

articles/applied-ai-services/form-recognizer/concept-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ See how data is extracted from your specific or unique documents by using custom
109109
> [!div class="nextstepaction"]
110110
> [Try Form Recognizer Studio](https://formrecognizer.appliedai.azure.com/studio/customform/projects)
111111
112-
#### Sample Labeling tool
112+
#### Sample Labeling tool (API v2.1)
113113

114114

115115
|Feature |Custom Template | Custom Neural |

articles/applied-ai-services/form-recognizer/concept-id-document.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ See how to extract data, including name, birth date, machine-readable zone, and
6262
> [!div class="nextstepaction"]
6363
> [Try Form Recognizer Studio](https://formrecognizer.appliedai.azure.com/studio/prebuilt?formType=idDocument)
6464
65-
#### Sample Labeling tool
65+
#### Sample Labeling tool (API v2.1)
6666

6767
You'll need an ID document. You can use our [sample ID document](https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/DriverLicense.png).
6868

articles/applied-ai-services/form-recognizer/concept-receipt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ See how data, including time and date of transactions, merchant information, and
6262
> [!div class="nextstepaction"]
6363
> [Try Form Recognizer Studio](https://formrecognizer.appliedai.azure.com/studio/prebuilt?formType=receipt)
6464
65-
#### Sample Labeling tool
65+
#### Sample Labeling tool (API v2.1)
6666

6767
You will need a receipt document. You can use our [sample receipt document](https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/contoso-receipt.png).
6868

0 commit comments

Comments
 (0)