summaryrefslogtreecommitdiff
path: root/doc/ci/examples/deployment
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-14 03:09:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-14 03:09:01 +0000
commitc60a1173018e93e6bf433f87cb726adc979d1c8a (patch)
tree5231ab640b6b4914e4aee123dd2030a005216303 /doc/ci/examples/deployment
parente144369009f3404072f7e0f969f7cded93195a01 (diff)
downloadgitlab-ce-c60a1173018e93e6bf433f87cb726adc979d1c8a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/examples/deployment')
-rw-r--r--doc/ci/examples/deployment/composer-npm-deploy.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/examples/deployment/composer-npm-deploy.md b/doc/ci/examples/deployment/composer-npm-deploy.md
index c9c78c9a4e4..f780a13998c 100644
--- a/doc/ci/examples/deployment/composer-npm-deploy.md
+++ b/doc/ci/examples/deployment/composer-npm-deploy.md
@@ -6,7 +6,7 @@ type: tutorial
This guide covers the building of dependencies of a PHP project while compiling assets via an NPM script using [GitLab CI/CD](../../README.md).
-While it is possible to create your own image with custom PHP and Node JS versions, for brevity, we will use an existing [Docker image](https://hub.docker.com/r/tetraweb/php/) that contains both PHP and NodeJS installed.
+While it is possible to create your own image with custom PHP and Node.js versions, for brevity, we will use an existing [Docker image](https://hub.docker.com/r/tetraweb/php/) that contains both PHP and Node.js installed.
```yaml
image: tetraweb/php
@@ -23,7 +23,7 @@ before_script:
- php -r "unlink('composer-setup.php');"
```
-This will make sure we have all requirements ready. Next, we want to run `composer install` to fetch all PHP dependencies and `npm install` to load node packages, then run the `npm` script. We need to append them into `before_script` section:
+This will make sure we have all requirements ready. Next, we want to run `composer install` to fetch all PHP dependencies and `npm install` to load Node.js packages, then run the `npm` script. We need to append them into `before_script` section:
```yaml
before_script: