Skip to content

Commit 23954f6

Browse files
authored
Merge pull request #177629 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents c14f0c1 + 2808459 commit 23954f6

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

articles/active-directory/external-identities/current-limitations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Azure AD B2B is subject to Azure AD service directory limits. For details about
3232
[National clouds](../develop/authentication-national-cloud.md) are physically isolated instances of Azure. B2B collaboration is not supported across national cloud boundaries. For example, if your Azure tenant is in the public, global cloud, you can't invite a user whose account is in a national cloud. To collaborate with the user, ask them for another email address or create a member user account for them in your directory.
3333

3434
## Azure US Government clouds
35-
Within the Azure US Government cloud, B2B collaboration is supported between tenants that are both within Azure US Government cloud and that both support B2B collaboration. Azure US Government tenants that support B2B collaboration can also collaborate with social users using Microsoft, Google accounts, or email one-time passcode accounts. If you invite a user outside of these groups (for example, if the user is in a tenant that isn't part of the Azure US Government cloud or doesn't yet support B2B collaboration), the invitation will fail or the user won't be able to redeem the invitation. For details about other limitations, see [Azure Active Directory Premium P1 and P2 Variations](../../azure-government/compare-azure-government-global-azure.md#azure-active-directory-premium-p1-and-p2).
35+
Within the Azure US Government cloud, B2B collaboration is supported between tenants that are both within Azure US Government cloud and that both support B2B collaboration. Azure US Government tenants that support B2B collaboration can also collaborate with social users using Microsoft, Google accounts, or email one-time passcode accounts. If you invite a user outside of these groups (for example, if the user is in a tenant that isn't part of the Azure US Government cloud or doesn't yet support B2B collaboration), the invitation will fail or the user won't be able to redeem the invitation. For Microsoft accounts (MSAs), there are known limitations with accessing the Azure portal: newly invited MSA guests are unable to redeem direct link invitations to the Azure portal, and existing MSA guests are unable to sign in to the Azure portal. For details about other limitations, see [Azure Active Directory Premium P1 and P2 Variations](../../azure-government/compare-azure-government-global-azure.md#azure-active-directory-premium-p1-and-p2).
3636

3737
### How can I tell if B2B collaboration is available in my Azure US Government tenant?
3838
To find out if your Azure US Government cloud tenant supports B2B collaboration, do the following:
@@ -51,4 +51,4 @@ To find out if your Azure US Government cloud tenant supports B2B collaboration,
5151
See the following articles on Azure AD B2B collaboration:
5252

5353
- [What is Azure AD B2B collaboration?](what-is-b2b.md)
54-
- [Delegate B2B collaboration invitations](delegate-invitations.md)
54+
- [Delegate B2B collaboration invitations](delegate-invitations.md)

articles/api-management/api-management-howto-setup-delegation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Recommended steps for creating a new delegation endpoint to implement on your si
149149
150150
These code samples show how to:
151151
152-
* Take the *delegation validation key*, which is set in the **Delegation** screen of the publisher portal.
152+
* Take the *delegation validation key*, which is set in the **Delegation** screen of the Azure portal.
153153
* Create an HMAC, which validates the signature, proving the validity of the passed returnUrl.
154154
155155
With slight modification, you can use the same code for the **productId** and **userId**.

articles/backup/backup-create-rs-vault.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Azure Backup automatically handles storage for the vault. You need to specify ho
1717
> [!NOTE]
1818
> Changing **Storage Replication type** (Locally redundant/ Geo-redundant) for a Recovery Services vault has to be done before configuring backups in the vault. Once you configure backup, the option to modify is disabled.
1919
>
20-
>- If you haven't yet configured the backup, then [follow these steps](#set-storage-redundancy) to review and modify the settings.
20+
>- If you haven't yet configured the backup, complete the following steps to review and modify the settings.
2121
>- If you've already configured the backup and must move from GRS to LRS, then [review these workarounds](#how-to-change-from-grs-to-lrs-after-configuring-backup).
2222
2323
1. From the **Recovery Services vaults** pane, select the new vault. Under the **Settings** section, select **Properties**.
@@ -54,7 +54,7 @@ When restoring a VM, you can restore the VM or its disk. If you're restoring fro
5454

5555
To choose this feature, select **Enable Cross Region Restore** from the **Backup Configuration** pane.
5656

57-
Since this process is at the storage level, there are [pricing implications](https://azure.microsoft.com/pricing/details/backup/).
57+
Because this process is at the storage level, there are [pricing implications](https://azure.microsoft.com/pricing/details/backup/).
5858

5959
>[!NOTE]
6060
>Before you begin:
@@ -163,4 +163,4 @@ If you need to keep the current protected data in the GRS vault and continue the
163163
## Next steps
164164

165165
[Learn about](backup-azure-recovery-services-vault-overview.md) Recovery Services vaults.
166-
[Learn about](backup-azure-delete-vault.md) Delete Recovery Services vaults.
166+
[Learn about](backup-azure-delete-vault.md) Delete Recovery Services vaults.

articles/dms/tutorial-azure-postgresql-to-azure-postgresql-online-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ To complete this tutorial, you need to:
4444
* Check [status of migration scenarios supported by Azure Database Migration Service](./resource-scenario-status.md) for supported migration and version combinations.
4545
* An existing [Azure Database for PostgreSQL](../postgresql/index.yml) version 10 and later instance with the **DVD Rental** database.
4646

47-
Also note that the target Azure Database for PostgreSQL version must be equal to or later than the on-premises PostgreSQL version. For example, PostgreSQL 10 can migrate to Azure Database for PostgreSQL 10, or 11, but not to Azure Database for PostgreSQL 9.6. Migrations to PostgreSQL 13+ are not supported at this time.
47+
Also note that the target Azure Database for PostgreSQL version must be equal to or later than the on-premises PostgreSQL version. For example, PostgreSQL 10 can migrate to Azure Database for PostgreSQL 10, or 11, but not to Azure Database for PostgreSQL 9.6.
4848

4949
* [Create an Azure Database for PostgreSQL server](../postgresql/quickstart-create-server-database-portal.md) or [Create an Azure Database for PostgreSQL - Hyperscale (Citus) server](../postgresql/quickstart-create-hyperscale-portal.md) as the target database server to migrate data into.
5050
* Create a Microsoft Azure Virtual Network for Azure Database Migration Service by using the Azure Resource Manager deployment model. For more information about creating a virtual network, see the [Virtual Network Documentation](../virtual-network/index.yml), and especially the quickstart articles with step-by-step details.

articles/purview/supported-classifications.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,16 @@ Person bloom filter has been prepared using the below two datasets.
3939
- [2010 US Census Data for Last Names (162-K entries)](https://www.census.gov/topics/population/genealogy/data/2010_surnames.html)
4040
- [Popular Baby Names (from SSN), using all years 1880-2019 (98-K entries)](https://www.ssa.gov/oact/babynames/limits.html)
4141

42+
> [!NOTE]
43+
> Azure Purview classifies columns only when the data contains first/last names. Azure Purview doesn't classify columns that contain full names.
44+
4245
## RegEx Classifications
4346

4447
## ABA routing number
4548

4649
### Format
4750

48-
nine digits that may be in a formatted or unformatted pattern
51+
Nine digits that can be in a formatted or unformatted pattern.
4952

5053
### Pattern
5154

0 commit comments

Comments
 (0)