10 files changed, 6 insertions, 5 deletions
diff --git a/doc/articles/index.md b/doc/articles/index.md
index 4b0c85b9272..0dcfcc5703a 100644
--- a/doc/articles/index.md
+++ b/doc/articles/index.md
@@ -26,6 +26,7 @@ Build, test, and deploy the software you develop with [GitLab CI/CD](../ci/READM
 
 | Article title | Category | Publishing date |
 | :------------ | :------: | --------------: |
+| [How to test and deploy Laravel/PHP applications with GitLab CI and Envoy](test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/index.md) | Tutorial | 2017-08-31 |
 | [How to deploy Maven projects to Artifactory with GitLab CI/CD](artifactory_and_gitlab/index.md) | Tutorial | 2017-08-15 |
 | [Making CI Easier with GitLab](https://about.gitlab.com/2017/07/13/making-ci-easier-with-gitlab/) | Concepts | 2017-07-13 |
 | [Dockerizing GitLab Review Apps](https://about.gitlab.com/2017/07/11/dockerizing-review-apps/) | Concepts | 2017-07-11 |
diff --git a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/.gitkeep b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/.gitkeep
+++ /dev/null
diff --git a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/.gitkeep b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/.gitkeep
+++ /dev/null
diff --git a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/container-registry-page-empty-image.png b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/container_registry_page_empty_image.png
index 1f52e1afe83..1f52e1afe83 100644
--- a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/container-registry-page-empty-image.png
+++ b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/container_registry_page_empty_image.png
diff --git a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/deploy-keys-page.png b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/deploy_keys_page.png
index d0ce425fbf4..d0ce425fbf4 100644
--- a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/deploy-keys-page.png
+++ b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/deploy_keys_page.png
diff --git a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/laravel-welcome-page.png b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/laravel_welcome_page.png
index 3bb21fd12b4..3bb21fd12b4 100644
--- a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/laravel-welcome-page.png
+++ b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/laravel_welcome_page.png
diff --git a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/production-server-app-directory.png b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/production_server_app_directory.png
index 6dbc29fc25c..6dbc29fc25c 100644
--- a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/production-server-app-directory.png
+++ b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/production_server_app_directory.png
diff --git a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/production-server-current-directory.png b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/production_server_current_directory.png
index 8a6dcccfa38..8a6dcccfa38 100644
--- a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/production-server-current-directory.png
+++ b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/production_server_current_directory.png
diff --git a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/secret-variables-page.png b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/secret_variables_page.png
index 3249ff9d4e6..3249ff9d4e6 100644
--- a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/secret-variables-page.png
+++ b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/img/secret_variables_page.png
diff --git a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/index.md b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/index.md
index 475123a44a0..ba1d5499721 100644
--- a/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/index.md
+++ b/doc/articles/test_and_deploy_laravel_apps_with_gitlab_ci_and_envoy/index.md
@@ -1,4 +1,4 @@
-# Test and deploy Laravel applications with GitLab CI and Envoy
+# Test and deploy Laravel applications with GitLab CI/CD and Envoy
 
 > **Type:** tutorial ||
 > **Level:** intermediary ||
@@ -437,10 +437,10 @@ Now that we have our `Dockerfile` let's build and push it to our [GitLab Contain
 
 On your GitLab project repository navigate to the **Registry** tab.
 
-![container registry page empty image](img/container-registry-page-empty-image.png)
+![container registry page empty image](img/container_registry_page_empty_image.png)
 
 You may need to enable container registry (under project's settings) to your project to see this tab.
-![container registry checkbox](img/container-registry-checkbox.png)
+![container registry checkbox](img/container_registry_checkbox.png)
 
 To start using Container Registry on our machine, we first need to login to the GitLab registry using our GitLab username and password.
 
@@ -460,7 +460,7 @@ To run the above commands, we first need to have [Docker](https://docs.docker.co
 
 Congratulations! You just pushed the first Docker image to the GitLab registry, and if you refresh the page you should be able to see it.
 
-![container registry page with image](img/container-registry-page-with-image.png)
+![container registry page with image](img/container_registry_page_with_image.png)
 
 >**Note:**
 You can also [use GitLab CI](https://about.gitlab.com/2016/05/23/gitlab-container-registry/#use-with-gitlab-ci) to build and push your Docker images, rather than doing that on your machine!
@@ -629,7 +629,7 @@ You may also want to add another job for [staging environment](https://about.git
 We have prepared everything we need to test and deploy our app with GitLab CI.
 To do that, commit and push `.gitlab-ci.yml` to the `master` branch. It will trigger a pipeline, which you can watch live under your project's **Pipelines**.
 
-![pipelines page](img/pipelines-page.png)
+![pipelines page](img/pipelines_page.png)
 
 Here we see our **Test** and **Deploy** stages.
 The **Test** stage has the `unit_test` build running.