Skip to content

Commit 68f8ebd

Browse files
Merge pull request #301282 from MicrosoftDocs/main
Merged by Learn.Build PR Management system
2 parents 978a13d + de2076a commit 68f8ebd

15 files changed

+611
-558
lines changed

articles/azure-functions/functions-create-your-first-function-visual-studio.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ Your function definition should now look like the following code:
7979
[Function("HttpExample")]
8080
public IActionResult Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post")] HttpRequest req)
8181
{
82+
_logger. LogInformation("C# HTTP trigger function processed a request.");
8283
return new OkObjectResult("Hello, functions");
8384
}
8485
```

articles/azure-maps/geocoding-coverage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Microsoft Azure Maps
44
description: See which regions Azure Maps Search covers. Geocoding categories include address points, house numbers, street level, city level, and points of interest.
55
author: farazgis
66
ms.author: fsiddiqui
7-
ms.date: 11/30/2021
7+
ms.date: 06/12/2025
88
ms.topic: reference
99
ms.service: azure-maps
1010
ms.subservice: search
@@ -146,7 +146,7 @@ The ability to geocode in a country/region is dependent upon the road data cover
146146
| Vietnam || ||||
147147
| Wallis & Futuna | | | |||
148148

149-
<sup>1</sup> Coverage is dependent on enabling data processing in South Korea. For more information, see [Enable South Korea addresses in Azure Maps](how-to-manage-consent.md).
149+
<sup>1</sup> Coverage is dependent on enabling data processing in South Korea. For more information, see [Configure global data processing](how-to-manage-consent.md).
150150

151151
## Europe
152152

articles/azure-maps/routing-coverage.md

Lines changed: 288 additions & 290 deletions
Large diffs are not rendered by default.

articles/azure-maps/supported-languages.md

Lines changed: 274 additions & 201 deletions
Large diffs are not rendered by default.

articles/data-factory/create-self-hosted-integration-runtime.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ Here's a high-level summary of the data-flow steps for copying with a self-hoste
6060
- Windows Server 2016
6161
- Windows Server 2019
6262
- Windows Server 2022
63+
- Windows Server 2025
6364

6465
Installation of the self-hosted integration runtime on a domain controller isn't supported.
6566

articles/databox-online/azure-stack-edge-gpu-deploy-virtual-machine-portal.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: alkohli
77
ms.service: azure-stack-edge
88
ms.custom: linux-related-content
99
ms.topic: how-to
10-
ms.date: 05/01/2023
10+
ms.date: 06/12/2025
1111
ms.author: alkohli
1212
# Customer intent: As an IT admin, I need to understand how to configure compute on an Azure Stack Edge Pro GPU device so that I can use it to transform data before I send it to Azure.
1313
---
@@ -19,7 +19,7 @@ ms.author: alkohli
1919
You can create and manage virtual machines (VMs) on an Azure Stack Edge Pro GPU device by using the Azure portal, templates, and Azure PowerShell cmdlets, and via the Azure CLI or Python scripts. This article describes how to create and manage a VM on your Azure Stack Edge Pro GPU device by using the Azure portal.
2020

2121
> [!IMPORTANT]
22-
> You will need to enable multifactor authentication for the user who manages the VMs and images that are deployed on your device from the cloud. The cloud operations will fail if the user doesn't have multifactor authentication enabled. For steps to enable multifactor authentication, see [Enable Microsoft Entra multifactor authentication](/training/modules/secure-aad-users-with-mfa/4-exercise-mfa).
22+
> You'll need to enable multifactor authentication for the user who manages the VMs and images that are deployed on your device from the cloud. The cloud operations fail if the user doesn't have multifactor authentication enabled. For steps to enable multifactor authentication, see [Enable Microsoft Entra multifactor authentication](/training/modules/secure-aad-users-with-mfa/4-exercise-mfa).
2323
2424
## VM deployment workflow
2525

@@ -45,16 +45,16 @@ The high-level summary of the deployment workflow is as follows:
4545

4646
Before you begin to create and manage VMs on your device via the Azure portal, make sure that:
4747

48-
1. You've completed the network settings on your Azure Stack Edge Pro GPU device as described in [Step 1: Configure an Azure Stack Edge Pro GPU device](./azure-stack-edge-gpu-connect-resource-manager.md#step-1-configure-azure-stack-edge-device).
48+
1. You complete the network settings on your Azure Stack Edge Pro GPU device as described in [Step 1: Configure an Azure Stack Edge Pro GPU device](./azure-stack-edge-gpu-connect-resource-manager.md#step-1-configure-azure-stack-edge-device).
4949

50-
1. You've enabled a network interface for compute. This network interface IP is used to create a virtual switch for the VM deployment. In the local UI of your device, go to **Compute**. Select the network interface that you'll use to create a virtual switch.
50+
1. You enable a network interface for compute. This network interface IP is used to create a virtual switch for the VM deployment. In the local UI of your device, go to **Compute**. Select the network interface that you use to create a virtual switch.
5151

5252
> [!IMPORTANT]
5353
> You can configure only one port for compute.
5454
5555
1. Enable compute on the network interface. Azure Stack Edge Pro GPU creates and manages a virtual switch corresponding to that network interface.
5656

57-
1. You have access to a Windows or Linux VHD that you'll use to create the VM image for the VM you intend to create.
57+
1. You have access to a Windows or Linux VHD that you use to create the VM image for the VM you intend to create.
5858

5959
## Deploy a VM
6060

@@ -72,11 +72,11 @@ Follow these steps to create a VM on your Azure Stack Edge Pro GPU device.
7272

7373
![Screenshot showing the Overview pane of an Azure Stack Edge device, with the Virtual machines option, under Edge Services, highlighted.](media/azure-stack-edge-gpu-deploy-virtual-machine-portal/add-virtual-machine-image-1.png)
7474

75-
1. On the **Overview** page. Select **Enable** to enable virtual machine cloud management.
75+
1. On the **Overview** page, select **Enable** to enable virtual machine cloud management.
7676

7777
![Screenshot of the Overview pane in Virtual Machines view for an Azure Stack Edge device. The Enable button, to enable VM cloud management, is highlighted.](media/azure-stack-edge-gpu-deploy-virtual-machine-portal/add-virtual-machine-image-2.png)
7878

79-
1. The first step is to add a VM image. You've already uploaded a VHD into the storage account in the earlier step. You'll use this VHD to create a VM image.
79+
1. The first step is to add a VM image. You already uploaded a VHD into the storage account in the earlier step. Use this VHD to create a VM image.
8080

8181
Select **+ Add image** to download the VHD from the storage account and add it to the device. The download process takes several minutes depending on the size of the VHD and the internet bandwidth available for the download.
8282

@@ -90,13 +90,13 @@ Follow these steps to create a VM on your Azure Stack Edge Pro GPU device.
9090
|Download to | Automatically set to the current device where you're deploying the VM. |
9191
|Edge resource group |Select the resource group to add the image to. |
9292
|Save image as | The name for the VM image that you're creating from the VHD you uploaded to the storage account. |
93-
|OS type |Choose from Windows or Linux as the operating system of the VHD you'll use to create the VM image. |
94-
|VM generation |Choose Gen 1 or Gen 2 as the generation of the image you'll use to create the VM. For Gen 2 VMs, secure boot is enabled by default. |
93+
|OS type |Choose from Windows or Linux as the operating system of the VHD you use to create the VM image. |
94+
|VM generation |Choose Gen 1 or Gen 2 as the generation of the image you use to create the VM. For Gen 2 VMs, secure boot is enabled by default. |
9595

9696

9797
![Screenshot showing the Add image page for a virtual machine with the Add button highlighted.](media/azure-stack-edge-gpu-deploy-virtual-machine-portal/add-virtual-machine-image-6.png)
9898

99-
1. The VHD is downloaded, and the VM image is created. Image creation takes several minutes to complete. You'll see a notification for the successful completion of the VM image.<!--There's a fleeting notification that image creation is in progress, but I didn't see any notification that image creation completed successfully.-->
99+
1. The VHD is downloaded, and the VM image is created. Image creation takes several minutes to complete. You see a notification for the successful completion of the VM image.<!--There's a fleeting notification that image creation is in progress, but I didn't see any notification that image creation completed successfully.-->
100100

101101
![Screenshot of the Overview for Virtual machines on an Azure Stack Edge device. On the Images pane, a newly created VM is highlighted.](media/azure-stack-edge-gpu-deploy-virtual-machine-portal/add-virtual-machine-image-8.png)
102102

@@ -140,7 +140,7 @@ Follow these steps to create a VM after you've created a VM image.
140140

141141
Select **Next: Disks**.
142142

143-
1. On the **Disks** tab, you'll attach disks to your VM.
143+
1. On the **Disks** tab, attach disks to your VM.
144144

145145
1. You can choose to **Create and attach a new disk** or **Attach an existing disk**.
146146

@@ -152,7 +152,7 @@ Follow these steps to create a VM after you've created a VM image.
152152

153153
1. Repeat the preceding process to add more disks. After the disks are created, they show up on the **Disks** tab. Select **Next: Networking**.
154154

155-
1. On the **Networking** tab, you'll configure the network connectivity for your VM.
155+
1. On the **Networking** tab, configure the network connectivity for your VM.
156156

157157
|Parameter |Description |
158158
|---------|---------|
@@ -198,7 +198,7 @@ Follow these steps to create a VM after you've created a VM image.
198198

199199
![Screenshot that shows the Details tab on the Overview pane for a virtual machine in Azure Stack Edge. The Overview label and the IP Address in Networking are highlighted.](media/azure-stack-edge-gpu-deploy-virtual-machine-portal/add-virtual-machine-details-1.png)
200200

201-
You'll use the IP address for the network interface to connect to the VM.
201+
Use the IP address for the network interface to connect to the VM.
202202

203203
## Connect to a VM
204204

articles/databox-online/azure-stack-edge-gpu-prepare-windows-generalized-image-iso.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: alkohli
66

77
ms.service: azure-stack-edge
88
ms.topic: how-to
9-
ms.date: 06/25/2021
9+
ms.date: 06/12/2025
1010
ms.author: alkohli
1111
#Customer intent: As an IT admin, I need to be able to quickly deploy new Windows virtual machines on my Azure Stack Edge Pro GPU device, and I want to use an ISO image for OS installation.
1212
---
@@ -45,15 +45,15 @@ Before you can create a generalized Windows VHD by using an ISO image, make sure
4545

4646
- You have access to a Windows client with Hyper-V Manager installed.
4747

48-
- You have access to an Azure blob storage account to store your VHD after it is prepared.
48+
- You have access to an Azure blob storage account to store your VHD after it's prepared.
4949

5050
## Prepare source VM using an ISO
5151

5252
When you use an ISO image to install the operating system on your VM image, you start by creating a blank, fixed-size VHD in Hyper-V Manager. You then use that VHD to create a virtual machine. Then you attach the ISO image to the VM.
5353

5454
#### Create new VHD in Hyper-V Manager
5555

56-
Your first step is to create a new Generation 1 VHD in Hyper-V Manager, which will be the source VHD for a new virtual machine.
56+
Your first step is to create a new Generation 1 VHD in Hyper-V Manager, which is the source VHD for a new virtual machine.
5757

5858
To create the VHD, follow these steps:
5959

@@ -73,17 +73,17 @@ To create the VHD, follow these steps:
7373

7474
![Enter the name and location for the VHD](./media/azure-stack-edge-gpu-prepare-windows-generalized-image-iso/vhd-from-iso-04.png)
7575

76-
4. Under **Configure Disk**, select **Create a new blank virtual hard disk**, and enter the size of disk you would like to create (generally 20 GB and above for Windows Server). Then select **Next >**.
76+
4. Under **Configure Disk**, select **Create a new blank virtual hard disk**, and enter the size of disk you would like to create (generally 20 GB or more for Windows Server). Then select **Next >**.
7777

7878
![Settings for creating a new blank virtual hard disk and specifying the size](./media/azure-stack-edge-gpu-prepare-windows-generalized-image-iso/vhd-from-iso-05.png)
7979

80-
5. Under **Summary**, review your selections, and select **Finish** to create the new VHD. The process will take five or more minutes depending on the size of the VHD created.
80+
5. Under **Summary**, review your selections, and select **Finish** to create the new VHD. The process takes five or more minutes depending on the size of the VHD created.
8181

8282
![Summary of VHD settings](./media/azure-stack-edge-gpu-prepare-windows-generalized-image-iso/vhd-from-iso-06.png)
8383

8484
#### Create Hyper-V VM from VHD
8585

86-
Now you'll use the VHD you just created to create a new virtual machine.
86+
Now use the VHD you just created to create a new virtual machine.
8787

8888
To create your new virtual machine, follow these steps:
8989

@@ -119,7 +119,7 @@ To create your new virtual machine, follow these steps:
119119

120120
After creating the new virtual machine, follow these steps to mount your ISO image on the DVD drive of the virtual machine:
121121

122-
1. In Hyper-V Manager, select the VM you just created, and then select **Settings**.
122+
1. In Hyper-V Manager, select the VM you created, and then select **Settings**.
123123

124124
![In Hyper-V Manager, open Settings for your virtual machine](./media/azure-stack-edge-gpu-prepare-windows-generalized-image-iso/vhd-from-iso-13.png)
125125

@@ -141,7 +141,7 @@ To finish building your virtual machine, you need to start the virtual machine a
141141
[!INCLUDE [Connect to Hyper-V VM](../../includes/azure-stack-edge-connect-to-hyperv-vm.md)]
142142

143143
> [!NOTE]
144-
> If you installed the Windows Server 2019 Standard operating system on your virtual machine, you'll need to change the **BIOS** setting to **IDE** before you [generalize the VHD](#generalize-the-vhd).
144+
> If you installed the Windows Server 2019 Standard operating system on your virtual machine, you must change the **BIOS** setting to **IDE** before you [generalize the VHD](#generalize-the-vhd).
145145
146146
## Generalize the VHD
147147

articles/databox-online/azure-stack-edge-gpu-prepare-windows-vhd-generalized-image.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: alkohli
66

77
ms.service: azure-stack-edge
88
ms.topic: how-to
9-
ms.date: 05/18/2022
9+
ms.date: 06/12/2025
1010
ms.author: alkohli
1111
#Customer intent: As an IT admin, I need to understand how to create and upload Azure VM images that I can use to deploy virtual machines on my Azure Stack Edge Pro GPU device.
1212
---
@@ -42,18 +42,18 @@ Before you prepare a Windows VHD for use as a generalized image on an Azure Stac
4242

4343
- You have a VHD or a VHDX containing a supported version of Windows.
4444
- You have access to a Windows client with Hyper-V Manager installed.
45-
- You have access to an Azure Blob storage account to store your VHD after it is prepared.
45+
- You have access to an Azure Blob storage account to store your VHD after it's prepared.
4646

4747
## Prepare source VM from Windows VHD
4848

49-
When your VM source is a Windows VHD or VHDX, you first need to convert the Windows VHD to a fixed-size VHD. You will use the fixed-size VHD to create a new virtual machine.
49+
When your VM source is a Windows VHD or VHDX, you first need to convert the Windows VHD to a fixed-size VHD. You'll use the fixed-size VHD to create a new virtual machine.
5050

5151
> [!IMPORTANT]
52-
> These procedures do not cover cases where the source VHD is configured with custom configurations and settings. For example, additional actions may be required to generalize a VHD containing custom firewall rules or proxy settings. For more information on these additional actions, see [Prepare a Windows VHD to upload to Azure - Azure Virtual Machines](/azure/virtual-machines/windows/prepare-for-upload-vhd-image).
52+
> These procedures don't cover cases where the source VHD is configured with custom configurations and settings. For example, additional actions may be required to generalize a VHD containing custom firewall rules or proxy settings. For more information on these additional actions, see [Prepare a Windows VHD to upload to Azure - Azure Virtual Machines](/azure/virtual-machines/windows/prepare-for-upload-vhd-image).
5353
5454
#### Convert source VHD to a fixed-size VHD
5555

56-
For your device, you'll need fixed-size VHDs to create VM images. You'll need to convert your source Windows VHD or VHDX to a fixed VHD.
56+
For your device, you need fixed-size VHDs to create VM images. You must convert your source Windows VHD or VHDX to a fixed VHD.
5757

5858
Follow these steps:
5959

@@ -93,7 +93,7 @@ Follow these steps:
9393
Convert-VHD -Path <source VHD path> -DestinationPath <destination-path.vhd> -VHDType Fixed
9494
```
9595
-->
96-
You'll use this fixed-size VHD for all the subsequent steps in this article.
96+
Use this fixed-size VHD for all the subsequent steps in this article.
9797

9898
#### Create Hyper-V VM from the fixed-size VHD
9999

articles/databox-online/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
ms.topic: landing-page
1111
author: alkohli
1212
ms.author: alkohli
13-
ms.date: 02/09/2022
13+
ms.date: 06/10/2025
1414

1515
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
1616

@@ -133,5 +133,5 @@ landingContent:
133133
url: azure-stack-edge-gpu-connect-powershell-interface.md#debug-kubernetes-issues-related-to-iot-edge
134134
- text: Return Azure Stack Edge Pro GPU
135135
url: azure-stack-edge-return-device.md
136-
- text: Open Support ticket
136+
- text: Open a Support ticket
137137
url: azure-stack-edge-contact-microsoft-support.md

articles/dev-box/how-to-set-up-dev-tunnels.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ Follow these steps to set up a dev tunnel and connect to your dev box using VS C
7373

7474
- Why do I need to sign-in to the Dev Box before enabling the tunnel?
7575

76-
This step is required to establish a user session for setting up the tunnel. After the initial sign-in, you can just disconnect from the Dev Box. Then you can enable or connect
76+
This step is required to establish a user session for setting up the tunnel. After the initial sign-in, you can just disconnect from the Dev Box. Then you can enable or connect to the tunnel without logging in again, unless the Dev Box is shut down or restarted.
7777

7878
- Why can't I connect to the Dev Box even if the tunnel is enabled?
7979

80-
Refresh the Dev Box extension explorer view with the button in the top right corner to check the latest status of the tunnel. If the tunnel is enabled, but you still can't connect, try disabling the tunnel, signing in to the Dev Box, and then re-enabling the tunnel.nnect, try disabling the tunnel, logging into the Dev Box, and then re-enabling the tunnel.
80+
Refresh the Dev Box extension explorer view with the button in the top right corner to check the latest status of the tunnel. If the tunnel is enabled, but you still can't connect, try disabling the tunnel, signing in to the Dev Box, and then re-enabling the tunnel.
8181

8282
## Related content
8383
- [Configure Conditional Access Policies for Dev Tunnels](how-to-conditional-access-dev-tunnels-service.md)

0 commit comments

Comments
 (0)