Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-jan-qs

Author: HeidiSteen

articles/aks/deploy-confidential-containers-default-policy.md

@@ -139,7 +139,7 @@ Use the following command to enable Confidential Containers (preview) by creatin
    * **--cluster-name**: Enter a unique name for the AKS cluster, such as *myAKSCluster*.
    * **--name**: Enter a unique name for your clusters node pool, such as *nodepool2*.
    * **--workload-runtime**: Specify *KataCcIsolation* to enable the feature on the node pool. Along with the `--workload-runtime` parameter, these other parameters shall satisfy the following requirements. Otherwise, the command fails and reports an issue with the corresponding parameter(s).
-   * **--os-sku**: **AzureLinux*. Only the Azure Linux os-sku supports this feature in this preview release.
+   * **--os-sku**: *AzureLinux*. Only the Azure Linux os-sku supports this feature in this preview release.
    * **--node-vm-size**: Any Azure VM size that is a generation 2 VM and supports nested virtualization works. For example, [Standard_DC8as_cc_v5][DC8as-series] VMs.
 
    The following example adds a user node pool to *myAKSCluster* with two nodes in *nodepool2* in the *myResourceGroup*:
@@ -193,7 +193,7 @@ For this preview release, we recommend for test and evaluation purposes to eithe
 1. Grant the managed identity you created earlier, and your account, access to the key vault. [Assign][assign-key-vault-access-cli] both identities the **Key Vault Crypto Officer** and **Key Vault Crypto User** Azure RBAC roles.
 
    >[!NOTE]
-   >The managed identity is the value you assigned to the `USER_ASSIGNED_IDENTITY_NAME` variable.
+   >The managed identity is the value you assign to the `USER_ASSIGNED_IDENTITY_NAME` variable.
 
    >[!NOTE]
    >To add role assignments, you must have `Microsoft.Authorization/roleAssignments/write` and `Microsoft.Authorization/roleAssignments/delete` permissions, such as [Key Vault Data Access Administrator][key-vault-data-access-admin-rbac], [User Access Administrator][user-access-admin-rbac], or [Owner][owner-rbac].
@@ -338,7 +338,7 @@ For this preview release, we recommend for test and evaluation purposes to eithe
 
     ```
 
-1. Prepare the RSA Encryption/Decryption key by the [bash script](https://github.com/microsoft/confidential-container-demos/raw/main/kafka/setup-key.sh) for the workload from GitHub. Save the file as `setup-key.sh`.
+1. Prepare the RSA Encryption/Decryption key using the [bash script](https://github.com/microsoft/confidential-container-demos/raw/main/kafka/setup-key.sh) for the workload from GitHub. Save the file as `setup-key.sh`.
 
 1. Set the `MAA_ENDPOINT` environmental variable to match the value for the `SkrClientMAAEndpoint` from the `consumer.yaml` manifest file by running the following command.
 
@@ -379,7 +379,7 @@ For this preview release, we recommend for test and evaluation purposes to eithe
 
 1. Copy and paste the external IP address of the consumer service into your browser and observe the decrypted message.
 
-    The following resembles the output of the command:
+    The following example resembles the output of the command:
 
     ```output
     Welcome to Confidential Containers on AKS!

articles/azure-arc/servers/troubleshoot-extended-security-updates.md

@@ -79,18 +79,11 @@ If you're unable to allow access to the PKI URL from your servers, you can manua
 1. Copy the certificate files to your Windows Server 2012 (R2) machines.
 1. Run any one set of the following commands in an elevated command prompt or PowerShell session to add the certificates to the "Intermediate Certificate Authorities" store for the local computer. The command should be run from the same directory as the certificate files. The commands are idempotent and won't make any changes if you've already imported the certificate:
 
-    ```powershell
-    certstore -addstore CA "Microsoft Azure TLS Issuing CA 01 - xsign.crt"
-    certstore -addstore CA "Microsoft Azure TLS Issuing CA 02 - xsign.crt"
-    certstore -addstore CA "Microsoft Azure TLS Issuing CA 05 - xsign.crt"
-    certstore -addstore CA "Microsoft Azure TLS Issuing CA 06 - xsign.crt"
     ```
-
-    ```powershell
-    Import-Certificate -FilePath '.\Microsoft Azure TLS Issuing CA 01 - xsign.crt' -CertStoreLocation Cert:\LocalMachine\CA
-    Import-Certificate -FilePath '.\Microsoft Azure TLS Issuing CA 02 - xsign.crt' -CertStoreLocation Cert:\LocalMachine\CA
-    Import-Certificate -FilePath '.\Microsoft Azure TLS Issuing CA 05 - xsign.crt' -CertStoreLocation Cert:\LocalMachine\CA
-    Import-Certificate -FilePath '.\Microsoft Azure TLS Issuing CA 06 - xsign.crt' -CertStoreLocation Cert:\LocalMachine\CA
+    certutil -addstore CA "Microsoft Azure TLS Issuing CA 01 - xsign.crt"
+    certutil -addstore CA "Microsoft Azure TLS Issuing CA 02 - xsign.crt"
+    certutil -addstore CA "Microsoft Azure TLS Issuing CA 05 - xsign.crt"
+    certutil -addstore CA "Microsoft Azure TLS Issuing CA 06 - xsign.crt"
     ```
 
 1. Try installing the Windows updates again. You may need to reboot your computer for the validation logic to recognize the newly imported intermediate CA certificates.

articles/azure-relay/.openpublishing.redirection.relay.json

@@ -5,6 +5,11 @@
     "redirect_url": "/azure/service-bus-messaging/security-baseline",
     "redirect_document_id": false
   },
+  {
+    "source_path_from_root": "/articles/azure-relay/relay-migrate-acs-sas.md",
+    "redirect_url": "/azure/azure-relay/relay-authentication-and-authorization",
+    "redirect_document_id": false
+  },
   {
     "source_path_from_root": "/articles/service-bus-relay/diagnostic-logs.md",
     "redirect_url": "/azure/azure-relay/diagnostic-logs",

articles/azure-relay/TOC.yml

@@ -56,10 +56,6 @@
     href: move-across-regions.md
   - name: Migrate from Azure Service Manager (classic) APIs to Resource Manager APIs
     href: ../service-bus-messaging/deprecate-service-bus-management.md?toc=%2fazure%2fservice-bus-relay%2ftoc.json    
-  - name: Plan and design
-    items:
-    - name: Migrate from ACS to SAS
-      href: relay-migrate-acs-sas.md
   - name: Develop
     items:
     - name: Create a namespace

articles/azure-relay/relay-migrate-acs-sas.md

@@ -262,6 +262,7 @@ When copying data from MySQL, the following mappings are used from MySQL data ty
 | `int unsigned` |`Int64`|
 | `integer` |`Int32` |
 | `integer unsigned` |`Int64` |
+| `json` |`String` |
 | `long varbinary` |`Byte[]` |
 | `long varchar` |`String` |
 | `longblob` |`Byte[]` |

articles/data-factory/connector-mysql.md

@@ -7,7 +7,7 @@ ms.author: bozhlin
 ms.reviewer: ssalgado
 ms.service: machine-learning
 ms.subservice: core
-ms.date: 08/31/2022
+ms.date: 01/02/2023
 ms.topic: how-to
 ms.custom: build-spring-2022, cliv2, sdkv2, event-tier1-build-2022
 ---
@@ -20,7 +20,7 @@ Once Azure Machine Learning extension is deployed on AKS or Arc Kubernetes clust
 
 ## Prerequisites
 
-Attaching a Kubernetes cluster to Azure Machine Learning workspace can flexibly support many different scenarios, such as the shared scenarios with multiple attachments, model training scripts accessing Azure resources, and the authentication configuration of the workspace. But you need to pay attention to the following prerequisites.
+Attaching a Kubernetes cluster to Azure Machine Learning workspace can flexibly support many different scenarios. For example, the shared scenarios with multiple attachments, model training scripts accessing Azure resources, and the authentication configuration of the workspace. 
 
 #### Multi-attach and workload isolation
 
@@ -103,7 +103,7 @@ Attaching a Kubernetes cluster makes it available to your workspace for training
 
 1. Enter a compute name and select your Kubernetes cluster from the dropdown.
 
-    * **(Optional)** Enter Kubernetes namespace, which defaults to `default`. All machine learning workloads will be sent to the specified Kubernetes namespace in the cluster. Compute attach won't create the Kubernetes namespace automatically or validate whether the kubernetes namespace exists. You need to verify that the specified namespace exists in your cluster, otherwise, any Azure Machine Learning workloads submitted to this compute will fail.  
+    * **(Optional)** Enter Kubernetes namespace, which defaults to `default`. All machine learning workloads are sent to the specified Kubernetes namespace in the cluster. Compute attach doesn't create the Kubernetes namespace automatically or validate whether the kubernetes namespace exists. You need to verify that the specified namespace exists in your cluster, otherwise, any Azure Machine Learning workloads submitted to this compute would fail.  
 
     * **(Optional)** Assign system-assigned or user-assigned managed identity. Managed identities eliminate the need for developers to manage credentials. For more information, see the [Assign managed identity](#assign-managed-identity-to-the-compute-target) section of this article.
 
@@ -180,7 +180,7 @@ Azure offers a couple of ways to assign roles to a managed identity.
 - [Use Azure CLI to assign roles](../role-based-access-control/role-assignments-cli.md)
 - [Use Azure PowerShell to assign roles](../role-based-access-control/role-assignments-powershell.md)
 
-If you are using the Azure portal to assign roles and have a **system-assigned managed identity**, **Select User**, **Group Principal** or **Service Principal**, you can search for the identity name by selecting **Select members**. The identity name needs to be formatted as: `<workspace name>/computes/<compute target name>`.
+If you're using the Azure portal to assign roles and have a **system-assigned managed identity**, **Select User**, **Group Principal** or **Service Principal**, you can search for the identity name by selecting **Select members**. The identity name needs to be formatted as: `<workspace name>/computes/<compute target name>`.
 
 If you have user-assigned managed identity, select **Managed identity** to find the target identity.
 
@@ -194,4 +194,4 @@ You can use a managed identity to access Azure Blob:
 
 - [Create and manage instance types](./how-to-manage-kubernetes-instance-types.md)
 - [Azure Machine Learning inference router and connectivity requirements](./how-to-kubernetes-inference-routing-azureml-fe.md)
-- [Secure AKS inferencing environment](./how-to-secure-kubernetes-inferencing-environment.md)
+- [Secure AKS inferencing environment](./how-to-secure-kubernetes-inferencing-environment.md)

articles/machine-learning/how-to-attach-kubernetes-to-workspace.md

@@ -10,7 +10,7 @@ ms.service: machine-learning
 ms.subservice: core
 ms.custom: event-tier1-build-2022
 ms.topic: how-to
-ms.date: 05/25/2021
+ms.date: 01/15/2023
 monikerRange: 'azureml-api-2 || azureml-api-1'
 ---
 
@@ -93,7 +93,7 @@ The extension currently supports datastores of the following types:
 For more information, see [datastore](concept-data.md#datastore).
 :::moniker-end
 :::moniker range="azureml-api-1"
-For more information, see [datastore](./v1/concept-data.md#connect-to-storage-with-datastores).
+For more information, see [datastore](concept-data.md).
 :::moniker-end
 ### Create a datastore
 
@@ -125,7 +125,7 @@ The extension currently supports the following dataset types:
 - *Tabular*: Allows you to materialize data into a DataFrame.
 - *File*: A file or collection of files. Allows you to download or mount files to your compute.
 
-For more information, see [datasets](./v1/concept-data.md)
+For more information, see [datasets](./concept-data.md)
 
 ### Create dataset
 
@@ -178,7 +178,7 @@ Alternatively, use the `> Azure ML: View Environment` command in the command pal
 :::moniker range="azureml-api-1"
 ## Experiments
 
-For more information, see [experiments](v1/concept-azure-machine-learning-architecture.md#experiments).
+For more information, see [experiments](concept-azure-machine-learning-architecture.md).
 :::moniker-end
 
 ### Create job
@@ -354,7 +354,7 @@ Alternatively, use the `> Azure ML: View Compute Properties` and `> Azure ML: De
 For more information, see [train machine learning models](concept-train-machine-learning-model.md).
 :::moniker-end
 :::moniker range="azureml-api-1"
-For more information, see [train machine learning models](./v1/concept-train-machine-learning-model.md).
+For more information, see [train machine learning models](./concept-train-machine-learning-model.md).
 :::moniker-end
 
 ### Create model
@@ -398,7 +398,7 @@ Alternatively, use the `> Azure ML: Remove Model` command in the command palette
 For more information, see [endpdoints](concept-endpoints.md).
 :::moniker-end
 :::moniker range="azureml-api-1"
-For more information, see [endpoints](v1/concept-azure-machine-learning-architecture.md#endpoints).
+For more information, see [endpoints](concept-azure-machine-learning-architecture.md).
 :::moniker-end
 
 ### Create endpoint

articles/machine-learning/how-to-manage-resources-vscode.md

@@ -8,7 +8,7 @@ author: tbombach
 ms.author: tbombach
 ms.service: machine-learning
 ms.subservice: core
-ms.date: 10/21/2021
+ms.date: 01/16/2023
 ms.topic: how-to
 ms.custom: devplatv2, event-tier1-build-2022, build-2023
 monikerRange: 'azureml-api-1 || azureml-api-2'
@@ -72,6 +72,8 @@ To choose your default workspace, select the **Set Azure Machine Learning Worksp
 
 Alternatively, use the `> Azure ML: Set Default Workspace` command in the command palette and follow the prompts to set your workspace.
 
+To open the command palette, Press `Command` and `P` on your keyboard. Then type `> Azure ML: Set Default Workspace`. 
+
 ## Next Steps
 
 - [Manage your Azure Machine Learning resources](how-to-manage-resources-vscode.md)