Skip to content

Commit 1da3887

Browse files
committed
Acrolynx pass
1 parent 8092ee2 commit 1da3887

6 files changed

+9
-9
lines changed

articles/jenkins/deploy-jenkins-app-service-plugin.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ You can use the Jenkins plugin to deploy a web app in any language that is suppo
3535
> [!NOTE]
3636
> The Java JDK and Maven are required to build the Java project. Install these components on the Jenkins Master, or on the VM agent if you use the agent for continuous integration.
3737
38-
To install the components, log in to the Jenkins instance with SSH and run the following commands:
38+
To install the components, sign in to the Jenkins instance with SSH and run the following commands:
3939

4040
```bash
4141
sudo apt-get install -y openjdk-7-jdk
@@ -128,7 +128,7 @@ Web Apps on Linux also supports traditional deployment methods, like Git and FTP
128128
Before setting up the job in Jenkins, you need a web app on Linux. You also need a container registry to store and manage your private Docker container images. You can use DockerHub to create the container registry. In this example, we use Azure Container Registry.
129129
130130
* [Create your web app on Linux](../app-service/containers/quickstart-nodejs.md).
131-
* Azure Container Registry is a managed [Docker Registry](https://docs.docker.com/registry/) service that is based on the open source Docker Registry version 2.0. [Create an Azure container registry](/azure/container-registry/container-registry-get-started-azure-cli). You can also use DockerHub.
131+
* Azure Container Registry is a managed [Docker Registry](https://docs.docker.com/registry/) service that is based on the open-source Docker Registry version 2.0. [Create an Azure container registry](/azure/container-registry/container-registry-get-started-azure-cli). You can also use DockerHub.
132132
133133
### Set up the Jenkins job for Docker
134134

articles/jenkins/execute-cli-jenkins-pipeline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Ensure you have version 1.2 or later:
4646
* Within the Jenkins dashboard, click **Manage Jenkins -> Plugin Manager ->** and search for **Azure Credential**.
4747
* Update the plugin if the version is earlier than 1.2.
4848

49-
Java JDK and Maven are also required in the Jenkins master. To install, log in to Jenkins master using SSH and run the following commands:
49+
Java JDK and Maven are also required in the Jenkins master. To install, sign in to Jenkins master using SSH and run the following commands:
5050
```bash
5151
sudo apt-get install -y openjdk-7-jdk
5252
sudo apt-get install -y maven

articles/jenkins/install-jenkins-solution-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Select the **Build** tab, then select **Add build step**, **Invoke Gradle script
7070

7171
![Use the Gradle wrapper to build](./media/install-jenkins-solution-template/jenkins-job-gradle-config.png)
7272

73-
Select **Advanced..** and then enter `complete` in the **Root Build script** field. Select **Save**.
73+
Select **Advanced** and then enter `complete` in the **Root Build script** field. Select **Save**.
7474

7575
![Set advanced settings in the Gradle wrapper build step](./media/install-jenkins-solution-template/jenkins-job-gradle-advances.png)
7676

articles/jenkins/java-deploy-webapp-tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You will perform the following tasks in this tutorial:
2828

2929
To complete this tutorial, you need:
3030

31-
* [Jenkins](https://jenkins.io/) with JDK and Maven tools configured . If you don't have a Jenkins system, create one now in Azure from the [Jenkins solution template](/azure/jenkins/install-jenkins-solution-template).
31+
* [Jenkins](https://jenkins.io/) with JDK and Maven tools configured. If you don't have a Jenkins system, create one now in Azure from the [Jenkins solution template](/azure/jenkins/install-jenkins-solution-template).
3232
* A [GitHub](https://github.com) account.
3333
* [Azure CLI 2.0](/cli/azure), either from your local command line or in the [Azure Cloud Shell](/azure/cloud-shell/overview)
3434

@@ -97,7 +97,7 @@ Set up Jenkins to receive [GitHub webhooks](https://developer.github.com/webhook
9797
## Configure the Azure App Service Jenkins plug-in
9898
9999
1. In the Jenkins web console, select the **MyJavaApp** job you created and then select **Configure** on the left hand of the page.
100-
2. Scroll down to **Post-build Actions**, then select **Add post-build action** and choose **Publish an Azure Web App**.
100+
2. Scroll down to **Post-build Actions**, select **Add post-build action**, and choose **Publish an Azure Web App**.
101101
3. Under **Azure Profile Configuration**, select **Add** next to **Azure Credentials** and choose **Jenkins**.
102102
4. In the **Add Credentials** dialog, select **Microsoft Azure Service Principal** from the **Kind** drop-down.
103103
5. Create an Active Directory Service principal from the Azure CLI or [Cloud Shell](/azure/cloud-shell/overview).
@@ -159,7 +159,7 @@ Set up Jenkins to receive [GitHub webhooks](https://developer.github.com/webhook
159159
## Deploy the app from GitHub
160160
161161
1. From the Jenkins project, select **Build Now** to deploy the sample app to Azure.
162-
2. Once the build completes, your app is live on Azure at it's publishing URL , for example http://myjavaapp.azurewebsites.net.
162+
2. Once the build completes, your app is live on Azure at its publishing URL, for example http://myjavaapp.azurewebsites.net.
163163
![View your deployed app on Azure](media/jenkins-java-quickstart/hello_docker_world_unedited.png)
164164
165165
## Push changes and redeploy

articles/jenkins/jenkins-azure-vm-agents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ In the **Image Configuration** section of the plugin configuration, select **Ubu
113113
114114
![Configure VM OS and tools](./media/jenkins-azure-vm-agents/jenkins-os-config.png)
115115
116-
Select **Add** next to **Admin Credentials**, then select **Jenkins**. Enter a username and password used to log in to the agents, making sure they satisfy the [username and password policy](/azure/virtual-machines/linux/faq#what-are-the-username-requirements-when-creating-a-vm) for administrative accounts on Azure VMs.
116+
Select **Add** next to **Admin Credentials**, then select **Jenkins**. Enter a username and password used to sign in to the agents, making sure they satisfy the [username and password policy](/azure/virtual-machines/linux/faq#what-are-the-username-requirements-when-creating-a-vm) for administrative accounts on Azure VMs.
117117
118118
Select **Verify Template** to verify the configuration and then select **Save** to save your changes and return to the Jenkins dashboard.
119119

articles/jenkins/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.date: 07/25/2018
1414

1515
[Jenkins](https://jenkins.io/) is a popular open-source automation server used to set up continuous integration and delivery (CI/CD) for your software projects. You can host your Jenkins deployment in Azure or extend your existing Jenkins configuration using Azure resources. Jenkins plugins are also available to simplify CI/CD of your applications to Azure.
1616

17-
This article is an introduction to using Azure with Jenkins, detailing the core Azure features available to Jenkins users. To get started with your own Jenkins server in Azure, see our [quickstart](install-jenkins-solution-template.md).
17+
This article is an introduction to using Azure with Jenkins, detailing the core Azure features available to Jenkins users. For more information about getting started with your own Jenkins server in Azure, see [Create a Jenkins server on Azure](install-jenkins-solution-template.md).
1818

1919
## Host your Jenkins servers in Azure
2020

0 commit comments

Comments
 (0)