Merge pull request #101256 from MicrosoftDocs/master

1/15 AM Publish

Author: huypub

.openpublishing.redirection.json

@@ -29,6 +29,8 @@
   items:
     - name: Create a managed domain using Azure PowerShell
       href: powershell-create-instance.md
+    - name: Create a managed domain using a template
+      href: template-create-instance.md
 - name: Concepts
   items:
     - name: Administration basics

articles/active-directory-domain-services/TOC.yml

@@ -18,7 +18,8 @@ ms.collection: M365-identity-device-management
 
 This article describes how to move your organization domains from Active Directory Federation Services (AD FS) to pass-through authentication.
 
-You can [download this article](https://aka.ms/ADFSTOPTADPDownload).
+> [!NOTE]
+> Changing your authentication method requires planning, testing, and potentially downtime. [Staged rollout](how-to-connect-staged-rollout.md) provides an alternative way to test and gradually migrate from federation to cloud authentication using pass-through authentication.
 
 ## Prerequisites for migrating to pass-through authentication
 

articles/active-directory-domain-services/template-create-instance.md

@@ -18,7 +18,8 @@ ms.collection: M365-identity-device-management
 
 This article describes how to move your organization domains from Active Directory Federation Services (AD FS) to password hash synchronization.
 
-You can [download this article](https://aka.ms/ADFSTOPHSDPDownload).
+> [!NOTE]
+> Changing your authentication method requires planning, testing, and potentially downtime. [Staged rollout](how-to-connect-staged-rollout.md) provides an alternative way to test and gradually migrate from federation to cloud authentication using password hash synchronization.
 
 ## Prerequisites for migrating to password hash synchronization
 

articles/active-directory/hybrid/plan-migrate-adfs-pass-through-authentication.md

@@ -14,7 +14,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: tutorial
-ms.date: 08/09/2019
+ms.date: 01/15/2020
 ms.author: jeedes
 
 ms.collection: M365-identity-device-management
@@ -155,21 +155,29 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 
 ## Configure Cisco Webex
 
-1. Sign in to [Cisco Cloud Collaboration Management](https://admin.ciscospark.com/) with your full administrator credentials.
+1. To automate the configuration within Cisco Webex, you need to install **My Apps Secure Sign-in browser extension** by clicking **Install the extension**.
 
-2. Select **Settings** and under the **Authentication** section, click **Modify**.
+	![My apps extension](common/install-myappssecure-extension.png)
+
+2. After adding extension to the browser, click on **Set up Cisco Webex** will direct you to the Cisco Webex application. From there, provide the admin credentials to sign into Cisco Webex. The browser extension will automatically configure the application for you and automate steps 3-8.
+
+	![Setup configuration](common/setup-sso.png)
+
+3. If you want to setup Cisco Webex manually, sign in to [Cisco Cloud Collaboration Management](https://admin.ciscospark.com/) with your full administrator credentials.
+
+4. Select **Settings** and under the **Authentication** section, click **Modify**.
 
     ![Configure Single Sign-On](./media/cisco-spark-tutorial/tutorial-cisco-spark-10.png)
 
-3. Select **Integrate a 3rd-party identity provider. (Advanced)** and go to the next screen.
+5. Select **Integrate a 3rd-party identity provider. (Advanced)** and go to the next screen.
 
-4. On the **Import Idp Metadata** page, either drag and drop the Azure AD metadata file onto the page or use the file browser option to locate and upload the Azure AD metadata file. Then, select **Require certificate signed by a certificate authority in Metadata (more secure)** and click **Next**.
+6. On the **Import Idp Metadata** page, either drag and drop the Azure AD metadata file onto the page or use the file browser option to locate and upload the Azure AD metadata file. Then, select **Require certificate signed by a certificate authority in Metadata (more secure)** and click **Next**.
 
 	![Configure Single Sign-On](./media/cisco-spark-tutorial/tutorial-cisco-spark-11.png)
 
-5. Select **Test SSO Connection**, and when a new browser tab opens, authenticate with Azure AD by signing in.
+7. Select **Test SSO Connection**, and when a new browser tab opens, authenticate with Azure AD by signing in.
 
-6. Return to the **Cisco Cloud Collaboration Management** browser tab. If the test was successful, select **This test was successful. Enable Single Sign-On option** and click **Next**.
+8. Return to the **Cisco Cloud Collaboration Management** browser tab. If the test was successful, select **This test was successful. Enable Single Sign-On option** and click **Next**.
 
 ### Create Cisco Webex test user
 

articles/active-directory/hybrid/plan-migrate-adfs-password-hash-sync.md

@@ -1,162 +1,233 @@
 ---
-title: 'Quickstart: Create a Linux Python app'
-description: Get started with Linux apps on Azure App Service by deploying your first Python app to a Linux container in App Service.
+title: 'Quickstart: Create Python app on Linux - Azure App Service'
+description: Deploy your first Python hello world app in Azure App Service on Linux in minutes.
+services: app-service\web
+documentationcenter: ''
 author: msangapu-msft
 
 ms.topic: quickstart
-ms.date: 08/23/2019
-ms.custom: mvc
-ms.custom: seodec18
+ms.date: 1/14/2020
+ms.author: msangapu
+ms.custom: seo-python-october2019
 
 experimental: false
-experiment_id: 1e304dc9-5add-4b
+experiment_id: 01a9132f-eaab-4c
 ---
-# Create a Python app in Azure App Service on Linux
+# Quickstart: Create a Python app in Azure App Service on Linux
 
-In this quickstart, you deploy a simple Python app to [App Service on Linux](app-service-linux-intro.md), which provides a highly scalable, self-patching web hosting service. You use the Azure command-line interface (the [Azure CLI](/cli/azure/install-azure-cli)) through the interactive, browser-based Azure Cloud Shell, so you can follow the steps use a Mac, Linux, or Windows computer.
+In this quickstart, you deploy a Python web app to [App Service on Linux](app-service-linux-intro.md), Azure's highly scalable, self-patching web hosting service. You use the local [Azure command-line interface (CLI)](/cli/azure/install-azure-cli) on a Mac, Linux, or Windows computer. The web app you configure uses a free App Service tier, so you incur no costs in the course of this article.
 
-![Sample app running in Azure](media/quickstart-python/hello-world-in-browser.png)
+If you prefer to deploy apps through an IDE, see [Deploy Python apps to App Service from Visual Studio Code](/azure/python/tutorial-deploy-app-service-on-linux-01).
 
-[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
+## Prerequisites
 
-[!INCLUDE [cloud-shell-try-it.md](../../../includes/cloud-shell-try-it.md)]
+- Azure subscription - [create one for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio)
+- <a href="https://www.python.org/downloads/" target="_blank">Python 3.7</a> (Python 3.6 is also supported)
+- <a href="https://git-scm.com/downloads" target="_blank">Git</a>
+- <a href="https://docs.microsoft.com/cli/azure/install-azure-cli" target="_blank">Azure CLI</a>
 
 ## Download the sample
 
-In the Cloud Shell, create a quickstart directory and then change to it.
+In a terminal window, run the following command to clone the sample application to your local computer. 
 
-```bash
-mkdir quickstart
-
-cd $HOME/quickstart
+```terminal
+git clone https://github.com/Azure-Samples/python-docs-hello-world
 ```
 
-Next, run the following command to clone the sample app repository to your quickstart directory.
+Then go into that folder:
 
-```bash
-git clone https://github.com/Azure-Samples/python-docs-hello-world
+```terminal
+cd python-docs-hello-world
 ```
 
-While running, it displays information similar to the following example:
+The repository contains an *application.py* file, which tells App Service that the code contains a Flask app. For more information, see [Container startup process and customizations](how-to-configure-python.md).
 
-```bash
-Cloning into 'python-docs-hello-world'...
-remote: Enumerating objects: 43, done.
-remote: Total 43 (delta 0), reused 0 (delta 0), pack-reused 43
-Unpacking objects: 100% (43/43), done.
-Checking connectivity... done.
+## Sign in to Azure
+
+The Azure CLI provides you with many convenient commands that you use from a local terminal to provision and manage Azure resources from the command line. You can use commands to complete the same tasks that you would through the Azure portal in a browser. You can also use CLI commands in scripts to automate management processes.
+
+To run Azure commands in the Azure CLI, you must first sign in using the `az login` command. This command opens a browser to gather your credentials.
+
+```terminal
+az login
 ```
 
-## Create a web app
+## Deploy the sample
 
-Change to the directory that contains the sample code and run the `az webapp up` command.
+The [`az webapp up`](/cli/azure/webapp#az-webapp-up) command creates the web app on App Service and deploys your code.
 
-In the following example, replace *\<app_name>* with a globally unique app name (valid characters are `a-z`, `0-9`, and `-`).
+In the *python-docs-hello-world* folder that contains the sample code, run the following `az webapp up` command. Replace  `<app-name>` with a globally unique app name (*valid characters are `a-z`, `0-9`, and `-`*). Also replace `<location-name>` with an Azure region such as **centralus**, **eastasia**, **westeurope**, **koreasouth**, **brazilsouth**, **centralindia**, and so on. (You can retrieve a list of allowable regions for your Azure account by running the [`az account locations-list`](/cli/azure/appservice?view=azure-cli-latest.md#az-appservice-list-locations) command.)
 
-```bash
-cd python-docs-hello-world
 
-az webapp up -n <app_name>
+```terminal
+az webapp up --sku F1 -n <app-name> -l <location-name>
 ```
 
-This command may take a few minutes to run. While running, it displays information similar to the following example:
+This command may take a few minutes complete run. While running, it displays information similar to the following example:
 
-```json
+```output
 The behavior of this command has been altered by the following extension: webapp
-Creating Resource group 'appsvc_rg_Linux_CentralUS' ...
+Creating Resource group 'appsvc_rg_Linux_centralus' ...
 Resource group creation complete
-Creating App service plan 'appsvc_asp_Linux_CentralUS' ...
+Creating App service plan 'appsvc_asp_Linux_centralus' ...
 App service plan creation complete
-Creating app '<app_name>' ....
+Creating app '<app-name>' ....
 Webapp creation complete
 Creating zip with contents of dir /home/username/quickstart/python-docs-hello-world ...
 Preparing to deploy contents to app.
 All done.
 {
-  "app_url": "https:/<app_name>.azurewebsites.net",
+  "app_url": "https:/<app-name>.azurewebsites.net",
   "location": "Central US",
-  "name": "<app_name>",
+  "name": "<app-name>",
   "os": "Linux",
-  "resourcegroup": "appsvc_rg_Linux_CentralUS ",
-  "serverfarm": "appsvc_asp_Linux_CentralUS",
+  "resourcegroup": "appsvc_rg_Linux_centralus ",
+  "serverfarm": "appsvc_asp_Linux_centralus",
   "sku": "BASIC",
   "src_path": "/home/username/quickstart/python-docs-hello-world ",
   "version_detected": "-",
   "version_to_create": "python|3.7"
 }
 ```
 
-The `az webapp up` command does the following actions:
+[!INCLUDE [AZ Webapp Up Note](../../../includes/app-service-web-az-webapp-up-note.md)]
 
-- Create a default resource group.
+## Browse to the app
 
-- Create a default app service plan.
+Browse to the deployed application in your web browser at the URL `http://<app-name>.azurewebsites.net`.
 
-- Create an app with the specified name.
+The Python sample code is running a Linux container in App Service using a built-in image.
 
-- [Zip deploy](https://docs.microsoft.com/azure/app-service/deploy-zip) files from the current working directory to the app.
+![Run a sample Python app in Azure](./media/quickstart-python/run-hello-world-sample-python-app-in-browser.png)
 
-## Browse to the app
+**Congratulations!** You've deployed your Python app to App Service on Linux.
+
+## Run the sample app locally
+
+In a terminal window, use the commands below (as appropriate for your operating system) to install the required dependencies and launch the built-in development server. 
 
-Browse to the deployed application using your web browser.
+# [Bash](#tab/bash)
 
 ```bash
-http://<app_name>.azurewebsites.net
+python3 -m venv venv
+source venv/bin/activate
+pip install -r requirements.txt
+FLASK_APP=application.py
+flask run
 ```
 
-The Python sample code is running in App Service on Linux with a built-in image.
+# [PowerShell](#tab/powershell)
+
+```powershell
+py -3 -m venv env
+env\scripts\activate
+pip install -r requirements.txt
+Set-Item Env:FLASK_APP ".\application.py"
+flask run
+```
+
+# [Cmd](#tab/cmd)
+
+```cmd
+py -3 -m venv env
+env\scripts\activate
+pip install -r requirements.txt
+SET FLASK_APP=application.py
+flask run
+```
 
-![Sample app running in Azure](media/quickstart-python/hello-world-in-browser.png)
+---
 
-**Congratulations!** You've deployed your first Python app to App Service on Linux.
+Open a web browser, and go to the sample app at `http://localhost:5000/`. The app displays the message **Hello World!**.
 
-## Update and redeploy the code
+![Run a sample Python app locally](./media/quickstart-python/run-hello-world-sample-python-app-in-browser.png)
 
-In the Cloud Shell, type `code application.py` to open the Cloud Shell editor.
+In your terminal window, press **Ctrl**+**C** to exit the web server.
 
-![Code application.py](media/quickstart-python/code-applicationpy.png)
+## Redeploy updates
 
- Make a small change to the text in the call to `return`:
+In your favorite code editor, open *application.py* and change the `return` statement on the last line to match the following code. The `print` statement is included here to generate logging output that you work with in the next section. 
 
 ```python
+print("Handling request to home page.")
 return "Hello Azure!"
 ```
 
-Save your changes and exit the editor. Use the command `^S` to save and `^Q` to exit.
+Save your changes and exit the editor. 
 
-You'll now redeploy the app. Substitute `<app_name>` with your app.
+Redeploy the app using the following `az webapp up` command, using the same command you used to deploy the app the first time, replacing `<app-name>` and `<location-name>` with the same names you used before. 
 
-```bash
-az webapp up -n <app_name>
+```terminal
+az webapp up --sku F1 -n <app-name> -l <location-name>
 ```
 
-Once deployment has completed, switch back to the browser window that opened in the **Browse to the app** step, and refresh the page.
+Once deployment has completed, switch back to the browser window open to `http://<app-name>.azurewebsites.net` and refresh the page, which should display the modified message:
+
+![Run an updated sample Python app in Azure](./media/quickstart-python/run-updated-hello-world-sample-python-app-in-browser.png)
 
-![Updated sample app running in Azure](media/quickstart-python/hello-azure-in-browser.png)
+> [!TIP]
+> Visual Studio Code provides powerful extensions for Python and Azure App Service, which simplify the process of deploying Python web apps to App Service. For more information, see [Deploy Python apps to App Service from Visual Studio Code](/azure/python/tutorial-deploy-app-service-on-linux-01).
 
-## Manage your new Azure app
+## Stream logs
 
-Go to the <a href="https://portal.azure.com" target="_blank">Azure portal</a> to manage the app you created.
+You can access the console logs generated from inside the app and the container in which it runs. Logs include any output generated using `print` statements.
+
+First, turn on container logging by running the following command in a terminal, replacing `<app-name>` with the name of your app and `<resource-group-name>` with the name of the resource group shown in the output of the `az webapp up` command you used (such as "appsvc_rg_Linux_centralus"):
+
+```terminal
+az webapp log config --name <app-name> --resource-group <resource-group-name> --docker-container-logging filesystem
+```
 
-From the left menu, click **App Services**, and then click the name of your Azure app.
+Once container logging is turned on, run the following command to show the log stream:
+
+```terminal
+az webapp log tail --name <app-name> --resource-group <resource-group-name>
+```
+
+Refresh the app in the browser to generate console logs, which should include lines similar to the following text. If you don't see output immediately, try again in 30 seconds.
+
+```output
+2019-10-23T12:40:03.815574424Z Handling request to home page.
+2019-10-23T12:40:03.815602424Z 172.16.0.1 - - [23/Oct/2019:12:40:03 +0000] "GET / HTTP/1.1" 200 12 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.63 Safari/537.36 Edg/78.0.276.19"
+```
 
-![Portal navigation to Azure app](./media/quickstart-python/app-service-list.png)
+You can also inspect the log files from the browser at `https://<app-name>.scm.azurewebsites.net/api/logs/docker`.
+
+To stop log streaming at any time, type `Ctrl`+`C`.
+
+## Manage the Azure app
+
+Go to the <a href="https://portal.azure.com" target="_blank">Azure portal</a> to manage the app you created. Search for and select **App Services**.
+
+![Navigate to App Services in the Azure portal](./media/quickstart-python/navigate-to-app-services-in-the-azure-portal.png)
+
+Select the name of your Azure app.
+
+![Navigate to your Python app in App Services in the Azure portal](./media/quickstart-python/navigate-to-app-in-app-services-in-the-azure-portal.png)
 
 You see your app's Overview page. Here, you can perform basic management tasks like browse, stop, start, restart, and delete.
 
-![App Service page in Azure portal](media/quickstart-python/app-service-detail.png)
+![Manage your Python app in the Overview page in the Azure portal](./media/quickstart-python/manage-an-app-in-app-services-in-the-azure-portal.png)
+
+The App Service menu provides different pages for configuring your app.
+
+## Clean up resources
 
-The left menu provides different pages for configuring your app. 
+In the preceding steps, you created Azure resources in a resource group. The resource group has a name like "appsvc_rg_Linux_CentralUS" depending on your location. If you use an App Service SKU other than the free F1 tier, these resources will incur ongoing costs.
 
-[!INCLUDE [cli-samples-clean-up](../../../includes/cli-samples-clean-up.md)]
+If you don't expect to need these resources in the future, delete the resource group by running the following command, replacing `<resource-group-name>` with the resource group shown in the output of the `az webapp up` command, such as "appsvc_rg_Linux_centralus". The command may take a minute to complete.
+
+```terminal
+az group delete -n <resource-group-name>
+```
 
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Tutorial: Python app with PostgreSQL](tutorial-python-postgresql-app.md)
+> [Tutorial: Python (Django) web app with PostgreSQL](tutorial-python-postgresql-app.md)
 
 > [!div class="nextstepaction"]
 > [Configure Python app](how-to-configure-python.md)
 
 > [!div class="nextstepaction"]
-> [Tutorial: Deploy from private container repository](tutorial-custom-docker-image.md)
+> [Tutorial: Run Python app in custom container](tutorial-custom-docker-image.md)

articles/active-directory/saas-apps/cisco-spark-tutorial.md

@@ -5,8 +5,8 @@ ms.topic: quickstart
 ms.date: 10/22/2019
 ms.custom: seo-python-october2019
 
-experimental: false
-experiment_id: 1e304dc9-5add-4b
+experimental: true
+experiment_id: 01a9132f-eaab-4c
 ---
 # Quickstart: Create a Python app in Azure App Service on Linux