Skip to content

Commit d5e7946

Browse files
authored
Merge pull request #208922 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 bc1eea9 + 985a297 commit d5e7946

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

articles/active-directory/privileged-identity-management/pim-how-to-change-default-settings.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ If setting multiple approvers, approval completes as soon as one of them approve
103103
![Select a user or group pane to select approvers](./media/pim-resource-roles-configure-role-settings/resources-role-settings-select-approvers.png)
104104

105105
1. Select at least one user and then click **Select**. Select at least one approver. If no specific approvers are selected, Privileged Role Administrators and Global Administrators become the default approvers.
106+
> [!Note]
107+
> An approver does not have to have an Azure AD administrative role themselves. They can be a regular user, such as an IT executive.
106108
107109
1. Select **Update** to save your changes.
108110

articles/aks/ingress-basic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ kubectl apply -f aks-helloworld-two.yaml --namespace ingress-basic
394394

395395
Both applications are now running on your Kubernetes cluster. To route traffic to each application, create a Kubernetes ingress resource. The ingress resource configures the rules that route traffic to one of the two applications.
396396

397-
In the following example, traffic to *EXTERNAL_IP* is routed to the service named `aks-helloworld-one`. Traffic to *EXTERNAL_IP/hello-world-two* is routed to the `aks-helloworld-two` service. Traffic to *EXTERNAL_IP/static* is routed to the service named `aks-helloworld-one` for static assets.
397+
In the following example, traffic to *EXTERNAL_IP/hello-world-one* is routed to the service named `aks-helloworld-one`. Traffic to *EXTERNAL_IP/hello-world-two* is routed to the `aks-helloworld-two` service. Traffic to *EXTERNAL_IP/static* is routed to the service named `aks-helloworld-one` for static assets.
398398

399399
Create a file named `hello-world-ingress.yaml` and copy in the following example YAML.
400400

articles/azure-functions/functions-bindings-register.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The following table lists the currently available versions of the default *Micro
4545
<sup>1</sup> Version 3.x of the extension bundle currently doesn't include the [Table Storage bindings](./functions-bindings-storage-table.md). If your app requires Table Storage, you'll need to continue using the 2.x version for now.
4646

4747
> [!NOTE]
48-
> While you can a specify custom version range in host.json, we recommend you use a version value from this table.
48+
> Even though host.json supports custom ranges for `version`, you should use a version value from this table.
4949
5050
## Explicitly install extensions
5151

articles/azure-monitor/profiler/profiler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ To enable Profiler on Linux, walk through the [ASP.NET Core Azure Linux web apps
1717
> For more information about supported runtime, see [.NET Core Support Policy](https://dotnet.microsoft.com/platform/support/policy/dotnet-core).
1818
1919

20-
## Pre-requisites
20+
## Prerequisites
2121

2222
- An [Azure App Services ASP.NET/ASP.NET Core app](../../app-service/quickstart-dotnetcore.md).
2323
- [Application Insights resource](../app/create-new-resource.md) connected to your App Service app.

articles/iot-hub-device-update/device-update-proxy-updates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ With Proxy updates, you can (1) target over-the-air updates to multiple componen
1616
* Targeting specific update files to different apps/components on the device
1717
* Targeting specific update files to sensors connected to an IoT devices. These sensors could be connected to the IoT device over a network protocol (for example, USB, CANbus etc.).
1818

19-
## Pre-requisite
19+
## Prerequisite
2020
In order to update a component or components that connected to a target IoT Device, the device builder must register a custom **Component Enumerator Extension** that is built specifically for their IoT devices. The Component Enumerator Extension is required so that the Device Update Agent can map a **'child update'** with a specific component, or group of components, which the update is intended for. See [Contoso Component Enumerator](components-enumerator.md) for an example on how to implement and register a custom Component Enumerator extension.
2121

2222
> [!NOTE]

articles/remote-rendering/how-tos/create-an-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This chapter guides you through the steps to create an account for the **Azure R
1616

1717
The following steps are needed to create an account for the Azure Remote Rendering service:
1818

19-
1. Go to the [Mixed Reality Preview page](https://aka.ms/MixedRealityPrivatePreview)
19+
1. Go to the Azure portal [portal.azure.com](https://ms.portal.azure.com/)
2020
1. Click the 'Create a resource' button
2121
1. In the search field ("Search the marketplace"), type in "Remote Rendering" and hit 'enter'.
2222
1. In the result list, click on the "Remote Rendering" tile

articles/synapse-analytics/sql/create-external-table-as-select.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ USE [mydbname];
8383
GO
8484

8585
SELECT
86-
country_name, population
86+
CountryName, PopulationCount
8787
FROM PopulationCETAS
8888
WHERE
89-
[year] = 2019
89+
[Year] = 2019
9090
ORDER BY
91-
[population] DESC;
91+
[PopulationCount] DESC;
9292
```
9393

9494
## Remarks

0 commit comments

Comments
 (0)