diff options
| author | Evan Read <eread@gitlab.com> | 2018-10-30 12:24:43 +1000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2018-11-19 10:41:21 +1100 |
| commit | 2155097640f7989bd4074cbefc54ddb8b6c342d5 (patch) | |
| tree | 229f3fe68ad44674882bbed6182672974ee0269a | |
| parent | bcd89a0d2ea985e50200478acd46c28a1ecb32ea (diff) | |
| download | gitlab-ce-2155097640f7989bd4074cbefc54ddb8b6c342d5.tar.gz | |
Fix spelling and clarify Secure entry
| -rw-r--r-- | doc/README.md | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/README.md b/doc/README.md index ba23c18272c..33d4716b87b 100644 --- a/doc/README.md +++ b/doc/README.md @@ -221,7 +221,7 @@ The following documentation relates to the DevOps **Create** stage: | Create Topics - Integration and Automation | Description | |:------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------| -| [GitLan API](api/README.md) | Integrate GitLab via a simple and powerful API. | +| [GitLab API](api/README.md) | Integrate GitLab via a simple and powerful API. | | [GitLab Integration](integration/README.md) | Integrate with multiple third-party services with GitLab to allow external issue trackers and external authentication. | | [GitLab Webhooks](user/project/integrations/webhooks.md) | Let GitLab notify you when new code has been pushed to your project. | | [Project Services](user/project/integrations/project_services.md) | Integrate a project with external services, such as CI and chat. | @@ -352,9 +352,12 @@ GitLab can help you secure your applications from within your development lifecy The following documentation relates to the DevOps **Secure** stage: -| Monitor Topics | Description | -|:--------------------------------------------------------|:-----------------------------------------------------------| -| [Container Scanning](ci/examples/container_scanning.md) | Use Clair to scan docker images for known vulnerabilities. | +| Monitor Topics | Description | +|:----------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------| +| [Container Scanning example](ci/examples/container_scanning.md) | `.gitlab-ci.yml` example of using Clair and clair-scanner to scan docker images for known vulnerabilities. | + +NOTE: **Note:** +Viewing [Container Scanning reports](https://docs.gitlab.com/ee/user/project/merge_requests/container_scanning.html) within merge requests requires [GitLab Ultimate](https://about.gitlab.com/pricing/). ## Subscribe to GitLab |