Skip to content

Commit 80a850f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into four-virtual-machines-articles
2 parents efdd64e + ffd0c68 commit 80a850f

File tree

1,494 files changed

+7850
-3861
lines changed

Some content is hidden

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

1,494 files changed

+7850
-3861
lines changed

.openpublishing.redirection.azure-arc-data.json

Lines changed: 116 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,121 @@
164164
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-midb-arc.md",
165165
"redirect_url": "/cli/azure/sql/midb-arc",
166166
"redirect_document_id": false
167+
},
168+
{
169+
"source_path_from_root": "/articles/azure-arc/data/concepts-distributed-postgres-hyperscale.md",
170+
"redirect_url": "/azure/azure-arc/data/release-notes",
171+
"redirect_document_id": false
172+
},
173+
{
174+
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-azure-portal.md",
175+
"redirect_url": "/azure/azure-arc/data/release-notes",
176+
"redirect_document_id": false
177+
},
178+
{
179+
"source_path_from_root": "/articles/azure-arc/data/postgresql-hyperscale-server-group-placement-on-kubernetes-cluster-nodes.md",
180+
"redirect_url": "/azure/azure-arc/data/release-notes",
181+
"redirect_document_id": false
182+
},
183+
{
184+
"source_path_from_root": "/articles/azure-arc/data/scale-out-in-postgresql-hyperscale-server-group.md",
185+
"redirect_url": "/azure/azure-arc/data/release-notes",
186+
"redirect_document_id": false
187+
},
188+
{
189+
"source_path_from_root": "/articles/azure-arc/data/backup-restore-postgresql-hyperscale.md",
190+
"redirect_url": "/azure/azure-arc/data/backup-restore-postgresql",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path_from_root": "/articles/azure-arc/data/configure-security-postgres-hyperscale.md",
195+
"redirect_url": "/azure/azure-arc/data/configure-security-postgresql",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path_from_root": "/articles/azure-arc/data/configure-server-parameters-postgresql-hyperscale.md",
200+
"redirect_url": "/azure/azure-arc/data/configure-server-parameters-postgresql",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-azure-data-studio.md",
205+
"redirect_url": "/azure/azure-arc/data/create-postgresql-server-azure-data-studio",
206+
"redirect_document_id": false
207+
},
208+
{
209+
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-kubernetes-native-tools.md",
210+
"redirect_url": "/azure/azure-arc/data/create-postgresql-server-kubernetes-native-tools",
211+
"redirect_document_id": false
212+
},
213+
{
214+
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group.md",
215+
"redirect_url": "/azure/azure-arc/data/create-postgresql-server",
216+
"redirect_document_id": false
217+
},
218+
{
219+
"source_path_from_root": "/articles/azure-arc/data/delete-postgresql-hyperscale-server-group.md",
220+
"redirect_url": "/azure/azure-arc/data/delete-postgresql-server",
221+
"redirect_document_id": false
222+
},
223+
{
224+
"source_path_from_root": "/articles/azure-arc/data/get-connection-endpoints-and-connection-strings-postgres-hyperscale.md",
225+
"redirect_url": "/azure/azure-arc/data/get-connection-endpoints-and-connection-strings-postgresql-server",
226+
"redirect_document_id": false
227+
},
228+
{
229+
"source_path_from_root": "/articles/azure-arc/data/limitations-postgresql-hyperscale.md",
230+
"redirect_url": "/azure/azure-arc/data/limitations-postgresql",
231+
"redirect_document_id": false
232+
},
233+
{
234+
"source_path_from_root": "/articles/azure-arc/data/manage-postgresql-hyperscale-server-group-with-azure-data-studio.md",
235+
"redirect_url": "/azure/azure-arc/data/manage-postgresql-server-with-azure-data-studio",
236+
"redirect_document_id": false
237+
},
238+
{
239+
"source_path_from_root": "/articles/azure-arc/data/migrate-postgresql-data-into-postgresql-hyperscale-server-group.md",
240+
"redirect_url": "/azure/azure-arc/data/migrate-postgresql-data",
241+
"redirect_document_id": false
242+
},
243+
{
244+
"source_path_from_root": "/articles/azure-arc/data/restore-adventureworks-sample-db-into-postgresql-hyperscale-server-group.md",
245+
"redirect_url": "/azure/azure-arc/data/restore-adventureworks-sample-db-into-postgresql-server",
246+
"redirect_document_id": false
247+
},
248+
{
249+
"source_path_from_root": "/articles/azure-arc/data/scale-up-down-postgresql-hyperscale-server-group-using-cli.md",
250+
"redirect_url": "/azure/azure-arc/data/scale-up-down-postgresql-server-using-cli",
251+
"redirect_document_id": false
252+
},
253+
{
254+
"source_path_from_root": "/articles/azure-arc/data/show-configuration-postgresql-hyperscale-server-group.md",
255+
"redirect_url": "/azure/azure-arc/data/show-configuration-postgresql-server",
256+
"redirect_document_id": false
257+
},
258+
{
259+
"source_path_from_root": "/articles/azure-arc/data/supported-versions-postgres-hyperscale.md",
260+
"redirect_url": "/azure/azure-arc/data/supported-versions-postgresql",
261+
"redirect_document_id": false
262+
},
263+
{
264+
"source_path_from_root": "/articles/azure-arc/data/using-extensions-in-postgresql-hyperscale-server-group.md",
265+
"redirect_url": "/azure/azure-arc/data/using-extensions-in-postgresql-server",
266+
"redirect_document_id": false
267+
},
268+
{
269+
"source_path_from_root": "/articles/azure-arc/data/list-server-groups-postgres-hyperscale.md",
270+
"redirect_url": "/azure/azure-arc/data/list-servers-postgresql",
271+
"redirect_document_id": false
272+
},
273+
{
274+
"source_path_from_root": "/articles/azure-arc/data/configure-server-parameters-postgresql.md",
275+
"redirect_url": "/azure/azure-arc/data/show-configuration-postgresql-server",
276+
"redirect_document_id": false
277+
},
278+
{
279+
"source_path_from_root": "/articles/azure-arc/data/what-is-azure-arc-enabled-postgres-hyperscale.md",
280+
"redirect_url": "/azure/azure-arc/data/what-is-azure-arc-enabled-postgresql",
281+
"redirect_document_id": false
167282
}
168283
]
169-
}
284+
}

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27872,6 +27872,11 @@
2787227872
"source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-cli-sample-copy-managed-disks-to-same-or-different-subscription.md",
2787327873
"redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-cli-sample-copy-managed-disks-to-same-or-different-subscription",
2787427874
"redirect_document_id": false
27875+
},
27876+
{
27877+
"source_path_from_root": "/articles/virtual-machines/disks-cross-tenant-cmk.md",
27878+
"redirect_url": "/azure/virtual-machines/disks-cross-tenant-customer-managed-keys",
27879+
"redirect_document_id": false
2787527880
},
2787627881
{
2787727882
"source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-cli-sample-copy-managed-disks-vhd.md",

articles/active-directory-b2c/add-web-api-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.subservice: B2C
1717

1818
This article shows you how to register web API resources in your Azure Active Directory B2C (Azure AD B2C) tenant so that they can accept and respond to requests by client applications that present an access token.
1919

20-
To register an application in your Azure AD B2C tenant, you can use Azure portal's new unified **App registrations** experience the legacy **Applications (Legacy)** experience. [Learn more about the new experience](./app-registrations-training-guide.md).
20+
To register an application in your Azure AD B2C tenant, you can use the Azure portal's new unified **App registrations** experience or the legacy **Applications (Legacy)** experience. [Learn more about the new experience](./app-registrations-training-guide.md).
2121

2222
#### [App registrations](#tab/app-reg-ga/)
2323

@@ -60,4 +60,4 @@ To call a protected web API from an application, you need to grant your applicat
6060

6161
[!INCLUDE [active-directory-b2c-permissions-api](../../includes/active-directory-b2c-permissions-api.md)]
6262

63-
Your application is registered to call the protected web API. A user authenticates with Azure AD B2C to use the application. The application obtains an authorization grant from Azure AD B2C to access the protected web API.
63+
Your application is registered to call the protected web API. A user authenticates with Azure AD B2C to use the application. The application obtains an authorization grant from Azure AD B2C to access the protected web API.

articles/active-directory-b2c/partner-arkose-labs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.reviewer: kengaderdus
1010
ms.service: active-directory
1111
ms.workload: identity
1212
ms.topic: how-to
13-
ms.date: 04/22/2021
13+
ms.date: 09/13/2022
1414
ms.author: gasinh
1515
ms.subservice: B2C
1616
---

articles/active-directory/authentication/concept-authentication-passwordless.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 08/17/2022
9+
ms.date: 09/13/2022
1010

1111
ms.author: justinha
1212
author: justinha
@@ -179,7 +179,7 @@ Here are some factors for you to consider when choosing Microsoft passwordless t
179179

180180
||**Windows Hello for Business**|**Passwordless sign-in with the Authenticator app**|**FIDO2 security keys**|
181181
|:-|:-|:-|:-|
182-
|**Pre-requisite**| Windows 10, version 1809 or later<br>Azure Active Directory| Authenticator app<br>Phone (iOS and Android devices running Android 6.0 or above.)|Windows 10, version 1903 or later<br>Azure Active Directory|
182+
|**Pre-requisite**| Windows 10, version 1809 or later<br>Azure Active Directory| Authenticator app<br>Phone (iOS and Android devices running Android 8.0 or above.)|Windows 10, version 1903 or later<br>Azure Active Directory|
183183
|**Mode**|Platform|Software|Hardware|
184184
|**Systems and devices**|PC with a built-in Trusted Platform Module (TPM)<br>PIN and biometrics recognition |PIN and biometrics recognition on phone|FIDO2 security devices that are Microsoft compatible|
185185
|**User experience**|Sign in using a PIN or biometric recognition (facial, iris, or fingerprint) with Windows devices.<br>Windows Hello authentication is tied to the device; the user needs both the device and a sign-in component such as a PIN or biometric factor to access corporate resources.|Sign in using a mobile phone with fingerprint scan, facial or iris recognition, or PIN.<br>Users sign in to work or personal account from their PC or mobile phone.|Sign in using FIDO2 security device (biometrics, PIN, and NFC)<br>User can access device based on organization controls and authenticate based on PIN, biometrics using devices such as USB security keys and NFC-enabled smartcards, keys, or wearables.|

articles/active-directory/authentication/howto-authentication-passwordless-phone.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services: active-directory
77
ms.service: active-directory
88
ms.subservice: authentication
99
ms.topic: how-to
10-
ms.date: 07/19/2022
10+
ms.date: 09/13/2022
1111

1212

1313
ms.author: justinha
@@ -48,7 +48,7 @@ The Azure AD accounts can be in the same tenant or different tenants. Guest acco
4848
To use passwordless phone sign-in with Microsoft Authenticator, the following prerequisites must be met:
4949

5050
- Recommended: Azure AD Multi-Factor Authentication, with push notifications allowed as a verification method. Push notifications to your smartphone or tablet help the Authenticator app to prevent unauthorized access to accounts and stop fraudulent transactions. The Authenticator app automatically generates codes when set up to do push notifications so a user has a backup sign-in method even if their device doesn't have connectivity.
51-
- Latest version of Microsoft Authenticator installed on devices running iOS 12.0 or greater, or Android 6.0 or greater.
51+
- Latest version of Microsoft Authenticator installed on devices running iOS 12.0 or greater, or Android 8.0 or greater.
5252
- For Android, the device that runs Microsoft Authenticator must be registered to an individual user. We're actively working to enable multiple accounts on Android.
5353
- For iOS, the device must be registered with each tenant where it's used to sign in. For example, the following device must be registered with Contoso and Wingtiptoys to allow all accounts to sign in:
5454
@@ -152,4 +152,4 @@ To learn about Azure AD authentication and passwordless methods, see the followi
152152

153153
- [Learn how passwordless authentication works](concept-authentication-passwordless.md)
154154
- [Learn about device registration](../devices/overview.md)
155-
- [Learn about Azure AD Multi-Factor Authentication](../authentication/howto-mfa-getstarted.md)
155+
- [Learn about Azure AD Multi-Factor Authentication](../authentication/howto-mfa-getstarted.md)

articles/active-directory/develop/access-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ An application may receive tokens for a user or directly from an application thr
280280
- Use `roles` to see permissions that have been granted to the subject of the token.
281281
- Use `oid` or `sub` to validate that the calling service principal is the expected one.
282282

283-
If the application needs to distinguish between app-only access tokens and access tokens for users, use the `idtyp` [optional claim](active-directory-optional-claims.md). Add the `idtyp` claim to the `accessToken` field, and check for the value `app`, app-only access tokens can be detected. ID tokens and access tokens for users won't have the `idtyp` claim included.
283+
If the application needs to distinguish between app-only access tokens and access tokens for users, use the `idtyp` [optional claim](active-directory-optional-claims.md). To detect app-only access tokens, add the `idtyp` claim to the `accessToken` field, and check for the value `app`. ID tokens and access tokens for users won't have the `idtyp` claim included.
284284

285285
## Token revocation
286286

0 commit comments

Comments
 (0)