Merge pull request #241807 from Blackmist/v1-v2-checkup

verifying & cleaning up v2->v1 links

Author: ShannonLeavitt

articles/machine-learning/concept-soft-delete.md

@@ -11,7 +11,7 @@ ms.author: deeikele
 author: deeikele
 ms.reviewer: larryfr
 ms.date: 11/07/2022
-monikerRange: 'azureml-api-2'
+monikerRange: 'azureml-api-2 || azureml-api-1'
 #Customer intent: As an IT pro, understand how to enable data protection capabilities, to protect against accidental deletion.
 ---
 
@@ -61,11 +61,17 @@ During the retention period, soft deleted workspaces can be recovered or permane
 
 The default deletion behavior when deleting a workspace is soft delete. Optionally, you may override the soft delete behavior by permanently deleting your workspace. Permanently deleting a workspace ensures workspace data is immediately deleted. Use this option to meet related compliance requirements, or whenever you require a workspace name to be reused immediately after deletion. This may be useful in dev/test scenarios where you want to create and later delete a workspace.
 
-When deleting a workspace from the Azure Portal, check __Delete the workspace permanently__. You can permanently delete only one workspace at a time, and not using a batch operation. 
+When deleting a workspace from the Azure portal, check __Delete the workspace permanently__. You can permanently delete only one workspace at a time, and not using a batch operation. 
 
 :::image type="content" source="./media/concept-soft-delete/soft-delete-permanently-delete.png" alt-text="Screenshot of the delete workspace form in the portal.":::
 
-If you are using the [Azure Machine Learning SDK or CLI](https://learn.microsoft.com/python/api/azure-ai-ml/azure.ai.ml.operations.workspaceoperations#azure-ai-ml-operations-workspaceoperations-begin-delete), you can set the `permanently_delete` flag.
+:::moniker range="azureml-api-1"
+> [!TIP]
+> The v1 SDK and CLI don't provide functionality to override the default soft-delete behavior. To override the default behavior from SDK or CLI, use the the v2 versions. For more information, see the [CLI & SDK v2](concept-v2.md) article or the [v2 version of this article](concept-soft-delete.md?view=azureml-api-2&preserve-view=true#deleting-a-workspace).
+
+:::moniker-end  
+:::moniker range="azureml-api-2"
+If you are using the [Azure Machine Learning SDK or CLI](/python/api/azure-ai-ml/azure.ai.ml.operations.workspaceoperations#azure-ai-ml-operations-workspaceoperations-begin-delete), you can set the `permanently_delete` flag.
 
 ```python
 from azure.ai.ml import MLClient
@@ -85,6 +91,8 @@ result = ml_client.workspaces.begin_delete(
 
 print(result)
 ```
+:::moniker-end
+
 Once permanently deleted, workspace data can no longer be recovered. Permanent deletion of workspace data is also triggered when the soft delete retention period expires.
 
 ## Manage soft deleted workspaces

articles/machine-learning/how-to-manage-kubernetes-instance-types.md

@@ -195,7 +195,7 @@ code_configuration:
 instance_type: <instance type name>
 environment: 
   conda_file: file:./model/conda.yml
-  image: mcr.microsoft.com/azureml/openmpi3.1.2-ubuntu18.04:20210727.v1
+  image: mcr.microsoft.com/azureml/openmpi3.1.2-ubuntu18.04:latest
 ```
 
 #### [Python SDK](#tab/select-instancetype-to-modeldeployment-with-sdk)
@@ -208,7 +208,7 @@ from azure.ai.ml import KubernetesOnlineDeployment,Model,Environment,CodeConfigu
 model = Model(path="./model/sklearn_mnist_model.pkl")
 env = Environment(
     conda_file="./model/conda.yml",
-    image="mcr.microsoft.com/azureml/openmpi3.1.2-ubuntu18.04:20210727.v1",
+    image="mcr.microsoft.com/azureml/openmpi3.1.2-ubuntu18.04:latest",
 )
 
 # define the deployment
@@ -248,7 +248,7 @@ code_configuration:
   scoring_script: score.py
 environment: 
   conda_file: file:./model/conda.yml
-  image: mcr.microsoft.com/azureml/openmpi3.1.2-ubuntu18.04:20210727.v1
+  image: mcr.microsoft.com/azureml/openmpi3.1.2-ubuntu18.04:latest
 resources:
   requests:
     cpu: "0.1"
@@ -274,7 +274,7 @@ from azure.ai.ml import (
 model = Model(path="./model/sklearn_mnist_model.pkl")
 env = Environment(
     conda_file="./model/conda.yml",
-    image="mcr.microsoft.com/azureml/openmpi3.1.2-ubuntu18.04:20210727.v1",
+    image="mcr.microsoft.com/azureml/openmpi3.1.2-ubuntu18.04:latest",
 )
 
 requests = ResourceSettings(cpu="0.1", memory="0.2G")

articles/machine-learning/how-to-manage-models.md

@@ -8,7 +8,7 @@ ms.author: osomorog
 ms.reviewer: larryfr
 ms.service: machine-learning
 ms.subservice: mlops
-ms.date: 04/15/2022
+ms.date: 06/16/2023
 ms.topic: conceptual
 ms.custom: cli-v2, sdk-v2, event-tier1-build-2022, ignite-2022, devx-track-azurecli
 ---

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

@@ -8,7 +8,7 @@ ms.subservice: core
 ms.author: deeikele
 author: deeikele
 ms.reviewer: larryfr
-ms.date: 08/12/2022
+ms.date: 06/16/2023
 ms.topic: how-to
 ms.custom: devx-track-azurecli, cliv2, event-tier1-build-2022
 ---
@@ -334,7 +334,8 @@ az group delete -g <resource-group-name>
 
 For more information, see the [az ml workspace delete](/cli/azure/ml/workspace#az-ml-workspace-delete) documentation.
 
-If you accidentally deleted your workspace, are still able to retrieve your notebooks. For more information, see the [workspace deletion](./v1/how-to-high-availability-machine-learning.md#workspace-deletion) section of the disaster recovery article.
+> [!TIP]
+> The default behavior for Azure Machine Learning is to _soft delete_ the workspace. This means that the workspace is not immediately deleted, but instead is marked for deletion. For more information, see [Soft delete](./concept-soft-delete.md).
 
 ## Troubleshooting
 

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

@@ -306,7 +306,8 @@ When you no longer need a workspace, delete it.
 
 [!INCLUDE [machine-learning-delete-workspace](../../includes/machine-learning-delete-workspace.md)]
 
-If you accidentally deleted your workspace, you may still be able to retrieve your notebooks. For details, see [Failover for business continuity and disaster recovery](./v1/how-to-high-availability-machine-learning.md#workspace-deletion).
+> [!TIP]
+> The default behavior for Azure Machine Learning is to _soft delete_ the workspace. This means that the workspace is not immediately deleted, but instead is marked for deletion. For more information, see [Soft delete](./concept-soft-delete.md).
 
 # [Python SDK](#tab/python)
 

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

@@ -264,7 +264,8 @@ You can also delete the resource group, which deletes the workspace and all othe
 az group delete -g <resource-group-name>
 ```
 
-If you accidentally deleted your workspace, are still able to retrieve your notebooks. For more information, see the [workspace deletion](how-to-high-availability-machine-learning.md#workspace-deletion) section of the disaster recovery article.
+> [!TIP]
+> The default behavior for Azure Machine Learning is to _soft delete_ the workspace. This means that the workspace is not immediately deleted, but instead is marked for deletion. For more information, see [Soft delete](../concept-soft-delete.md).
 
 ## Troubleshooting
 

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

@@ -248,7 +248,8 @@ When you no longer need a workspace, delete it.
 
 [!INCLUDE [machine-learning-delete-workspace](../../../includes/machine-learning-delete-workspace.md)]
 
-If you accidentally deleted your workspace, you may still be able to retrieve your notebooks. For details, see [Failover for business continuity and disaster recovery](how-to-high-availability-machine-learning.md#workspace-deletion).
+> [!TIP]
+> The default behavior for Azure Machine Learning is to _soft delete_ the workspace. This means that the workspace is not immediately deleted, but instead is marked for deletion. For more information, see [Soft delete](../concept-soft-delete.md).
 
 
 Delete the workspace `ws`: