Update Eclipse quickstart and sign in guidance with new device login feature (#825)

General updates to this article.

docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse-create-hello-world-web-app.md

@@ -1,7 +1,8 @@
 ---
-title: Create a Hello World web app for Azure using Eclipse
+title: Create a Hello World web app for Azure App Service using Eclipse
 description: This tutorial shows you how to use the Azure Toolkit for Eclipse to create a Hello World Web App for Azure.
 services: app-service
+keywords: java, eclipse, web app, azure app service, hello world, quick start
 documentationcenter: java
 author: selvasingh
 manager: routlaw
@@ -17,29 +18,47 @@ ms.topic: article
 ms.workload: web
 ---
 
-# Create a Hello World web app for Azure using Eclipse
+# Create a Hello World web app for Azure App Service using Eclipse
 
-This tutorial shows how to create and deploy a basic Hello World application to Azure as a web app by using the [Azure Toolkit for Eclipse].
+Using open sourced [Azure Toolkit for Eclipse](https://marketplace.eclipse.org/content/azure-toolkit-eclipse) plugin, creating and deploying a basic Hello World application to Azure App Service as a web app can be done in a few minutes.
 
 > [!NOTE]
 >
-> For a version of this article that uses the [Azure Toolkit for IntelliJ], see [Create a Hello World web app for Azure using IntelliJ][intellij-hello-world].
+> If you prefer using IntelliJ IDEA, check out our [similar tutorial for IntelliJ][intellij-hello-world].
+>
+>[!INCLUDE [quickstarts-free-trial-note](../includes/quickstarts-free-trial-note.md)]
+>
+> Don't forget to clean up the resources after you complete this tutorial. In that case, running this guide will not exceed your free account quota.
 >
 
-> [!IMPORTANT]
-> 
-> The Azure Toolkit for Eclipse was updated in August 2017 with a different workflow. This article illustrates creating a Hello World web app by using version 3.0.7 (or later) of the Azure Toolkit for Eclipse. If you are using the version 3.0.6 (or earlier) of the toolkit, you will need to follow the steps in [Create a Hello World web app for Azure in Eclipse using the legacy toolkit][Legacy Version].
-> 
+[!INCLUDE [azure-toolkit-for-intellij-basic-prerequisites](../includes/azure-toolkit-for-eclipse-basic-prerequisites.md)]
 
-When you have completed this tutorial, your application will look similar to the following illustration when you view it in a web browser:
+## Installation and sign-in
 
-![Preview of Hello World app][browse-web-app]
+1. Drag the following button to your running Eclipse workspace to install the Azure Toolkit for Eclipse plugin ([other installation options](azure-toolkit-for-eclipse-installation.md)).
 
-[!INCLUDE [azure-toolkit-for-eclipse-prerequisites](../includes/azure-toolkit-for-eclipse-prerequisites.md)]
+    [![Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client](https://marketplace.eclipse.org/sites/all/themes/solstice/public/images/marketplace/btn-install.png)](http://marketplace.eclipse.org/marketplace-client-intro?mpc_install=1919278 "Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client")
 
-## Create a new web app project
+1. To sign in to your Azure account, click **Tools**, then click **Azure**, and then click **Sign In**.
+   ![Eclipse Menu for Azure Sign In][I01]
 
-1. Start Eclipse, and sign into your Azure account by using the instructions in the [Azure Sign In Instructions for the Azure Toolkit for Eclipse][eclipse-sign-in-instructions] article.
+1. In the **Azure Sign In** window, select **Device Login**, and then click **Sign in** ([other sign-in options](azure-toolkit-for-eclipse-sign-in-instructions.md)).
+
+   ![The Azure Sign In window with device login selected][I02]
+
+1. Click **Copy&Open** in **Azure Device Login** dialog .
+
+   ![The Azure Login Dialog window][I03]
+
+1. In the browser, paste your device code (which has been copied when you clicked **Copy&Open** in last step) and then click **Next**.
+
+   ![The device login browser][I04]
+
+1. Finally, in the **Select Subscriptions** dialog box, select the subscriptions that you want to use, then click **OK**.
+
+   ![The Select Subscriptions dialog box][I05]
+
+## Creating web app project
 
 1. Click **File**, click **New**, and then click **Dynamic Web Project**. (If you don't see **Dynamic Web Project** listed as an available project after clicking **File** and **New**, then do the following: click **File**, click **New**, click **Project...**, expand **Web**, click **Dynamic Web Project**, and click **Next**.)
 
@@ -71,7 +90,7 @@ When you have completed this tutorial, your application will look similar to the
 
 8. Save index.jsp.
 
-## Deploy your web app to Azure
+## Deploying web app to Azure
 
 1. Within Eclipse's Project Explorer view, right-click your project, choose **Azure**, and then choose **Publish as Azure Web App**.
    
@@ -105,7 +124,11 @@ When you have completed this tutorial, your application will look similar to the
 
    ![Browsing your web app][browse-web-app]
 
-1. After you have published your web to Azure, you can manage your app by right-clicking on it and selecting one of the options on the context menu. For example, you can **Start**, **Stop**, or **Delete** your web app.
+[!INCLUDE [azure-toolkit-for-eclipse-show-azure-explorer](../includes/azure-toolkit-for-eclipse-show-azure-explorer.md)]
+
+## Cleaning up resources
+
+1. After you have published your web app to Azure, you can manage it by right-clicking in Azure Explorer and selecting one of the options in the context menu. For example, you can **Delete** your web app here to clean up the resource for this tutorial.
 
    ![Manage app service][manage-app-service]
 
@@ -126,6 +149,11 @@ For additional information about creating Azure Web Apps, see the [Web Apps Over
 [Legacy Version]: azure-toolkit-for-eclipse-create-hello-world-web-app-legacy-version.md
 
 <!-- IMG List -->
+[I01]: media/azure-toolkit-for-eclipse-sign-in-instructions/I01.png
+[I02]: media/azure-toolkit-for-eclipse-sign-in-instructions/I02.png
+[I03]: media/azure-toolkit-for-eclipse-sign-in-instructions/I03.png
+[I04]: media/azure-toolkit-for-eclipse-sign-in-instructions/I04.png
+[I05]: media/azure-toolkit-for-eclipse-sign-in-instructions/I05.png
 
 [browse-web-app]: ./media/azure-toolkit-for-eclipse-create-hello-world-web-app/browse-web-app.png
 [file-new-dynamic-web-project]: ./media/azure-toolkit-for-eclipse-create-hello-world-web-app/file-new-dynamic-web-project.png

docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse-installation.md

@@ -1,5 +1,5 @@
 ---
-title: Install the Azure Toolkit for Eclipse
+title: Installing the Azure Toolkit for Eclipse
 description: Learn how to install the Azure Toolkit for Eclipse plug-in to create and deploy cloud applications to Azure.
 services: ''
 documentationcenter: java
@@ -17,9 +17,12 @@ ms.topic: article
 ms.workload: na
 ---
 
-# Install the Azure Toolkit for Eclipse
+# Installing the Azure Toolkit for Eclipse
 
-The Azure Toolkit for Eclipse provides templates and functionality that allow you to easily create, develop, test, and deploy cloud applications to Azure from the Eclipse development environment.
+There are two ways to install Azure Toolkit for Eclipse:
+
+  - [Eclipse marketplace](#eclipse-marketplace)
+  - [Install new software](#install-new-software)
 
 > [!NOTE] 
 > 
@@ -28,11 +31,19 @@ The Azure Toolkit for Eclipse provides templates and functionality that allow yo
 > <https://github.com/microsoft/azure-tools-for-java> 
 > 
 
-The following steps show you how to install the Azure Toolkit for Eclipse.
+[!INCLUDE [azure-toolkit-for-eclipse-basic-prerequisites](../includes/azure-toolkit-for-eclipse-basic-prerequisites.md)]
 
-[!INCLUDE [azure-toolkit-for-eclipse-prerequisites](../includes/azure-toolkit-for-eclipse-prerequisites.md)]
+## Eclipse marketplace
 
-## To install the Azure Toolkit for Eclipse
+1. Drag the following button to your running Eclipse workspace.
+
+    [![Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client](https://marketplace.eclipse.org/sites/all/themes/solstice/public/images/marketplace/btn-install.png)](http://marketplace.eclipse.org/marketplace-client-intro?mpc_install=1919278 "Drag to your running Eclipse* workspace. *Requires Eclipse Marketplace Client")
+
+2. Otherwise, it is also possible to search and install the **Azure Toolkit for Eclipse plugin** at **Help/Eclipse Marketplace**.
+
+    ![Marketplace](./media/azure-toolkit-for-eclipse-installation/marketplace.png)
+
+## Install new software
 
 1. Start Eclipse.
 
@@ -85,7 +96,6 @@ The following steps show you how to install the Azure Toolkit for Eclipse.
 <!-- Legacy MSDN URL = https://msdn.microsoft.com/library/azure/hh690946.aspx -->
 
 <!-- IMG List -->
-
 [01]: media/azure-toolkit-for-eclipse-installation/eclipse-installation-01.png
 [02]: media/azure-toolkit-for-eclipse-installation/eclipse-installation-02.png
 [03]: media/azure-toolkit-for-eclipse-installation/eclipse-installation-03.png

docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse-sign-in-instructions.md

@@ -1,5 +1,5 @@
 ---
-title: Sign In Instructions for the Azure Toolkit for Eclipse
+title: Sign-in instructions for the Azure Toolkit for Eclipse
 description: Learn how to sign into Microsoft Azure by using the Azure Toolkit for Eclipse.
 services: ''
 documentationcenter: java
@@ -17,120 +17,88 @@ ms.topic: article
 ms.workload: na
 ---
 
-# Azure Sign In Instructions for the Azure Toolkit for Eclipse
+# Sign-in instructions for the Azure Toolkit for Eclipse
 
 The Azure Toolkit for Eclipse provides two methods for signing into your Azure account:
 
-  * **Automated** - when you are using this method, you will create a credentials file which contains your service principal data, after which you can use the credentials file to automatically sign into your Azure account.
-  * **Interactive** - when you are using this method, you will enter your Azure credentials each time you sign into your Azure account.
+  - [Sign in to your Azure account by Device Login](#sign-in-to-your-azure-account-by-device-login)
+  - [Sign in to your Azure account by Service Principal](#sign-in-to-your-azure-account-by-service-principal)
 
-The steps in the following sections will describe how to use each method.
+[**Sign out**](#sign-out-of-your-azure-account) methods are also provided.
 
 [!INCLUDE [azure-toolkit-for-eclipse-prerequisites](../includes/azure-toolkit-for-eclipse-prerequisites.md)]
 
-## Signing into your Azure account automatically and creating a credentials file to use in the future
+## Sign in to your Azure account by Device Login
 
-The following steps will walk you through creating a credentials file which contains your service principal data. Once you have completed these steps, Eclipse will automatically use the credentials file to automatically sign you into Azure each time you open your project.
+To sign in Azure by device login, do the following:
 
 1. Open your project with Eclipse.
 
-1. Click **Tools**, then click **Azure**, and then click **Sign In**.
-
-   ![Eclipse Menu for Azure Sign In][A01]
-
-1. When the **Azure Sign In** dialog box appears, select **Automated**, and then click **New**.
-
-   ![Sign In Dialog Box][A02]
-
-1. When the **Azure Log In** dialog box appears, enter your Azure credentials, and then click **Sign In**.
-
-   ![Azure Log In Dialog Box][A03]
-
-1. When the **Create authentication files** dialog box appears, select the subscriptions that you want to use, choose your destination directory, and then click **Start**.
-
-   ![Azure Log In Dialog Box][A04]
-
-1. The **Service Principal Creatation Status** dialog box will be displayed, and after your files have been created successfully, click **OK**.
-
-   ![Service Principal Creatation Status Dialog Box][A05]
-
-1. When the **Azure Sign In** dialog box appears, click **Sign In**.
-
-   ![Azure Log In Dialog Box][A06]
-
-1. When the **Select Subscriptions** dialog box appears, select the subscriptions that you want to use, and then click **OK**.
-
-   ![Select Subscriptions Dialog Box][A07]
-
-## Signing out of your Azure account when you signed in automatically
-
-After you have configured the steps in the previous section, the Azure Toolkit will automatically sign you into your Azure account each time you restart Eclipse. However, to sign out of your Azure account and prevent the Azure Toolkit from signing you in automatically, use the following steps.
-
-1. In Eclipse, click **Tools**, then click **Azure**, and then click **Sign Out**.
-
-   ![Eclipse Menu for Azure Sign Out][L01]
-
-1. When the **Azure Sign Out** dialog box appears, click **Yes**.
-
-   ![Sign Out Dialog Box][L03]
-
-## Signing into your Azure account automatically using a credentials file which you have already created
-
-If you sign out of Azure when you are using Eclipse, you will need to reconfigure the Azure Toolkit for Eclipse to use a credentials file which have created before you can automatically sign into your Azure acccount. The following steps will walk you through configuring the Azure Toolkit to use an existing credentials file.
-
-1. Open your project with Eclipse.
-
-1. Click **Tools**, then click **Azure**, and then click **Sign In**.
-
-   ![Eclipse Menu for Azure Sign In][A01]
-
-1. When the **Azure Sign In** dialog box appears, select **Automated**, and then click **Browse**.
-
-   ![Sign In Dialog Box][A02]
-
-1. When the **Select Authenticated File** dialog box appears, select a credentials file which you created earlier, and then click **Open**.
-
-   ![Sign In Dialog Box][A08]
-
-1. When the **Azure Sign In** dialog box appears, click **Sign In**.
-
-   ![Azure Log In Dialog Box][A06]
-
-1. When the **Select Subscriptions** dialog box appears, select the subscriptions that you want to use, and then click **OK**.
-
-   ![Select Subscriptions Dialog Box][A07]
-
-## Signing into your Azure account interactively
-
-The following steps will illustrate how to sign into Azure by manually entering your Azure credentials.
-
-1. Open your project with Eclipse.
-
-1. Click **Tools**, then click **Azure**, and then click **Sign In**.
-
+2. Click **Tools**, then click **Azure**, and then click **Sign In**.
    ![Eclipse Menu for Azure Sign In][I01]
 
-1. When the **Azure Sign In** dialog box appears, select **Interactive**, and then click **Sign In**.
+3. In the **Azure Sign In** window, select **Device Login**, and then click **Sign in**.
 
-   ![Sign In Dialog Box][I02]
+   ![The Azure Sign In window with device login selected][I02]
 
-1. When the **Azure Log In** dialog box appears, enter your Azure credentials, and then click **Sign In**.
+4. Click **Copy&Open** in **Azure Device Login** dialog .
 
-   ![Azure Log In Dialog Box][I03]
+   ![The Azure Login Dialog window][I03]
 
-1. When the **Select Subscriptions** dialog box appears, select the subscriptions that you want to use, and then click **OK**.
+5. In the browser, paste your device code (which has been copied when you clicked **Copy&Open** in last step) and then click **Next**.
 
-   ![Select Subscriptions Dialog Box][I04]
+   ![The device login browser][I04]
 
-## Signing out of your Azure account when you signed in interactively
+6. Finally, in the **Select Subscriptions** dialog box, select the subscriptions that you want to use, then click **OK**.
 
-After you have configured the steps in the previous section, you will automatically signed out of your Azure account each time you restart Eclipse. However, if you want to sign out of your Azure account without restarting Eclipse, use the following steps.
+   ![The Select Subscriptions dialog box][I05]
+
+## Sign in to your Azure account by Service Principal
+
+This section walks you through creating a credentials file that contains your service principal data. After you have completed this process, Eclipse uses the credentials file to automatically sign you in to Azure when open your project.
+
+1. Open your project with Eclipse.
+
+2. Click **Tools**, then click **Azure**, and then click **Sign In**.
+   ![The Eclipse Azure Sign In command][A01]
+
+3. In the **Azure Sign In** window, select **Service Principal**. If you do not have the service principal authentication file yet, click **New** to create one. Otherwise you can click **Browse** to open it and jump to step 8.
+
+   ![The Azure Sign In window with service principal selected][A02]
+
+4. Click **Copy&Open** in **Azure Device Login** dialog.
+
+   ![The Azure Login Dialog window][A08]
+
+5. In the browser, paste your device code (which has been copied when you click **Copy&Open** in last step) and then click **Next**.
+
+   ![The device login browser][A03]
+
+6. In the **Create Authentication Files** window, select the subscriptions that you want to use, choose your destination directory, and then click **Start**.
+
+   ![The Create Authentication Files window][A04]
+
+7. In the **Service Principal Creation Status** dialog box, click **OK** after your files have been created successfully.
+
+   ![The Service Principal Creation Status dialog box][A05]
+
+8. Address of the created file will be automatically filled in the **Azure Sign In** window, now click **Sign in**.
+
+   ![Azure Log In Dialog Box][A06]
+
+9. Finally, in the **Select Subscriptions** dialog box, select the subscriptions that you want to use, then click **OK**.
+
+   ![The Select Subscriptions dialog box][A07]
+
+## Sign out of your Azure account
+
+After you have configured your account by preceding steps, you will be automatically signed in each time you start Eclipse. However, if you want to sign out of your Azure account, use the following steps.
 
 1. In Eclipse, click **Tools**, then click **Azure**, and then click **Sign Out**.
 
    ![Eclipse Menu for Azure Sign Out][L01]
 
-1. When the **Azure Sign Out** dialog box appears, click **Yes**.
+2. When the **Azure Sign Out** dialog box appears, click **Yes**.
 
    ![Sign Out Dialog Box][L02]
 
@@ -147,6 +115,7 @@ After you have configured the steps in the previous section, you will automatica
 [I02]: media/azure-toolkit-for-eclipse-sign-in-instructions/I02.png
 [I03]: media/azure-toolkit-for-eclipse-sign-in-instructions/I03.png
 [I04]: media/azure-toolkit-for-eclipse-sign-in-instructions/I04.png
+[I05]: media/azure-toolkit-for-eclipse-sign-in-instructions/I05.png
 
 [A01]: media/azure-toolkit-for-eclipse-sign-in-instructions/A01.png
 [A02]: media/azure-toolkit-for-eclipse-sign-in-instructions/A02.png

docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse.md

@@ -19,65 +19,44 @@ ms.workload: na
 
 # Azure Toolkit for Eclipse
 
-The Azure Toolkit for Eclipse provides templates and functionality that you can use to easily create, develop, test, and deploy cloud applications to Azure from inside the Eclipse integrated development environment (IDE).
+The Azure Toolkit for Eclipse provides templates and functionality that you can use to easily create, develop, test, and deploy cloud applications to Azure from inside the Eclipse IDE.
 
 > [!NOTE]
 > 
-> There is also an Azure Toolkit for the IntelliJ IDE. For more information, see [Azure Toolkit for IntelliJ](../intellij/azure-toolkit-for-intellij.md).
+> There is also an Azure Toolkit for the IntelliJ IDEA. For more information, see [Azure Toolkit for IntelliJ](../intellij/azure-toolkit-for-intellij.md).
 > 
 
-## Get started with the Azure Toolkit for Eclipse
-The following articles will help you start using the Azure Toolkit for Eclipse:
+## Get Started in 10 minutes
 
-* [Installing the Azure Toolkit for Eclipse](azure-toolkit-for-eclipse-installation.md)
+* [Create a Hello World web app for Azure App Service](azure-toolkit-for-eclipse-create-hello-world-web-app.md)
 
-* [Sign-in instructions for the Azure Toolkit for Eclipse](azure-toolkit-for-eclipse-sign-in-instructions.md)
+## Step-by-Step tutorials
 
-* [Create a Hello World web app for Azure in Eclipse](azure-toolkit-for-eclipse-create-hello-world-web-app.md)
+* [Publish a Spring Boot app as a Docker container](azure-toolkit-for-eclipse-publish-spring-boot-docker-app.md)
 
-## Use the Azure Toolkit for Eclipse with your Java Projects
-The following articles demonstrate using the Azure Toolkit for Eclipse to add Azure functionality to your Java projects:
-
-* [Publish a Spring Boot app as a Docker container by using the Azure Toolkit for Eclipse](azure-toolkit-for-eclipse-publish-spring-boot-docker-app.md)
-
-* [Publish a web app as a Docker container by using the Azure Toolkit for Eclipse](azure-toolkit-for-eclipse-publish-as-docker-container.md)
+* [Publish a web app as a Docker container](azure-toolkit-for-eclipse-publish-as-docker-container.md)
 
 * [Use HDInsight Tools Plugin for Eclipse to create Spark applications for an HDInsight Spark Linux cluster](/azure/hdinsight/hdinsight-apache-spark-eclipse-tool-plugin)
 
 * [Displaying Javadoc content in Eclipse for the Package for Azure Libraries for Java](azure-toolkit-for-eclipse-displaying-javadoc-content-for-azure-libraries.md)
 
-## Manage Azure resources using the Azure Toolkit for Eclipse
-The following articles demonstrate using the Azure Toolkit for Eclipse to manage your Azure resources:
+## Managing Azure resources
 
-* [Manage redis caches by using the Azure Explorer for Eclipse](azure-toolkit-for-eclipse-managing-redis-caches-using-azure-explorer.md)
+* [Redis caches](azure-toolkit-for-eclipse-managing-redis-caches-using-azure-explorer.md)
 
-* [Manage storage accounts by using the Azure Explorer for Eclipse](azure-toolkit-for-eclipse-managing-storage-accounts-using-azure-explorer.md)
+* [Storage accounts](azure-toolkit-for-eclipse-managing-storage-accounts-using-azure-explorer.md)
 
-* [Manage virtual machines by using the Azure Explorer for Eclipse](azure-toolkit-for-eclipse-managing-virtual-machines-using-azure-explorer.md)
+* [Virtual machines](azure-toolkit-for-eclipse-managing-virtual-machines-using-azure-explorer.md)
 
-## Next steps
+## What's more
 
-For more information about the Azure Toolkit for Eclipse, see the following pages:
-
-* [Azure Toolkit Release Notes](https://github.com/Microsoft/azure-tools-for-java/releases)
-
-* [Azure Toolkit for Eclipse in the Eclipse Marketplace](http://marketplace.eclipse.org/content/azure-toolkit-eclipse)
-
-For more information about using Java with Azure, see the [Azure for Java Developers](https://docs.microsoft.com/java/azure/) and the [Java Tools for Visual Studio Team Services](/azure/devops/java/).
-
-<!-- [!INCLUDE [azure-toolkit-for-eclipse-additional-resources](../includes/azure-toolkit-for-eclipse-additional-resources.md)] -->
+[!INCLUDE [azure-toolkit-for-eclipse-additional-resources](../includes/azure-toolkit-for-eclipse-additional-resources.md)]
 
 > [!NOTE]
 > 
 > The Azure Toolkit for Eclipse is an open-source project whose source code is available under the [MIT license from the project's site](https://github.com/microsoft/azure-tools-for-java).
 > 
 
-<!-- URL List -->
-
-[Azure for Java Developers]: https://docs.microsoft.com/java/azure
-
-<!-- Temporarily Deprecated URLs -->
-
 <!-- [Deploying large deployments](azure-toolkit-for-eclipse-deploying-large-deployments.md) -->
 <!-- [How to Maintain Session Data with Session Affinity]: http://go.microsoft.com/fwlink/?LinkID=699539 -->
 <!-- [How to Use Co-located Caching]: http://go.microsoft.com/fwlink/?LinkID=699542 -->

docs-ref-conceptual/eclipse/toc.yml

@@ -1,19 +1,19 @@
 - name: Azure Toolkit for Eclipse
   href: azure-toolkit-for-eclipse.md
   items:
-  - name: Install 
-    href: azure-toolkit-for-eclipse-installation.md
   - name: Get Started
     href: azure-toolkit-for-eclipse-create-hello-world-web-app.md
   - name: Tutorials
     items:
       - name: Deploy containers to Azure VMs
         href: azure-toolkit-for-eclipse-publish-as-docker-container.md
-      - name: Deploy a web app to Azure App Service
+      - name: Publish a Spring Boot app as a Docker container
         href: azure-toolkit-for-eclipse-publish-spring-boot-docker-app.md
   - name: How-To
     items: 
-    - name: Set up authentication
+    - name: Install the toolkit
+      href: azure-toolkit-for-eclipse-installation.md
+    - name: Sign in to your Azure account
       href: azure-toolkit-for-eclipse-sign-in-instructions.md
     - name: Manage Azure resources
       items:
@@ -24,4 +24,6 @@
        - name: Azure Redis Cache
          href: azure-toolkit-for-eclipse-managing-redis-caches-using-azure-explorer.md
   - name: Release notes
-    href: https://github.com/Microsoft/azure-tools-for-java/releases
+    href: https://github.com/Microsoft/azure-tools-for-java/releases
+  - name: Marketplace
+    href: https://marketplace.eclipse.org/content/azure-toolkit-eclipse

docs-ref-conceptual/includes/azure-toolkit-for-eclipse-additional-resources.md

@@ -1,14 +1,8 @@
-For more information about the Azure Toolkit for Eclipse, see the following links: 
-
-* [Azure Toolkit for Eclipse](../eclipse/azure-toolkit-for-eclipse.md) 
-* [Release Notes](https://github.com/Microsoft/azure-tools-for-java/releases) 
-* [Installing the Azure Toolkit for Eclipse](../eclipse/azure-toolkit-for-eclipse-installation.md) 
-* [Create a Hello World web app for Azure in Eclipse](../eclipse/azure-toolkit-for-eclipse-create-hello-world-web-app.md) 
-* [Sign-in instructions for the Azure Toolkit for Eclipse](../eclipse/azure-toolkit-for-eclipse-sign-in-instructions.md) 
+To report bugs or request new features, create issues on [our GitHub repository](https://github.com/Microsoft/azure-tools-for-java/issues). Or, ask questions on [Stack Overflow with tag azure-java-tools](https://stackoverflow.com/questions/tagged/azure-java-tools)。
 
 For more information about using Java with Azure, see the following links: 
 
-* [Azure for Java Developers](https://docs.microsoft.com/java/azure/) 
-* [Java Tools for Visual Studio Team Services](/azure/devops/java/)
+* [Azure for Java Developers](/java/azure/) 
+* [Java with Azure DevOps Services](/azure/devops/java/)
 * [Get Java JDK downloads and support when developing for Azure](https://aka.ms/azure-jdks)
 <!-- TODO: Add URLs for Java in VSCode here --> 

docs-ref-conceptual/includes/azure-toolkit-for-eclipse-basic-prerequisites.md

@@ -0,0 +1,11 @@
+## Prerequisites
+
+To complete the steps in this article, you will need to install the Azure Toolkit for Eclipse, which requires the following software components:
+
+* An [Azure supported Java Development Kit (JDK)](https://aka.ms/azure-jdks)
+* An [Eclipse IDE](http://www.eclipse.org/downloads/)
+
+> [!NOTE]
+> 
+> The [Azure Toolkit for Eclipse](http://marketplace.eclipse.org/content/azure-toolkit-eclipse) page at the Eclipse Marketplace lists the builds that are compatible with the toolkit.
+> 

docs-ref-conceptual/includes/azure-toolkit-for-eclipse-prerequisites.md

@@ -1,14 +1,11 @@
 ## Prerequisites
-To complete the steps in his article, you will need to install the Azure Toolkit for Eclipse, which requires the following software components:
 
-* Eclipse IDE for Java EE Developers, Mars, or later. You can download it from the [Eclipse website](http://www.eclipse.org/downloads/).
-* A supported Java Development Kit (JDK). For more information about the JDKs available for use when developing on Azure, see <https://aka.ms/azure-jdks>.
-* An operating system. The Azure Toolkit for Eclipse has been tested on the following operating systems:
-  
-  * Windows 10, Windows 8.1, Windows 8, and Windows 7
-  * Windows Server 2012 R2, Windows Server 2012, Windows Server 2008 R2, and Windows Server 2008
-  * [Mac OS X](http://www.apple.com/osx) version "Yosemite" and later
-  * [Ubuntu Linux](http://www.ubuntu.com) version 14, 15, and 16
+To complete the steps in this article, you will need to install the Azure Toolkit for Eclipse, which requires the following software components:
+
+* An [Azure supported Java Development Kit (JDK)](https://aka.ms/azure-jdks)
+* An [Eclipse IDE](http://www.eclipse.org/downloads/)
+* The [Azure Toolkit for Eclipse](https://marketplace.eclipse.org/content/azure-toolkit-eclipse), see [installation guide](../eclipse/azure-toolkit-for-eclipse-installation.md) for more information
+* Be [signed in](../eclipse/azure-toolkit-for-eclipse-sign-in-instructions.md) to your Azure account for the Azure Toolkit for Eclipse
 
 > [!NOTE]
 > 

docs-ref-conceptual/includes/azure-toolkit-for-eclipse-show-azure-explorer.md

@@ -1,4 +1,4 @@
-## Display the Azure Explorer view
+## Displaying the Azure Explorer view
 
 If the **Azure Explorer** view is not visible in Eclipse, display it by doing the following:
 

docs-ref-conceptual/includes/azure-toolkit-for-intellij-additional-resources.md

@@ -1,14 +1,8 @@
-For more information about the Azure Toolkit for IntelliJ IDEA, see the following links: 
-
-* [Azure Toolkit for IntelliJ](../intellij/azure-toolkit-for-intellij.md) 
-* [Release Notes](https://github.com/Microsoft/azure-tools-for-java/releases) 
-* [Installing the Azure Toolkit for IntelliJ](../intellij/azure-toolkit-for-intellij-installation.md) 
-* [Create a Hello World web app for Azure in IntelliJ](../intellij/azure-toolkit-for-intellij-create-hello-world-web-app.md) 
-* [Sign-in instructions for the Azure Toolkit for IntelliJ](../intellij/azure-toolkit-for-intellij-sign-in-instructions.md) 
+To report bugs or request new features, create issues on [our GitHub repository](https://github.com/Microsoft/azure-tools-for-java/issues). Or, ask questions on [Stack Overflow with tag azure-java-tools](https://stackoverflow.com/questions/tagged/azure-java-tools)。
 
 For more information about using Java with Azure, see the following links: 
 
-* [Azure for Java Developers](https://docs.microsoft.com/java/azure/) 
-* [Java Tools for Visual Studio Team Services](/azure/devops/java/)
+* [Azure for Java Developers](/java/azure/) 
+* [Java with Azure DevOps Services](/azure/devops/java/)
 * [Get Java JDK downloads and support when developing for Azure](https://aka.ms/azure-jdks)
 <!-- TODO: Add URLs for Java in VSCode here --> 

docs-ref-conceptual/includes/quickstarts-free-trial-note.md

@@ -0,0 +1 @@
+If you don't have an [Azure subscription](https://docs.microsoft.com/azure/guides/developer/azure-developer-guide#understanding-accounts-subscriptions-and-billing), create a [free account](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio) before you begin.

docs-ref-conceptual/intellij/azure-toolkit-for-intellij-create-hello-world-web-app.md

@@ -1,5 +1,5 @@
 ---
-title: Create a Hello World web app for Azure using IntelliJ
+title: Create a Hello World web app for Azure App Service using IntelliJ
 description: This tutorial shows you how to use the Azure Toolkit for IntelliJ to create a Hello World Web App for Azure.
 services: app-service
 keywords: java, intellij, web app, azure app service, hello world, quick start
@@ -18,28 +18,22 @@ ms.topic: article
 ms.workload: web
 ---
 
-# Create a Hello World web app for Azure using IntelliJ
-
-Using open sourced [Azure Toolkit for IntelliJ](https://plugins.jetbrains.com/plugin/8053) plugin, create and deploy a basic Hello World application to Azure as a web app can be done in a few minutes.
-
-Table of Contents:
-  - [Prerequisites](#prerequisites)
-  - [Installation and Sign in](#installation-and-sign-in)
-  - [Creating web app project](#creating-web-app-project)
-  - [Deploying web app to Azure](#deploying-web-app-to-azure)
-  - [Managing deploy configurations](#managing-deploy-configurations)
-  - [Cleaning up resources](#cleaning-up-resources)
-  - [Next steps](#next-steps)
+# Create a Hello World web app for Azure App Service using IntelliJ
 
+Using open sourced [Azure Toolkit for IntelliJ](https://plugins.jetbrains.com/plugin/8053) plugin, creating and deploying a basic Hello World application to Azure App Service as a web app can be done in a few minutes.
 
 > [!NOTE]
 >
 > If you prefer using Eclipse, check out our [similar tutorial for Eclipse][eclipse-hello-world].
 >
+>[!INCLUDE [quickstarts-free-trial-note](../includes/quickstarts-free-trial-note.md)]
+>
+> Don't forget to clean up the resources after you complete this tutorial. In that case, running this guide will not exceed your free account quota.
+>
 
 [!INCLUDE [azure-toolkit-for-intellij-basic-prerequisites](../includes/azure-toolkit-for-intellij-basic-prerequisites.md)]
 
-## Installation and Sign in
+## Installation and Sign-in
 
 1. In IntelliJ IDEA's Settings/Preferences dialog (Ctrl+Alt+S), select **Plugins**. Then, find the **Azure Toolkit for IntelliJ** in the **Marketplace** and click **Install**. After installed, click **Restart** to activate the plugin. 
 

docs-ref-conceptual/intellij/azure-toolkit-for-intellij.md

@@ -28,9 +28,9 @@ The Azure Toolkit for IntelliJ provides templates and functionality that you can
 
 ## Get started in 10 minutes
 
-* [Create a Hello World web app for Azure in IntelliJ](azure-toolkit-for-intellij-create-hello-world-web-app.md)
+* [Create a Hello World web app for Azure App Service](azure-toolkit-for-intellij-create-hello-world-web-app.md)
 
-## Step-by-Step Tutorials
+## Step-by-Step tutorials
 
 * [Run a Hello World web app in a Linux container by using the Azure Toolkit for IntelliJ](azure-toolkit-for-intellij-hello-world-web-app-linux.md)
 
@@ -42,37 +42,16 @@ The Azure Toolkit for IntelliJ provides templates and functionality that you can
 
 ## Managing Azure resources
 
-* [Manage redis caches by using the Azure Explorer for IntelliJ](azure-toolkit-for-intellij-managing-redis-caches-using-azure-explorer.md)
+* [Redis caches](azure-toolkit-for-intellij-managing-redis-caches-using-azure-explorer.md)
 
-* [Manage storage accounts by using the Azure Explorer for IntelliJ](azure-toolkit-for-intellij-managing-virtual-machines-using-azure-explorer.md)
+* [Storage accounts](azure-toolkit-for-intellij-managing-virtual-machines-using-azure-explorer.md)
 
-* [Manage virtual machines by using the Azure Explorer for IntelliJ](azure-toolkit-for-intellij-managing-storage-accounts-using-azure-explorer.md)
+* [Virtual machines](azure-toolkit-for-intellij-managing-storage-accounts-using-azure-explorer.md)
 
 ## What's more
 
-For more information about the Azure Toolkit for IntelliJ, see:
-
-* [Azure Toolkit Release Notes](https://github.com/Microsoft/azure-tools-for-java/releases)
-
-* [Azure Toolkit for IntelliJ in the JetBrains Plugins Repository](https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij)
-
-For more information about using Java with Azure, see:
-
-* [Azure for Java Developers](https://docs.microsoft.com/java/azure/)
-
-* [Java Tools for Visual Studio Team Services](/azure/devops/java/).
-
+[!INCLUDE [azure-toolkit-for-intellij-additional-resources](../includes/azure-toolkit-for-intellij-additional-resources.md)]
 > [!NOTE]
 > 
 > The Azure Toolkit for IntelliJ is an open-source project whose source code is available under the [MIT license from the project's site](https://github.com/microsoft/azure-tools-for-java).
 > 
-
-<!-- [!INCLUDE [azure-toolkit-for-intellij-additional-resources](../includes/azure-toolkit-for-intellij-additional-resources.md)] -->
-
-<!-- URL List -->
-
-[Azure for Java Developers]: https://docs.microsoft.com/java/azure/
-
-<!-- Temporarily Deprecated URLs -->
-
-<!-- [Debug a Java Web App on Azure in IntelliJ]: ./app-service-web/app-service-web-debug-java-web-app-in-intellij.md -->

docs-ref-conceptual/intellij/toc.yml

@@ -4,7 +4,7 @@
   - name: Get Started
     href: azure-toolkit-for-intellij-create-hello-world-web-app.md
     maintainContext: true
-  - name: Step-by-Step Tutorials
+  - name: Tutorials
     items:
       - name: Deploy web app to a Linux container
         href: azure-toolkit-for-intellij-hello-world-web-app-linux.md
@@ -14,7 +14,7 @@
         href: azure-toolkit-for-intellij-publish-spring-boot-docker-app.md
   - name: How-To
     items: 
-    - name: Sigh in to you Azure account
+    - name: Sign in to your Azure account
       href: azure-toolkit-for-intellij-sign-in-instructions.md
     - name: Manage Azure resources
       items:
@@ -26,4 +26,6 @@
          href: azure-toolkit-for-intellij-managing-redis-caches-using-azure-explorer.md
   - name: Release notes
     href: https://github.com/Microsoft/azure-tools-for-java/releases
+  - name: Marketplace
+    href: https://plugins.jetbrains.com/plugin/8053