Merge pull request #103346 from v-thepet/quickstarts11

GitHubber17 · web-flow · commit 17c2dc3ed210 · 2020-02-10T14:10:41.000-08:00
Two service-fabric quickstarts
diff --git a/articles/service-fabric/service-fabric-quickstart-java-reliable-services.md b/articles/service-fabric/service-fabric-quickstart-java-reliable-services.md
@@ -10,32 +10,22 @@ ms.custom: mvc, devcenter, seo-java-august2019, seo-java-september2019
 ---
 # Quickstart:  Deploy a Java app to Azure Service Fabric on Linux
 
-This quickstart shows how to deploy your first Java application to Azure Service Fabric using the Eclipse IDE on a Linux developer machine. When you're finished, you have a voting application with a Java web front end that saves voting results in a stateful back-end service in the cluster.
+In this quickstart, you deploy a Java application to Azure Service Fabric using the Eclipse IDE on a Linux developer machine. When you're finished, you have a voting application with a Java web front end that saves voting results in a stateful back-end service in the cluster.
 
 Azure Service Fabric is a distributed systems platform for deploying and managing microservices and containers.
 
-![Azure Service Fabric voting sample](./media/service-fabric-quickstart-java/service-fabric-voting-sample.png)
-
-In this quickstart, you learn how to:
-
-* Use Eclipse as a tool for your Service Fabric Java applications
-* Deploy the application to your local cluster
-* Scale-out the application across multiple nodes
-
 ## Prerequisites
 
-To complete this quickstart:
-
-1. [Install Service Fabric SDK & Service Fabric Command Line Interface (CLI)](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#installation-methods)
-2. [Install Git](https://git-scm.com/)
-3. [Install Eclipse](https://www.eclipse.org/downloads/)
-4. [Set up Java Environment](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#set-up-java-development), making sure to follow the optional steps to install the Eclipse plug-in
+- [Java environment](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#set-up-java-development) and [Yeoman](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#set-up-yeoman-generators-for-containers-and-guest-executables)
+- [Eclipse Neon (4.6)+](https://www.eclipse.org/downloads/packages/) and [Eclipse plug-in for Service Fabric](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#install-the-eclipse-plug-in-optional)
+- [Service Fabric SDK and Command Line Interface (CLI)](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#installation-methods)
+- [Git](https://git-scm.com/downloads)
 
 ## Download the sample
 
 In a command window, run the following command to clone the sample app repository to your local machine.
 
-```git
+```bash
 git clone https://github.com/Azure-Samples/service-fabric-java-quickstart.git
 ```
 
@@ -46,13 +36,13 @@ git clone https://github.com/Azure-Samples/service-fabric-java-quickstart.git
     ```bash
     sudo /opt/microsoft/sdk/servicefabric/common/clustersetup/devclustersetup.sh
     ```
-    The startup of the local cluster takes some time. To confirm that the cluster is fully up, access the Service Fabric Explorer at **http://localhost:19080**. The five healthy nodes indicate the local cluster is up and running.
+    The startup of the local cluster takes some time. To confirm that the cluster is fully up, access the Service Fabric Explorer at `http://localhost:19080`. The five healthy nodes indicate the local cluster is up and running.
 
     ![Azure Service Fabric Explorer shows healthy nodes](./media/service-fabric-quickstart-java/service-fabric-explorer-healthy-nodes.png)
 
 2. Open Eclipse.
 3. Select **File** > **Import** > **Gradle** > **Existing Gradle Project** and follow the wizard.
-4. Select **Directory** and choose the `Voting` directory from the `service-fabric-java-quickstart` folder you cloned from GitHub. Select **Finish**.
+4. Select **Directory** and choose the **Voting** directory from the **service-fabric-java-quickstart** folder you cloned from GitHub. Select **Finish**.
 
     ![Import Gradle project into Eclipse](./media/service-fabric-quickstart-java/eclipse-import-gradle-project.png)
 
@@ -67,15 +57,17 @@ git clone https://github.com/Azure-Samples/service-fabric-java-quickstart.git
 
 You can now add a set of voting options, and start taking votes. The application runs and stores all data in your Service Fabric cluster, without the need for a separate database.
 
+![Azure Service Fabric voting sample](./media/service-fabric-quickstart-java/service-fabric-voting-sample.png)
+
 ## Scale applications and services in a cluster
 
-Services can be scaled across a cluster to accommodate for a change in the load on the services. You scale a service by changing the number of instances running in the cluster. There are many ways of scaling your services; for example, you can use scripts or commands from Service Fabric CLI (sfctl). The following steps use Service Fabric Explorer.
+Services can be scaled across a cluster to accommodate for a change in the load on the services. You scale a service by changing the number of instances running in the cluster. There are many ways of scaling your services. For example, you can use scripts or commands from Service Fabric CLI (`sfctl`). The following steps use Service Fabric Explorer.
 
-Service Fabric Explorer runs in all Service Fabric clusters and can be accessed from a browser by browsing to the cluster's HTTP management port (19080); for example, `http://localhost:19080`.
+Service Fabric Explorer runs in all Service Fabric clusters and can be accessed from a browser by browsing to the cluster's HTTP management port (19080). For example, `http://localhost:19080`.
 
 To scale the web front-end service, do the following:
 
-1. Open Service Fabric Explorer in your cluster - for example, `https://localhost:19080`.
+1. Open Service Fabric Explorer in your cluster. For example, `https://localhost:19080`.
 2. Select the ellipsis (**...**) next to the **fabric:/Voting/VotingWeb** node in the treeview and select **Scale Service**.
 
     ![Scale a service in Azure Service Fabric](./media/service-fabric-quickstart-java/service-fabric-scale-service.png)
diff --git a/articles/service-fabric/service-fabric-quickstart-java-spring-boot.md b/articles/service-fabric/service-fabric-quickstart-java-spring-boot.md
@@ -10,64 +10,47 @@ ms.custom: mvc, devcenter, seo-java-august2019, seo-java-september2019
 ---
 # Quickstart: Deploy a Java Spring Boot app on Azure Service Fabric
 
-This quickstart shows how to deploy a Java Spring Boot application to Azure Service Fabric. Azure Service Fabric is a distributed systems platform for deploying and managing microservices and containers. 
-
-This quickstart uses the [Getting Started](https://spring.io/guides/gs/spring-boot/) sample from the Spring website. Using familiar command-line tools, this quickstart walks you through deploying the Spring Boot sample as a Service Fabric application. When you're finished, you have the Spring Boot Getting Started sample working on Service Fabric.
-
-![Spring Boot Service Fabric sample](./media/service-fabric-quickstart-java-spring-boot/spring-boot-service-fabric-sample.png)
-
-In this quickstart, you learn how to:
-
-* Deploy a Spring Boot application to Service Fabric
-* Deploy the application to your local cluster
-* Scale-out the application across multiple nodes
-* Perform failover of your service with no hit to availability
+In this quickstart, you deploy a Java Spring Boot application to Azure Service Fabric by using familiar command-line tools on Linux or MacOS. Azure Service Fabric is a distributed systems platform for deploying and managing microservices and containers. 
 
 ## Prerequisites
 
-To complete this quickstart:
+#### [Linux](#tab/linux)
 
-1. Install Service Fabric SDK & Service Fabric Command Line Interface (CLI)
+- [Java environment](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#set-up-java-development) and [Yeoman](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#set-up-yeoman-generators-for-containers-and-guest-executables)
+- [Service Fabric SDK & Service Fabric Command Line Interface (CLI)](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#installation-methods)
+- [Git](https://git-scm.com/downloads)
 
-    a. [Mac](https://docs.microsoft.com/azure/service-fabric/service-fabric-cli#cli-mac)
-    
-    b. [Linux](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#installation-methods)
-
-1. [Install Git](https://git-scm.com/)
-1. Install Yeoman
+#### [MacOS](#tab/macos)
 
-    a. [Mac](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-mac#create-your-application-on-your-mac-by-using-yeoman)
+- [Java environment and Yeoman](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-mac#create-your-application-on-your-mac-by-using-yeoman)
+- [Service Fabric SDK & Service Fabric Command Line Interface (CLI)](https://docs.microsoft.com/azure/service-fabric/service-fabric-cli#cli-mac)
+- [Git](https://git-scm.com/downloads)
 
-    b. [Linux](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#set-up-yeoman-generators-for-containers-and-guest-executables)
-1. Set up Java Environment
-
-    a. [Mac](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-mac#create-your-application-on-your-mac-by-using-yeoman)
-    
-    b.  [Linux](https://docs.microsoft.com/azure/service-fabric/service-fabric-get-started-linux#set-up-java-development)
+--- 
 
 ## Download the sample
 
-In a terminal window, run the following command to clone the Spring Boot Getting Started sample app to your local machine.
+In a terminal window, run the following command to clone the Spring Boot [Getting Started](https://github.com/spring-guides/gs-spring-boot) sample app to your local machine.
 
 ```bash
 git clone https://github.com/spring-guides/gs-spring-boot.git
 ```
 
 ## Build the Spring Boot application 
-1. Inside the `gs-spring-boot/complete` directory, run the command below to build the application 
+Inside the *gs-spring-boot/complete* directory, run the command below to build the application 
 
-    ```bash
-    ./gradlew build
-    ``` 
+```bash
+./gradlew build
+``` 
 
 ## Package the Spring Boot application 
-1. Inside the `gs-spring-boot` directory in your clone, run the `yo azuresfguest` command. 
+1. Inside the *gs-spring-boot* directory in your clone, run the `yo azuresfguest` command. 
 
 1. Enter the following details for each prompt.
 
     ![Spring Boot Yeoman entries](./media/service-fabric-quickstart-java-spring-boot/yeoman-entries-spring-boot.png)
 
-1. In the `SpringServiceFabric/SpringServiceFabric/SpringGettingStartedPkg/code` folder, create a file called `entryPoint.sh`. Add the following to the `entryPoint.sh` file. 
+1. In the *SpringServiceFabric/SpringServiceFabric/SpringGettingStartedPkg/code* folder, create a file called *entryPoint.sh*. Add the following code to the *entryPoint.sh* file. 
 
     ```bash
     #!/bin/bash
@@ -86,7 +69,7 @@ git clone https://github.com/spring-guides/gs-spring-boot.git
        </Resources>
     ```
 
-    The **ServiceManifest.xml** now looks like this: 
+    The *ServiceManifest.xml* now looks like this: 
 
     ```xml
     <?xml version="1.0" encoding="utf-8"?>
@@ -131,17 +114,17 @@ At this stage, you have created a Service Fabric application for the Spring Boot
     docker run --name sftestcluster -d -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 -p 8080:8080 mysfcluster
     ```
 
-    The startup of the local cluster takes some time. To confirm that the cluster is fully up, access the Service Fabric Explorer at **http://localhost:19080**. The five healthy nodes indicate the local cluster is up and running. 
+    The startup of the local cluster takes some time. To confirm that the cluster is fully up, access the Service Fabric Explorer at `http://localhost:19080`. The five healthy nodes indicate the local cluster is up and running. 
     
     ![Service Fabric Explorer shows healthy nodes](./media/service-fabric-quickstart-java-spring-boot/service-fabric-explorer-healthy-nodes.png)
 
-1. Open the `gs-spring-boot/SpringServiceFabric` folder.
+1. Open the *gs-spring-boot/SpringServiceFabric* folder.
 1. Run the following command to connect to your local cluster.
 
     ```bash
     sfctl cluster select --endpoint http://localhost:19080
     ```
-1. Run the `install.sh` script.
+1. Run the *install.sh* script.
 
     ```bash
     ./install.sh
@@ -153,6 +136,8 @@ At this stage, you have created a Service Fabric application for the Spring Boot
 
 You can now access the Spring Boot application that was deployed to a Service Fabric cluster.
 
+For more information, see the Spring Boot [Getting Started](https://spring.io/guides/gs/spring-boot/) sample on the Spring website.
+
 ## Scale applications and services in a cluster
 
 Services can be scaled across a cluster to accommodate for a change in load on the services. You scale a service by changing the number of instances running in the cluster. There are many ways of scaling your services, for example, you can use scripts or commands from Service Fabric CLI (sfctl). The following steps use Service Fabric Explorer.
