Skip to content

Commit 4678e59

Browse files
authored
Merge pull request #270687 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 a7d3c11 + 3eb041b commit 4678e59

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

articles/active-directory-b2c/identity-provider-azure-ad-multi-tenant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This article shows you how to enable sign-in for users using the multitenant end
3636
[!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
3737

3838
> [!NOTE]
39-
> In this article, it assumed that **SocialAndLocalAccounts** starter pack is used in the previous steps mentioned in pre-requisite.
39+
> In this article, it is assumed that the **SocialAndLocalAccounts** starter pack is used in the previous steps mentioned in the pre-requisite.
4040
4141
## Register a Microsoft Entra app
4242

articles/aks/upgrade-windows-2019-2022.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ When upgrading the OS version of a running Windows workload on Azure Kubernetes
1616
When a new version of the Windows Server operating system is released, AKS is committed to supporting it and recommending you upgrade to the latest version to take advantage of the fixes, improvements, and new functionality. AKS provides a five-year support lifecycle for every Windows Server version, starting with Windows Server 2022. During this period, AKS will release a new version that supports a newer version of Windows Server OS for you to upgrade to.
1717

1818
> [!NOTE]
19-
>- Windows Server 2019 is being retired after Kubernetes version 1.32 reaches end of life (EOL). For more information, see [AKS release notes][aks-release-notes].
20-
>- Windows Server 2022 is being retired after Kubernetes version 1.34 reaches its end of life (EOL). For more information, see [AKS release notes][aks-release-notes].
19+
> - Windows Server 2019 is being retired after Kubernetes version 1.32 reaches end of life (EOL). For more information, see [AKS release notes][aks-release-notes].
20+
> - Windows Server 2022 is being retired after Kubernetes version 1.34 reaches its end of life (EOL). For more information, see [AKS release notes][aks-release-notes].
2121
2222
## Limitations
2323

@@ -102,7 +102,7 @@ Node Selector is the most common and recommended option for placement of Windows
102102
kubectl get pods -o wide
103103
```
104104

105-
The following example output shows the pods in the `defualt` namespace:
105+
The following example output shows the pods in the `default` namespace:
106106

107107
```output
108108
NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES

articles/app-service/reference-app-settings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ For more information on custom containers, see [Run a custom container in Azure]
335335
|-|-|-|
336336
| `WEBSITES_ENABLE_APP_SERVICE_STORAGE` | Set to `true` to enable the `/home` directory to be shared across scaled instances. The default is `true` for custom containers. ||
337337
| `WEBSITES_CONTAINER_START_TIME_LIMIT` | Amount of time in seconds to wait for the container to complete start-up before restarting the container. Default is `230`. You can increase it up to the maximum of `1800`. ||
338-
| `WEBSITES_CONTAINER_STOP_TIME_LIMIT` | Amount of time in seconds to wait for the container to terminate gracefully. Deafult is `5`. You can increase to a maximum of `120` ||
338+
| `WEBSITES_CONTAINER_STOP_TIME_LIMIT` | Amount of time in seconds to wait for the container to terminate gracefully. Default is `5`. You can increase to a maximum of `120` ||
339339
| `DOCKER_REGISTRY_SERVER_URL` | URL of the registry server, when running a custom container in App Service. For security, this variable isn't passed on to the container. | `https://<server-name>.azurecr.io` |
340340
| `DOCKER_REGISTRY_SERVER_USERNAME` | Username to authenticate with the registry server at `DOCKER_REGISTRY_SERVER_URL`. For security, this variable isn't passed on to the container. ||
341341
| `DOCKER_REGISTRY_SERVER_PASSWORD` | Password to authenticate with the registry server at `DOCKER_REGISTRY_SERVER_URL`. For security, this variable isn't passed on to the container. ||
@@ -600,7 +600,7 @@ The following environment variables are related to the [push notifications](/pre
600600
| `WEBSITE_PUSH_TAGS_REQUIRING_AUTH` | Read-only. Contains a list of tags in the notification registration that requires user authentication. |
601601
| `WEBSITE_PUSH_TAGS_DYNAMIC` | Read-only. Contains a list of tags in the notification registration that were added automatically. |
602602

603-
>[!NOTE]
603+
> [!NOTE]
604604
> This article contains references to a term that Microsoft no longer uses. When the term is removed from the software, we’ll remove it from this article.
605605
606606
<!--

articles/azure-monitor/logs/save-query.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Most users should leave the option to **Save to the default query pack**, which
4040
:::image type="content" source="media/save-query/save-query-dialog.png" lightbox="media/save-query/save-query-dialog.png" alt-text="Screenshot that shows the Save as query dialog." border="false":::
4141

4242
## Edit a query
43-
You might want to edit a query that you've already saved. You might want to change the query itself or modify any of its properties. After you open an existing query in Log Analytics, you can edit it by selecting **Edit query details** from the **Save** dropdown. Now you can save the edited query with the same properties or modify any properties before saving.
43+
You might want to edit a query that you've already saved. You might want to change the query itself or modify any of its properties. After you open an existing query in Log Analytics and make changes, you can save the edited query with the same properties or modify any properties before saving.
4444

4545
If you want to save the query with a different name, select **Save as query** as if you were creating a new query.
4646

articles/container-instances/availability-zones.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Azure Container Instances (ACI) supports *zonal* container group deployments, me
2222
## Limitations
2323

2424
> [!IMPORTANT]
25-
* Container groups with GPU resources don't support availability zones at this time.
25+
> Container groups with GPU resources don't support availability zones at this time.
2626
2727
### Version requirements
2828

articles/frontdoor/migrate-tier.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Azure Front Door Standard and Premium tier bring the latest cloud delivery netwo
6363
> [!NOTE]
6464
> The **Configure WAF policy upgrades** link will only appear if you have WAF policies associated to the Front Door (classic) profile.
6565
66-
For each WAF policy associated to the Front Door (classic) profile select an action. You can make copy of the WAF policy that matches the tier you're migrating the Front Door profile to or you can use an existing compatible WAF policy. You may also change the WAF policy name from the default provided name. Once completed, select **Apply** to save your Front Door WAF settings.
66+
For each WAF policy associated to the Front Door (classic) profile select an action. You can make a copy of the WAF policy that matches the tier you're migrating the Front Door profile to or you can use an existing compatible WAF policy. You may also change the WAF policy name from the default provided name. Once completed, select **Apply** to save your Front Door WAF settings.
6767

6868
:::image type="content" source="./media/migrate-tier/waf-policy.png" alt-text="Screenshot of the upgrade WAF policy screen.":::
6969

articles/machine-learning/component-reference/resnet.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This classification algorithm is a supervised learning method, and requires a la
2020
> [!NOTE]
2121
> This component does not support labeled dataset generated from *Data Labeling* in the studio, but only support labeled image directory generated from [Convert to Image Directory](convert-to-image-directory.md) component.
2222
23-
You can train the model by providing a model and a labeled image directory as inputs to [Train Pytorch Model](train-pytorch-model.md). The trained model can then be used to predict values for the new input examples using [Score Image Model](score-image-model.md).
23+
You can train the model by providing a model and a labeled image directory as inputs to [Train PyTorch Model](train-pytorch-model.md). The trained model can then be used to predict values for the new input examples using [Score Image Model](score-image-model.md).
2424

2525
### More about ResNet
2626

@@ -36,7 +36,7 @@ Refer to [this paper](https://pytorch.org/vision/stable/models.html#torchvision.
3636

3737
4. For **Zero init residual**, specify whether to zero-initialize the last batch norm layer in each residual branch. If selected, the residual branch starts with zeros, and each residual block behaves like an identity. This can help with convergence at large batch sizes according to https://arxiv.org/abs/1706.02677.
3838

39-
5. Connect the output of **ResNet** component, training and validation image dataset component to the [Train Pytorch Model](train-pytorch-model.md).
39+
5. Connect the output of **ResNet** component, training and validation image dataset component to the [Train PyTorch Model](train-pytorch-model.md).
4040

4141
6. Submit the pipeline.
4242

@@ -59,8 +59,8 @@ After pipeline run is completed, to use the model for scoring, connect the [Trai
5959

6060
| Name | Type | Description |
6161
| --------------- | ----------------------- | ---------------------------------------- |
62-
| Untrained model | UntrainedModelDirectory | An untrained ResNet model that can be connected to Train Pytorch Model. |
62+
| Untrained model | UntrainedModelDirectory | An untrained ResNet model that can be connected to Train PyTorch Model. |
6363

6464
## Next steps
6565

66-
See the [set of components available](component-reference.md) to Azure Machine Learning.
66+
See the [set of components available](component-reference.md) to Azure Machine Learning.

articles/machine-learning/how-to-use-batch-model-openai-embeddings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ Model deployments in batch endpoints can only deploy registered models. You can
225225
> * Add an environment variable `AZUREML_BI_TEXT_COLUMN` to control (optionally) which input field you want to generate embeddings for.
226226
227227
> [!TIP]
228-
> By default, MLflow will use the first text column available in the input data to generate embeddings from. Use the environment variable `AZUREML_BI_TEXT_COLUMN` with the name of an existing column in the input dataset to change the column if needed. Leave it blank if the defaut behavior works for you.
228+
> By default, MLflow will use the first text column available in the input data to generate embeddings from. Use the environment variable `AZUREML_BI_TEXT_COLUMN` with the name of an existing column in the input dataset to change the column if needed. Leave it blank if the default behavior works for you.
229229
230230
The scoring script looks as follows:
231231

articles/operator-nexus/howto-configure-isolation-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ The following parameters for isolation domains are optional.
255255
| Parameter|Description|Example|Required|
256256
|---|---|---|---|
257257
| `redistributeConnectedSubnet` | Advertise connected subnets default value is True |True | |
258-
| `redistributeStaticRoutes` |Advertise Static Routes can have value of true/False. Defualt Value is False | False | |
258+
| `redistributeStaticRoutes` |Advertise Static Routes can have value of true/False. Default Value is False | False | |
259259
| `aggregateRouteConfiguration`|List of Ipv4 and Ipv6 route configurations | | |
260260
| `connectedSubnetRoutePolicy` | Route Policy Configuration for IPv4 or Ipv6 L3 ISD connected subnets. Refer to help file for using correct syntax | | |
261261

0 commit comments

Comments
 (0)