Skip to content

Commit 5a707d3

Browse files
authored
Merge pull request #191007 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 70e502a + 045e43e commit 5a707d3

File tree

35 files changed

+63
-62
lines changed

35 files changed

+63
-62
lines changed

articles/active-directory-b2c/configure-authentication-sample-web-app.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ A computer that's running either of the following:
4444

4545
# [Visual Studio](#tab/visual-studio)
4646

47-
* [Visual Studio 2019 16.8 or later](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019), with the ASP.NET and web development workload
48-
* [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet)
47+
* [Visual Studio 2022 17.0 or later](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019), with the ASP.NET and web development workload
48+
* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet)
4949

5050
# [Visual Studio Code](#tab/visual-studio-code)
5151

5252
* [Visual Studio Code](https://code.visualstudio.com/download)
5353
* [C# for Visual Studio Code (latest version)](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp)
54-
* [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet)
54+
* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet)
5555

5656
---
5757

@@ -76,7 +76,7 @@ To create the web app registration, do the following:
7676
1. Select **App registrations**, and then select **New registration**.
7777
1. Under **Name**, enter a name for the application (for example, *webapp1*).
7878
1. Under **Supported account types**, select **Accounts in any identity provider or organizational directory (for authenticating users with user flows)**.
79-
1. Under **Redirect URI**, select **Web** and then, in the URL box, enter `https://localhost:5001/signin-oidc`.
79+
1. Under **Redirect URI**, select **Web** and then, in the URL box, enter `https://localhost:44316/signin-oidc`.
8080
1. Under **Permissions**, select the **Grant admin consent to openid and offline access permissions** checkbox.
8181
1. Select **Register**.
8282
1. Select **Overview**.
@@ -131,7 +131,7 @@ Your final configuration file should look like the following JSON:
131131
## Step 5: Run the sample web app
132132

133133
1. Build and run the project.
134-
1. Go to `https://localhost:5001`.
134+
1. Go to `https://localhost:44316`.
135135
1. Select **Sign Up/In**.
136136

137137
![Screenshot of the "Sign Up/In" button on the project Welcome page.](./media/configure-authentication-sample-web-app/web-app-sign-in.png)

articles/active-directory/develop/msal-net-web-browsers.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,15 @@ IPublicClientApplication pca = PublicClientApplicationBuilder
9696
> [!Note]
9797
> If you configure `http://localhost`, internally MSAL.NET will find a random open port and use it.
9898
99-
### Linux and MAC
99+
### Linux and macOS
100100

101-
On Linux, MSAL.NET will open the default OS browser using the xdg-open tool. To troubleshoot, run the tool from a terminal, for example, `xdg-open "https://www.bing.com"`. On Mac, the browser is opened by invoking `open <url>`.
101+
On Linux, MSAL.NET opens the default OS browser with a tool like [xdg-open](http://manpages.ubuntu.com/manpages/focal/man1/xdg-open.1.html). Opening the browser with `sudo` is unsupported by MSAL and will cause MSAL to throw an exception.
102102

103-
### Customizing the experience
103+
On macOS, the browser is opened by invoking `open <url>`.
104104

105-
> [!NOTE]
106-
> Customization is available in MSAL.NET 4.1.0 or later.
105+
### Customizing the experience
107106

108-
MSAL.NET is able to respond with an HTTP message when a token is received or in case of error. You can display an HTML message or redirect to an URL of your choice:
107+
MSAL.NET can respond with an HTTP message or HTTP redirect when a token is received or an error occurs.
109108

110109
```csharp
111110
var options = new SystemWebViewOptions()

articles/api-management/api-management-using-with-internal-vnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ For configurations specific to the *external* mode, where the service endpoints
5555
1. Continue configuring VNet settings for the remaining locations of your API Management instance.
5656
1. In the top navigation bar, select **Save**, then select **Apply network configuration**.
5757

58-
It can take 15 to 45 minutes to update the API Management instance.
58+
It can take 15 to 45 minutes to update the API Management instance. The Developer tier has downtime during the process. The Basic and higher SKUs don't have downtime during the process.
5959

6060
After successful deployment, you should see your API Management service's **private** virtual IP address and **public** virtual IP address on the **Overview** blade. For more information about the IP addresses, see [Routing](#routing) in this article.
6161

articles/api-management/api-management-using-with-vnet.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ For configurations specific to the *internal* mode, where the endpoints are acce
4949

5050
7. In the top navigation bar, select **Save**, then select **Apply network configuration**.
5151

52-
It can take 15 to 45 minutes to update the API Management instance.
52+
It can take 15 to 45 minutes to update the API Management instance. The Developer tier has downtime during the process. The Basic and higher SKUs don't have downtime during the process.
5353

5454
### Enable connectivity using a Resource Manager template (`stv2` compute platform)
5555

@@ -76,9 +76,10 @@ The API Management service depends on several Azure services. When API Managemen
7676
* For guidance on custom DNS setup, including forwarding for Azure-provided hostnames, see [Name resolution for resources in Azure virtual networks](../virtual-network/virtual-networks-name-resolution-for-vms-and-role-instances.md#name-resolution-that-uses-your-own-dns-server).
7777
* Outbound network access on port `53` is required for communication with DNS servers. For more settings, see [Virtual network configuration reference](virtual-network-reference.md).
7878

79-
> [!IMPORTANT]
79+
> [!IMPORTANT]
8080
> If you plan to use a custom DNS server(s) for the VNet, set it up **before** deploying an API Management service into it. Otherwise, you'll need to update the API Management service each time you change the DNS Server(s) by running the [Apply Network Configuration Operation](/rest/api/apimanagement/current-ga/api-management-service/apply-network-configuration-updates).
8181
82+
8283
## Routing
8384

8485
+ A load-balanced public IP address (VIP) is reserved to provide access to all service endpoints and resources outside the VNet.

articles/api-management/private-endpoint.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Set up private endpoint for Azure API Management
2+
title: Set up private endpoint for Azure API Management Preview
33
description: Learn how to restrict access to an Azure API Management instance by using an Azure private endpoint and Azure Private Link.
44
ms.service: api-management
55
author: dlepow
@@ -234,4 +234,4 @@ To connect to 'Microsoft.ApiManagement/service/my-apim-service', please use the
234234
* Use [policy expressions](api-management-policy-expressions.md#ref-context-request) with the `context.request` variable to identify traffic from the private endpoint.
235235
* Learn more about [private endpoints](../private-link/private-endpoint-overview.md) and [Private Link](../private-link/private-link-overview.md).
236236
* Learn more about [managing private endpoint connections](../private-link/manage-private-endpoint.md).
237-
* Use a [Resource Manager template](https://azure.microsoft.com/resources/templates/api-management-private-endpoint/) to create an API Management instance and a private endpoint with private DNS integration.
237+
* Use a [Resource Manager template](https://azure.microsoft.com/resources/templates/api-management-private-endpoint/) to create an API Management instance and a private endpoint with private DNS integration.

articles/app-service/configure-connect-to-azure-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ The following features are supported for Linux containers:
132132
| **Storage accounts** | Azure Storage account. It must contain an Azure Files share. |
133133
| **Share name** | Files share to mount. |
134134
| **Access key** (Advanced only) | [Access key](../storage/common/storage-account-keys-manage.md) for your storage account. |
135-
| **Mount path** | Directory inside the Windows container to mount to Azure Storage. Do not use a root directory (`[C-Z]:\` or `/`) or the `home` directory (`[C-Z]:\home`, or `/home`).|
135+
| **Mount path** | Directory inside your file/blob storage that you want to mount. Do not use a root directory (`[C-Z]:\` or `/`) or the `home` directory (`[C-Z]:\home`, or `/home`).|
136136
::: zone-end
137137
::: zone pivot="container-linux"
138138
| Setting | Description |

articles/applied-ai-services/form-recognizer/api-v2-0/includes/python-v3-0-0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pip install azure-ai-formrecognizer
3939
> [!NOTE]
4040
> The Form Recognizer 3.0.0 SDK reflects API v2.0
4141
42-
### Create a new python application
42+
### Create a new Python application
4343

4444
Create a new Python application in your preferred editor or IDE. Then import the following libraries.
4545

articles/applied-ai-services/form-recognizer/includes/how-to-guides/python-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ After installing Python, you can install the latest version of the Form Recogniz
4040
pip install azure-ai-formrecognizer
4141
```
4242

43-
### Create a new python application
43+
### Create a new Python application
4444

4545
Create a new Python application named `form-recognizer.py` in your preferred editor or IDE. Then import the following libraries.
4646

articles/applied-ai-services/metrics-advisor/includes/quickstarts/python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ After installing Python, you can install the client library with:
3636
pip install azure-ai-metricsadvisor --pre
3737
```
3838

39-
### Create a new python application
39+
### Create a new Python application
4040

4141
Create a new Python file and import the following libraries.
4242

articles/automation/dsc-linux-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ Get-AzAutomationDscNodeConfiguration `
206206

207207
Register the Azure Linux VM as a Desired State Configuration (DSC) node for the Azure Automation account. The [Register-AzAutomationDscNode](/powershell/module/az.automation/register-azautomationdscnode) cmdlet only supports VMs running Windows OS. The Azure Linux VM will first need to be configured for DSC. For detailed steps, see [Get started with Desired State Configuration (DSC) for Linux](/powershell/dsc/getting-started/lnxgettingstarted).
208208

209-
1. Construct a python script with the registration command using PowerShell for later execution on your Azure Linux VM by running the following code:
209+
1. Construct a Python script with the registration command using PowerShell for later execution on your Azure Linux VM by running the following code:
210210

211211
```powershell
212212
$primaryKey = (Get-AzAutomationRegistrationInfo `

0 commit comments

Comments
 (0)