Skip to content

Commit 19f3836

Browse files
authored
Merge pull request #226107 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 260c224 + 3af883f commit 19f3836

File tree

8 files changed

+13
-17
lines changed

8 files changed

+13
-17
lines changed

articles/active-directory/develop/console-quickstart-portal-nodejs.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ ms.custom: mode-api
2525
2626
> [!div renderon="portal" id="display-on-portal" class="sxs-lookup"]
2727
> # Quickstart: Acquire a token and call Microsoft Graph API from a Node.js console app using app's identity
28-
>
29-
> [!div renderon="portal" class="sxs-lookup"]
28+
>
3029
> In this quickstart, you download and run a code sample that demonstrates how a Node.js console application can get an access token using the app's identity to call the Microsoft Graph API and display a [list of users](/graph/api/user-list) in the directory. The code sample demonstrates how an unattended job or Windows service can run with an application identity, instead of a user's identity.
3130
>
3231
> This quickstart uses the [Microsoft Authentication Library for Node.js (MSAL Node)](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-node) with the [client credentials grant](v2-oauth2-client-creds-grant-flow.md).

articles/active-directory/develop/daemon-quickstart-portal-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ ms.custom: aaddev, identityplatformtop40, devx-track-python, "scenarios:getting-
2525
> We apologize for the inconvenience and appreciate your patience while we work to get this resolved.
2626
2727
> [!div renderon="portal" id="display-on-portal" class="sxs-lookup"]
28+
> # Quickstart: Acquire a token and call Microsoft Graph API from a Python console app using app's identity
2829
>
29-
> [!div renderon="portal" class="sxs-lookup"]
3030
> In this quickstart, you download and run a code sample that demonstrates how a Python application can get an access token using the app's identity to call the Microsoft Graph API and display a [list of users](/graph/api/user-list) in the directory. The code sample demonstrates how an unattended job or Windows service can run with an application identity, instead of a user's identity.
3131
>
3232
> ## Prerequisites

articles/active-directory/develop/web-app-quickstart-portal-java.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ms.custom: aaddev, "scenarios:getting-started", "languages:Java", devx-track-jav
2222
>
2323
> We apologize for the inconvenience and appreciate your patience while we work to get this resolved.
2424
25-
> > [!div renderon="portal" id="display-on-portal" class="sxs-lookup"]
25+
> [!div renderon="portal" id="display-on-portal" class="sxs-lookup"]
2626
> # Quickstart: Add sign-in with Microsoft to a Java web app
2727
>
2828
> In this quickstart, you download and run a code sample that demonstrates how a Java web application can sign in users and call the Microsoft Graph API. Users from any Azure Active Directory (Azure AD) organization can sign in to the application.
@@ -187,4 +187,4 @@ ms.custom: aaddev, "scenarios:getting-started", "languages:Java", devx-track-jav
187187
> For a more in-depth discussion of building web apps that sign in users on the Microsoft identity platform, see the multipart scenario series:
188188
>
189189
> > [!div class="nextstepaction"]
190-
> > [Scenario: Web app that signs in users](scenario-web-app-sign-user-overview.md?tabs=java)
190+
> > [Scenario: Web app that signs in users](scenario-web-app-sign-user-overview.md?tabs=java)

articles/azure-functions/functions-deployment-slots.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ Some configuration settings are slot-specific. The following lists detail which
5959
- Always On
6060
- Diagnostic settings
6161
- Cross-origin resource sharing (CORS)
62+
- Private endpoints
6263

6364
**Non slot-specific settings**:
6465

articles/cognitive-services/cognitive-services-container-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Azure Cognitive Services containers provide the following set of Docker containe
7272

7373
| Service | Container | Description | Availability |
7474
|--|--|--|--|
75-
| [Computer Vision][cv-containers] | **Read OCR** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-vision-read)) | The Read OCR container allows you to extract printed and handwritten text from images and documents with support for JPEG, PNG, BMP, PDF, and TIFF file formats. For more information, see the [Read API documentation](./computer-vision/overview-ocr.md). | Generally Available. This container can also [run in disconnected environments](containers/disconnected-containers.md). |
75+
| [Computer Vision][cv-containers] | **Read OCR** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-vision-read)) | The Read OCR container allows you to extract printed and handwritten text from images and documents with support for JPEG, PNG, BMP, PDF, and TIFF file formats. For more information, see the [Read API documentation](./computer-vision/overview-ocr.md). | Generally Available. Gated - [request access](https://aka.ms/csgate). <br>This container can also [run in disconnected environments](containers/disconnected-containers.md). |
7676
| [Spatial Analysis][spa-containers] | **Spatial analysis** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-vision-spatial-analysis)) | Analyzes real-time streaming video to understand spatial relationships between people, their movement, and interactions with objects in physical environments. | Preview |
7777

7878
<!--

articles/healthcare-apis/configure-azure-rbac.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ In the Role selection, search for one of the built-in roles for the FHIR data pl
2929
* **FHIR Data Exporter**: Can read and export ($export operator) data.
3030
* **FHIR Data Contributor**: Can perform all data plane operations.
3131
* **FHIR Data Converter**: Can use the converter to perform data conversion.
32+
* **FHIR SMART User**: Role allows to read and write FHIR data according to the SMART IG V1.0.0 specifications.
3233

3334
In the **Select** section, type the client application registration name. If the name is found, the application name is listed. Select the application name, and then select **Save**.
3435

articles/search/search-lucene-query-architecture.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ POST /indexes/hotels/docs/search?api-version=2020-06-30
6060

6161
For this request, the search engine does the following operations:
6262

63-
1. Filters out documents where the price is at least $60 and less than $300.
63+
1. Finds documents where the price is at least $60 and less than $300.
6464

6565
2. Executes the query. In this example, the search query consists of phrases and terms: `"Spacious, air-condition* +\"Ocean view\""` (users typically don't enter punctuation, but including it in the example allows us to explain how analyzers handle it).
6666

@@ -411,4 +411,4 @@ This article explored full text search in the context of Azure Cognitive Search.
411411
[1]: ./media/search-lucene-query-architecture/architecture-diagram2.png
412412
[2]: ./media/search-lucene-query-architecture/azSearch-queryparsing-should2.png
413413
[3]: ./media/search-lucene-query-architecture/azSearch-queryparsing-must2.png
414-
[4]: ./media/search-lucene-query-architecture/azSearch-queryparsing-spacious2.png
414+
[4]: ./media/search-lucene-query-architecture/azSearch-queryparsing-spacious2.png

articles/update-center/overview.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.topic: overview
1010

1111
# About Update management center (preview)
1212

13-
Update management center (preview) is a unified service to help manage and govern updates for all your machines. You can monitor Windows and Linux update compliance across your deployments in Azure, on-premises, and on the other cloud platforms from a single dashboard. Using Update management center (preview), you can make updates in real-time or schedule them within a defined maintenance window.
13+
Update management center (preview) is a unified service to help manage and govern updates for all your machines. You can monitor Windows and Linux update compliance across your deployments in Azure, on-premises, and on the other cloud platforms from a single dashboard. In addition, you can use the Update management center (preview) to make real-time updates or schedule them within a defined maintenance window.
1414

1515
You can use the update management center (preview) in Azure to:
1616

@@ -45,7 +45,6 @@ Update management center (preview) has been redesigned and doesn't depend on Azu
4545
- Helps secure machines with new ways of patching such as [automatic VM guest patching](../virtual-machines/automatic-vm-guest-patching.md) in Azure, [hotpatching](../automanage/automanage-hotpatch.md) or custom maintenance schedules.
4646
- Sync patch cycles in relation to patch Tuesday—the unofficial term for Microsoft's scheduled security fix release on every second Tuesday of each month.
4747

48-
4948
The following diagram illustrates how update management center (preview) assesses and applies updates to all Azure machines and Arc-enabled servers for both Windows and Linux.
5049

5150
![Update center workflow](./media/overview/update-management-center-overview.png)
@@ -55,7 +54,7 @@ To support management of your Azure VM or non-Azure machine, update management c
5554
- [Azure virtual machine Windows agent](../virtual-machines/extensions/agent-windows.md) or [Azure virtual machine Linux agent](../virtual-machines/extensions/agent-linux.md) for Azure VMs.
5655
- [Azure arc-enabled servers agent](../azure-arc/servers/agent-overview.md) for non-Azure Linux and Windows machines or physical servers.
5756

58-
The extension agent installation and configuration is managed by update management center (preview) and there's no manual intervention required as long as the Azure VM agent or Azure Arc-enabled server agent is functional. The update management center (preview) extension runs code locally on the machine to interact with the operating system, and it includes:
57+
The extension agent installation and configuration are managed by the update management center (preview). There's no manual intervention required as long as the Azure VM agent or Azure Arc-enabled server agent is functional. The update management center (preview) extension runs code locally on the machine to interact with the operating system, and it includes:
5958

6059
- Retrieving the assessment information about status of system updates for it specified by the Windows Update client or Linux package manager.
6160
- Initiating the download and installation of approved updates with Windows Update client or Linux package manager.
@@ -77,11 +76,9 @@ Along with the prerequisites listed below, see [support matrix](support-matrix.m
7776
|Azure VM | [Azure Virtual Machine Contributor](../role-based-access-control/built-in-roles.md#virtual-machine-contributor) or Azure [Owner](../role-based-access-control/built-in-roles.md#owner).
7877
Arc enabled server | [Azure Connected Machine Resource Administrator](../azure-arc/servers/security-overview.md#identity-and-access-control).
7978

80-
8179
### Permissions
8280

83-
You need the following permissions to create and manage update deployments. The following table shows the permissions needed when using update management center (preview).
84-
81+
You need the following permissions to create and manage update deployments. The following table shows the permissions needed when using the update management center (preview).
8582

8683
**Actions** |**Permission** |**Scope** |
8784
--- | --- | --- |
@@ -94,7 +91,6 @@ You need the following permissions to create and manage update deployments. The
9491
|Read permission for Maintenance updates resource |*Microsoft.Maintenance/updates/read* |Machine |
9592
|Read permission for Maintenance apply updates resource |*Microsoft.Maintenance/applyUpdates/read* |Machine |
9693

97-
9894
### Network planning
9995

10096
To prepare your network to support update management center (preview), you may need to configure some infrastructure components.
@@ -107,11 +103,10 @@ For Red Hat Linux machines, see [IPs for the RHUI content delivery servers](../v
107103

108104
Update management center (preview) supports Azure VMs created using Azure Marketplace images, where the virtual machine agent is already included in the Azure Marketplace image.
109105

110-
111106
## Next steps
112107

113108
- [View updates for single machine](view-updates.md)
114109
- [Deploy updates now (on-demand) for single machine](deploy-updates.md)
115110
- [Schedule recurring updates](scheduled-patching.md)
116111
- [Manage update settings via Portal](manage-update-settings.md)
117-
- [Manage multiple machines using update management center](manage-multiple-machines.md)
112+
- [Manage multiple machines using update management center](manage-multiple-machines.md)

0 commit comments

Comments
 (0)