Skip to content

Commit 1c3d795

Browse files
authored
Merge branch 'main' into cosmos-update-hub-landing
2 parents a808081 + 6c3e386 commit 1c3d795

File tree

55 files changed

+95
-76
lines changed

Some content is hidden

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

55 files changed

+95
-76
lines changed

articles/active-directory/conditional-access/concept-continuous-access-evaluation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The initial implementation of continuous access evaluation focuses on Exchange,
2727

2828
To prepare your applications to use CAE, see [How to use Continuous Access Evaluation enabled APIs in your applications](../develop/app-resilience-continuous-access-evaluation.md).
2929

30-
Continuous access evaluation isn't currently available in Azure Government GCC High tenants.
30+
Continuous access evaluation is available in Azure Government tenants (GCC High and DOD) for Exchange Online.
3131

3232
### Key benefits
3333

articles/active-directory/external-identities/tutorial-bulk-invite.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
---
22

3-
title: Tutorial for bulk inviting B2B collaboration users - Azure AD
3+
title: Bulk invite guest users for B2B collaboration tutorial - Azure AD
44
description: In this tutorial, you learn how to send bulk invitations using a CSV file to external Azure AD B2B collaboration users.
55

66
services: active-directory
77
ms.service: active-directory
88
ms.subservice: B2B
99
ms.topic: tutorial
10-
ms.date: 10/24/2022
10+
ms.date: 02/28/2023
1111

1212
ms.author: cmulligan
1313
author: csmulligan
1414
manager: celestedg
1515

1616
# Customer intent: As a tenant administrator, I want to send B2B invitations to multiple external users at the same time so that I can avoid having to send individual invitations to each user.
1717

18-
ms.collection: M365-identity-device-management
18+
ms.collection: engagement-fy23, M365-identity-device-management
1919
ms.custom: engagement-fy23
2020
---
2121

2222
# Tutorial: Bulk invite Azure AD B2B collaboration users
2323

24-
If you use [Azure Active Directory (Azure AD) B2B collaboration](what-is-b2b.md) to work with external partners, you can invite multiple guest users to your organization at the same time. In this tutorial, you learn how to use the Azure portal to send bulk invitations to external users. Specifically, you'll follow these steps:
24+
If you use Azure Active Directory (Azure AD) B2B collaboration to work with external partners, you can invite multiple guest users to your organization at the same time. In this tutorial, you learn how to use the Azure portal to send bulk invitations to external users. Specifically, you'll follow these steps:
2525

2626
> [!div class="checklist"]
2727
>
@@ -136,6 +136,7 @@ For example: `Remove-MgUser -UserId "lstokes_fabrikam.com#EXT#@contoso.onmicroso
136136

137137
## Next steps
138138

139+
- [Bulk invite guest users via PowerShell](bulk-invite-powershell.md)
139140
- [Learn about the Azure AD B2B collaboration invitation redemption process](redemption-experience.md)
140141
- [Enforce multi-factor authentication for B2B guest users](b2b-tutorial-require-mfa.md)
141-
- [Billing model for guest user collaboration usage](external-identities-pricing.md#about-monthly-active-users-mau-billing)
142+

articles/active-directory/governance/customize-workflow-schedule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Workflows created within Lifecycle Workflows follow the same schedule that you d
2525

2626
1. Sign in to the [Azure portal](https://portal.azure.com).
2727

28-
1. Select **Identity Governance** on the search bar near the top of the page.
28+
1. Type in **Identity Governance** on the search bar near the top of the page and select it.
2929

3030
1. In the left menu, select **Lifecycle workflows (Preview)**.
3131

articles/active-directory/governance/lifecycle-workflow-versioning.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ Versioning with Lifecycle Workflows provides many benefits over the alternative
2828

2929
## Workflow properties and versions
3030

31-
While updates to workflows can trigger the creation of a new version, this isn't always the case. There are parameters of workflows, known as basic properties, that can be updated without a new version of the workflow being created. The list of these parameters are as follows:
31+
While updates to workflows can trigger the creation of a new version, this isn't always the case. There are parameters of workflows known as basic properties, that 's changeable without creating a new version of the workflow. The list of these parameters are as follows:
3232

3333
- displayName
3434
- description
3535
- isEnabled
3636
- IsSchedulingEnabled
37+
- task name
38+
- task description
3739

3840

3941
You'll find these corresponding parameters in the Azure portal under the **Properties** section of the workflow you're updating.

articles/active-directory/governance/manage-workflow-properties.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,19 @@ ms.custom: template-how-to
1414

1515
# Manage workflow properties (preview)
1616

17-
Managing workflows can be accomplished in one of two ways.
17+
Managing workflows can be accomplished in one of two ways:
1818
- Updating the basic properties of a workflow without creating a new version of it
19-
- Creating a new version of the updated workflow.
19+
- Creating a new version of the updated workflow
2020

2121
You can update the following basic information without creating a new workflow.
2222
- display name
2323
- description
24-
- whether or not it is enabled.
25-
- Whether or not workflow schedule is enabled.
24+
- whether or not it's enabled
25+
- Whether or not workflow schedule is enabled
26+
- task name
27+
- task description
2628

27-
If you change any other parameters, a new version is required to be created as outlined in the [Managing workflow versions](manage-workflow-tasks.md) article.
29+
If you change any other parameters, a new version is required to be created as outlined in the [Managing workflow versions](manage-workflow-tasks.md) article.
2830

2931
If done via the Azure portal, the new version is created automatically. If done using Microsoft Graph, you will have to manually create a new version of the workflow. For more information, see [Edit the properties of a workflow using Microsoft Graph](#edit-the-properties-of-a-workflow-using-microsoft-graph).
3032

articles/active-directory/identity-protection/concept-workload-identity-risk.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ Organizations can export data by configurating [diagnostic settings in Azure AD]
8787

8888
Using [Conditional Access for workload identities](../conditional-access/workload-identity.md), you can block access for specific accounts you choose when Identity Protection marks them "at risk." Policy can be applied to single-tenant service principals that have been registered in your tenant. Third-party SaaS, multi-tenanted apps, and managed identities are out of scope.
8989

90+
For improved security and resilience of your workload identities, Continuous Access Evaluation (CAE) for workload identities is a powerful tool that offers instant enforcement of your Conditional Access policies and any detected risk signals. CAE-enabled third party workload identities accessing CAE-capable first party resources are equipped with 24 hour Long Lived Tokens (LLT's) that are subject to continuous security checks. Refer to the [CAE for workload identities documentation](../conditional-access/concept-continuous-access-evaluation-workload.md) for information on configuring workload identity clients for CAE and up to date feature scope.
91+
9092
## Investigate risky workload identities
9193

9294
Identity Protection provides organizations with two reports they can use to investigate workload identity risk. These reports are the risky workload identities, and risk detections for workload identities. All reports allow for downloading of events in .CSV format for further analysis outside of the Azure portal.

articles/active-directory/managed-identities-azure-resources/tutorial-vm-managed-identities-cosmos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,5 +448,5 @@ Learn more about managed identities for Azure resources:
448448

449449
Learn more about Azure Cosmos DB:
450450

451-
- [Azure Cosmos DB resource model](../../cosmos-db/account-databases-containers-items.md)
451+
- [Azure Cosmos DB resource model](../../cosmos-db/resource-model.md)
452452
- [Tutorial: Build a .NET console app to manage data in an Azure Cosmos DB for NoSQL account](../../cosmos-db/sql/sql-api-get-started.md)

articles/aks/dapr.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ Global Azure cloud is supported with Arc support on the following regions:
9696
- If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
9797
- Install the latest version of the [Azure CLI][install-cli].
9898
- If you don't have one already, you need to create an [AKS cluster][deploy-cluster] or connect an [Arc-enabled Kubernetes cluster][arc-k8s-cluster].
99+
- Make sure you have [an Azure Kubernetes Service RBAC Admin role](../role-based-access-control/built-in-roles.md#azure-kubernetes-service-rbac-admin)
99100

100101
### Set up the Azure CLI extension for cluster extensions
101102

articles/cognitive-services/openai/tutorials/embeddings.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ In this tutorial, you learn how to:
3434
* Access granted to Azure OpenAI in the desired Azure subscription
3535
Currently, access to this service is granted only by application. You can apply for access to Azure OpenAI by completing the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>. Open an issue on this repo to contact us if you have an issue.
3636
* <a href="https://www.python.org/" target="_blank">Python 3.7.1 or later version</a>
37-
* The following Python libraries: openai, num2words, matplotlib, plotly, scipy, scikit-learn, transformers.
37+
* The following Python libraries: openai, num2words, matplotlib, plotly, scipy, scikit-learn,pandas, transformers.
3838
* An Azure OpenAI resource with **text-search-curie-doc-001** and **text-search-curie-query-001** models deployed. These models are currently only available in [certain regions](../concepts/models.md#model-summary-table-and-region-availability). If you don't have a resource the process is documented in our [resource deployment guide](../how-to/create-resource.md).
3939

4040
> [!NOTE]
@@ -47,7 +47,7 @@ In this tutorial, you learn how to:
4747
If you haven't already, you need to install the following libraries:
4848

4949
```cmd
50-
pip install openai num2words matplotlib plotly scipy scikit-learn transformers
50+
pip install openai num2words matplotlib plotly scipy scikit-learn pandas transformers
5151
```
5252

5353
Alternatively, you can use our [requirements.txt file](https://github.com/Azure-Samples/Azure-OpenAI-Docs-Samples/blob/main/Samples/Tutorials/Embeddings/requirements.txt).
@@ -403,4 +403,4 @@ If you created an OpenAI resource solely for completing this tutorial and want t
403403

404404
Learn more about Azure OpenAI's models:
405405
> [!div class="nextstepaction"]
406-
> [Next steps button](../concepts/models.md)
406+
> [Next steps button](../concepts/models.md)

articles/cosmos-db/.openpublishing.redirection.cosmos-db.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/cosmos-db/account-databases-containers-items.md",
5+
"redirect_url": "/azure/cosmos-db/resource-model",
6+
"redirect_document_id": true
7+
},
38
{
49
"source_path_from_root": "/articles/cosmos-db/create-mongodb-flask.md",
510
"redirect_url": "/azure/cosmos-db/mongodb-introduction",

0 commit comments

Comments
 (0)