Editorial review changes

Author: MikeDodaro

articles/spring-cloud/spring-cloud-github-actions-key-vault.md

@@ -9,14 +9,14 @@ ms.date: 01/20/2019
 ---
 
 # Authenticate Azure Spring Cloud with Key Vault in Github Actions
-Key vault is a secure place to store keys. Enterprise users need to store credentials for CI/CD environments in scope that they control. The key to get credentials in the key vault should be limited to resource scope.  The key to get credentials has access to only the key vault scope, not the entire Azure scope. It's like a key that can only open a strongbox not a master key that can open all doors in a building. It is a way to get a key with another key, but useful in a CICD workflow. 
+Key vault is a secure place to store keys. Enterprise users need to store credentials for CI/CD environments in scope that they control. The key to get credentials in the key vault should be limited to resource scope.  It has access to only the key vault scope, not the entire Azure scope. It's like a key that can only open a strong box not a master key that can open all doors in a building. It's a way to get a key with another key, but useful in a CICD workflow. 
 
-## Generate Credential to Access to Key Vault
-To generate the key to open the strongbox, execute command below on you local machine:
+## Generate Credential
+To generate a key to access the key vault, execute command below on your local machine:
 ```
 az ad sp create-for-rbac --role contributor --scopes /subscriptions/<SUBSCRIPTION_ID>/resourceGroups/<RESOURCE_GROUP>/providers/Microsoft.KeyVault/vaults/<KEY_VAULT> --sdk-auth
 ```
-Note the scope specified by the `--scopes` parameter, which limits the key access to the resource.  It can only access the strongbox.
+Note the scope specified by the `--scopes` parameter, which limits the key access to the resource.  It can only access the strong box.
 
 With results:
 ```
@@ -33,12 +33,12 @@ With results:
     "managementEndpointUrl": "https://management.core.windows.net/"
 }
 ```
-Then save the results to GitHub **secrets** as described in[Set up your GitHub repository and authenticate with Azure](./spring-cloud-howto-github-actions.md#set-up-your-github-repository-and-authenticate-with-azure).
+Then save the results to GitHub **secrets** as described in [Set up your GitHub repository and authenticate with Azure](./spring-cloud-howto-github-actions.md#set-up-your-github-repository-and-authenticate-with-azure).
 
 ## Add Access Policies for the Credential
-The credential created above can only get general information about the Key Vault, not the contents it stores.  To get secrets stored in the Key Vault, you need set access policies for the credential.
+The credential you created above can only get general information about the Key Vault, not the contents it stores.  To get secrets stored in the Key Vault, you need set access policies for the credential.
 
-Go to the **Key Vault** dashboard in Azure Portal, click the **Access control** menu, then open the **Role assignments** tab. Select **Apps** for **Type**, `This resource` for **scope**.  You should see the credential you created in previous step:
+Go to the **Key Vault** dashboard in Azure portal, click the **Access control** menu, then open the **Role assignments** tab. Select **Apps** for **Type**, `This resource` for **scope**.  You should see the credential you created in previous step:
 
  ![Set access policy](./media/github-actions/key-vault1.png)
 
@@ -70,11 +70,11 @@ Again, results:
     "managementEndpointUrl": "https://management.core.windows.net/"
 }
 ```
-Copy the entire JSON string.  Bo back to **Key Vault** dashboard. Open the **Secrets** menu, then click the **Generate/Import** button. Input the secret name, such as `AZURE-CRENDENTIALS-FOR-SPRING`. Paste the JSON credential string to the **Value** input box. You may notice the value input box is a one-line text feild, rather then a multi-line text area.  You can paste the complete JSON string there.
+Copy the entire JSON string.  Bo back to **Key Vault** dashboard. Open the **Secrets** menu, then click the **Generate/Import** button. Input the secret name, such as `AZURE-CRENDENTIALS-FOR-SPRING`. Paste the JSON credential string to the **Value** input box. You may notice the value input box is a one-line text field, rather than a multi-line text area.  You can paste the complete JSON string there.
 
  ![Full scope credential](./media/github-actions/key-vault3.png)
 
-## Combine all credentials in GitHub Actions
+## Combine credentials in GitHub Actions
 Set the credentials used when the CICD pipeline executes:
 
 ```
@@ -86,7 +86,7 @@ jobs:
     steps:
     - uses: azure/login@v1
       with:
-        creds: ${{ secrets.AZURE_CREDENTIALS }}           # Strongbox key you generated in the first step
+        creds: ${{ secrets.AZURE_CREDENTIALS }}           # Strong box key you generated in the first step
     - uses: Azure/[email protected]
       with:
         keyvault: "zlhe-test"

articles/spring-cloud/spring-cloud-howto-github-actions.md

@@ -12,9 +12,9 @@ ms.date: 01/15/2019
 GitHub Actions support an automated software development lifecycle workflow. With GitHub Actions for Azure Spring Cloud you can create workflows in your repository to build, test, package, release, and deploy to Azure. 
 
 ## Prerequisites
-This example requires the [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest)
+This example requires the [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest).
 
-## Set up your GitHub repository and authenticate with Azure
+## Set up GitHub repository and authenticate
 You need an Azure service principle credential to authorize Azure login action. To get an Azure credential, execute the following commands on your local machine:
 ```
 az login
@@ -39,14 +39,14 @@ This example uses the [Piggy Metrics](https://github.com/Azure-Samples/piggymetr
 
  ![Add new secret](./media/github-actions/actions1.png)
 
-Set the secret name to AZURE_CREDENTIALS, and its value to the JSON string that you found under the heading *Set up your GitHub repository and authenticate with Azure*.
+Set the secret name to `AZURE_CREDENTIALS` and its value to the JSON string that you found under the heading *Set up your GitHub repository and authenticate with Azure*.
 
  ![Set secret data](./media/github-actions/actions2.png)
 
-You can also get the Azure login credential from Key Vault in GitHub actions as explained in [Authenticate Azure Spring with Key Vault in Github Actions](./spring-cloud-github-actions-key-vault.md).
+You can also get the Azure login credential from Key Vault in GitHub actions as explained in [Authenticate Azure Spring with Key Vault in GitHub Actions](./spring-cloud-github-actions-key-vault.md).
 
-## Provision Azure Spring Cloud service instance
-To provision your service instance, run the following commands using the Azure CLI.
+## Provision service instance
+To provision your Azure Spring Cloud service instance, run the following commands using the Azure CLI.
 ```
 az extension add --name spring-cloud
 az group create --location eastus --name <resource group name>
@@ -111,7 +111,10 @@ jobs:
         az spring-cloud app deploy -n auth-service --jar-path ${{ github.workspace }}/auth-service/target/auth-service.jar
 ```
 ### Deploy with Azure CLI action
-The az `run` command will use the latest version of Azure CLI. In case of breaking changes, you can also use a specific version of Azure CLI with azure/CLI `action`. This will run all the az command in a new container, therefore note that `env` will not work, and cross action file access may have extra restrictions.
+The az `run` command will use the latest version of Azure CLI. If there are breaking changes, you can also use a specific version of Azure CLI with azure/CLI `action`. 
+
+> [!Note] 
+> This command will run all the az command in a new container, so `env` will not work, and cross action file access may have extra restrictions.
 
 Create the .github/workflow/main.yml file in the repository:
 ```
@@ -188,13 +191,13 @@ jobs:
 ## Run the workflow
 GitHub Actions should be enabled automatically after you push `.github/workflow/main.yml` to GitHub. The action will be triggered when you push a new commit. If you create this file in the browser, your action should have already run.
 
-To verify your action has been enabled, click **Actions** tab on the GitHub repository page:
+To verify that the action has been enabled, click **Actions** tab on the GitHub repository page:
 
  ![Verify action enabled](./media/github-actions/actions3.png)
 
-If your action runs in error, for example, you haven't set Azure credential, you can re-run checks after fixing the error. On GitHub repository page, click **Actions**, select the specific workflow task, then click Re-run checks button to re-run checks:
+If your action runs in error, for example, if you haven't set Azure credential, you can rerun checks after fixing the error. On the GitHub repository page, click **Actions**, select the specific workflow task, and then click Rerun checks button to rerun checks:
 
- ![Re-run checks](./media/github-actions/actions4.png)
+ ![Rerun checks](./media/github-actions/actions4.png)
 
 ## Next steps
 * [Key Vault for Spring Cloud GitHub actions](./spring-cloud-github-actions-key-vault.md)