diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 09:08:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 09:08:06 +0300 |
| commit | 9bded6fb2268204757c35540fadef8e1b6351249 (patch) | |
| tree | 4aed0a1c3deff8a073432dd40bbb3fe3b12bed83 /doc | |
| parent | 25f414893f8f1dde029f60e781d195e426e514a1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/.vale/gitlab/Substitutions.yml | 1 | ||||
| -rw-r--r-- | doc/development/documentation/index.md | 2 | ||||
| -rw-r--r-- | doc/development/documentation/site_architecture/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/description_templates.md | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/doc/.vale/gitlab/Substitutions.yml b/doc/.vale/gitlab/Substitutions.yml index b9c0dbecf31..1b858645315 100644 --- a/doc/.vale/gitlab/Substitutions.yml +++ b/doc/.vale/gitlab/Substitutions.yml @@ -9,6 +9,7 @@ link: https://about.gitlab.com/handbook/communication/#top-misused-terms level: error ignorecase: true swap: + frontmatter: front matter GitLabber: GitLab team member gitlab omnibus: Omnibus GitLab param: parameter diff --git a/doc/development/documentation/index.md b/doc/development/documentation/index.md index 256d3f5d86c..c88490635d5 100644 --- a/doc/development/documentation/index.md +++ b/doc/development/documentation/index.md @@ -550,7 +550,7 @@ You can also [configure the text editor of your choice](https://errata-ai.github.io/vale/#local-use-by-a-single-writer) to display the results. -Vale's test results [are displayed](#testing) in CI pipelines. +Vale's error-level test results [are displayed](#testing) in CI pipelines. ##### Disable a Vale test diff --git a/doc/development/documentation/site_architecture/index.md b/doc/development/documentation/site_architecture/index.md index 56dd3821b1c..169d46ae9ac 100644 --- a/doc/development/documentation/site_architecture/index.md +++ b/doc/development/documentation/site_architecture/index.md @@ -173,7 +173,7 @@ we reference the array with a symbol (`:versions`). ## Bumping versions of CSS and JavaScript Whenever the custom CSS and JavaScript files under `content/assets/` change, -make sure to bump their version in the frontmatter. This method guarantees that +make sure to bump their version in the front matter. This method guarantees that your changes will take effect by clearing the cache of previous files. Always use Nanoc's way of including those files, do not hardcode them in the diff --git a/doc/user/project/description_templates.md b/doc/user/project/description_templates.md index 16ac53a2b52..4090d52b38a 100644 --- a/doc/user/project/description_templates.md +++ b/doc/user/project/description_templates.md @@ -29,7 +29,7 @@ templates of the default branch will be taken into account. For example, if you have a project for tracking new blog posts, you can require the title, outlines, author name, author social media information, and so on. - Following the previous example, you can make a template for every MR submitted - with a new blog post, requiring information about the post date, frontmatter data, + with a new blog post, requiring information about the post date, front matter data, images guidelines, link to the related issue, reviewer name, and so on. - You can also create issues and merge request templates for different stages of your workflow, for example, feature proposal, feature improvement, or a bug report. |