Skip to content

Commit 71424c6

Browse files
authored
Merge pull request #236208 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 52cd454 + 3e27465 commit 71424c6

10 files changed

+55
-50
lines changed

articles/mysql/single-server/concepts-connectivity-architecture.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The following table lists the gateway IP addresses of the Azure Database for MyS
4242
| **Region name** | **Gateway IP addresses** | **Gateway IP addresses (decommissioning)** | **Gateway IP addresses (decommissioned)** |
4343
|------------------------|------------------------------------------------------------|-----------------------------------------------|-----------------------------------------------|
4444
| Australia Central | 20.36.105.32 | 20.36.105.0 | |
45-
| Australia Central2 | 20.36.113.0 | | |
45+
| Australia Central2 | 20.36.113.0, 20.36.113.32 | | |
4646
| Australia East | 13.75.149.87, 40.79.161.1 | | |
4747
| Australia South East | 13.73.109.251, 13.77.49.32, 13.77.48.10 | | |
4848
| Brazil South | 191.233.201.8, 191.233.200.16 | | 104.41.11.5 |
@@ -65,10 +65,10 @@ The following table lists the gateway IP addresses of the Azure Database for MyS
6565
| Germany North East | 51.5.144.179 | | |
6666
| Germany West Central | 51.116.152.0 | | |
6767
| India Central | 20.192.96.33 | 104.211.96.159 | |
68-
| India South | 104.211.224.146 | | |
68+
| India South | 40.78.192.32 | 104.211.224.146 | |
6969
| India West | 104.211.160.80 | | |
7070
| Japan East | 40.79.192.23, 40.79.184.8 | 13.78.61.196 | |
71-
| Japan West | 191.238.68.11, 40.74.96.6, 40.74.96.7 | 104.214.148.156 | |
71+
| Japan West | 191.238.68.11, 40.74.96.6, 40.74.96.7, 40.74.96.32 | 104.214.148.156 | |
7272
| Korea Central | 52.231.17.13 | 52.231.32.42 | |
7373
| Korea South | 52.231.145.3, 52.231.151.97 | 52.231.200.86 | |
7474
| North Central US | 52.162.104.35, 52.162.104.36 | 23.96.178.199 | |
@@ -134,4 +134,4 @@ No, this is a gateway hardware decommission and have no relation to private link
134134
## Next steps
135135
* [Create and manage Azure Database for MySQL firewall rules using the Azure portal](./how-to-manage-firewall-using-portal.md)
136136
* [Create and manage Azure Database for MySQL firewall rules using Azure CLI](./how-to-manage-firewall-using-cli.md)
137-
* [Configure redirection with Azure Database for MySQL](./how-to-redirection.md)
137+
* [Configure redirection with Azure Database for MySQL](./how-to-redirection.md)

articles/openshift/howto-gpu-workloads.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ARO supports the following GPU workers:
5858

5959
1. Enter **quotas** in the search box, then select **Compute**.
6060

61-
1. In the search box, enter **NCAv3_T4**, check the box for the region your cluster is in, and then select **Request quota increase**.
61+
1. In the search box, enter **NCAsv3_T4**, check the box for the region your cluster is in, and then select **Request quota increase**.
6262

6363
1. Configure quota.
6464

@@ -149,13 +149,13 @@ ARO uses Kubernetes MachineSet to create machine sets. The procedure below expla
149149
1. Change the `.spec.selector.matchLabels.machine.openshift.io/cluster-api-machineset` field to match the `.metadata.name` field.
150150

151151
```bash
152-
jq '.spec.selector.matchLabels."machine.openshift.io/cluster-api-machineset" = "nvidia-worker-southcentralus1"' gpu_machineset.json| sponge gpu_machineset.json
152+
jq '.spec.selector.matchLabels."machine.openshift.io/cluster-api-machineset" = "nvidia-worker-<region><az>"' gpu_machineset.json| sponge gpu_machineset.json
153153
```
154154

155155
1. Change the `.spec.template.metadata.labels.machine.openshift.io/cluster-api-machineset` to match the `.metadata.name` field.
156156

157157
```bash
158-
jq '.spec.template.metadata.labels."machine.openshift.io/cluster-api-machineset" = "nvidia-worker-southcentralus1"' gpu_machineset.json| sponge gpu_machineset.json
158+
jq '.spec.template.metadata.labels."machine.openshift.io/cluster-api-machineset" = "nvidia-worker-<region><az>"' gpu_machineset.json| sponge gpu_machineset.json
159159
```
160160

161161
1. Change the `spec.template.spec.providerSpec.value.vmSize` to match the desired GPU instance type from Azure.
@@ -244,6 +244,12 @@ This section explains how to create the `nvidia-gpu-operator` namespace, set up
244244
```bash
245245
CHANNEL=$(oc get packagemanifest gpu-operator-certified -n openshift-marketplace -o jsonpath='{.status.defaultChannel}')
246246
```
247+
> [!NOTE]
248+
> If your cluster was created without providing the pull secret, the cluster won't include samples or operators from Red Hat or from certified partners. This will result in the following error message:
249+
>
250+
> *Error from server (NotFound): packagemanifests.packages.operators.coreos.com "gpu-operator-certified" not found.*
251+
>
252+
> To add your Red Hat pull secret on an Azure Red Hat OpenShift cluster, [follow this guidance](howto-add-update-pull-secret.md).
247253
248254
1. Get latest Nvidia package using the following command:
249255

articles/service-bus-messaging/service-bus-python-how-to-use-topics-subscriptions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ Open your favorite editor, such as [Visual Studio Code](https://code.visualstudi
378378
for msg in received_msgs:
379379
print("Received: " + str(msg))
380380
# complete the message so that the message is removed from the subscription
381-
receiver.complete_message(msg)
381+
await receiver.complete_message(msg)
382382
```
383383
384384
3. Call the `run` method.

articles/virtual-machines/linux/expand-disks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ If a data disk was expanded without downtime using the procedure mentioned previ
144144
1. Insert a `1` character into the rescan file for this device. Note the reference to sda, this would change if a different disk device was resized.
145145

146146
```bash
147-
sudo echo 1 > /sys/class/block/sda/device/rescan
147+
echo 1 | sudo tee /sys/class/block/sda/device/rescan
148148
```
149149

150150
1. Verify that the new disk size has been recognized

markdown templates/aml-templates/template-howto.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.author: your-msft-alias
1010
author: your-github-account-name
1111
ms.date: 04/10/2018
1212
---
13-
# This H1 is the title of the article. It appears in search, appears at the top of the article, and has the second greatest impact on search. 100 chars or less.
13+
# This H1 is the title of the article. It appears in search, appears at the top of the article, and has the second most significant impact on search100 chars or less.
1414

1515
Guidance [here](https://review.learn.microsoft.com/help/contribute/contribute-how-to-write-seo-basics?branch=main)
1616

markdown templates/aml-templates/template-quickstart.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 04/10/2018
1212
---
1313

1414
# The H1 heading is the article title that shows on the web
15-
Once sentence into intro about Machine Learning. Intro paragraph to explain the intent of this Quickstart, and time it takes. You can finish this Quickstart in about five minutes.
15+
One sentence into the intro about Machine Learning. Intro paragraph to explain the intent of this Quickstart and the time it takes. You can finish this Quickstart in about five minutes.
1616

1717
If you don't have an Azure subscription, create a [free](https://azure.microsoft.com/free/) account before you begin.
1818

@@ -31,10 +31,10 @@ Setting|Suggested value|Description
3131
Server name |*example-name*|Choose a unique name that identifies your Azure Machine Learning server.
3232
Subscription|*Your subscription*|The Azure subscription that you want to use for your server. If you have multiple subscriptions, choose the appropriate subscription in which the resource is billed for.
3333
Resource Group|*myresourcegroup*| You may make a new resource group name, or use an existing one from your subscription.
34-
Server admin login |*mylogin*| Make your own login account to use when connecting to the server.
34+
Server admin login |*mylogin*| Make your login account when connecting to the server.
3535

3636
> [!IMPORTANT]
37-
> The server admin login and password that you specify here are required to log in to the server and its databases later in this Quickstart. Remember or record this information for later use.
37+
> The server admin login and password you specify here must log in to the server and its databases later in this Quickstart. Remember or record this information for later use.
3838
3939
## Example command using a bash shell comment
4040

@@ -43,7 +43,7 @@ A code block you could use.
4343
tool --switch1 value2 --switch2 value2
4444
```
4545

46-
The table describes the switched used in the preceding command:
46+
The table describes the switch used in the preceding command:
4747

4848
tool parameter |Suggested value|Description
4949
---|---|---
@@ -60,17 +60,17 @@ Something happened.
6060
6161

6262
## Clean up resources
63-
Clean up the resources you created in the quickstart either by deleting the [Azure resource group](../../azure-resource-manager/resource-group-overview.md), which includes all the resources in the resource group, or by deleting the one server resource if you want to keep the other resources intact.
63+
Clean up the resources you created in the Quickstart either by deleting the [Azure resource group](../../azure-resource-manager/resource-group-overview.md), which includes all the resources in the resource group, or by deleting the one server resource if you want to keep the other resources intact.
6464

6565
> [!TIP]
66-
> Other Quickstarts in this collection build upon this quick start. If you plan to continue on to work with subsequent quickstarts, do not clean up the resources created in this quickstart. If you do not plan to continue, use the following steps to delete resources created by this quickstart in the Azure portal.
66+
> Other Quickstarts in this collection build upon this quick start. If you plan to continue to work with subsequent quickstarts, do not clean up the resources created in this Quickstart. If you do not plan to continue, use the following steps to delete resources created by this Quickstart in the Azure portal.
6767
68-
To delete the entire resource group including the newly created server:
68+
To delete the entire resource group, including the newly created server:
6969
1. Locate your resource group in the Azure portal. From the left-hand menu in the Azure portal, click **Resource groups** and then click the name of your resource group, such as our example **myresourcegroup**.
70-
2. On your resource group page, click **Delete**. Then type the name of your resource group, such as our example **myresourcegroup**, in the text box to confirm deletion, and then click **Delete**.
70+
2. On your resource group page, click **Delete**. Then type the name of your resource group, such as our example **myresourcegroup**, in the text box to confirm the deletion, and then click **Delete**.
7171

72-
Or instead, to delete the newly created server:
73-
1. Locate your server in the Azure portal, if you do not have it open. From the left-hand menu in Azure portal, click **All resources**, and then search for the server you created.
72+
Or, instead, delete the newly created server:
73+
1. Locate your server in the Azure portal if you do not have it open. From the left-hand menu in Azure portal, click **All resources**, and then search for the server you created.
7474
2. On the **Overview** page, click the **Delete** button on the top pane.
7575
3. Confirm the server name you want to delete.
7676

markdown templates/aml-templates/template-tutorial.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ author: your-github-account-name
1111
ms.date: 04/10/2018
1212
---
1313

14-
# Tutorial: Verb ... --> This H1 is the title of the article. It appears in search, appears at the top of article, second greatest impact on search, 100 chars or less
14+
# Tutorial: Verb ... --> This H1 is the title of the article. It appears in search, appears at the top of the article, and has the second greatest impact on search, 100 chars or less
1515

16-
AUTHORS: A single sentence intro about AML. Intro paragraph to explain the intent of this tutorial. Lead with a light intro that describes, in customer-friendly language, what theyll learn, or do, or accomplish. Answer the fundamental why would I want to do this? question. Avoid starting the tutorial with a bunch of notes or caveats.
16+
AUTHORS: A single-sentence intro about AML. Intro paragraph to explain the intent of this tutorial. Lead with a light introduction that describes, in customer-friendly language, what they'll learn, or do, or accomplish. Answer the fundamental "why would I want to do this?" question. Avoid starting the tutorial with a bunch of notes or caveats.
1717

18-
In this tutorial you will do X...
18+
In this tutorial, you will do X...
1919

2020
AUTHORS: Quick read tutorial [here](https://review.learn.microsoft.com/help/contribute/contribute-how-to-mvc-tutorial?branch=main). Also, don't forget to run Acrolinx to find issues before you commit.
2121

22-
In this tutorial, you use X to do Y or you learn how to:
22+
In this tutorial, you use X to do Y, or you learn how to:
2323
> [!div class="checklist"]
2424
> * Create something
2525
> * Do something
@@ -29,9 +29,9 @@ In this tutorial, you use X to do Y or you learn how to:
2929
> [Important!]
3030
> Avoid notes, tips, and important boxes. Except for this one, ha!
3131
>
32-
> Tutorials are typically longer and more complex than quickstarts. They are created from the list of top user tasks identified in milestone one and focus on the single best procedure for completing that task. A tutorial usually aligns to one or two customer tasks. At a minimum, you need one tutorial in the Tutorials node of the TOC.
32+
> Tutorials are typically longer and more complex than quickstarts. They are created from the list of top user tasks identified in milestone one and focus on the best procedure for completing that task. A tutorial usually aligns with one or two customer tasks. At a minimum, you need one tutorial in the Tutorials node of the TOC.
3333
>
34-
> Tutorials are 100 – 200 level for an audience new to the service, product, or scenario. Ideally, your tutorials should build on each other using a common theme with the result being a completed customer scenario. Unlike how-to content, they are not open-ended, exhaustive walkthroughs of a feature.
34+
> Tutorials are 100 – 200 for an audience new to the service, product, or scenario. Ideally, your tutorials should build on each other using a common theme, resulting in a completed customer scenario. Unlike how-to content, they are not open-ended, complete walkthroughs of a feature.
3535
3636
## Prerequisites
3737

@@ -44,13 +44,13 @@ To complete this tutorial, you need:
4444
## Log in to the Azure portal
4545
Log in to the [Azure portal](https://portal.azure.com).
4646

47-
Dont number H2 and H3 headings. Tutorials are procedure based and customers understand that the sections follow in sequence.
47+
Don't number H2 and H3 headings. Tutorials are procedure-based, and customers understand that the sections follow in sequence.
4848

4949
## Create a thing
5050
Paragraphs here
5151

5252
Follow these steps to create the thing:
53-
1. Click the **+ New** button found on the upper left-hand corner of the Azure portal.
53+
1. Click the **+ New** button found in the upper left corner of the Azure portal.
5454
2. Next step
5555
3. Next step.
5656

@@ -68,9 +68,9 @@ Paragraph and Steps
6868
[!INCLUDE [aml-delete-resource-group](../../../includes/aml-delete-resource-group.md)]
6969

7070
## Next Steps
71-
Tutorials should always have a Next steps H2 that points to the next logical tutorial in a series (one link only here), or, if there are no other tutorials, to some other cool thing the customer can do with the service. Use the blue box format for tutorials and note that you can shorten the H1 in the boxes if the original one doesnt fit.
71+
Tutorials should always have a "Next steps" H2 that points to the following logical tutorial in a series (one link only here) or, if there are no other tutorials, to some other cool thing the customer can do with the service. Use the blue box format for tutorials, and note that you can shorten the H1 in the boxes if the original one doesn't fit.
7272

7373
> [!div class="nextstepaction"]
7474
> [Azure Windows virtual machine tutorials](../../articles/machine-learning/overview-what-is-azure-ml.md)
7575
76-
Do not link to troubleshooting content or FAQs. This implies the customer is going to run into known issues. Either fix these issues beforehand or create a different path to success for users that avoid these problems.
76+
Do not link to troubleshooting content or FAQs. This implies that the customer is going to run into known issues. Either fix these issues beforehand or create a different path to success for users that avoid these problems.

0 commit comments

Comments
 (0)