Skip to content

Commit 16706b4

Browse files
committed
prmerger feedback
1 parent ad71d1e commit 16706b4

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

articles/app-service/deploy-continuous-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ For Windows apps, you can manually configure continuous deployment from a cloud
9595

9696
## What are the build providers?
9797

98-
Depending on your deployment source in the Deployment Center, you might see a few options to select for build providers. Build providers help you build an CI/CD solution with Azure App Service by automating build, test, and deployment.
98+
Depending on your deployment source in the Deployment Center, you might see a few options to select for build providers. Build providers help you build a CI/CD solution with Azure App Service by automating build, test, and deployment.
9999

100100
You're not limited to the build provider options found in the Deployment Center, but App Service lets you set them up quickly and offers some integrated deployment logging experience.
101101

articles/app-service/deploy-github-actions.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Get started with [GitHub Actions](https://docs.github.com/en/actions/learn-githu
2222

2323
GitHub Actions deployment is integrated into the default [app creation wizard](https://portal.azure.com/#create/Microsoft.WebSite). You just need to set **Continuous deployment** to **Enable** in the Deployment tab, and configure the organization, repository, and branch you want.
2424

25-
:::image type="content" source="media/deploy-github-actions/create-wizard-deployment.png" alt-text="A screenshot showing how to enable GitHub Actions deployment in the App Service create wizard":::
25+
:::image type="content" source="media/deploy-github-actions/create-wizard-deployment.png" alt-text="A screenshot showing how to enable GitHub Actions deployment in the App Service create wizard.":::
2626

2727
When you enable continuous deployment, the app creation wizard automatically picks the authentication method based on the basic authentication selection and configures your app and your GitHub repository accordingly:
2828

@@ -32,7 +32,7 @@ When you enable continuous deployment, the app creation wizard automatically pic
3232
|Enable| [Basic authentication](configure-basic-auth-disable.md) |
3333

3434
> [!NOTE]
35-
> If you receive an error when creating your app saying that your Azure account doesn't have certain permissions, it may not have [the required permissions to create and configure the user-assigned identity](deploy-continuous-deployment.md#why-do-i-see-the-error-you-do-not-have-sufficient-permissions-on-this-app-to-assign-role-based-access-to-a-managed-identity-and-configure-federated-credentials). For an alternative, see [Set up GitHub Actions deployment from the Deployment Center](#set-up-github-actions-deployment-from-the-deployment-center)
35+
> If you receive an error when creating your app saying that your Azure account doesn't have certain permissions, it may not have [the required permissions to create and configure the user-assigned identity](deploy-continuous-deployment.md#why-do-i-see-the-error-you-do-not-have-sufficient-permissions-on-this-app-to-assign-role-based-access-to-a-managed-identity-and-configure-federated-credentials). For an alternative, see [Set up GitHub Actions deployment from the Deployment Center](#set-up-github-actions-deployment-from-the-deployment-center).
3636
3737
## Set up GitHub Actions deployment from the Deployment Center
3838

@@ -48,9 +48,9 @@ For more information, see [Continuous deployment to Azure App Service](deploy-co
4848

4949
You can also deploy a workflow without using the Deployment Center.
5050

51-
- [1. Generate deployment credentials](#1-generate-deployment-credentials)
52-
- [2. Configure the GitHub secret](#2-configure-the-github-secret)
53-
- [3. Add the workflow file to your GitHub repository](#3-add-the-workflow-file-to-your-github-repository)
51+
1. [Generate deployment credentials](#1-generate-deployment-credentials)
52+
1. [Configure the GitHub secret](#2-configure-the-github-secret)
53+
1. [Add the workflow file to your GitHub repository](#3-add-the-workflow-file-to-your-github-repository)
5454

5555
### 1. Generate deployment credentials
5656

@@ -218,7 +218,7 @@ At a minimum, the workflow file would have the following distinct steps:
218218
1. Build the web app.
219219
1. Deploy the web app.
220220

221-
To deploy your code to an App Service app, you use the [azure/webapps-deploy@v3](https://github.com/Azure/webapps-deploy/tree/releases/v3) action. The action requires the name of your web app in `app-name` and, depending on your language stack, the path of the a *.zip, *.war, *.jar, or folder to deploy in `package`. For a complete list of possible inputs for the `azure/webapps-deploy@v3` action, see the [action.yml](https://github.com/Azure/webapps-deploy/blob/releases/v3/action.yml) definition.
221+
To deploy your code to an App Service app, you use the [azure/webapps-deploy@v3](https://github.com/Azure/webapps-deploy/tree/releases/v3) action. The action requires the name of your web app in `app-name` and, depending on your language stack, the path of a *.zip, *.war, *.jar, or folder to deploy in `package`. For a complete list of possible inputs for the `azure/webapps-deploy@v3` action, see the [action.yml](https://github.com/Azure/webapps-deploy/blob/releases/v3/action.yml) definition.
222222

223223
The following examples show the part of the workflow that builds the web app, in different supported languages.
224224

@@ -236,8 +236,6 @@ The following examples show the part of the workflow that builds the web app, in
236236

237237
-----
238238

239-
## Frequently asked questions
240-
241239
## Next steps
242240

243241
Check out references on Azure GitHub Actions and workflows:

articles/app-service/quickstart-php.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ You can create the web app using the [Azure CLI](/cli/azure/get-started-with-azu
7777

7878
### [Azure CLI](#tab/cli)
7979

80-
Azure CLI has a command [`az webapp up`](/cli/azure/webapp#az-webapp-up) that creates the necessary resources and deploy your application in a single step.
80+
Azure CLI has a command [`az webapp up`](/cli/azure/webapp#az-webapp-up) that creates the necessary resources and deploys your application in a single step.
8181

8282
In the terminal, deploy the code in your local folder using the [`az webapp up`](/cli/azure/webapp#az-webapp-up) command:
8383

@@ -142,12 +142,12 @@ Browse to the deployed application in your web browser at the URL `http://<app-n
142142
- Under **Runtime stack** select *PHP 8.2*.
143143
- Under **Operating System**, select *Linux*.
144144
- Under **Region**, select an Azure region close to you.
145-
- **App Service Plan**: Create an app service plan named *myAppServicePlan*.
145+
- Under **App Service Plan**, create an app service plan named *myAppServicePlan*.
146146
- Under **Pricing plan**, select **Free F1**.
147147

148148
:::image type="content" source="./media/quickstart-php/app-service-details-php.png" lightbox="./media/quickstart-php/app-service-details-php.png" alt-text="Screenshot of new App Service app configuration for PHP in the Azure portal.":::
149149

150-
1. Select the **Deployment** tab at the top of the page
150+
1. Select the **Deployment** tab at the top of the page.
151151

152152
1. Under **GitHub Actions settings**, set **Continuous deployment** to *Enable*.
153153

@@ -204,10 +204,10 @@ The PHP sample code is running in an Azure App Service.
204204

205205
1. On your repo page, press `.` to start Visual Studio Code within your browser.
206206

207-
![Screenshot of the forked php-docs-hello-world repo in GitHub with instructions to press the period key on this screen.](media/quickstart-php/forked-github-repo-press-period.png)
207+
![Screenshot of the forked php-docs-hello-world repo in GitHub with instructions to press the period key on this screen.](media/quickstart-php/forked-github-repo-press-period.png)
208208

209-
> [!NOTE]
210-
> The URL will change from GitHub.com to GitHub.dev. This feature only works with repos that have files. This does not work on empty repos.
209+
> [!NOTE]
210+
> The URL will change from GitHub.com to GitHub.dev. This feature only works with repos that have files. This does not work on empty repos.
211211

212212
1. Edit **index.php** so that it shows "Hello Azure!" instead of "Hello World!"
213213

articles/app-service/tutorial-multi-region-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ To complete this tutorial:
4545

4646
## Create two instances of a web app
4747

48-
You need two instances of a web app that run in different Azure regions for this tutorial. You use the [region pair](../availability-zones/cross-region-replication-azure.md#azure-paired-regions) East US/West US as your two regions and create two empty web apps. Feel free to choose you're own regions if needed.
48+
You need two instances of a web app that run in different Azure regions for this tutorial. You use the [region pair](../availability-zones/cross-region-replication-azure.md#azure-paired-regions) East US/West US as your two regions and create two empty web apps. Feel free to choose your own regions if needed.
4949

5050
To make management and clean-up simpler, you use a single resource group for all resources in this tutorial. Consider using separate resource groups for each region/resource to further isolate your resources in a disaster recovery situation.
5151

@@ -469,7 +469,7 @@ Now that you have a service principal that can access your App Service apps, edi
469469
470470
### How does slot traffic routing allow me to test updates that I make to my apps?
471471
472-
Traffic routing with slots allows you to direct a predefined portion of your user traffic to each slot. Initially, 100% of traffic is directed to the production site. However, you have the ability, for example, to send 10% of your traffic to your staging slot. If you configure slot traffic routing in this way, when users try to access your app, 10% of them is automatically routed to the staging slot with no changes to your Front Door instance. To learn more about slot swaps and staging environments in App Service, see [Set up staging environments in Azure App Service](deploy-staging-slots.md).
472+
Traffic routing with slots allows you to direct a predefined portion of your user traffic to each slot. Initially, 100% of traffic is directed to the production site. However, you have the ability, for example, to send 10% of your traffic to your staging slot. If you configure slot traffic routing in this way, when users try to access your app, 10% of them are automatically routed to the staging slot with no changes to your Front Door instance. To learn more about slot swaps and staging environments in App Service, see [Set up staging environments in Azure App Service](deploy-staging-slots.md).
473473
474474
### How do I move my code from my staging slot to my production slot?
475475
@@ -483,7 +483,7 @@ az webapp deployment slot swap --resource-group MyResourceGroup -name <web-app-n
483483
484484
After a few minutes, you can navigate to your Front Door's endpoint to validate the slot swap succeeded.
485485
486-
At this point, your apps are up and running and any changes you make to your application source code automatically triggers an update to both of your staging slots. You can then repeat the slot swap process when you're ready to move that code into production.
486+
At this point, your apps are up and running and any changes you make to your application source code automatically trigger an update to both of your staging slots. You can then repeat the slot swap process when you're ready to move that code into production.
487487
488488
### How else can I use Azure Front Door in my multi-region deployments?
489489

0 commit comments

Comments
 (0)