Skip to content

Commit fa80786

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents d4ab2f0 + 34d0473 commit fa80786

File tree

122 files changed

+1607
-3884
lines changed

Some content is hidden

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

122 files changed

+1607
-3884
lines changed

.openpublishing.redirection.json

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41768,6 +41768,86 @@
4176841768
"redirect_url": "/azure/cognitive-services/Content-Moderator/encrypt-data-at-rest",
4176941769
"redirect_document_id": false
4177041770
},
41771+
{
41772+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/ecommerce-retail-catalog-moderation.md",
41773+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41774+
"redirect_document_id": false
41775+
},
41776+
{
41777+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/facebook-post-moderation.md",
41778+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41779+
"redirect_document_id": false
41780+
},
41781+
{
41782+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/moderation-jobs-quickstart-dotnet.md",
41783+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41784+
"redirect_document_id": false
41785+
},
41786+
{
41787+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/quick-start.md",
41788+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41789+
"redirect_document_id": false
41790+
},
41791+
{
41792+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/review-api.md",
41793+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41794+
"redirect_document_id": false
41795+
},
41796+
{
41797+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/try-review-api-job.md",
41798+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41799+
"redirect_document_id": false
41800+
},
41801+
{
41802+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/try-review-api-workflow.md",
41803+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41804+
"redirect_document_id": false
41805+
},
41806+
{
41807+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/video-moderation-human-review.md",
41808+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41809+
"redirect_document_id": false
41810+
},
41811+
{
41812+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/video-reviews-quickstart-dotnet.md",
41813+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41814+
"redirect_document_id": false
41815+
},
41816+
{
41817+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/video-transcript-reviews-quickstart-dotnet.md",
41818+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41819+
"redirect_document_id": false
41820+
},
41821+
{
41822+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/Review-Tool-User-Guide/Configure.md",
41823+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41824+
"redirect_document_id": false
41825+
},
41826+
{
41827+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/Review-Tool-User-Guide/human-in-the-loop.md",
41828+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41829+
"redirect_document_id": false
41830+
},
41831+
{
41832+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/Review-Tool-User-Guide/Review-Moderated-Images.md",
41833+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41834+
"redirect_document_id": false
41835+
},
41836+
{
41837+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/Review-Tool-User-Guide/Workflows.md",
41838+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41839+
"redirect_document_id": false
41840+
},
41841+
{
41842+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/try-review-api-review.md",
41843+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41844+
"redirect_document_id": false
41845+
},
41846+
{
41847+
"source_path_from_root": "/articles/cognitive-services/Content-Moderator/whats-new.md",
41848+
"redirect_url": "/azure/cognitive-services/Content-Moderator/overview",
41849+
"redirect_document_id": false
41850+
},
4177141851
{
4177241852
"source_path_from_root": "/articles/cognitive-services/Custom-Vision-Service/custom-vision-encryption-of-data-at-rest.md",
4177341853
"redirect_url": "/azure/cognitive-services/Custom-Vision-Service/encrypt-data-at-rest",

articles/active-directory/conditional-access/howto-policy-approved-app-or-app-protection.md

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ With Conditional Access, organizations can restrict access to [approved (modern
3333
3434
For more information about the benefits of using app protection policies, see the article [App protection policies overview](/mem/intune/apps/app-protection-policy).
3535

36-
## Template deployment
36+
## Create a Conditional Access policy
3737

38-
Organizations can choose to deploy this policy using the steps outlined below or using the [Conditional Access templates (Preview)](concept-conditional-access-policy-common.md#conditional-access-templates-preview).
38+
The policies below are put in to [Report-only mode](howto-conditional-access-insights-reporting.md) to start so administrators can determine the impact they'll have on existing users. When administrators are comfortable that the policies apply as they intend, they can switch to **On** or stage the deployment by adding specific groups and excluding others.
3939

40-
## Create a Conditional Access policy
40+
### Require approved client apps or app protection policy with mobile devices
4141

42-
The following steps will help create a Conditional Access policy requiring an approved client app **or** an app protection policy. This policy works in tandem with an [app protection policy created in Microsoft Intune](/mem/intune/apps/app-protection-policies).
42+
The following steps will help create a Conditional Access policy requiring an approved client app **or** an app protection policy when using an iOS/iPadOS or Android device. This policy will also prevent the use of Exchange ActiveSync clients using basic authentication on mobile devices. This policy works in tandem with an [app protection policy created in Microsoft Intune](/mem/intune/apps/app-protection-policies).
4343

44-
This policy is put in to [Report-only mode](howto-conditional-access-insights-reporting.md) to start so administrators can determine the impact they'll have on existing users. When administrators are comfortable that the policy applies as they intend, they can switch to **On** or stage the deployment by adding specific groups and excluding others.
44+
Organizations can choose to deploy this policy using the steps outlined below or using the [Conditional Access templates (Preview)](concept-conditional-access-policy-common.md#conditional-access-templates-preview).
4545

4646
1. Sign in to the **Azure portal** as a global administrator, security administrator, or Conditional Access administrator.
4747
1. Browse to **Azure Active Directory** > **Security** > **Conditional Access**.
@@ -52,7 +52,6 @@ This policy is put in to [Report-only mode](howto-conditional-access-insights-re
5252
1. Under **Exclude**, select **Users and groups** and exclude at least one account to prevent yourself from being locked out. If you don't exclude any accounts, you can't create the policy.
5353
1. Select **Done**.
5454
1. Under **Cloud apps or actions**, select **All cloud apps**.
55-
1. Select **Done**.
5655
1. Under **Conditions** > **Device platforms**, set **Configure** to **Yes**.
5756
1. Under **Include**, **Select device platforms**.
5857
1. Choose **Android** and **iOS**
@@ -65,6 +64,31 @@ This policy is put in to [Report-only mode](howto-conditional-access-insights-re
6564

6665
After confirming your settings using [report-only mode](howto-conditional-access-insights-reporting.md), an administrator can move the **Enable policy** toggle from **Report-only** to **On**.
6766

67+
### Block Exchange ActiveSync on all devices
68+
69+
This policy will block all Exchange ActiveSync clients using basic authentication from connecting to Exchange Online.
70+
71+
1. Sign in to the **Azure portal** as a global administrator, security administrator, or Conditional Access administrator.
72+
1. Browse to **Azure Active Directory** > **Security** > **Conditional Access**.
73+
1. Select **New policy**.
74+
1. Give your policy a name. We recommend that organizations create a meaningful standard for the names of their policies.
75+
1. Under **Assignments**, select **Users and groups**
76+
1. Under **Include**, select **All users**.
77+
1. Under **Exclude**, select **Users and groups** and exclude at least one account to prevent yourself from being locked out. If you don't exclude any accounts, you can't create the policy.
78+
1. Select **Done**.
79+
1. Under **Cloud apps or actions**, select **Select apps**.
80+
1. Select **Office 365 Exchange Online**.
81+
1. Select **Select**.
82+
1. Under **Conditions** > **Client apps**, set **Configure** to **Yes**.
83+
1. Uncheck all options except **Exchange ActiveSync clients**.
84+
1. Select **Done**.
85+
1. Under **Access controls** > **Grant**, select **Grant access**.
86+
1. Select **Require app protection policy**
87+
1. Confirm your settings and set **Enable policy** to **Report-only**.
88+
1. Select **Create** to create to enable your policy.
89+
90+
After confirming your settings using [report-only mode](howto-conditional-access-insights-reporting.md), an administrator can move the **Enable policy** toggle from **Report-only** to **On**.
91+
6892
## Next steps
6993

7094
[App protection policies overview](/intune/apps/app-protection-policy)

articles/active-directory/develop/redirect-uris-ios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Given the following application registration in the Azure portal:
4242

4343
App1 uses redirect `msauth.com.contoso.app1://auth`.\
4444
App2 uses `msauth.com.contoso.app2://auth`.\
45-
App3 uses `msauth.com.contoso.app1://auth`.
45+
App3 uses `msauth.com.contoso.app3://auth`.
4646

4747
### Migrating from ADAL to MSAL
4848

14.9 KB
Loading

articles/applied-ai-services/form-recognizer/create-a-form-recognizer-resource.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@ Let's get started:
4545

4646
1. Select **Review + Create**.
4747

48-
:::image border="true" type="content" source="media/logic-apps-tutorial/logic-app-connector-demo-two.png" alt-text="Still image showing the correct values for creating Form Recognizer resource.":::
48+
:::image type="content" source="media/logic-apps-tutorial/logic-app-connector-demo-two.png" alt-text="Still image showing the correct values for creating Form Recognizer resource.":::
4949

5050
1. Azure will run a quick validation check, after a few seconds you should see a green banner that says **Validation Passed**.
5151

5252
1. Once the validation banner appears, select the **Create** button from the bottom-left corner.
5353

5454
1. After you select create, you'll be redirected to a new page that says **Deployment in progress**. After a few seconds, you'll see a message that says, **Your deployment is complete**.
5555

56+
:::image type="content" source="media/logic-apps-tutorial/form-recognizer-validation.gif" alt-text="GIF showing the Azure portal validation process.":::
57+
5658
## Get Endpoint URL and API keys
5759

5860
1. Once you receive the *deployment is complete* message, select the **Go to resource** button.
5961

60-
:::image border="true" type="content" source="media/logic-apps-tutorial/logic-app-connector-demo-three.gif" alt-text="Gif showing the validation process of creating Form Recognizer resource.":::
61-
6262
1. Copy the key and endpoint values from your Form Recognizer resource paste them in a convenient location, such as *Microsoft Notepad*. You'll need the key and endpoint values to connect your application to the Form Recognizer API.
6363

6464
1. If your overview page does not have the keys and endpoint visible, you can select the **Keys and Endpoint** button on the left navigation bar and retrieve them there.
93.7 KB
Loading
-95.3 KB
Loading
-31.8 KB
Loading
39.8 KB
Loading
227 Bytes
Loading

0 commit comments

Comments
 (0)