Automatic merge of gitlab-org/gitlab master

doc/operations/incident_management/alerts.md

@@ -33,9 +33,10 @@ The alert list displays the following information:
 - **Event count**: The number of times that an alert has fired.
 - **Issue**: A link to the incident issue that has been created for the alert.
 - **Status**: The current status of the alert:
-  - **Triggered**: No one has begun investigation.
+  - **Triggered**: Investigation has not started.
   - **Acknowledged**: Someone is actively investigating the problem.
   - **Resolved**: No further work is required.
+  - **Ignored**: No action will be taken on the alert.
 
 NOTE:
 Check out a live example available from the

doc/user/application_security/vulnerabilities/severities.md

@@ -61,10 +61,10 @@ the following tables:
 
 ## Container Scanning
 
-| GitLab analyzer                                                        | Outputs severity levels? | Native severity level type | Native severity level example                                |
+| GitLab scanner                                                        | Outputs severity levels? | Native severity level type | Native severity level example                                |
 |------------------------------------------------------------------------|--------------------------|----------------------------|--------------------------------------------------------------|
-| [`klar`](https://gitlab.com/gitlab-org/security-products/analyzers/klar) | **{check-circle}** Yes   | String                     | `Negligible`, `Low`, `Medium`, `High`, `Critical`, `Defcon1` |
-| [`container-scanning`](https://gitlab.com/gitlab-org/security-products/analyzers/container-scanning)| **{check-circle}** Yes | String | `Unknown`, `Low`, `Medium`, `High`, `Critical` |
+| [`clair`](https://gitlab.com/gitlab-org/security-products/analyzers/klar) | **{check-circle}** Yes   | String                     | `Negligible`, `Low`, `Medium`, `High`, `Critical`, `Defcon1` |
+| [`trivy`](https://gitlab.com/gitlab-org/security-products/analyzers/container-scanning)| **{check-circle}** Yes | String | `Unknown`, `Low`, `Medium`, `High`, `Critical` |
 
 ## Fuzz Testing