Skip to content

Commit fea2955

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into er-redirect
2 parents 3074afd + 1ddda42 commit fea2955

52 files changed

Lines changed: 861 additions & 717 deletions

File tree

Some content is hidden

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

articles/azure-functions/durable/durable-task-scheduler/durable-task-scheduler.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,14 @@ Stale orchestration data should be purged periodically to ensure efficient stora
152152
| Orchestration custom status | 1 MB |
153153
| Entity state | 1 MB |
154154

155+
- **Orchestration instance ID length:**
156+
157+
Orchestration instance IDs are limited to a maximum length of 100 characters.
158+
159+
* Allowed characters: Printable ASCII only (letters, numbers, symbols like -, _, ., etc. Characters 0x20 through 0x7E)
160+
* Minimum length: 1 character (cannot be empty)
161+
* Instance IDs starting with @ are reserved for entities
162+
155163
- **Feature parity:**
156164

157165
[Extended sessions](../durable-functions-azure-storage-provider.md#extended-sessions) are not available in the Durable Task Scheduler backend yet.
@@ -168,4 +176,4 @@ Stale orchestration data should be purged periodically to ensure efficient stora
168176
## Next steps
169177

170178
> [!div class="nextstepaction"]
171-
> [Choose your orchestration framework](./choose-orchestration-framework.md)
179+
> [Choose your orchestration framework](./choose-orchestration-framework.md)

articles/azure-maps/rest-api-azure-maps.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The most recent stable release of the Azure Maps services.
2525
| [Geolocation] | 1.0 | Convert IP addresses to country/region ISO codes. |
2626
| [Render] | 2024-04-01 | Get road, satellite/aerial, weather, traffic map tiles, and static map images. |
2727
| [Route] | 2025-01-01 | Calculate optimized travel times and distances between locations for multiple modes of transportation and returns localized travel instructions. Now supports [Snap to Roads] API that snaps GPS data to road aligned coordinates. |
28-
| [Search] | 2025-01-01 | Geocode addresses and coordinates, search for business listings and places by name or category and get administrative boundary polygons. |
28+
| [Search] | 2026-01-01 | Geocode addresses and coordinates, search for places and businesses by name or category, and retrieve administrative boundary polygons. The Autocomplete API returns real-time suggestions for addresses and places based on partial user input. |
2929
| [Timezone] | 1.0 | Get time zone and sunrise/sunset information for specified locations. |
3030
| [Traffic] | 2025-01-01 | Provides traffic incident data, such as construction, traffic congestion, accidents, and more, within a specified bounding box. |
3131
| [Weather] | 1.1 | Get current, forecasted, and historical weather conditions, air quality, tropical storm details, and weather along a route. |
@@ -50,7 +50,6 @@ Prerelease version of an Azure Maps service. Preview releases contain new functi
5050
| API | API version | Description |
5151
|-----|-------------|-------------|
5252
| [Route][Route-2024-07-01-preview] | 2024-07-01-preview | The Route Range API supports high definition isochrone polygons. |
53-
| [Search][Search-2025-06-01-preview] | 2025-06-01-preview | The new Autocomplete (preview) API enhances user experience by providing real-time suggestions as users type queries for addresses or places. |
5453

5554
<!--- Links to latest versions of each service ---------------------------------->
5655
[Geolocation]: /rest/api/maps/geolocation
@@ -73,4 +72,3 @@ Prerelease version of an Azure Maps service. Preview releases contain new functi
7372
<!--- 2024-07-01-preview is the latest preview release of the Route service,
7473
currently the only Azure Maps service in Preview -------------------------->
7574
[Route-2024-07-01-preview]: /rest/api/maps/route?view=rest-maps-2024-07-01-preview
76-
[Search-2025-06-01-preview]: /rest/api/maps/search?view=rest-maps-2025-06-01-preview

articles/cost-management-billing/benefits/macc/track-consumption-commitment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.reviewer: shrshett
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: how-to
9-
ms.date: 01/20/2025
9+
ms.date: 03/03/2026
1010
ms.author: shrshett
1111
ms.custom: sfi-image-nochange
1212
---

articles/cost-management-billing/manage/avoid-charges-free-account.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ author: shrutis06
55
ms.reviewer: shrshett
66
ms.service: cost-management-billing
77
ms.subservice: billing
8-
ms.topic: concept-article
9-
ms.date: 09/23/2025
8+
ms.topic: conceptual
9+
ms.date: 03/03/2026
1010
ms.author: shrshett
1111
---
1212

articles/cost-management-billing/manage/create-free-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.reviewer: shrshett
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: conceptual
9-
ms.date: 09/22/2025
9+
ms.date: 03/03/2026
1010
ms.author: shrshett
1111
---
1212

articles/cost-management-billing/manage/markup-china.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.reviewer: shrshett
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: how-to
9-
ms.date: 09/22/2025
9+
ms.date: 03/03/2026
1010
ms.author: shrshett
1111
ms.custom: references_regions
1212
---

articles/cost-management-billing/understand/mca-understand-your-usage.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: Microsoft Customer Agreement Azure usage and charges file terms
33
description: Learn how to read and understand the sections of the Azure usage and charges CSV for your billing profile.
4-
author: shrutis06
5-
ms.reviewer: shrshett
4+
author: vikramdesai01
5+
ms.reviewer: vikdesai
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: conceptual
9-
ms.date: 09/16/2025
10-
ms.author: shrshett
9+
ms.date: 03/03/2026
10+
ms.author: vikdesai
1111
---
1212

1313
# Terms in the Azure usage and charges file for a Microsoft Customer Agreement

articles/dns/tutorial-alias-pip.md

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: dns
55
author: asudbring
66
ms.service: azure-dns
77
ms.topic: tutorial
8-
ms.date: 11/30/2023
8+
ms.date: 03/03/2026
99
ms.author: allensu
1010
ms.custom: template-tutorial #Required; leave this attribute/value as-is.
1111
#Customer intent: As an experienced network administrator, I want to configure Azure an DNS alias record to refer to an Azure public IP address.
@@ -76,11 +76,11 @@ Create a virtual network and a subnet to place your web server in.
7676

7777
## Create a web server virtual machine
7878

79-
Create a Windows Server virtual machine and then install IIS web server on it.
79+
Create a Linux virtual machine and install NGINX web server on it.
8080

8181
### Create the virtual machine
8282

83-
Create a Windows Server 2019 virtual machine.
83+
Create an Ubuntu virtual machine.
8484

8585
1. In the Azure portal, enter *virtual machine* in the search box at the top of the portal, and then select **Virtual machines** from the search results.
8686
1. In **Virtual machines**, select **+ Create** and then select **Azure virtual machine**.
@@ -92,16 +92,17 @@ Create a Windows Server 2019 virtual machine.
9292
| Subscription | Select your Azure subscription. |
9393
| Resource Group | Select **PIPResourceGroup**. |
9494
| **Instance details** | |
95-
| Virtual machine name | Enter **Web-01**. |
95+
| Virtual machine name | Enter **web-01**. |
9696
| Region | Select **(US) East US**. |
9797
| Availability options | Select **No infrastructure redundancy required**. |
9898
| Security type | Select **Standard**. |
99-
| Image | Select **Windows Server 2019 Datacenter - Gen2**. |
99+
| Image | Select **Ubuntu Server 24.04 LTS - x64 Gen2**. |
100100
| Size | Select your VM size. |
101101
| **Administrator account** | |
102+
| Authentication type | Select **SSH public key**. |
102103
| Username | Enter a username. |
103-
| Password | Enter a password. |
104-
| Confirm password | Reenter the password. |
104+
| SSH public key source | Select **Generate new key pair**. |
105+
| Key pair name | Enter a name for the key pair. |
105106
| **Inbound port rules** | |
106107
| Public inbound ports | Select **None**. |
107108

@@ -118,35 +119,40 @@ Create a Windows Server 2019 virtual machine.
118119
| Public IP | Take the default Standard SKU public IP. |
119120
| NIC network security group | Select **Basic**. |
120121
| Public inbound ports | Select **Allow selected ports**. |
121-
| Select inbound ports | Select **HTTP (80)**, **HTTPS (443)** and **RDP (3389)**. |
122+
| Select inbound ports | Select **HTTP (80)** and **HTTPS (443)**. |
122123

123124
1. Select **Review + create**.
124125
1. Review the settings, and then select **Create**.
125126

126127
This deployment may take a few minutes to complete.
127128

128129
> [!NOTE]
129-
> **Web-01** virtual machine has an attached NIC with a Standard SKU dynamic public IP that changes every time the virtual machine is restarted.
130+
> The **web-01** virtual machine has an attached NIC with a Standard SKU dynamic public IP that changes every time the virtual machine is restarted.
130131
131-
### Install IIS web server
132+
> [!NOTE]
133+
> The network security group rules block inbound SSH access from the internet. To run commands on the virtual machine, use the **Run command** feature in the Azure portal or deploy Azure Bastion. For more information about Azure Bastion, see [Quickstart: Deploy Azure Bastion with default settings](../bastion/quickstart-host-portal.md).
134+
135+
### Install NGINX web server
136+
137+
Install NGINX web server on **web-01** using the **Run command** feature in the Azure portal.
138+
139+
1. In the search box at the top of the portal, enter *virtual machine*. Select **Virtual machines** in the search results.
140+
141+
1. Select the **web-01** virtual machine.
142+
143+
1. In the **Operations** section of the left menu, select **Run command**.
132144

133-
Install IIS web server on **Web-01**.
145+
1. Select **RunShellScript**.
134146

135-
1. In the **Overview** page of **Web-01**, select **Connect** and then **RDP**.
136-
1. In the **RDP** page, select **Download RDP File**.
137-
1. Open *Web-01.rdp*, and select **Connect**.
138-
1. Enter the username and password entered during virtual machine creation.
139-
1. On the **Server Manager** dashboard, select **Manage** then **Add Roles and Features**.
140-
1. Select **Server Roles** or select **Next** three times. On the **Server Roles** screen, select **Web Server (IIS)**.
141-
1. Select **Add Features**, and then select **Next**.
147+
1. In the **Run Command Script** pane, enter the following command:
142148

143-
:::image type="content" source="./media/tutorial-alias-pip/iis-web-server-installation.png" alt-text="Screenshot of Add Roles and Features Wizard in Windows Server 2019 showing how to install the I I S Web Server by adding Web Server role.":::
149+
```bash
150+
sudo apt-get update && sudo apt-get install -y nginx
151+
```
144152

145-
1. Select **Confirmation** or select **Next** three times, and then select **Install**. The installation process takes a few minutes to finish.
146-
1. After the installation finishes, select **Close**.
147-
1. Open a web browser. Browse to **localhost** to verify that the default IIS web page appears.
153+
1. Select **Run**.
148154

149-
:::image type="content" source="./media/tutorial-alias-pip/iis-web-server.png" alt-text="Screenshot of Internet Explorer showing the I I S Web Server default web page.":::
155+
1. Wait for the command to complete. The output displays the installation progress and finishes when NGINX is installed.
150156

151157
## Create an alias record
152158

@@ -157,18 +163,18 @@ Create an alias record that points to the public IP address.
157163
1. In the **Add record set**, enter *web01* in the **Name**.
158164
1. Select **A** for the **Type**.
159165
1. Select **Yes** for the **Alias record set**, and then select the **Azure Resource** for the **Alias type**.
160-
1. Select the **Web-01-ip** public IP address for the **Azure resource**.
166+
1. Select the **web-01-ip** public IP address for the **Azure resource**.
161167
1. Select **OK**.
162168

163-
:::image type="content" source="./media/tutorial-alias-pip/add-public-ip-alias-inline.png" alt-text="Screenshot of adding an alias record to refer to the Azure public IP of the I I S web server using the Add record set page." lightbox="./media/tutorial-alias-pip/add-public-ip-alias-expanded.png":::
169+
:::image type="content" source="./media/tutorial-alias-pip/add-public-ip-alias-inline.png" alt-text="Screenshot of adding an alias record to refer to the Azure public IP of the web server using the Add record set page." lightbox="./media/tutorial-alias-pip/add-public-ip-alias-expanded.png":::
164170

165171
## Test the alias record
166172

167173
1. In the Azure portal, enter *virtual machine* in the search box at the top of the portal, and then select **Virtual machines** from the search results.
168-
1. Select the **Web-01** virtual machine. Note the public IP address in the **Overview** page.
169-
1. From a web browser, browse to `web01.contoso.com`, which is the fully qualified domain name of the **Web-01** virtual machine. You now see the IIS default web page.
174+
1. Select the **web-01** virtual machine. Note the public IP address in the **Overview** page.
175+
1. From a web browser, browse to `web01.contoso.com`, which is the fully qualified domain name of the **web-01** virtual machine. You now see the NGINX default web page.
170176
1. Close the web browser.
171-
1. Stop the **Web-01** virtual machine, and then restart it.
177+
1. Stop the **web-01** virtual machine, and then restart it.
172178
1. After the virtual machine restarts, note the new public IP address for the virtual machine.
173179
1. From a web browser, browse again to `web01.contoso.com`.
174180

0 commit comments

Comments
 (0)