diff --git a/.markdownlint.yml b/.markdownlint.yml index 82bb44f0701478b1552e14cb92050a45cd314b45_Lm1hcmtkb3dubGludC55bWw=..c98103f6db40875a6330fc33e78c27a9625523c6_Lm1hcmtkb3dubGludC55bWw= 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -1,29 +1,29 @@ --- # Base Markdownlint configuration # Extended Markdownlint configuration in doc/.markdownlint/ -"default": true -"first-header-h1": true -"header-style": - "style": "atx" -"ul-style": - "style": "dash" -"no-trailing-spaces": false -"line-length": false -"no-duplicate-header": - "allow_different_nesting": true -"no-trailing-punctuation": - "punctuation": ".,;:!。,;:ï¼ï¼Ÿ" -"ol-prefix": - "style": "one" -"no-inline-html": false -"hr-style": - "style": "---" -"no-emphasis-as-heading": false -"first-line-h1": false -"code-block-style": - "style": "fenced" -"proper-names": - "names": [ +default: true +first-header-h1: true +header-style: + style: "atx" +ul-style: + style: "dash" +no-trailing-spaces: false +line-length: false +no-duplicate-header: + allow_different_nesting: true +no-trailing-punctuation: + punctuation: ".,;:!。,;:ï¼ï¼Ÿ" +ol-prefix: + style: "one" +no-inline-html: false +hr-style: + style: "---" +no-emphasis-as-heading: false +first-line-h1: false +code-block-style: + style: "fenced" +proper-names: + names: [ "Akismet", "Alertmanager", "API", @@ -139,4 +139,4 @@ "YAML", "YouTrack" ] - "code_blocks": false + code_blocks: false diff --git a/doc/.markdownlint/markdownlint-no-trailing-spaces.yml b/doc/.markdownlint/markdownlint-no-trailing-spaces.yml index 82bb44f0701478b1552e14cb92050a45cd314b45_ZG9jLy5tYXJrZG93bmxpbnQvbWFya2Rvd25saW50LW5vLXRyYWlsaW5nLXNwYWNlcy55bWw=..c98103f6db40875a6330fc33e78c27a9625523c6_ZG9jLy5tYXJrZG93bmxpbnQvbWFya2Rvd25saW50LW5vLXRyYWlsaW5nLXNwYWNlcy55bWw= 100644 --- a/doc/.markdownlint/markdownlint-no-trailing-spaces.yml +++ b/doc/.markdownlint/markdownlint-no-trailing-spaces.yml @@ -1,4 +1,4 @@ --- # Extended Markdown configuration to enforce no-trailing-spaces rule -"extends": "../../.markdownlint.yml" -"no-trailing-spaces": true +extends: "../../.markdownlint.yml" +no-trailing-spaces: true diff --git a/doc/update/convert_to_omnibus.md b/doc/update/convert_to_omnibus.md index 82bb44f0701478b1552e14cb92050a45cd314b45_ZG9jL3VwZGF0ZS9jb252ZXJ0X3RvX29tbmlidXMubWQ=..c98103f6db40875a6330fc33e78c27a9625523c6_ZG9jL3VwZGF0ZS9jb252ZXJ0X3RvX29tbmlidXMubWQ= 100644 --- a/doc/update/convert_to_omnibus.md +++ b/doc/update/convert_to_omnibus.md @@ -9,7 +9,7 @@ Upgrading from non-Omnibus installations has not been tested by GitLab.com. Please be advised that you lose your settings in files such as `gitlab.yml`, -`puma.rb` and `smtp_settings.rb`. You need to +`puma.rb` and `smtp_settings.rb`. You must [configure those settings in `/etc/gitlab/gitlab.rb`](../index.md#configuring). Before starting the migration, ensure that you are moving to **exactly the same version** of GitLab.