Skip to content

Commit 1f2d862

Browse files
authored
Merge pull request #196876 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents d7cdd4d + 9561c1c commit 1f2d862

File tree

127 files changed

+1958
-938
lines changed

Some content is hidden

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

127 files changed

+1958
-938
lines changed

articles/active-directory/develop/test-setup-environment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.subservice: develop
1111
ms.topic: how-to
1212
ms.workload: identity
13-
ms.date: 09/28/2021
13+
ms.date: 05/02/2022
1414
ms.author: arcrowe
1515
ms.reviewer:
1616
ms.custom: aaddev
@@ -45,7 +45,7 @@ If you can't safely constrain your test app in your production tenant, you can c
4545
If you don't already have a dedicated test tenant, you can create one for free using the Microsoft 365 Developer Program or manually create one yourself.
4646

4747
#### Join the Microsoft 365 Developer Program (recommended)
48-
The [Microsoft 365 Developer Program](https://developer.microsoft.com/microsoft-365/dev-program) is free and can have test user accounts and sample data packs automatically added to the tenant.
48+
The [Microsoft 365 Developer Program](/office/developer-program/microsoft-365-developer-program) is free and can have test user accounts and sample data packs automatically added to the tenant.
4949
1. Click on the **Join now** button on the screen.
5050
2. Sign in with a new Microsoft Account or use an existing (work) account you already have.
5151
3. On the sign-up page select your region, enter a company name and accept the terms and conditions of the program before you click **Next**.

articles/active-directory/reports-monitoring/reference-basic-info-sign-in-logs.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.topic: reference
1313
ms.tgt_pltfrm: na
1414
ms.workload: identity
1515
ms.subservice: report-monitor
16-
ms.date: 12/17/2021
16+
ms.date: 05/02/2022
1717
ms.author: markvi
1818
ms.reviewer: besiler
1919

@@ -88,12 +88,12 @@ The type of a user. Examples include `member`, `guest`, or `external`.
8888

8989
This attribute describes the type of cross-tenant access used by the actor to access the resource. Possible values are:
9090

91-
- `none`
92-
- `b2bCollaboration`
93-
- `b2bDirectConnect`
94-
- `microsoftSupport`
95-
- `serviceProvider`
96-
- `unknownFutureValue`
91+
- `none` - A sign-in event that did not cross an Azure AD tenant's boundaries.
92+
- `b2bCollaboration`- A cross tenant sign-in performed by a guest user using B2B Collaboration.
93+
- `b2bDirectConnect` - A cross tenant sign-in performed by a B2B.
94+
- `microsoftSupport`- A cross tenant sign-in performed by a Microsoft support agent in a Microsoft customer tenant.
95+
- `serviceProvider` - A cross-tenant sign-in performed by a Cloud Service Provider (CSP) or similar admin on behalf of that CSP's customer in a tenant
96+
- `unknownFutureValue` - A sentinel value used by MS Graph to help clients handle changes in enum lists. For more information, see [Best practices for working with Microsoft Graph](https://docs.microsoft.com/graph/best-practices-concept).
9797

9898
If the sign-in did not the pass the boundaries of a tenant, the value is `none`.
9999

articles/api-management/TOC.yml

Lines changed: 263 additions & 244 deletions
Large diffs are not rendered by default.

articles/app-service/app-service-plan-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ You can move an app to another App Service plan, as long as the source plan and
4444
> [!NOTE]
4545
> Azure deploys each new App Service plan into a deployment unit, internally called a webspace. Each region can have many webspaces, but your app can only move between plans that are created in the same webspace. An App Service Environment is an isolated webspace, so apps can be moved between plans in the same App Service Environment, but not between plans in different App Service Environments.
4646
>
47-
> You can’t specify the webspace you want when creating a plan, but it’s possible to ensure that a plan is created in the same webspace as an existing plan. In brief, all plans created with the same resource group and region combination are deployed into the same webspace. For example, if you created a plan in resource group A and region B, then any plan you subsequently create in resource group A and region B is deployed into the same webspace. Note that plans can’t move webspaces after they’re created, so you can’t move a plan into “the same webspace” as another plan by moving it to another resource group.
47+
> You can’t specify the webspace you want when creating a plan, but it’s possible to ensure that a plan is created in the same webspace as an existing plan. In brief, all plans created with the same resource group, region combination and operating system are deployed into the same webspace. For example, if you created a plan in resource group A and region B, then any plan you subsequently create in resource group A and region B is deployed into the same webspace. Note that plans can’t move webspaces after they’re created, so you can’t move a plan into “the same webspace” as another plan by moving it to another resource group.
4848
>
4949
5050
1. In the [Azure portal](https://portal.azure.com), search for and select **App services** and select the app that you want to move.

articles/app-service/configure-ssl-certificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: seodec18
1515
Once the certificate is added to your App Service app or [function app](../azure-functions/index.yml), you can [secure a custom DNS name with it](configure-ssl-bindings.md) or [use it in your application code](configure-ssl-certificate-in-code.md).
1616

1717
> [!NOTE]
18-
> A certificate uploaded into an app is stored in a deployment unit that is bound to the app service plan's resource group and region combination (internally called a *webspace*). This makes the certificate accessible to other apps in the same resource group and region combination.
18+
> A certificate uploaded into an app is stored in a deployment unit that is bound to the app service plan's resource group, region and operating system combination (internally called a *webspace*). This makes the certificate accessible to other apps in the same resource group and region combination.
1919
2020
The following table lists the options you have for adding certificates in App Service:
2121

articles/applied-ai-services/form-recognizer/language-support.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: lajanuar
1313

1414
# Language support for Form Recognizer
1515

16-
This table lists the written languages supported by each Form Recognizer service.
16+
This article covers the supported languages for text and field **extraction (by feature)** and **[detection (Read only)](#detected-languages-read-api)**. Both groups are mutually exclusive.
1717

1818
<!-- markdownlint-disable MD001 -->
1919
<!-- markdownlint-disable MD024 -->
@@ -29,7 +29,7 @@ The following lists include the currently GA languages in for the v2.1 version a
2929
3030
To use the preview languages, refer to the [v3.0 REST API migration guide](/rest/api/media/#changes-to-the-rest-api-endpoints) to understand the differences from the v2.1 GA API and explore the [v3.0 preview SDK quickstarts](quickstarts/try-v3-python-sdk.md).
3131

32-
### Handwritten languages (preview and GA)
32+
### Handwritten text (preview and GA)
3333

3434
The following table lists the supported languages for extracting handwritten texts.
3535

@@ -41,7 +41,7 @@ The following table lists the supported languages for extracting handwritten tex
4141
|German (preview) |`de`|Spanish (preview) |`es`|
4242
|Italian (preview) |`it`|
4343

44-
### Print languages (preview)
44+
### Print text (preview)
4545

4646
This section lists the supported languages for extracting printed texts in the latest preview.
4747

@@ -94,7 +94,7 @@ This section lists the supported languages for extracting printed texts in the l
9494
|Kurukh (Devanagari) | `kru`|Welsh | `cy`
9595
|Kyrgyz (Cyrillic) | `ky`
9696

97-
### Print languages (GA)
97+
### Print text (GA)
9898

9999
This section lists the supported languages for extracting printed texts in the latest GA version.
100100

@@ -178,14 +178,14 @@ Language| Locale code |
178178

179179
## Detected languages: Read API
180180

181-
The [Read API](concept-read.md) supports language detection for the following languages:
181+
The [Read API](concept-read.md) supports detecting the following languages in your documents. This list may include languages not currently supported for text extraction.
182182

183183
> [!NOTE]
184184
> **Language detection**
185185
>
186-
> Form Recognizer read model can _detect_ a wide range of languages, variants, dialects, and some regional/cultural languages and return a language code.
187-
>
188-
> This section lists the languages that can be detected using the Read API. To determine if text can also be _extracted_ for a given language, see [handwritten](#handwritten-languages-preview-and-ga), [print preview](#print-languages-preview), and [print GA](#print-languages-ga) language extraction lists (above).
186+
> Form Recognizer read model can _detect_ possible presence of languages and returns language codes for detected languages. To determine if text can also be
187+
> extracted for a given language, see previous sections.
188+
189189

190190
| Language | Code |
191191
|---------------------|---------------|

articles/azure-arc/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
description: Learn how to deploy resources to complex and distributed environments across on-premises, edge and multicloud. Azure Arc enables deployment of Azure services anywhere and extends Azure management to any infrastructure.
1111
ms.service: azure-arc
1212
ms.topic: hub-page
13-
ms.date: 10/25/2021
13+
ms.date: 05/02/2022
1414
ms.custom: e2e-hybrid
1515

1616
# highlightedContent section (optional)
@@ -81,7 +81,7 @@ conceptualContent:
8181
text: Apply configurations on clusters using GitOps
8282
- url: ./kubernetes/tutorial-arc-enabled-open-service-mesh.md
8383
itemType: tutorial
84-
text: Azure Arc-enabled Open Service Mesh (Preview)
84+
text: Azure Arc-enabled Open Service Mesh
8585
# footerLink (optional)
8686
footerLink:
8787
url: ./kubernetes/index.yml

0 commit comments

Comments
 (0)