Skip to content

Commit 3b1bebf

Browse files
authored
Merge pull request #2 from MicrosoftDocs/main
Merge main into working branch
2 parents 9491893 + 5f102b6 commit 3b1bebf

File tree

273 files changed

+1202
-1412
lines changed

Some content is hidden

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

273 files changed

+1202
-1412
lines changed

.openpublishing.redirection.json

Lines changed: 93 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -34357,57 +34357,97 @@
3435734357
{
3435834358
"source_path": "learn-pr/azure/implement-firewall-load-balancer/7-summary.yml",
3435934359
"redirect_url": "https://learn.microsoft.com/azure-stack/hci/manage/sdn-technical-reference",
34360-
"redirect_document_id": false
34361-
},
34362-
{
34363-
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/index.md",
34364-
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34365-
"redirect_document_id": false
34366-
},
34367-
{
34368-
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/5-determine-service-endpoint-services.md",
34369-
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34370-
"redirect_document_id": false
34371-
},
34372-
{
34373-
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/4-determine-service-endpoint-uses.md",
34374-
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34375-
"redirect_document_id": false
34376-
},
34377-
{
34378-
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/6-identify-private-link-uses.md",
34379-
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34380-
"redirect_document_id": false
34381-
},
34382-
{
34383-
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/3-identify-user-defined-routes.md",
34384-
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34385-
"redirect_document_id": false
34386-
},
34387-
{
34388-
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/7-simulation-routing.md",
34389-
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34390-
"redirect_document_id": false
34391-
},
34392-
{
34393-
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/1-introduction.md",
34394-
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34395-
"redirect_document_id": false
34396-
},
34397-
{
34398-
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/8-knowledge-check.md",
34399-
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34400-
"redirect_document_id": false
34401-
},
34402-
{
34403-
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/2-review-system-routes.md",
34404-
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34405-
"redirect_document_id": false
34406-
},
34407-
{
34408-
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/9-summary-resources.md",
34409-
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34410-
"redirect_document_id": false
34411-
}
34412-
]
34360+
"redirect_document_id": false
34361+
},
34362+
{
34363+
"source_path": "learn-pr/azure/introduction-code-to-cloud/1-introduction.yml",
34364+
"redirect_url": "https://learn.microsoft.com/azure/static-web-apps/",
34365+
"redirect_document_id": false
34366+
},
34367+
{
34368+
"source_path": "learn-pr/azure/introduction-code-to-cloud/2-what-is-code-to-cloud.yml",
34369+
"redirect_url": "https://learn.microsoft.com/azure/static-web-apps/",
34370+
"redirect_document_id": false
34371+
},
34372+
{
34373+
"source_path": "learn-pr/azure/introduction-code-to-cloud/3-exercise-deploy-to-code-to-cloud-using-starter-template.yml",
34374+
"redirect_url": "https://learn.microsoft.com/azure/static-web-apps/",
34375+
"redirect_document_id": false
34376+
},
34377+
{
34378+
"source_path": "learn-pr/azure/introduction-code-to-cloud/4-exercise-bring-your-own-repository-to-code-to-cloud.yml",
34379+
"redirect_url": "https://learn.microsoft.com/azure/static-web-apps/",
34380+
"redirect_document_id": false
34381+
},
34382+
{
34383+
"source_path": "learn-pr/azure/introduction-code-to-cloud/5-manage-your-app-components-on-code-to-cloud.yml",
34384+
"redirect_url": "https://learn.microsoft.com/azure/static-web-apps/",
34385+
"redirect_document_id": false
34386+
},
34387+
{
34388+
"source_path": "learn-pr/azure/introduction-code-to-cloud/6-summary.yml",
34389+
"redirect_url": "https://learn.microsoft.com/azure/static-web-apps/",
34390+
"redirect_document_id": false
34391+
},
34392+
{
34393+
"source_path": "learn-pr/azure/introduction-code-to-cloud/7-knowledge-check.yml",
34394+
"redirect_url": "https://learn.microsoft.com/azure/static-web-apps/",
34395+
"redirect_document_id": false
34396+
},
34397+
{
34398+
"source_path": "learn-pr/azure/introduction-code-to-cloud/index.yml",
34399+
"redirect_url": "https://learn.microsoft.com/azure/static-web-apps/",
34400+
"redirect_document_id": false
34401+
},
34402+
{
34403+
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/index.md",
34404+
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34405+
"redirect_document_id": false
34406+
},
34407+
{
34408+
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/5-determine-service-endpoint-services.md",
34409+
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34410+
"redirect_document_id": false
34411+
},
34412+
{
34413+
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/4-determine-service-endpoint-uses.md",
34414+
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34415+
"redirect_document_id": false
34416+
},
34417+
{
34418+
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/6-identify-private-link-uses.md",
34419+
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34420+
"redirect_document_id": false
34421+
},
34422+
{
34423+
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/3-identify-user-defined-routes.md",
34424+
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34425+
"redirect_document_id": false
34426+
},
34427+
{
34428+
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/7-simulation-routing.md",
34429+
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34430+
"redirect_document_id": false
34431+
},
34432+
{
34433+
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/1-introduction.md",
34434+
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34435+
"redirect_document_id": false
34436+
},
34437+
{
34438+
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/8-knowledge-check.md",
34439+
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34440+
"redirect_document_id": false
34441+
},
34442+
{
34443+
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/2-review-system-routes.md",
34444+
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34445+
"redirect_document_id": false
34446+
},
34447+
{
34448+
"source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/9-summary-resources.md",
34449+
"redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
34450+
"redirect_document_id": false
34451+
}
34452+
]
3441334453
}

learn-pr/achievements.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4117,8 +4117,13 @@ achievements:
41174117
title: Manage data assets in the classic Microsoft Purview Data Catalog
41184118
summary: This module teaches you how to use the classic Microsoft Purview Data Catalog to manage your scanned data assets. How to curate a business glossary, and how to browse assets across your entire data estate.
41194119
iconUrl: /learn/achievements/manage-data-assets-in-microsoft-purview-data-catalog.svg
4120+
- uid: learn.introduction-code-to-cloud.badge
4121+
type: badge
4122+
title: Introduction to Code to Cloud
4123+
summary: This module covers provides an Introduction to Code to Cloud, a service that allows you to seamlessly deploy your complex micro-architecture solutions to Microsoft Azure.
4124+
iconUrl: /learn/achievements/generic-badge.svg
41204125
- uid: learn.wwl.configure-network-routing-endpoints.badge
41214126
type: badge
41224127
title: Configure network routing and endpoints
41234128
summary: Learn how to configure network routes, including endpoints and private links.
4124-
iconUrl: /training/achievements/network-routing-endpoints-configure.svg
4129+
iconUrl: /training/achievements/network-routing-endpoints-configure.svg

learn-pr/azure/create-windows-virtual-machine-in-azure/includes/3-exercise-create-a-vm.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Your company processes video content on Windows VMs. A new city has contracted with your company to process their traffic cameras, but it's a model with which you haven't worked before. You need to create a new Windows VM and install some proprietary codecs in order to process and analyze the new video content.
1+
Your company processes video content on Windows virtual machines. A new city has contracted with your company to process their traffic cameras, but it's a model with which you haven't worked before. You need to create a new Windows virtual machine (VM) and install some proprietary codecs in order to process and analyze the new video content.
22

33
## Create a new Windows virtual machine
44

@@ -43,13 +43,13 @@ Azure presents a *wizard* as a series of tabs to walk you through all the config
4343
| Image | Select **[smalldisk] Windows Server 2019 Datacenter - x64 Gen2** from the dropdown list. |
4444
| VM architecture | Accept default (x64) |
4545
| Run with Azure Spot discount| Accept default (unchecked). |
46-
| Size | The **Size** field isn't directly editable. Select or accept the default **Standard DS1 v2**, which will give the VM 1 CPU and 3.5 GB of memory. Optionally, select the field to view recommended or recently chosen sizes; select **See all sizes** to explore filters for sizes based on vCPUs, RAM, Data disks, operations per second, and cost. Select the X in the top right of the pane to close the pane. |
46+
| Size | The **Size** field isn't directly editable. Select or accept the default **Standard DS1 v2**, which gives the VM 1 CPU and 3.5 GB of memory. Optionally, select the field to view recommended or recently chosen sizes; select **See all sizes** to explore filters for sizes based on vCPUs, RAM, Data disks, operations per second, and cost. Close the pane by selecting **X** in the top right corner. |
4747
| **Administrator account** |
48-
| Username | Enter a username you'll use to sign in to the VM. |
49-
| Password | Enter a password that's at least 12 characters long and has at least three of the following four characteristics: one lower case character, one uppercase character, one number, and one special character that isn't '\\' or '-'. Use something you'll remember or write it down, as you'll need it later. |
48+
| Username | Enter a username for signing in to the VM. |
49+
| Password | Enter a password that's at least 12 characters long and has at least three of the following four characteristics: one lower case character, one uppercase character, one number, and one special character that isn't `\\` or `-`. Use something you can remember or write it down, as you need to use it later. |
5050
| Confirm password | Confirm your password. |
5151
| **Inbound port rules** |
52-
| Public inbound ports | Select **Allow selected ports**. We want to be able to access the desktop for this Windows VM using RDP. |
52+
| Public inbound ports | Select **Allow selected ports**. We want to be able to access the desktop for this Windows VM using Remote Desktop Protocol (RDP). |
5353
| Select inbound ports | Select **RDP (3389)** from the dropdown list. As the note in the UI indicates, we can also adjust the network ports after we create the VM. |
5454
| **Licensing** |
5555
| Would you like to use an existing Windows Server License | Leave unchecked |
@@ -59,7 +59,7 @@ Azure presents a *wizard* as a series of tabs to walk you through all the config
5959

6060
1. Select **Next : Disks**.
6161
> [!TIP]
62-
> You can use the horizonal scroll bar to slide the view to the left to get back to the VM settings, which had opened a new pane to the right.
62+
> You can use the horizonal scroll bar to slide the view to the left to get back to the VM settings, which had opened a new pane on the right hand side.
6363
6464
## Configure disks for the VM
6565

@@ -75,11 +75,11 @@ Azure presents a *wizard* as a series of tabs to walk you through all the config
7575
| Key management | Accept the default. |
7676
| Enable Ultra Disk compatibility | Accept the default (unchecked) |
7777
| **Data disks** |
78-
| Select **Create and attach a new disk** link. The **Create a new disk** pane appears. | Accept all the default values for the following settings: *Name*; *Source type*; *Size*; *Key management*; and *Enable shared disk*. This is where you could use a snapshot, or Storage Blob, to create a VHD. |
78+
| Select **Create and attach a new disk** link. The **Create a new disk** pane appears. | Accept all the default values for the following settings: *Name*; *Source type*; *Size*; *Key management*; and *Enable shared disk*. This field is where you could use a snapshot, or Storage Blob, to create a virtual hard disk (VHD). |
7979

8080
1. Select **OK** to save the settings and close the pane.
8181

82-
:::image type="content" source="../media/3-configure-disks.png" alt-text="Screenshot showing the configure disks section for the VM.":::
82+
:::image type="content" source="../media/3-configure-disks.png" alt-text="Screenshot showing the configured disks section for the VM.":::
8383

8484
1. On the **Create a virtual machine** pane **Disks** tab, under **Data disks**, there should now be a new row showing the newly configured disk.
8585

@@ -89,9 +89,9 @@ Azure presents a *wizard* as a series of tabs to walk you through all the config
8989

9090
1. Select **Next : Networking**.
9191

92-
In a production system where other components are already in use, it would be important to use an *existing* virtual network so that the VM can communicate with the other cloud services in the production solution. If no virtual network has been defined in this location, create it here and configure the:
92+
In a production system where other components are already in use, it would be important to use an *existing* virtual network so that the VM can communicate with the other cloud services in the production solution. If no virtual network is defined in this location, create it here and configure the:
9393

94-
- **Subnet**: First subnet to subdivide the address space; it must fit within the defined address space. After the VNet is created, you can add more subnets.
94+
- **Subnet**: First subnet to subdivide the address space; it must fit within the defined address space. After the virtual network is created, you can add more subnets.
9595
- **Public IP**: Overall IPV4 space available to this network.
9696

9797
1. On the **Networking** tab, let's change some of the settings. Under the input field for **Virtual network**, select **Create new**. The **Create virtual network** pane appears.
@@ -102,9 +102,9 @@ Azure presents a *wizard* as a series of tabs to walk you through all the config
102102
|---------|---------|
103103
| Name | Accept the default name. |
104104
| **Address space** |
105-
| *Address range* | In the row below the heading, enter `172.16.0.0/16` to give the address space a full range of addresses, then check the box next to the address you just entered. If another address range row exists, select the **Delete** icon to delete it. |
105+
| *Address range* | In the row below the heading, enter `172.16.0.0/16` to give the address space a full range of addresses, then check the box next to the address you just entered. If another address range row exists, delete it. |
106106
| **Subnets** |
107-
| *Subnet name* | Enter *default* in the first input field, then select the checkbox next to the name you just entered. If another row exists, select it to delete it. |
107+
| *Subnet name* | Enter *default* for the Subnet name in the first input field. Then, select the checkbox next to the name you just entered. If another row exists, select it to delete it. |
108108
| *Address range* | In the empty input field, enter `172.16.1.0/24` to give the subnet 256 IP addresses of space. |
109109

110110
1. Select **OK** to save your settings and return to the **Create a virtual machine** pane.
@@ -114,11 +114,11 @@ Azure presents a *wizard* as a series of tabs to walk you through all the config
114114
115115
## Finish configuring the VM and create the image
116116

117-
On the **Create a virtual machine** pane, the rest of the tabs have reasonable defaults and there's no need to change any of them. You can explore the other tabs if you like. Each field has an **(i)** icon next to it which, if selected, will show a detailed definition of that configuration setting. Reviewing field descriptions is a great way to learn about the settings you can use to configure the VM.
117+
On the **Create a virtual machine** pane, the rest of the tabs have reasonable defaults and there's no need to change any of them. You can explore the other tabs if you like. Each field has an **(i)** icon next to it which, if selected, shows a detailed definition of that configuration setting. Reviewing field descriptions is a great way to learn about the settings you can use to configure the VM.
118118

119-
1. Select **Review + create**. The system will validate your options and display details about the VM being created.
119+
1. Select **Review + create**. The system validates your options and display details about the VM being created.
120120

121-
1. Select **Create** to deploy the VM. The Azure dashboard will show the name of the VM that's being deployed and details about your deployment. Deployment may take several minutes.
121+
1. Select **Create** to deploy the VM. The Azure dashboard shows the name of the VM that's being deployed and details about your deployment. Deployment might take several minutes.
122122

123123
1. After deployment completes, select **Go to resource**. Your virtual machine pane appears.
124124

learn-pr/azure/introduction-code-to-cloud/1-introduction.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

learn-pr/azure/introduction-code-to-cloud/2-what-is-code-to-cloud.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

learn-pr/azure/introduction-code-to-cloud/3-exercise-deploy-to-code-to-cloud-using-starter-template.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

learn-pr/azure/introduction-code-to-cloud/4-exercise-bring-your-own-repository-to-code-to-cloud.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)