Skip to content

Commit 3826ba9

Browse files
authored
Merge pull request #4251 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-ai-docs (branch main)
2 parents 1f0d619 + 982e009 commit 3826ba9

12 files changed

+17
-17
lines changed

articles/ai-services/speech-service/includes/spx-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Enter `spx` or `spx help` to see help for the Speech CLI.
8080

8181
#### [Docker (Windows, Linux, macOS)](#tab/dockerinstall)
8282

83-
The following example pulls a public container image from Docker Hub. We recommend that you authenticate with your Docker Hub account (`docker login`) first instead of making an anonymous pull request. To improve reliability when you're using public content, import and manage the image in a private Azure container registry. [Learn more about working with public images](/azure/container-registry/buffer-gate-public-content).
83+
The following example pulls a public container image from Docker Hub. We recommend that you authenticate with your Docker Hub account (`docker login`) first instead of making an anonymous pull request. To improve reliability when you're using public content, import and manage the image in a private Azure Container Registry. [Learn more about working with public images](/azure/container-registry/buffer-gate-public-content).
8484

8585
Follow these steps to install the Speech CLI in a Docker container:
8686

articles/machine-learning/concept-endpoints-online-auth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ If the endpoint identity is a SAI, the following roles are assigned to the endpo
121121

122122
| Role | Description | Condition for automatic role assignment |
123123
| --- | --- | --- |
124-
| **AcrPull** | Allows the endpoint identity to pull images from the Azure container registry associated with the workspace | The endpoint identity is a SAI.
124+
| **AcrPull** | Allows the endpoint identity to pull images from the Azure Container Registry associated with the workspace | The endpoint identity is a SAI.
125125
| **Storage Blob Data Reader** | Allows the endpoint identity to read blobs from the default datastore of the workspace | The endpoint identity is a SAI.
126126
| **AzureML Metrics Writer (preview)** | Allows the endpoint identity to write metrics to the workspace | The endpoint identity is a SAI.
127127
| **Azure Machine Learning Workspace Connection Secrets Reader** | Allows the endpoint identity to read secrets from workspace connections | The endpoint identity is a SAI and the endpoint creation has a flag to enforce access to the default secret stores. The user identity that creates the endpoint also has permission to read secrets from workspace connections.

articles/machine-learning/how-to-access-azureml-behind-firewall.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Besides above requirements, the following outbound URLs are also required for Az
175175
| Outbound Endpoint| Port | Description|Training |Inference |
176176
|-----|-----|-----|:-----:|:-----:|
177177
| `*.kusto.windows.net`<br>`*.table.core.windows.net`<br>`*.queue.core.windows.net` | 443 | Required to upload system logs to Kusto. |__&check;__|__&check;__|
178-
| `<your ACR name>.azurecr.io`<br>`<your ACR name>.<region>.data.azurecr.io` | 443 | Azure container registry, required to pull docker images used for machine learning workloads.|__&check;__|__&check;__|
178+
| `<your ACR name>.azurecr.io`<br>`<your ACR name>.<region>.data.azurecr.io` | 443 | Azure Container Registry, required to pull docker images used for machine learning workloads.|__&check;__|__&check;__|
179179
| `<your storage account name>.blob.core.windows.net` | 443 | Azure blob storage, required to fetch machine learning project scripts, data or models, and upload job logs/outputs.|__&check;__|__&check;__|
180180
| `<your workspace ID>.workspace.<region>.api.azureml.ms`<br>`<region>.experiments.azureml.net`<br>`<region>.api.azureml.ms` | 443 | Azure Machine Learning service API.|__&check;__|__&check;__|
181181
| `pypi.org` | 443 | Python package index, to install pip packages used for training job environment initialization.|__&check;__|N/A|

articles/machine-learning/how-to-manage-workspace-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ The following considerations and limitations apply to dependent resources associ
153153
The Azure Machine Learning workspace uses Azure Container Registry for some operations, and automatically creates a Container Registry instance when it first needs one.
154154
[!INCLUDE [machine-learning-delete-acr](includes/machine-learning-delete-acr.md)]
155155

156-
To use an existing Azure container registry with an Azure Machine Learning workspace, you must [enable the admin account](/azure/container-registry/container-registry-authentication#admin-account) on the container registry.
156+
To use an existing Azure Container Registry with an Azure Machine Learning workspace, you must [enable the admin account](/azure/container-registry/container-registry-authentication#admin-account) on the container registry.
157157

158158
#### Storage Account
159159

articles/machine-learning/how-to-package-models-app-service.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ In this section, you package the previously registered MLflow model and deploy i
150150
151151
1. Look for the environment named *heart-classifier-mlflow-package*, which is the name of the package you just created.
152152
153-
1. Copy the value that's in the **Azure container registry** field.
153+
1. Copy the value that's in the **Azure Container Registry** field.
154154
155-
:::image type="content" source="./media/model-packaging/model-package-container-name.png" alt-text="A screenshot showing the section where the Azure container registry image name is displayed in Azure Machine Learning studio.":::
155+
:::image type="content" source="./media/model-packaging/model-package-container-name.png" alt-text="A screenshot showing the section where the Azure Container Registry image name is displayed in Azure Machine Learning studio.":::
156156
157157
158158
1. Now, deploy this package in an App Service.
@@ -177,7 +177,7 @@ In this section, you package the previously registered MLflow model and deploy i
177177
178178
1. For **Image Source**, select **Azure Container Registry**.
179179
180-
1. Configure the **Azure container registry options** as follows:
180+
1. Configure the **Azure Container Registry options** as follows:
181181
182182
1. For **Registry**, select the Azure Container Registry associated with the Azure Machine Learning workspace.
183183

articles/machine-learning/how-to-prevent-data-loss-exfiltration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Use the following steps to enable a storage endpoint for the subnet that contain
159159
When using Azure Machine Learning curated environments, make sure to use the latest environment version. The container registry for the environment must also be `mcr.microsoft.com`. To check the container registry, use the following steps:
160160

161161
1. From [Azure Machine Learning studio](https://ml.azure.com), select your workspace and then select __Environments__.
162-
1. Verify that the __Azure container registry__ begins with a value of `mcr.microsoft.com`.
162+
1. Verify that the __Azure Container Registry__ begins with a value of `mcr.microsoft.com`.
163163

164164
> [!IMPORTANT]
165165
> If the container registry is `viennaglobal.azurecr.io` you cannot use the curated environment with the data exfiltration. Try upgrading to the latest version of the curated environment.

articles/machine-learning/includes/machine-learning-online-endpoint-troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ If the value of `bypass` isn't `AzureServices`, use the guidance in [Configure A
4343
> This issue applies when you use the [legacy network isolation method for managed online endpoints](../concept-secure-online-endpoint.md#secure-outbound-access-with-legacy-network-isolation-method). In this method, Azure Machine Learning creates a managed virtual network for each deployment under an endpoint.
4444
4545
1. Check whether the `egress-public-network-access` flag has a value of `disabled` for the deployment. If this flag is enabled, and the visibility of the container registry is private, this failure is expected.
46-
1. Use the following command to check the status of the private endpoint connection. Replace `<registry-name>` with the name of the Azure container registry for your workspace:
46+
1. Use the following command to check the status of the private endpoint connection. Replace `<registry-name>` with the name of the Azure Container Registry for your workspace:
4747

4848
```azurecli
4949
az acr private-endpoint-connection list -r <registry-name> --query "[?privateLinkServiceConnectionState.description=='Egress for Microsoft.MachineLearningServices/workspaces/onlineEndpoints'].{ID:id, status:privateLinkServiceConnectionState.status}"

articles/machine-learning/reference-yaml-workspace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The source JSON schema can be found at https://azuremlschemas.azureedge.net/late
3737
| `resource_group` | string | **Required.** The resource group containing the workspace. If the resource group does not exist, a new one will be created. | | |
3838
| `hbi_workspace` | boolean | Whether the customer data is of high business impact (HBI), containing sensitive business information. For more information, see [Data encryption at rest](concept-data-encryption.md#encryption-at-rest). | | `false` |
3939
| `storage_account` | string | The fully qualified resource ID of an existing Azure storage account to use as the default storage account for the workspace. A storage account with premium storage or hierarchical namespace cannot be used as the default storage account. If omitted, a new storage account will be created. | | |
40-
| `container_registry` | string | The fully qualified resource ID of an existing Azure container registry to use as the default container registry for the workspace. Azure Machine Learning uses Azure Container Registry (ACR) for managing container images used for training and deployment. If omitted, a new container registry will be created. Creation is lazy loaded, so the container registry gets created the first time it is needed for an operation for either training or deployment. | | |
40+
| `container_registry` | string | The fully qualified resource ID of an existing Azure Container Registry to use as the default container registry for the workspace. Azure Machine Learning uses Azure Container Registry (ACR) for managing container images used for training and deployment. If omitted, a new container registry will be created. Creation is lazy loaded, so the container registry gets created the first time it is needed for an operation for either training or deployment. | | |
4141
| `key_vault` | string | The fully qualified resource ID of an existing Azure key vault to use as the default key vault for the workspace. If omitted, a new key vault will be created. | | |
4242
| `application_insights` | string | The fully qualified resource ID of an existing Azure application insights to use as the default application insights for the workspace. If omitted, a new application insights will be created. | | |
4343
| `customer_managed_key` | object | Azure Machine Learning stores metadata in an Azure Cosmos DB instance. By default the data is encrypted at rest with Microsoft-managed keys. To use your own customer-managed key for encryption, specify the customer-managed key information in this section. For more information, see [Data encryption for Azure Cosmos DB](concept-data-encryption.md#azure-cosmos-db). | | |

articles/machine-learning/v1/how-to-deploy-package-models.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Both packages can be used to get a local Docker image.
4444
4545
### Download a packaged model
4646

47-
The following example builds an image, which is registered in the Azure container registry for your workspace:
47+
The following example builds an image, which is registered in the Azure Container Registry for your workspace:
4848

4949
```python
5050
package = Model.package(ws, [model], inference_config)
@@ -79,16 +79,16 @@ package = Model.package(ws, [model], inference_config, generate_dockerfile=True)
7979
package.wait_for_creation(show_output=True)
8080
# Download the package.
8181
package.save("./imagefiles")
82-
# Get the Azure container registry that the model/Dockerfile uses.
82+
# Get the Azure Container Registry that the model/Dockerfile uses.
8383
acr=package.get_container_registry()
8484
print("Address:", acr.address)
8585
print("Username:", acr.username)
8686
print("Password:", acr.password)
8787
```
8888

89-
This code downloads the files needed to build the image to the `imagefiles` directory. The Dockerfile included in the saved files references a base image stored in an Azure container registry. When you build the image on your local Docker installation, you need to use the address, user name, and password to authenticate to the registry. Use the following steps to build the image by using a local Docker installation:
89+
This code downloads the files needed to build the image to the `imagefiles` directory. The Dockerfile included in the saved files references a base image stored in an Azure Container Registry. When you build the image on your local Docker installation, you need to use the address, user name, and password to authenticate to the registry. Use the following steps to build the image by using a local Docker installation:
9090

91-
1. From a shell or command-line session, use the following command to authenticate Docker with the Azure container registry. Replace `<address>`, `<username>`, and `<password>` with the values retrieved by `package.get_container_registry()`.
91+
1. From a shell or command-line session, use the following command to authenticate Docker with the Azure Container Registry. Replace `<address>`, `<username>`, and `<password>` with the values retrieved by `package.get_container_registry()`.
9292

9393
```bash
9494
docker login <address> -u <username> -p <password>

articles/machine-learning/v1/how-to-manage-workspace-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ When you deploy an Azure Machine Learning workspace, various other services are
101101
> * Hierarchical Namespace (ADLS Gen 2) is disabled
102102
> These requirements are only for the _default_ storage account used by the workspace.
103103
>
104-
> When attaching Azure container registry, you must have the [admin account](/azure/container-registry/container-registry-authentication#admin-account) enabled before it can be used with an Azure Machine Learning workspace.
104+
> When attaching Azure Container Registry, you must have the [admin account](/azure/container-registry/container-registry-authentication#admin-account) enabled before it can be used with an Azure Machine Learning workspace.
105105
106106
# [Create with new resources](#tab/createnewresources)
107107

0 commit comments

Comments
 (0)