diff --git a/docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse-installation.md b/docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse-installation.md
index f23466dddf85..41b435e70375 100644
--- a/docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse-installation.md
+++ b/docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse-installation.md
@@ -47,7 +47,7 @@ The following steps show you how to install the Azure Toolkit for Eclipse.
    
    ![Installing the Azure Toolkit for Eclipse][02]
 
-1. If you expand the **Azure Toolkit for Eclipse**, you will see a list of components like following examples:
+1. If you expand **Azure Toolkit for Eclipse**, you will see a list of components that will be installed; for example:
 
    | Feature | Description | 
    |---|---| 
diff --git a/docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse-publish-spring-boot-docker-app.md b/docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse-publish-spring-boot-docker-app.md
index 7ad067e2633c..b258eeca89cb 100644
--- a/docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse-publish-spring-boot-docker-app.md
+++ b/docs-ref-conceptual/eclipse/azure-toolkit-for-eclipse-publish-spring-boot-docker-app.md
@@ -32,7 +32,7 @@ This tutorial walks you through the steps to deploy a Spring Boot application as
 
 ### Import the public repository
 
-The following steps walk you through cloning the Spring Boot Docker repository to your local computer by using IntelliJ. If you want to use a command line, see [Deploy a Spring Boot application on Linux in Azure Container Service][Deploy Spring Boot on Linux in ACS].
+The following steps walk you through cloning the Spring Boot Docker repository to your local computer by using IntelliJ. If you want to use a command line, see [Deploy a Spring Boot application on Linux in Azure Container Service][Deploy Spring Boot on Linux in AKS].
 
 1. Open Eclipse.
 
@@ -207,7 +207,7 @@ For additional resources for Docker, see the official [Docker website].
 <!-- URL List -->
 
 [Azure Management Portal]: http://go.microsoft.com/fwlink/?LinkID=512959
-[Deploy Spring Boot on Linux in ACS]: /azure/container-service/kubernetes/container-service-deploy-spring-boot-app-on-linux
+[Deploy Spring Boot on Linux in AKS]: /azure/container-service/kubernetes/container-service-deploy-spring-boot-app-on-linux
 [Docker]: https://www.docker.com/
 [Publish Container with Azure Toolkit]: azure-toolkit-for-eclipse-publish-as-docker-container.md
 [Spring Boot]: http://projects.spring.io/spring-boot/
diff --git a/docs-ref-conceptual/intellij/azure-toolkit-for-intellij-publish-spring-boot-docker-app.md b/docs-ref-conceptual/intellij/azure-toolkit-for-intellij-publish-spring-boot-docker-app.md
index ed07eaa1a6d0..680871524da8 100644
--- a/docs-ref-conceptual/intellij/azure-toolkit-for-intellij-publish-spring-boot-docker-app.md
+++ b/docs-ref-conceptual/intellij/azure-toolkit-for-intellij-publish-spring-boot-docker-app.md
@@ -30,7 +30,7 @@ This tutorial walks you through the steps to deploy a Spring Boot application as
 
 ## Clone the default Spring Boot Docker repo
 
-The following steps walk you through cloning the Spring Boot Docker repo by using IntelliJ. If you want to use a command line, see [Deploy a Spring Boot application on Linux in Azure Container Service][Deploy Spring Boot on Linux in ACS].
+The following steps walk you through cloning the Spring Boot Docker repo by using IntelliJ. If you want to use a command line, see [Deploy a Spring Boot application on Linux in Azure Container Service][Deploy Spring Boot on Linux in AKS].
 
 1. Open IntelliJ.
 
@@ -223,7 +223,7 @@ To learn about additional methods for creating Spring Boot apps by using Intelli
 [Azure Management Portal]: http://go.microsoft.com/fwlink/?LinkID=512959
 [Azure Sign In for IntelliJ]: ./azure-toolkit-for-intellij-sign-in-instructions.md
 [Configuring Artifacts]: https://www.jetbrains.com/help/idea/2016.1/configuring-artifacts.html
-[Deploy Spring Boot on Linux in ACS]: /azure/container-service/kubernetes/container-service-deploy-spring-boot-app-on-linux
+[Deploy Spring Boot on Linux in AKS]: /azure/container-service/kubernetes/container-service-deploy-spring-boot-app-on-linux
 [Docker]: https://www.docker.com/
 [Publish Container with Azure Toolkit]: ./azure-toolkit-for-intellij-publish-as-docker-container.md
 [Spring Boot]: http://projects.spring.io/spring-boot/
diff --git a/docs-ref-conceptual/spring-framework/index.yml b/docs-ref-conceptual/spring-framework/index.yml
index 18fb0614dfd4..8e8ae597151d 100644
--- a/docs-ref-conceptual/spring-framework/index.yml
+++ b/docs-ref-conceptual/spring-framework/index.yml
@@ -27,29 +27,29 @@ sections:
   - type: list
     style: unordered
     items:
-    - href: deploy-spring-boot-java-web-app-on-azure.md
-      html: <p>Deploy a Spring Boot app to the Azure App Service</p>
-    - href: deploy-spring-boot-java-app-with-maven-plugin.md
-      html: <p>Use the Maven Plugin for Azure Web Apps to deploy a Spring Boot app to Azure</p>
+    - type: markdown
+      text: [Deploy a Spring Boot app to the Azure App Service](deploy-spring-boot-java-web-app-on-azure.md)
+    - type: markdown
+      html: [Use the Maven Plugin for Azure Web Apps to deploy a Spring Boot app to Azure](deploy-spring-boot-java-app-with-maven-plugin.md)
 - title: Official Spring Documentation
   items:
   - type: list
     style: unordered
     items:
-    - href: https://spring.io/
-      html: <p>Spring Framework</p>
-    - href: https://spring.io/docs
-      html: <p>Learn Spring</p>
-    - href: https://spring.io/docs/reference
-      html: <p>Reference Documentation</p>
+    - type: markdown
+      text: [Spring Framework](https://spring.io/)
+    - type: markdown
+      text: [Learn Spring](https://spring.io/docs)
+    - type: markdown
+      text: [Reference Documentation](https://spring.io/docs/reference)
 - title: Samples
   items:
   - type: list
     style: unordered
     items:
-    - href: https://start.spring.io/
-      html: <p>Spring Initializr/p>
-    - href: https://github.com/spring-guides/
-      html: <p>Spring Guides</p>
-    - href: https://github.com/Microsoft/azure-spring-boot/
-      html: <p>Spring Boot Starters for Azure</p>
+    - type: markdown
+      text: [Spring Initializr](https://start.spring.io/)
+    - type: markdown
+      text: [Spring Guides](https://github.com/spring-guides/)
+    - type: markdown
+      text: [Spring Boot Starters for Azure](https://github.com/Microsoft/azure-spring-boot/)