Updating articles based on review

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

@@ -63,7 +63,7 @@ For more information about the Azure Toolkit for Eclipse, see the following page
 
 * [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 Java Developer Center](https://azure.microsoft.com/develop/java/) and the [Java Tools for Visual Studio Team Services](https://java.visualstudio.com/).
+For more information about using Java with Azure, see the [Azure Java Developer Center](https://docs.microsoft.com/java/azure/) and the [Java Tools for Visual Studio Team Services](https://java.visualstudio.com/).
 
 <!-- [!INCLUDE [azure-toolkit-for-eclipse-additional-resources](../includes/azure-toolkit-for-eclipse-additional-resources.md)] -->
 

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

@@ -13,6 +13,6 @@ For more information about the Azure toolkits for the Eclipse and IntelliJ IDEs,
 
 For more information about using Java with Azure, see the following links: 
 
-* [Azure Java Developer Center](https://azure.microsoft.com/develop/java/) 
+* [Azure Java Developer Center](https://docs.microsoft.com/java/azure/) 
 * [Java Tools for Visual Studio Team Services](https://java.visualstudio.com/) 
 <!-- TODO: Add URLs for Java in VSCode here --> 

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

@@ -8,6 +8,6 @@ For more information about the Azure Toolkit for Eclipse, see the following link
 
 For more information about using Java with Azure, see the following links: 
 
-* [Azure Java Developer Center](https://azure.microsoft.com/develop/java/) 
+* [Azure Java Developer Center](https://docs.microsoft.com/java/azure/) 
 * [Java Tools for Visual Studio Team Services](https://java.visualstudio.com/) 
 <!-- TODO: Add URLs for Java in VSCode here --> 

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

@@ -2,9 +2,7 @@
 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 Java Developer Kit (JDK), version 1.8 or later.
-
 * 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

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

@@ -8,6 +8,6 @@ For more information about the Azure Toolkit for IntelliJ IDEA, see the followin
 
 For more information about using Java with Azure, see the following links: 
 
-* [Azure Java Developer Center](https://azure.microsoft.com/develop/java/) 
+* [Azure Java Developer Center](https://docs.microsoft.com/java/azure/) 
 * [Java Tools for Visual Studio Team Services](https://java.visualstudio.com/) 
 <!-- TODO: Add URLs for Java in VSCode here --> 

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

@@ -2,9 +2,7 @@
 To complete the steps in his article, you will need to install the Azure Toolkit for IntelliJ, which requires the following software components:
 
 * IntelliJ IDEA Ultimate Edition or Community Edition, which can be downloaded from the [JetBrains website](https://www.jetbrains.com/idea/download/).
-
 * A Java Developer Kit (JDK), version 1.8 or later.
-
 * An operating system. The Azure Toolkit for IntelliJ has been tested on the following operating systems:
   
   * Windows 10, Windows 8.1, Windows 8, and Windows 7

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

@@ -139,7 +139,7 @@ For additional resources for Docker, see the official [Docker website][Docker].
 
 [Azure portal]: https://portal.azure.com/
 [Create a private Docker container registry using the Azure portal]: /azure/container-registry/container-registry-get-started-portal
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [Java Tools for Visual Studio Team Services]: https://java.visualstudio.com/
 [Create Docker Registry using Azure CLI]: /azure/container-registry/container-registry-get-started-azure-cli
 

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

@@ -63,7 +63,7 @@ For more information about the Azure Toolkit for IntelliJ, see the following pag
 
 * [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 the [Azure Java Developer Center](https://azure.microsoft.com/develop/java/) and the [Java Tools for Visual Studio Team Services](https://java.visualstudio.com/).
+For more information about using Java with Azure, see the [Azure Java Developer Center](https://docs.microsoft.com/java/azure/) and the [Java Tools for Visual Studio Team Services](https://java.visualstudio.com/).
 
 > [!NOTE]
 > 
@@ -74,7 +74,7 @@ For more information about using Java with Azure, see the [Azure Java Developer
 
 <!-- URL List -->
 
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [Java Tools for Visual Studio Team Services]: https://java.visualstudio.com/
 
 <!-- Temporarily Deprecated URLs -->

docs-ref-conceptual/spring-framework/configure-spring-boot-initializer-java-app-with-redis-cache.md

@@ -28,9 +28,7 @@ This article walks you through creating a Redis cache using the Azure portal, th
 The following prerequisites are required in order to follow the steps in this article:
 
 * An Azure subscription; if you don't already have an Azure subscription, you can activate your [MSDN subscriber benefits] or sign up for a [free Azure account].
-
 * A [Java Development Kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/), version 1.7 or later.
-
 * [Apache Maven](http://maven.apache.org/), version 3.0 or later.
 
 ## Create a custom application using the Spring Initializr
@@ -208,7 +206,7 @@ The **[Spring Framework]** is an open-source solution that helps Java developers
 
 <!-- URL List -->
 
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [free Azure account]: https://azure.microsoft.com/pricing/free-trial/
 [Java Tools for Visual Studio Team Services]: https://java.visualstudio.com/
 [MSDN subscriber benefits]: https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/

docs-ref-conceptual/spring-framework/configure-spring-boot-starter-java-app-with-azure-active-directory.md

@@ -28,9 +28,7 @@ This article demonstrates creating an app with the **[Spring Initializr]** which
 The following prerequisites are required in order to follow the steps in this article:
 
 * An Azure subscription; if you don't already have an Azure subscription, you can activate your [MSDN subscriber benefits] or sign up for a [free Azure account].
-
 * A [Java Development Kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/), version 1.7 or later.
-
 * [Apache Maven](http://maven.apache.org/), version 3.0 or later.
 
 ## Create a custom application using the Spring Initializr
@@ -215,6 +213,14 @@ The following prerequisites are required in order to follow the steps in this ar
 
 1. Open a command prompt and change directory to the folder where your app's *pom.xml* file is located.
 
+1. Build your Spring Boot application with Maven and run it; for example:
+
+   ```shell
+   mvn clean package
+   ```
+
+   ![][build-application]
+
 1. Build your Spring Boot application with Maven and run it; for example:
 
    ```shell
@@ -222,6 +228,8 @@ The following prerequisites are required in order to follow the steps in this ar
    mvn spring-boot:run
    ```
 
+
+
 1. After your application is built and started by Maven, open <http://localhost:8080> in a web browser.
 
 ## Next steps
@@ -244,7 +252,7 @@ The **[Spring Framework]** is an open-source solution that helps Java developers
 
 [Azure Active Directory Documentation]: /azure/active-directory/
 [Get started with Azure AD]: /azure/active-directory/get-started-azure-ad
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [free Azure account]: https://azure.microsoft.com/pricing/free-trial/
 [Java Tools for Visual Studio Team Services]: https://java.visualstudio.com/
 [MSDN subscriber benefits]: https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/
@@ -272,3 +280,4 @@ The **[Spring Framework]** is an open-source solution that helps Java developers
 [directory-11]: media/configure-spring-boot-starter-java-app-with-azure-active-directory/directory-11.png
 [directory-12]: media/configure-spring-boot-starter-java-app-with-azure-active-directory/directory-12.png
 
+[build-application]: media/configure-spring-boot-starter-java-app-with-azure-active-directory/build-application.png

docs-ref-conceptual/spring-framework/configure-spring-boot-starter-java-app-with-azure-key-vault.md

@@ -0,0 +1,349 @@
+---
+title: How to use the Spring Boot Starter for Azure Key Vault
+description: Learn how to configure a Spring Boot Initializer app with the Azure Key Vault starter.
+services: key-vault
+documentationcenter: java
+author: rmcmurray
+manager: routlaw
+editor: ''
+
+ms.assetid:
+ms.service: key-vault
+ms.workload: identity
+ms.tgt_pltfrm: multiple
+ms.devlang: java
+ms.topic: article
+ms.date: 11/29/2017
+ms.author: robmcm
+---
+
+# How to use the Spring Boot Starter for Azure Key Vault
+
+## Overview
+
+This article demonstrates creating an app with the **[Spring Initializr]** which uses the Spring Boot Starter for Azure Key Vault to store secrets.
+
+## Prerequisites
+
+The following prerequisites are required in order to follow the steps in this article:
+
+* An Azure subscription; if you don't already have an Azure subscription, you can activate your [MSDN subscriber benefits] or sign up for a [free Azure account].
+* A [Java Development Kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/), version 1.7 or later.
+* [Apache Maven](http://maven.apache.org/), version 3.0 or later.
+
+## Create an app using the Spring Initialzr
+
+1. Browse to <https://start.spring.io/>.
+
+1. Specify that you want to generate a **Maven** project with **Java**, enter the **Group** and **Aritifact** names for your application, and then click the link to **Switch to the full version** of the Spring Initializr.
+
+   ![Specify Group and Aritifact names][secrets-01]
+
+1. Scroll down to the **Azure** section and check the box for **Azure Key Vault**.
+
+   ![Select Azure Key Vault starter][secrets-02]
+
+1. Scroll to the bottom of the page and click the button to **Generate Project**.
+
+   ![Generate Spring Boot project][secrets-03]
+
+1. When prompted, download the project to a path on your local computer.
+
+## Sign into Azure and select the subscription to use
+
+1. Open a command prompt.
+
+1. Sign into your Azure account by using the Azure CLI:
+
+   ```azurecli
+   az login
+   ```
+   Follow the instructions to complete the sign-in process.
+
+1. List your subscriptions:
+
+   ```azurecli
+   az account list
+   ```
+   Azure will return a list of your subscriptions, and you will need to copy the GUID for the subscription that you want to use; for example:
+
+   ```json
+   [
+     {
+       "cloudName": "AzureCloud",
+       "id": "11111111-1111-1111-1111-111111111111",
+       "isDefault": true,
+       "name": "Converted Windows Azure MSDN - Visual Studio Ultimate",
+       "state": "Enabled",
+       "tenantId": "tttttttt-tttt-tttt-tttt-tttttttttttt",
+       "user": {
+         "name": "contoso@microsoft.com",
+         "type": "user"
+       }
+     }
+   ]
+
+1. Specify the GUID for the account you want to use with Azure; for example:
+
+   ```azurecli
+   az account set -s 11111111-1111-1111-1111-111111111111
+   ```
+
+## Create an Azure service principal
+
+In this section, you create an Azure service principal that the Maven plugin uses when deploying your web app to Azure.
+
+1. Create an Azure service principal:
+   ```shell
+   az ad sp create-for-rbac --name "uuuuuuuu" --password "pppppppp"
+   ```
+   Where `uuuuuuuu` is the user name and `pppppppp` is the password for the service principal.
+
+1. Azure responds with JSON that resembles the following example:
+   ```json
+   {
+      "appId": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+      "displayName": "uuuuuuuu",
+      "name": "http://uuuuuuuu",
+      "password": "pppppppp",
+      "tenant": "tttttttt-tttt-tttt-tttt-tttttttttttt"
+   }
+   ```
+   Save the `appId` value for later.
+
+## Create and configure a new Azure Key Vault
+
+1. Create a resource group for the Azure resources you will use for your key vault; for example:
+   ```azurecli
+   az group create --name wingtiptoysresources --location westus
+   ```
+   Where:
+   | Parameter | Description |
+   |---|---|
+   | `name` | Specifies a unique name for your resource group. |
+   | `location` | Specifies the [Azure region](https://azure.microsoft.com/regions/) where your resource group will be hosted. |
+
+   The Azure CLI will display the results of your resource group creation; for example:  
+
+   ```json
+   {
+     "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/wingtiptoysresources",
+     "location": "westus",
+     "managedBy": null,
+     "name": "wingtiptoysresources",
+     "properties": {
+       "provisioningState": "Succeeded"
+     },
+     "tags": null
+   }
+   ```
+
+1. Create a new key vault in the resource group you just created; for example:
+   ```azurecli
+   az keyvault create --name wingtiptoyskeyvault --resource-group wingtiptoysresources --location westus --enabled-for-deployment true --enabled-for-disk-encryption true --enabled-for-template-deployment true --sku standard
+   ```
+   Where:
+   | Parameter | Description |
+   |---|---|
+   | `name` | Specifies a unique name for your key vault. |
+   | `location` | Specifies the [Azure region](https://azure.microsoft.com/regions/) where your resource group will be hosted. |
+   | `enabled-for-deployment` | Specifies the [key vault deployment option](https://docs.microsoft.com/en-us/cli/azure/keyvault). |
+   | `enabled-for-disk-encryption` | Specifies the [key vault encryption option](https://docs.microsoft.com/en-us/cli/azure/keyvault). |
+   | `enabled-for-template-deployment` | Specifies the [key vault encryption option](https://docs.microsoft.com/en-us/cli/azure/keyvault). |
+   | `sku` | Specifies the [key vault SKU option](https://docs.microsoft.com/en-us/cli/azure/keyvault). |
+
+   The Azure CLI will display the results of your key vault creation; for example:  
+
+   ```json
+   {
+     "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/wingtiptoysresources/providers/Microsoft.KeyVault/vaults/wingtiptoyskeyvault",
+     "location": "westus",
+     "name": "wingtiptoyskeyvault",
+     "properties": {
+       //
+       // A long list of values will be displayed here.
+       //
+       "enabledForDeployment": true,
+       "enabledForDiskEncryption": true,
+       "enabledForTemplateDeployment": true,
+       "sku": {
+         "name": "standard"
+       },
+       "tenantId": "tttttttt-tttt-tttt-tttt-tttttttttttt",
+       "vaultUri": "https://wingtiptoyskeyvault.vault.azure.net"
+     },
+     "resourceGroup": "wingtiptoysresources",
+     "tags": {},
+     "type": "Microsoft.KeyVault/vaults"
+   }
+   ```
+   Save the `vaultUri` value for later.
+
+1. Set the access policy for the Azure service principal you created earlier; for example:
+   ```azurecli
+   az keyvault set-policy --name wingtiptoyskeyvault --secret-permission backup delete get list purge recover restore set --object-id aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
+   ```
+   Where:
+   | Parameter | Description |
+   |---|---|
+   | `name` | Specifies your key vault name from earlier. |
+   | `secret-permission` | Specifies the [security policies](https://docs.microsoft.com/en-us/cli/azure/keyvault) for your key vault. |
+   | `object-id` | Specifies your service principal's `appId` from earlier. |
+
+   The Azure CLI will display the results of your security policy creation; for example:  
+
+   ```json
+   {
+     "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/wingtiptoysresources/providers/Microsoft.KeyVault/vaults/wingtiptoyskeyvault",
+     "location": "westus",
+     "name": "wingtiptoyskeyvault",
+     "properties": {
+       //
+       // A long list of values will be displayed here.
+       //
+       "createMode": null,
+       "enableSoftDelete": null,
+       "enabledForDeployment": true,
+       "enabledForDiskEncryption": true,
+       "enabledForTemplateDeployment": true,
+       "sku": {
+         "name": "standard"
+       },
+       "tenantId": "tttttttt-tttt-tttt-tttt-tttttttttttt",
+       "vaultUri": "https://wingtiptoyskeyvault.vault.azure.net/"
+     },
+     "resourceGroup": "wingtiptoysresources",
+     "tags": {},
+     "type": "Microsoft.KeyVault/vaults"
+   }
+   ```
+
+1. Store a secret in your new key vault; for example:
+   ```azurecli
+   az keyvault secret set --name connection-string --value "jdbc:sqlserver://wingtiptoys.database.windows.net:1433;database=DATABASE;" --vault-name wingtiptoyskeyvault
+   ```
+   Where:
+   | Parameter | Description |
+   |---|---|
+   | `name` | Specifies the name of your secret. |
+   | `value` | Specifies the value of your secret. |
+   | `vault-name` | Specifies your key vault name from earlier. |
+
+   The Azure CLI will display the results of your secret creation; for example:  
+
+   ```json
+   {
+     "attributes": {
+       "created": "2017-12-01T09:00:16+00:00",
+       "enabled": true,
+       "expires": null,
+       "notBefore": null,
+       "recoveryLevel": "Purgeable",
+       "updated": "2017-12-01T09:00:16+00:00"
+     },
+     "contentType": null,
+     "id": "https://wingtiptoyskeyvault.vault.azure.net/secrets/connection-string/123456789abcdef123456789abcdef",
+     "kid": null,
+     "managed": null,
+     "tags": {
+       "file-encoding": "utf-8"
+     },
+     "value": "jdbc:sqlserver://wingtiptoys.database.windows.net:1433;database=DATABASE;"
+   }
+   ```
+
+## Configure and compile your Spring Boot application
+
+1. Extract the files from the Spring Boot project archive files that you downloaded earlier into a directory.
+
+1. Navigate to the *src/main/resources* folder in your project and open the *application.properties* file in a text editor.
+
+1. Add the values for your key vault; for example:
+   ```yaml
+   azure.keyvault.uri=https://wingtiptoyskeyvault.vault.azure.net/
+   azure.keyvault.client-id=aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
+   azure.keyvault.client-key=put-your-azure-client-key-here
+   ```
+   Where:
+   | Parameter | Description |
+   |---|---|
+   | `azure.keyvault.uri` | Specifies the `vaultUri` of your key vault from earlier. |
+   | `azure.keyvault.client-id` | Specifies the `appId` value from your service principal. |
+   | `azure.keyvault.client-key` | Specifies your key vault name from earlier. |
+
+1. Navigate to the main source code file of your project; for example: */src/main/java/com/wingtiptoys/secrets*.
+
+1. Open the application's main Java file in a file in a text editor; for example: *SecretsApplication.java*, and add the following lines to the file:
+
+   ```java
+   package com.wingtiptoys.secrets;
+
+   import org.springframework.boot.SpringApplication;
+   import org.springframework.boot.autoconfigure.SpringBootApplication;
+   import org.springframework.beans.factory.annotation.Value;
+   import org.springframework.boot.CommandLineRunner;
+
+   @SpringBootApplication
+   public class SecretsApplication implements CommandLineRunner {
+
+       @Value("${connection-string}")
+       private String connectionString;
+
+       public static void main(String[] args) {
+           SpringApplication.run(SecretsApplication.class, args);
+       }
+
+       public void run(String... varl) throws Exception {
+           System.out.println("Connection String stored in Azure Key Vault: " + connectionString);
+       }
+   }
+   ```
+
+1. Save and close the main application Java file.
+
+## Build and test your app
+
+1. Navigate to the directory where the *pom.xml* file for your Spring Boot app is located:
+
+1. Build your Spring Boot application with Maven and run it; for example:
+
+   ```azurecli
+   mvn clean package
+   mvn spring-boot:run
+   ```
+
+## Next steps
+
+For more information about using Azure Key Vaults, see the following articles:
+
+* [Key Vault Documentation].
+
+* [Get started with Azure Key Vault]
+
+For more information about using Spring Boot applications on Azure, see the following articles:
+
+* [Deploy a Spring Boot Application to the Azure App Service](deploy-spring-boot-java-web-app-on-azure.md)
+
+* [Running a Spring Boot Application on a Kubernetes Cluster in the Azure Container Service](deploy-spring-boot-java-app-on-kubernetes.md)
+
+For more information about using Azure with Java, see the [Azure Java Developer Center] and the [Java Tools for Visual Studio Team Services].
+
+The **[Spring Framework]** is an open-source solution that helps Java developers create enterprise-level applications. One of the more-popular projects that is built on top of that platform is [Spring Boot], which provides a simplified approach for creating stand-alone Java applications. To help developers get started with Spring Boot, several sample Spring Boot packages are available at <https://github.com/spring-guides/>. In addition to choosing from the list of basic Spring Boot projects, the **[Spring Initializr]** helps developers get started with creating custom Spring Boot applications.
+
+<!-- URL List -->
+
+[Key Vault Documentation]: /azure/key-vault/
+[Get started with Azure Key Vault]: /azure/key-vault/key-vault-get-started
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
+[free Azure account]: https://azure.microsoft.com/pricing/free-trial/
+[Java Tools for Visual Studio Team Services]: https://java.visualstudio.com/
+[MSDN subscriber benefits]: https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/
+[Spring Boot]: http://projects.spring.io/spring-boot/
+[Spring Initializr]: https://start.spring.io/
+[Spring Framework]: https://spring.io/
+
+<!-- IMG List -->
+
+[secrets-01]: media/configure-spring-boot-starter-java-app-with-azure-key-vault/secrets-01.png
+[secrets-02]: media/configure-spring-boot-starter-java-app-with-azure-key-vault/secrets-02.png
+[secrets-03]: media/configure-spring-boot-starter-java-app-with-azure-key-vault/secrets-03.png

docs-ref-conceptual/spring-framework/configure-spring-boot-starter-java-app-with-cosmos-db.md

@@ -30,9 +30,7 @@ This article demonstrates creating an Azure Cosmos DB using the Azure portal, th
 The following prerequisites are required in order to follow the steps in this article:
 
 * An Azure subscription; if you don't already have an Azure subscription, you can activate your [MSDN subscriber benefits] or sign up for a [free Azure account].
-
 * A [Java Development Kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/), version 1.7 or later.
-
 * [Apache Maven](http://maven.apache.org/), version 3.0 or later.
 
 ## Create an Azure Cosmos DB by using the Azure portal
@@ -311,7 +309,7 @@ The **[Spring Framework]** is an open-source solution that helps Java developers
 <!-- URL List -->
 
 [Azure Cosmos DB Documentation]: /azure/cosmos-db/
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [Build a DocumentDB API app with Java]: https://docs.microsoft.com/azure/cosmos-db/create-documentdb-java
 [free Azure account]: https://azure.microsoft.com/pricing/free-trial/
 [Java Tools for Visual Studio Team Services]: https://java.visualstudio.com/

docs-ref-conceptual/spring-framework/deploy-containerized-spring-boot-java-app-with-maven-plugin.md

@@ -315,7 +315,7 @@ For more information about the various technologies discussed in this article, s
 <!-- URL List -->
 
 [Azure Command-Line Interface (CLI)]: /cli/azure/overview
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [Azure portal]: https://portal.azure.com/
 [Docker]: https://www.docker.com/
 [Docker plugin for Maven]: https://github.com/spotify/docker-maven-plugin

docs-ref-conceptual/spring-framework/deploy-spring-boot-java-app-from-container-registry-using-maven-plugin.md

@@ -379,7 +379,7 @@ For more information about the various technologies discussed in this article, s
 
 [Azure Command-Line Interface (CLI)]: /cli/azure/overview
 [Azure Container Service (AKS)]: https://azure.microsoft.com/services/container-service/
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [Azure portal]: https://portal.azure.com/
 [Maven Plugin for Azure Web Apps]: https://github.com/Microsoft/azure-maven-plugins/tree/master/azure-webapp-maven-plugin
 [Create a private Docker container registry using the Azure portal]: /azure/container-registry/container-registry-get-started-portal

docs-ref-conceptual/spring-framework/deploy-spring-boot-java-app-on-kubernetes.md

@@ -321,7 +321,7 @@ For additional examples for how to use custom Docker images with Azure, see [Usi
 
 [Azure Command-Line Interface (CLI)]: /cli/azure/overview
 [Azure Container Service (AKS)]: https://azure.microsoft.com/services/container-service/
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [Azure portal]: https://portal.azure.com/
 [Create a private Docker container registry using the Azure portal]: /azure/container-registry/container-registry-get-started-portal
 [Using a custom Docker image for Azure Web App on Linux]: /azure/app-service-web/app-service-linux-using-custom-docker-image

docs-ref-conceptual/spring-framework/deploy-spring-boot-java-app-on-linux.md

@@ -278,7 +278,7 @@ For additional examples for how to use custom Docker images with Azure, see [Usi
 
 [Azure Command-Line Interface (CLI)]: /cli/azure/overview
 [Azure Container Service (AKS)]: https://azure.microsoft.com/services/container-service/
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [Azure portal]: https://portal.azure.com/
 [Create a private Docker container registry using the Azure portal]: /azure/container-registry/container-registry-get-started-portal
 [Using a custom Docker image for Azure Web App on Linux]: /azure/app-service-web/app-service-linux-using-custom-docker-image

docs-ref-conceptual/spring-framework/deploy-spring-boot-java-app-using-fabric8-maven-plugin.md

@@ -520,7 +520,7 @@ For additional examples for how to use custom Docker images with Azure, see [Usi
 
 [Azure Command-Line Interface (CLI)]: /cli/azure/overview
 [Azure Container Service (AKS)]: https://azure.microsoft.com/services/container-service/
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [Azure portal]: https://portal.azure.com/
 [Create a private Docker container registry using the Azure portal]: /azure/container-registry/container-registry-get-started-portal
 [Using a custom Docker image for Azure Web App on Linux]: /azure/app-service-web/app-service-linux-using-custom-docker-image

docs-ref-conceptual/spring-framework/deploy-spring-boot-java-app-with-maven-plugin.md

@@ -265,7 +265,7 @@ For more information about the various technologies discussed in this article, s
 <!-- URL List -->
 
 [Azure Command-Line Interface (CLI)]: /cli/azure/overview
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [Azure portal]: https://portal.azure.com/
 [free Azure account]: https://azure.microsoft.com/pricing/free-trial/
 [Git]: https://github.com/

docs-ref-conceptual/spring-framework/deploy-spring-boot-java-web-app-on-azure.md

@@ -207,7 +207,7 @@ For more information about configuring additional settings for your web app, see
 
 [Azure App Service]: https://azure.microsoft.com/services/app-service/
 [Azure Container Service]: https://azure.microsoft.com/services/container-service/
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [Azure portal]: https://portal.azure.com/
 [Configure web apps in Azure App Service]: /azure/app-service/web-sites-configure
 [Deploy your app to Azure App Service using FTP/S]: https://docs.microsoft.com/azure/app-service/app-service-deploy-ftp

docs-ref-conceptual/spring-framework/index.yml

@@ -1,15 +1,15 @@
 ### YamlMime:YamlDocument
 documentType: LandingData
-title: Spring Framework on Azure
+title: Spring on Azure
 metadata:
   document_id: 
-  title: Spring Framework on Azure
-  description: Get started using the Spring Framework on Microsoft Azure.
+  title: Spring on Azure
+  description: Get started using the Spring Boot on Microsoft Azure.
   keywords: Azure, Java, Maven, Spring, Boot
   author: rmcmurray
   ms.author: robmcm
   manager: routlaw
-  ms.date: 10/11/2017
+  ms.date: 12/01/2017
   ms.topic: article
   ms.prod: azure
   ms.technology: azure
@@ -19,16 +19,29 @@ sections:
 - items:
   - type: markdown
     text: The [Spring Framework](http://spring.io/) is an open-source solution that helps Java developers create enterprise-level applications, and one of the more-popular projects that is built on top of that platform is [Spring Boot](https://projects.spring.io/spring-boot/), which provides a simplified approach for creating stand-alone Java applications. By using the information in this website, developers can combine these technologies with Microsoft Azure to create powerful, cloud-based applications.
-- title: Quickstarts
+- title: Getting Started Guides
   items:
   - type: markdown
-    text: Get started developing apps using Spring Boot and Microsoft Azure by using the following quickstart articles.
+    text: Learn how to use the Spring Boot starters for Azure that are available for use with the [Spring Initializr](http://start.spring.io/).
   - type: list
-    style: unordered
-    className: spaced noBullet
+    style: icon48
     items: 
-    - html: <a href="/java/azure/spring-framework/spring-boot-starters-for-azure">Spring Boot Starters for Azure</a>
-    - html: <a href="/java/azure/spring-framework/deploy-spring-boot-java-web-app-on-azure">Deploy a Spring Boot app to the Azure App Service</a>
+    - image: 
+        src: https://docs.microsoft.com/en-us/media/common/i_get-started.svg
+      text: Spring Boot Starters for Azure
+      href: spring-boot-starters-for-azure.md
+    - image: 
+        src: https://docs.microsoft.com/en-us/azure/media/index/storage.svg
+      text: Spring Boot Starter for Azure Storage
+      href: configure-spring-boot-starter-java-app-with-azure-storage.md
+    - image: 
+        src: https://docs.microsoft.com/en-us/azure/media/index/ActiveDirectory.svg
+      text: Spring Boot Starter for Azure Active Directory
+      href: configure-spring-boot-starter-java-app-with-azure-active-directory.md
+    - image: 
+        src: https://docs.microsoft.com/en-us/azure/media/index/KeyVault.svg
+      text: Spring Boot Starter for Azure Key Vault
+      href: configure-spring-boot-starter-java-app-with-azure-key-vault.md
 - title: Step-by-Step Tutorials
   items:
   - type: markdown
@@ -37,18 +50,14 @@ sections:
     style: unordered
     className: spaced noBullet
     items:
-    - html: <a href="/java/azure/spring-framework/configure-spring-boot-initializer-java-app-with-redis-cache">How to configure a Spring Boot Initializer app to use Redis Cache</a>
-    - html: <a href="/java/azure/spring-framework/deploy-spring-boot-java-app-with-maven-plugin">Use the Maven Plugin for Azure Web Apps to deploy a Spring Boot app to Azure</a>
-- title: Spring Boot Starters for Azure
-  items:
-  - type: markdown
-    text: Learn how to use the Spring Boot starters for Azure that are available for use with the [Spring Initializr](http://start.spring.io/).
-  - type: list
-    style: unordered
-    className: spaced noBullet
-    items:
-    - html: <a href="/java/azure/spring-framework/spring-boot-starters-for-azure">Spring Boot Starters for Azure</a>
-    - html: <a href="/java/azure/spring-framework/configure-spring-boot-starter-java-app-with-azure-storage">How to use the Spring Boot Starter for Azure Storage</a>
+    - html: <a href="configure-spring-boot-initializer-java-app-with-redis-cache.md">How to configure a Spring Boot Initializer app to use Redis Cache</a>
+    - html: <a href="configure-spring-boot-starter-java-app-with-cosmos-db.md">How to use the Spring Boot Starter with an Azure Cosmos DB DocumentDB API</a>
+    - html: <a href="deploy-spring-boot-java-app-with-maven-plugin.md">How to use the Maven Plugin for Azure Web Apps to deploy a Spring Boot app to Azure</a>
+    - html: <a href="deploy-spring-boot-java-app-on-kubernetes.md">Deploy a Spring Boot App on Kubernetes in Azure Container Service</a>
+    - html: <a href="deploy-spring-boot-java-app-on-linux.md">Deploy a Spring Boot Web App on Linux in Azure Container Service</a>
+    - html: <a href="deploy-spring-boot-java-app-using-fabric8-maven-plugin.md">Deploy a Spring Boot app using the Fabric8 Maven Plugin</a>
+    - html: <a href="deploy-containerized-spring-boot-java-app-with-maven-plugin.md">How to use the Maven Plugin for Azure Web Apps to deploy a containerized Spring Boot app to Azure</a>
+    - html: <a href="deploy-spring-boot-java-app-from-container-registry-using-maven-plugin.md">How to use the Maven Plugin for Azure Web Apps to deploy a Spring Boot app in Azure Container Registry to Azure App Service</a>
 - title: Samples
   items:
   - type: list

docs-ref-conceptual/spring-framework/spring-boot-starters-for-azure.md

@@ -225,7 +225,7 @@ When you add this starter to a Spring Boot project, the following changes are ma
 
 ## Next steps
 
-For more information about using [Spring Boot] applications on Azure, see [Spring Boot Getting Started].
+For more information about using [Spring Boot] applications on Azure, see [Spring on Azure].
 
 For more information about using Azure with Java, see the [Azure Java Developer Center] and the [Java Tools for Visual Studio Team Services].
 
@@ -233,10 +233,10 @@ For help with getting started with your own Spring Boot applications, see the **
 
 <!-- URL List -->
 
-[Azure Java Developer Center]: https://azure.microsoft.com/develop/java/
+[Azure Java Developer Center]: https://docs.microsoft.com/java/azure/
 [Java Tools for Visual Studio Team Services]: https://java.visualstudio.com/
 [Spring Boot]: http://projects.spring.io/spring-boot/
-[Spring Boot Getting Started]: https://github.com/spring-guides/gs-spring-boot
+[Spring on Azure]: https://docs.microsoft.com/java/azure/spring-framework/
 [Spring Framework]: https://spring.io/
 [Spring Initializr]: https://start.spring.io/
 

docs-ref-conceptual/spring-framework/toc.yml

@@ -1,42 +1,42 @@
-- name: Spring Framework on Azure
+- name: Spring on Azure
   href: ./index.yml
   items:
-  - name: Quickstarts
+  - name: Getting Started Guides
     items:
       - name: Spring Boot Starters for Azure
         href: spring-boot-starters-for-azure.md
-      - name: Deploy a Spring Boot app to  Azure App Service
-        href: deploy-spring-boot-java-web-app-on-azure.md
-      - name: Deploy a Spring Boot app to Azure Web Apps using a Maven Plugin
-        href: deploy-spring-boot-java-app-with-maven-plugin.md
+      - name: Spring Boot Starter for Azure Storage
+        href: configure-spring-boot-starter-java-app-with-azure-storage.md
+      - name: Spring Boot Starter for Azure Active Directory
+        href: configure-spring-boot-starter-java-app-with-azure-active-directory.md
+      - name: Spring Boot Starter for Azure Key Vault
+        href: configure-spring-boot-starter-java-app-with-azure-key-vault.md
   - name: Tutorials
     items:
-      - name: Deploy a Spring Boot app on Kubernetes in Azure Container Service
-        href: deploy-spring-boot-java-app-on-kubernetes.md
-      - name: Deploy a Spring Boot web app on Linux in Azure Container Service
-        href: deploy-spring-boot-java-app-on-linux.md
-      - name: Deploy a Spring Boot app using the Fabric8 Maven Plugin
-        href: deploy-spring-boot-java-app-using-fabric8-maven-plugin.md
-  - name: How-To
-    items:
-      - name: Configure a Spring Boot app with Redis Cache
+      - name: Configure Spring Boot app with Redis Cache
         href: configure-spring-boot-initializer-java-app-with-redis-cache.md
-      - name: Configure a Spring Boot app with Azure Cosmos DB
+      - name: Configure Spring Boot app with Azure Cosmos DB
         href: configure-spring-boot-starter-java-app-with-cosmos-db.md
-      - name: Deploy a containerized Spring Boot app to Azure Web Apps with Maven
+      - name: Deploy Spring Boot app using Maven Plugin
+        href: deploy-spring-boot-java-app-with-maven-plugin.md
+      - name: Deploy Spring Boot app on Kubernetes
+        href: deploy-spring-boot-java-app-on-kubernetes.md
+      - name: Deploy Spring Boot web app on Linux
+        href: deploy-spring-boot-java-app-on-linux.md
+      - name: Deploy Spring Boot app using Fabric8 Plugin for Maven
+        href: deploy-spring-boot-java-app-using-fabric8-maven-plugin.md
+      - name: Deploy Containerized Spring Boot app to Azure Web Apps with Maven
         href: deploy-containerized-spring-boot-java-app-with-maven-plugin.md
-      - name: Deploy a Spring Boot app in Azure Container Registry to Azure App Service with Maven
+      - name: Deploy Containerized Spring Boot app to Azure App Service with Maven
         href: deploy-spring-boot-java-app-from-container-registry-using-maven-plugin.md
   - name: Samples
     items:
-      - name: Sample To Do List web app using Spring Boot and DocumentDB
+      - name: To Do List sample app using Spring Boot and DocumentDB
         href: https://github.com/Microsoft/todo-app-java-on-azure/
-      - name: Sample To Do List web app using Spring Boot and MySQL
+      - name: To Do List sample app using Spring Boot and MySQL
         href: https://github.com/Azure-Samples/mysql-spring-boot-todo
       - name: Spring Initializr
         href: https://start.spring.io/
-      - name: Spring Boot Starters for Azure
-        href: https://github.com/Microsoft/azure-spring-boot/
   - name: Reference
     items:
       - name: Spring Framework
@@ -47,3 +47,5 @@
         href: https://projects.spring.io/spring-boot/
       - name: Spring Project References
         href: https://spring.io/docs/reference
+      - name: Spring Boot Starters for Azure
+        href: https://github.com/Microsoft/azure-spring-boot/

docs-ref-conceptual/toc.yml

@@ -21,6 +21,7 @@
        - name: Get started with Java using Intellij
          href: intellij/java-sdk-azure-get-started-intellij.md
     - name: Tools
+      expanded: true
       href: java-azure-tools.md 
       items: 
         - name: IntelliJ
@@ -32,8 +33,8 @@
           items:
             - name: Azure Web Apps
               href: https://github.com/Microsoft/azure-maven-plugins/tree/master/azure-webapp-maven-plugin
-        - name: Spring Boot Starters for Azure
-          href: spring-framework/spring-boot-starters-for-azure.md
+        - name: Spring on Azure
+          href: spring-framework/index.yml
     - name: Java Tutorials 
       items:
         - name: "Spring Boot + MySQL"