Add latest changes from gitlab-org/gitlab@master

2 files changed, 66 insertions, 11 deletions

diff --git a/doc/development/documentation/styleguide/index.md b/doc/development/documentation/styleguide/index.md
index b0cd61a7ed6..179e2308c01 100644
--- a/doc/development/documentation/styleguide/index.md
+++ b/doc/development/documentation/styleguide/index.md
@@ -17,7 +17,7 @@ In addition to this page, the following resources can help you craft and contrib
 - [Doc contribution guidelines](../index.md)
 - [Recommended word list](word_list.md)
 - [Doc style and consistency testing](../testing.md)
-- [UI text guidelines](https://design.gitlab.com/content/error-messages/)
+- [Guidelines for UI error messages](https://design.gitlab.com/content/error-messages/)
 - [GitLab Handbook style guidelines](https://about.gitlab.com/handbook/communication/#writing-style-guidelines)
 - [Microsoft Style Guide](https://docs.microsoft.com/en-us/style-guide/welcome/)
 - [Google Developer Documentation Style Guide](https://developers.google.com/style)
@@ -841,6 +841,28 @@ To open group settings:
 1. Expand **General pipelines**.
 ```
 
+To open either project or group settings:
+
+```markdown
+1. On the top bar, select **Main menu**, and:
+   - For a project, select ***Projects** and find your project.
+   - For a group, select **Groups** and find your group.
+1. On the left sidebar, select **Settings > CI/CD**.
+1. Expand **General pipelines**.
+```
+
+To create a project:
+
+```markdown
+1. On the top bar, select **Create new... > New project**.
+```
+
+To create a group:
+
+```markdown
+1. On the top bar, select **Create new... > New group**.
+```
+
 To open the Admin Area:
 
 ```markdown
diff --git a/doc/development/gitlab_flavored_markdown/specification_guide/index.md b/doc/development/gitlab_flavored_markdown/specification_guide/index.md
index c1227e5d33f..304345275b5 100644
--- a/doc/development/gitlab_flavored_markdown/specification_guide/index.md
+++ b/doc/development/gitlab_flavored_markdown/specification_guide/index.md
@@ -6,29 +6,62 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # GitLab Flavored Markdown (GLFM) Specification Guide **(FREE)**
 
+## Summary
+
+- _GitLab_ Flavored Markdown (GLFM) is based on
+  [_GitHub_ Flavored Markdown](https://github.github.com/gfm/) (GFM),
+  which is based on [CommonMark](https://spec.commonmark.org/current/).
+- GLFM is divided into two "sets" of Markdown syntax:
+  - An "[official specification](#official-specifications)",
+    which is not dependent upon any specific
+    implementation or environment, and can be supported in any editor.
+  - "[Internal extensions](#internal-extensions)", which may be
+    dependent upon the GitLab environment and metadata.
+- Everything in each of these sets of syntax is specified by
+  [special Markdown files](#input-specification-files)
+  based on the [CommonMark specification syntax](https://spec.commonmark.org/0.30/#about-this-document),
+  which contain side-by-side "examples" of Markdown and the corresponding
+  generated HTML, and associated documentation describing each example.
+- There are also [YAML metadata files](#input-specification-files), which
+  may contain additional information on how individual Markdown/HTML examples
+  should be processed and rendered.
+- These Markdown/YAML files and the examples they contain serve multiple goals:
+  - They are the canonical "source of truth" for how GLFM should be rendered.
+  - They support rendering a [formatted HTML document](#spechtml) containing all
+    of the examples and associated documentation, as the
+    [GFM and CommonMark specs](#various-markdown-specifications) also do.
+  - They support running standard CommonMark [conformance testing](#markdown-conformance-testing)
+    against the official specification.
+  - They support [snapshot testing](#markdown-snapshot-testing) of GitLab
+    internal GLFM processing logic. This is accomplished by automatically
+    generating YAML ["example snapshot files"](#example-snapshot-files)
+    which are used as fixtures to drive automated testing within the GitLab app.
+- There are [various scripts and logic](#scripts)
+  which are used to accomplish the above goals.
+
+## Introduction
+
 GitLab supports Markdown in various places. The Markdown dialect we use is called
-GitLab Flavored Markdown, or GLFM.
+GitLab Flavored Markdown (GLFM).
+
+NOTE:
+In this document, _GFM_ refers to _GitHub_ Flavored Markdown, not _GitLab_ Flavored Markdown.
+Refer to the [section on acronyms](#acronyms-glfm-ghfm-gfm-commonmark)
+for a detailed explanation of the various acronyms used in this document.
 
 The specification for the GLFM dialect is based on the
 [GitHub Flavored Markdown (GFM) specification](https://github.github.com/gfm/),
 which is in turn based on the [CommonMark specification](https://spec.commonmark.org/current/).
 The GLFM specification includes
-[several extensions](../../../user/markdown.md#differences-between-gitlab-flavored-markdown-and-standard-markdown)
-to the GFM specification.
+[many additions](../../../user/markdown.md#differences-between-gitlab-flavored-markdown-and-standard-markdown)
+compared to the GFM specification.
 
-See the [section on acronyms](#acronyms-glfm-ghfm-gfm-commonmark) for a
-detailed explanation of the various acronyms used in this document.
 This guide is a developer-facing document that describes the various terms and
 definitions, goals, tools, and implementations related to the GLFM specification.
 It is intended to support and augment the [user-facing documentation](../../../user/markdown.md)
 for GitLab Flavored Markdown.
 
 NOTE:
-In this document, _GFM_ refers to _GitHub_ Flavored Markdown, not _GitLab_ Flavored Markdown.
-Refer to the [section on acronyms](#acronyms-glfm-ghfm-gfm-commonmark)
-for a detailed explanation of the various acronyms used in this document.
-
-NOTE:
 This guide and the implementation and files described in it are still a work in
 progress. As the work progresses, rewrites and consolidation
 between this guide and the [user-facing documentation](../../../user/markdown.md)