Merge pull request MicrosoftDocs#18477 from ahmedelnably/master

Various Articles Update

articles/app-service-web/app-service-linux-faq.md

@@ -51,15 +51,15 @@ If you have a question, comment on the article and we'll answer it as soon as po
 
 **Q:** My web app still uses an old Docker container image after I've updated the image on Docker Hub. Do you support continuous integration/deployment of custom containers?
 
-**A:** To set up continuous integration/deployment for DockerHub images by check the following article [Docker Hub Continuous Deployment with Web App on Linux](./app-service-linux-ci-cd.md). For private registries, you can refresh the container by stopping and then starting your web app. Or you can change or add a dummy application setting to force a refresh of your container.
+**A:** To set up continuous integration/deployment for Azure Container Registry or DockerHub images by check the following article [Continuous Deployment with Azure Web App on Linux](./app-service-linux-ci-cd.md). For private registries, you can refresh the container by stopping and then starting your web app. Or you can change or add a dummy application setting to force a refresh of your container.
 
 **Q:** Do you support staging environments?
 
 **A:** Yes.
 
 **Q:** Can I use **web deploy** to deploy my web app?
 
-**A:** Yes, you need to set an app setting called `UseWebDeployScm` to `false`.
+**A:** Yes, you need to set an app setting called `WEBSITE_WEBDEPLOY_USE_SCM` to `false`.
 
 ## Language support
 
@@ -99,7 +99,7 @@ If you have a question, comment on the article and we'll answer it as soon as po
 
 **Q:** My custom container listens to a port other than port 80. How can I configure my app to route the requests to that port?
 
-**A:** We have auto port detection, also you can specify an application setting called **PORT**, and give it the value of the expected port number.
+**A:** We have auto port detection, also you can specify an application setting called **WEBSITES_PORT**, and give it the value of the expected port number. Previously the platform was using `PORT` app setting, we are planning to deprecate the use this app setting and move to using `WEBSITES_PORT` exclusively.
 
 **Q:** Do I need to implement HTTPS in my custom container.
 
@@ -126,4 +126,4 @@ If you have a question, comment on the article and we'll answer it as soon as po
 * [Creating web apps in Azure Web App on Linux](app-service-linux-how-to-create-web-app.md)
 * [SSH support for Azure Web App on Linux](./app-service-linux-ssh-support.md)
 * [Set up staging environments in Azure App Service](./web-sites-staged-publishing.md)
-* [Docker Hub Continuous Deployment with Azure Web App on Linux](./app-service-linux-ci-cd.md)
+* [Continuous Deployment with Azure Web App on Linux](./app-service-linux-ci-cd.md)

articles/app-service-web/app-service-linux-intro.md

@@ -65,8 +65,8 @@ For Kudu, some of the basic functionality:
 
 For devops:
 
-* Staging environments
-* DockerHub CI/CD
+* Deployment Slots
+* ACR and DockerHub CI/CD
 
 ## Limitations
 The Azure portal shows only features that currently work for Web App on Linux and hides the rest. As we enable more features, they will be visible on the portal.
@@ -79,6 +79,7 @@ This public preview is currently only available in the following regions:
 * West Europe 
 * Southeast Asia
 * Australia East
+* Japan East
 
 Web Apps on Linux is only supported in the Dedicated app service plans and does not have a Free or Shared tier. Also, App Service plans for regular and Linux web apps are mutually exclusive, so you cannot create a Linux web app in a non-Linux app service plan.
 

articles/app-service-web/app-service-linux-ssh-support.md

@@ -51,7 +51,7 @@ If you are not already authenticated, you are required to authenticate with your
 
 In order for a custom Docker image to support SSH communication between the container and the client in the Azure portal, perform the following steps for your Docker image. 
 
-These steps are are shown in the Azure App Service repository as an example [here](https://github.com/Azure-App-Service/node/tree/master/4.4.7-1).
+These steps are are shown in the Azure App Service repository as an example [here](https://github.com/Azure-App-Service/node/blob/master/6.9.3/).
 
 1. Include the `openssh-server` installation in [`RUN` instruction](https://docs.docker.com/engine/reference/builder/#run) in the Dockerfile for your image and set the password for the root account to `"Docker!"`. 
 

articles/app-service-web/app-service-linux-using-custom-docker-image.md

@@ -28,7 +28,7 @@ App Service provides pre-defined application stacks on Linux with support for sp
 
 
 ## How to: set a custom Docker image for a web app
-You can set the custom Docker image for both new and existing webs apps. When you create a web app on Linux in the [Azure portal](https://portal.azure.com), click **Configure container** to set a custom Docker image:
+You can set the custom Docker image for both new and existing webs apps. When you create a web app on Linux in the [Azure portal](https://portal.azure.com/#create/Microsoft.AppSvcLinux), click **Configure container** to set a custom Docker image:
 
 ![Custom Docker Image for a new web app on Linux][1]
 
@@ -60,18 +60,20 @@ To use a custom Docker image from a private image registry:
 
 ## How to: set the port used by your Docker image ##
 
-When you use a custom Docker image for your web app, you can use the `PORT` environment variable in your Dockerfile, which gets added to the generated container. Consider the following example of a docker file for a Ruby application:
+When you use a custom Docker image for your web app, you can use the `WEBSITES_PORT` environment variable in your Dockerfile, which gets added to the generated container. Consider the following example of a docker file for a Ruby application:
 
 	FROM ruby:2.2.0
 	RUN mkdir /app
 	WORKDIR /app
 	ADD . /app
 	RUN bundle install
-	CMD bundle exec puma config.ru -p $PORT -e production
+	CMD bundle exec puma config.ru -p WEBSITES_PORT -e production
 
-On last line of the command, you can see that the PORT environment variable is passed at runtime. Remember that casing matters in commands.
+On last line of the command, you can see that the WEBSITES_PORT environment variable is passed at runtime. Remember that casing matters in commands.
 
-When you use an existing Docker image built by someone else, you may need to specify a port other than port 80 for the application. To configure the port, add an application setting named `PORT` with the value as shown below:
+Previously the platform was using `PORT` app setting, we are planning to deprecate the use this app setting and move to using `WEBSITES_PORT` exclusively.
+
+When you use an existing Docker image built by someone else, you may need to specify a port other than port 80 for the application. To configure the port, add an application setting named `WEBSITES_PORT` with the value as shown below:
 
 ![Configure PORT app setting for custom Docker image][6]
 
@@ -89,8 +91,8 @@ To switch from using a custom image to using a built-in image:
 
 ## Troubleshooting ##
 
-When your application fails to start with your custom Docker image, check the Docker logs in the LogFiles/docker directory. You can access this directory either through your SCM site or via FTP.
-To log the `stdout` and `stderr` from your container, you need to enable **Web server logging** under **Diagnostics Logs**.
+When your application fails to start with your custom Docker image, check the Docker logs in the LogFiles directory. You can access this directory either through your SCM site or via FTP.
+To log the `stdout` and `stderr` from your container, you need to enable **Docker Container logging** under **Diagnostics Logs**.
 
 ![Enabling Logging][8]