Merge pull request #209642 from sdgilley/sdg-v2

create v2 version of samples

Author: 19BMG00

articles/machine-learning/samples-notebooks.md

@@ -1,7 +1,7 @@
 ---
-title: Example Jupyter Notebooks
+title: Example Jupyter Notebooks (v2)
 titleSuffix: Azure Machine Learning
-description: Learn how to find and use the Juypter Notebooks designed to help you explore the SDK and serve as models for your own machine learning projects.
+description: Learn how to find and use the Juypter Notebooks designed to help you explore the SDK (v2) and serve as models for your own machine learning projects.
 services: machine-learning
 ms.service: machine-learning
 ms.subservice: core
@@ -10,26 +10,28 @@ ms.topic: sample
 author: sdgilley
 ms.author: sgilley
 ms.reviewer: sgilley
-ms.date: 12/27/2021
+ms.date: 08/30/2022
 ms.custom: seodec18
 #Customer intent: As a professional data scientist, I find and run example Jupyter Notebooks for Azure Machine Learning.
 ---
 
 # Explore Azure Machine Learning with Jupyter Notebooks
 
-The [Azure Machine Learning Notebooks repository](https://github.com/azure/machinelearningnotebooks) includes the latest Azure Machine Learning Python SDK samples. These Jupyter notebooks are designed to help you explore the SDK and serve as models for your own machine learning projects.  In this repository, you'll find tutorial notebooks in the **tutorials** folder and feature-specific notebooks in the **how-to-use-azureml** folder.
+[!INCLUDE [sdk v2](../../includes/machine-learning-sdk-v2.md)]
+> [!div class="op_single_selector" title1="Select the Azure Machine Learning version you are using:"]
+> * [v1](<v1/samples-notebooks-v1.md>)
+> * [v2 (preview)](samples-notebooks.md)
 
-Also explore the community-driven repository of [AzureML-Examples](https://github.com/Azure/azureml-examples). This repository includes notebooks and [CLI (v2)](how-to-configure-cli.md) examples. For information on the various example types, see the [readme](https://github.com/Azure/azureml-examples#azure-machine-learning-examples).
+The [AzureML-Examples](https://github.com/Azure/azureml-examples) repository includes the latest (v2) Azure Machine Learning Python CLI and SDK samples. For information on the various example types, see the [readme](https://github.com/Azure/azureml-examples#azure-machine-learning-examples).
 
-This article shows you how to access the repositories from the following environments:
+This article shows you how to access the repository from the following environments:
 
-- [Azure Machine Learning compute instance](#notebookvm)
-- [Bring your own notebook server](#byo)
-- [Data Science Virtual Machine](#dsvm)
+- Azure Machine Learning compute instance
+- Your own compute resource
+- Data Science Virtual Machine
 
 
-<a name="notebookvm"></a>
-## Get samples on Azure Machine Learning compute instance
+## Option 1: Access on Azure Machine Learning compute instance (recommended)
 
 The easiest way to get started with the samples is to complete the [Quickstart: Get started with Azure Machine Learning](quickstart-create-resources.md). Once completed, you'll have a dedicated notebook server pre-loaded with the SDK and the Azure Machine Learning Notebooks repository. No downloads or installation necessary.
 
@@ -39,22 +41,20 @@ To add the community-driven repository, [use a compute instance terminal](how-to
 git clone https://github.com/Azure/azureml-examples.git --depth 1
 ```
 
-<a name="byo"></a>
-
-## Get samples on your notebook server
+## Option 2: Access on your own notebook server
 
 If you'd like to bring your own notebook server for local development, follow these steps on your computer.
 
-[!INCLUDE [aml-your-server](../../includes/aml-your-server.md)]
+[!INCLUDE [aml-your-server](../../includes/aml-your-server-v2.md)]
+
+These instructions install the base SDK packages necessary for the quickstart and tutorial notebooks. Other sample notebooks may require you to install extra components. For more information, see [Install the Azure Machine Learning SDK for Python](https://aka.ms/sdk-v2-install).
 
-These instructions install the base SDK packages necessary for the quickstart and tutorial notebooks. Other sample notebooks may require you to install extra components. For more information, see [Install the Azure Machine Learning SDK for Python](/python/api/overview/azure/ml/install).
 
-<a name="dsvm"></a>
-## Get samples on DSVM
+## Option 3: Access on a DSVM
 
 The Data Science Virtual Machine (DSVM) is a customized VM image built specifically for doing data science. If you [create a DSVM](how-to-configure-environment.md#dsvm), the SDK and notebook server are installed and configured for you. However, you'll still need to create a workspace and clone the sample repository.
 
-[!INCLUDE [aml-dsvm-server](../../includes/aml-dsvm-server.md)]
+[!INCLUDE [aml-dsvm-server](../../includes/aml-dsvm-server-v2.md)]
 
 ## Next steps
 

articles/machine-learning/v1/samples-notebooks-v1.md

@@ -0,0 +1,59 @@
+---
+title: Example Jupyter Notebooks (v1)
+titleSuffix: Azure Machine Learning
+description: Learn how to find and use the Juypter Notebooks designed to help you explore the SDK (v1) and serve as models for your own machine learning projects.
+services: machine-learning
+ms.service: machine-learning
+ms.subservice: core
+ms.topic: sample
+
+author: sdgilley
+ms.author: sgilley
+ms.reviewer: sgilley
+ms.date: 12/27/2021
+ms.custom: seodec18
+#Customer intent: As a professional data scientist, I find and run example Jupyter Notebooks for Azure Machine Learning.
+---
+
+# Explore Azure Machine Learning with Jupyter Notebooks (v1)
+
+[!INCLUDE [sdk v1](../../../includes/machine-learning-sdk-v1.md)]
+> [!div class="op_single_selector" title1="Select the Azure Machine Learning version you are using:"]
+> * [v1](<samples-notebooks-v1.md>)
+> * [v2 (preview)](../samples-notebooks.md)
+
+The [Azure Machine Learning Notebooks repository](https://github.com/azure/machinelearningnotebooks) includes Azure Machine Learning Python SDK (v1) samples. These Jupyter notebooks are designed to help you explore the SDK and serve as models for your own machine learning projects.  In this repository, you'll find tutorial notebooks in the **tutorials** folder and feature-specific notebooks in the **how-to-use-azureml** folder.
+
+This article shows you how to access the repositories from the following environments:
+
+- Azure Machine Learning compute instance
+- Bring your own notebook server
+- Data Science Virtual Machine
+
+
+## Option 1: Access on Azure Machine Learning compute instance (recommended)
+
+The easiest way to get started with the samples is to complete the [Quickstart: Get started with Azure Machine Learning](../quickstart-create-resources.md). Once completed, you'll have a dedicated notebook server pre-loaded with the SDK and the Azure Machine Learning Notebooks repository. No downloads or installation necessary.
+
+## Option 2: Access on your own notebook server
+
+If you'd like to bring your own notebook server for local development, follow these steps on your computer.
+
+[!INCLUDE [aml-your-server](../../../includes/aml-your-server.md)]
+
+These instructions install the base SDK packages necessary for the quickstart and tutorial notebooks. Other sample notebooks may require you to install extra components. For more information, see [Install the Azure Machine Learning SDK for Python](/python/api/overview/azure/ml/install).
+
+## Option 3: Access on a DSVM
+
+The Data Science Virtual Machine (DSVM) is a customized VM image built specifically for doing data science. If you [create a DSVM](../how-to-configure-environment.md#dsvm), the SDK and notebook server are installed and configured for you. However, you'll still need to create a workspace and clone the sample repository.
+
+[!INCLUDE [aml-dsvm-server](../../../includes/aml-dsvm-server.md)]
+
+## Next steps
+
+Explore the [MachineLearningNotebooks](https://github.com/Azure/MachineLearningNotebooks) repository to discover what Azure Machine Learning can do.
+
+For more GitHub sample projects and examples, see these repos:
++ [Microsoft/MLOps](https://github.com/Microsoft/MLOps)
++ [Microsoft/MLOpsPython](https://github.com/microsoft/MLOpsPython)
+

articles/machine-learning/v1/toc.yml

@@ -56,6 +56,14 @@
           href: tutorial-1st-experiment-bring-data.md
     - name: "Build a training pipeline (Python)"
       href: "tutorial-pipeline-python-sdk.md"
+- name: Samples (v1)
+  items: 
+    - name: Jupyter Notebooks
+      displayName: example, examples, server, jupyter, azure notebooks, python, notebook, github
+      href: samples-notebooks-v1.md
+    - name: Examples repository
+      displayName: example, examples, jupyter, python, notebook, github
+      href: https://github.com/azure/machinelearningnotebooks
 - name: How-to guides (v1)
   items:
   - name: Install and set up the CLI (v1)

includes/aml-dsvm-server-v2.md

@@ -0,0 +1,34 @@
+---
+title: "include file"
+description: "include file"
+services: machine-learning
+author: sdgilley
+ms.service: machine-learning
+ms.author: sgilley
+manager: cgronlund
+ms.custom: "include file"
+ms.topic: "include"
+ms.date: 12/27/2021
+---
+
+1. [Create an Azure Machine Learning workspace](../articles/machine-learning/how-to-manage-workspace.md).
+
+1. Download a workspace configuration file:
+
+    * Sign in to [Azure Machine Learning studio](https://ml.azure.com)
+    * Select your workspace settings in the upper right
+    * Select **Download config file**
+
+    ![Download config.json](./media/aml-dsvm-server/download-config.png)
+
+1. From the directory where you added the configuration file, clone the [the AzureML-Examples repository](https://aka.ms/aml-notebooks).
+
+    ```bash
+    git clone https://github.com/Azure/azureml-examples.git --depth 1
+    ```
+
+1. Start the notebook server from the directory, which now contains the clone and the config file.
+
+    ```bash
+    jupyter notebook
+    ```

includes/aml-dsvm-server.md

@@ -15,25 +15,19 @@ ms.date: 12/27/2021
 
 1. Add a workspace configuration file using either of these methods:
 
-    * In the [Azure portal](https://portal.azure.com), select  **Download config.json** from the **Overview** section of your workspace. 
+    * In [Azure Machine Learning studio](https://ml.azure.com), select your workspace settings in the upper right, then select **Download config file**. 
 
     ![Download config.json](./media/aml-dsvm-server/download-config.png)
 
-    * Create a new workspace using code in the [configuration.ipynb](https://github.com/Azure/MachineLearningNotebooks/blob/master/configuration.ipynb) notebook in your cloned directory.
+    * Create a new workspace using code in the [configuration.ipynb](https://github.com/Azure/MachineLearningNotebooks/blob/master/configuration.ipynb) notebook.
 
 1. From the directory where you added the configuration file, clone [the Machine Learning Notebooks repository](https://aka.ms/aml-notebooks).
 
     ```bash
     git clone https://github.com/Azure/MachineLearningNotebooks.git --depth 1
     ```
 
-1. From the same directory, clone [the AzureML-Examples repository](https://aka.ms/aml-notebooks).
-
-    ```bash
-    git clone https://github.com/Azure/azureml-examples.git --depth 1
-    ```
-
-1. Start the notebook server from the directory, which now contains the two clones and the config file.
+1. Start the notebook server from the directory, which now contains the clone and the config file.
 
     ```bash
     jupyter notebook

includes/aml-your-server-v2.md

@@ -0,0 +1,30 @@
+---
+title: "include file"
+description: "include file"
+services: machine-learning
+author: sdgilley
+ms.service: machine-learning
+ms.author: sgilley
+manager: scottpolly
+ms.custom: "include file"
+ms.topic: "include"
+ms.date: 08/30/2022
+---
+
+1. Use the instructions at [Azure Machine Learning SDK](https://aka.ms/sdk-v2-install)  to install the Azure Machine Learning SDK (v2) for Python
+
+1. Create an [Azure Machine Learning workspace](../articles/machine-learning/how-to-manage-workspace.md).
+
+1. Write a  [configuration file](../articles/machine-learning/how-to-configure-environment.md#workspace) file (**aml_config/config.json**).
+
+1. Clone [the AzureML-Examples repository](https://aka.ms/aml-notebooks).
+
+    ```bash
+    git clone https://github.com/Azure/azureml-examples.git --depth 1
+    ```
+
+1. Start the notebook server from the directory containing your clone.
+
+    ```bash
+    jupyter notebook
+    ```

includes/aml-your-server.md

@@ -11,7 +11,7 @@ ms.topic: "include"
 ms.date: 12/27/2021
 ---
 
-1. Use the instructions at [Azure Machine Learning SDK](/python/api/overview/azure/ml/install)  to install the Azure Machine Learning SDK for Python
+1. Use the instructions at [Azure Machine Learning SDK](/python/api/overview/azure/ml/install)  to install the Azure Machine Learning SDK (v1) for Python
 
 1. Create an [Azure Machine Learning workspace](../articles/machine-learning/how-to-manage-workspace.md).
 
@@ -23,13 +23,7 @@ ms.date: 12/27/2021
     git clone https://github.com/Azure/MachineLearningNotebooks.git --depth 1
     ```
 
-1. Clone [the AzureML-Examples repository](https://aka.ms/aml-notebooks).
-
-    ```bash
-    git clone https://github.com/Azure/azureml-examples.git --depth 1
-    ```
-
-1. Start the notebook server from the directory containing both these clones.
+1. Start the notebook server from the directory containing your clone.
 
     ```bash
     jupyter notebook