Skip to content

Commit 9da5a6b

Browse files
authored
Merge pull request #6541 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 b1768d8 + 3fc674e commit 9da5a6b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

articles/machine-learning/concept-customer-managed-keys.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ When you use a customer-managed key, there are two possible configurations:
5252
- [Service-side encryption](#service-side-encryption-of-metadata): The resources are stored service-side on Microsoft-managed resources. This configuration reduces costs and also reduces the chance of conflict with policies you may have set for your Azure subscription.
5353
- [Subscription-side encryption (classic)](#subscription-side-encryption-of-metadata-classic): The resources are hosted in your Azure subscription and encrypted with your key. While these resources exist in your subscription, Microsoft manages them. These resources are automatically created and configured when you create your Azure Machine Learning workspace.
5454

55-
## Service-side encryption of metadata
55+
### Service-side encryption of metadata
5656

5757
In this configuration, encrypted data is stored service-side on Microsoft-managed resources instead of in your subscription. Using service-side encryption reduces costs compared to the subscription-side encryption, and mitigates the likelihood of Azure policy conflicts.
5858

articles/machine-learning/reference-yaml-deployment-batch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The source JSON schema can be found at https://azuremlschemas.azureedge.net/late
3333
| `description` | string | Description of the deployment. | | |
3434
| `tags` | object | Dictionary of tags for the deployment. | | |
3535
| `endpoint_name` | string | **Required.** Name of the endpoint to create the deployment under. | | |
36-
| `type` | string | **Required.** Type of the bath deployment. Use `model` for [model deployments](concept-endpoints-batch.md#model-deployment) and `pipeline` for [pipeline component deployments](concept-endpoints-batch.md#pipeline-component-deployment). <br><br>**New in version 1.7**. | `model`, `pipeline` | `model` |
36+
| `type` | string | Type of the batch deployment. Use `model` for [model deployments](concept-endpoints-batch.md#model-deployment) and `pipeline` for [pipeline component deployments](concept-endpoints-batch.md#pipeline-component-deployment). If not specified, defaults to classic batch deployment <br><br>**New in version 1.7**. | `model`, `pipeline` | |
3737
| `settings` | object | Configuration of the deployment. See specific YAML reference for model and pipeline component for allowed values. <br><br>**New in version 1.7**. | | |
3838

3939
> [!TIP]

0 commit comments

Comments
 (0)