Skip to content

Commit 3295c83

Browse files
authored
Merge pull request #191755 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents c2216d2 + 2a9ff13 commit 3295c83

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

articles/active-directory/conditional-access/terms-of-use.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ Conditional Access policies take effect immediately. When this happens, the admi
355355
356356
## B2B guests
357357

358-
Most organizations have a process in place for their employees to consent to their organization's terms of use policy and privacy statements. But how can you enforce the same consents for Azure AD business-to-business (B2B) guests when they're added via SharePoint or Teams? Using Conditional Access and terms of use policies, you can enforce a policy directly towards B2B guest users. During the invitation redemption flow, the user is presented with the terms of use policy. This support is currently in preview.
358+
Most organizations have a process in place for their employees to consent to their organization's terms of use policy and privacy statements. But how can you enforce the same consents for Azure AD business-to-business (B2B) guests when they're added via SharePoint or Teams? Using Conditional Access and terms of use policies, you can enforce a policy directly towards B2B guest users. During the invitation redemption flow, the user is presented with the terms of use policy.
359359

360360
Terms of use policies will only be displayed when the user has a guest account in Azure AD. SharePoint Online currently has an [ad hoc external sharing recipient experience](/sharepoint/what-s-new-in-sharing-in-targeted-release) to share a document or a folder that doesn't require the user to have a guest account. In this case, a terms of use policy isn't displayed.
361361

articles/defender-for-cloud/includes/defender-for-containers-enable-plan-aks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ms.author: memildin
2525
:::image type="content" source="../media/defender-for-containers/auto-provisioning-defender-for-containers.png" alt-text="Screenshot of the auto provisioning options for Microsoft Defender for Containers." lightbox="../media/defender-for-containers/auto-provisioning-defender-for-containers.png":::
2626

2727
> [!NOTE]
28-
> If you choose to **disable the plan** at any time after enabling if through the portal as shown above, you'll need to manually disable auto provisioning of the Defender for Containers components. This will not remove the components from machines on which they've already been deployed.
28+
> If you choose to **disable the plan** at any time after enabling it through the portal as shown above, you'll need to manually disable auto provisioning of the Defender for Containers components. This will not remove the components from machines on which they've already been deployed.
2929
3030
1. If you disable the auto provisioning of any component, you can easily deploy the component to one or more clusters using the appropriate recommendation:
3131

@@ -144,4 +144,4 @@ To install the 'SecurityProfile' on an existing cluster with Resource Manager:
144144
},
145145
}
146146
}
147-
```
147+
```

articles/defender-for-cloud/includes/defender-for-containers-enable-plan-arc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ms.date: 01/24/2022
2525
:::image type="content" source="../media/defender-for-containers/auto-provisioning-defender-for-containers.png" alt-text="Screenshot of the auto provisioning options for Microsoft Defender for Containers." lightbox="../media/defender-for-containers/auto-provisioning-defender-for-containers.png":::
2626

2727
> [!NOTE]
28-
> If you choose to **disable the plan** at any time after enabling if through the portal as shown above, you'll need to manually disable auto provisioning of the Defender for Containers components. This will not remove the components from machines on which they've already been deployed.
28+
> If you choose to **disable the plan** at any time after enabling it through the portal as shown above, you'll need to manually disable auto provisioning of the Defender for Containers components. This will not remove the components from machines on which they've already been deployed.
2929
3030
1. If you disable the auto provisioning of any component, you can easily deploy the component to one or more clusters using the appropriate recommendation:
3131

articles/synapse-analytics/get-started-analyze-data-explorer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ In this article, you'll learn the basic steps to load and analyze data with Data
3434
## Create a Data Explorer database
3535

3636
1. In Synapse Studio, on the left-side pane, select **Data**.
37-
1. Select **+** (Add new resource) > **Data Explorer pool**, and paste the following information:
37+
1. Select **+** (Add new resource) > **Data Explorer database**, and paste the following information:
3838

3939
| Setting | Suggested value | Description |
4040
|--|--|--|

0 commit comments

Comments
 (0)