Skip to content

Commit a9c947e

Browse files
ereadRavlen
authored andcommitted
Vale and Markdown rule refresh for project
1 parent dd6cff1 commit a9c947e

File tree

9 files changed

+84
-37
lines changed

9 files changed

+84
-37
lines changed

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
ruby 3.1.4
2-
vale 2.29.6
2+
vale 3.0.7

doc/.vale/gitlab/HistoryItems.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
# Warning: gitlab.HistoryItems
3+
#
4+
# Ensures history items are properly formatted.
5+
#
6+
extends: existence
7+
message: "History items must always start with '> -', one item per line, even if there is only one item."
8+
link: https://docs.gitlab.com/ee/development/documentation/versions.html#add-a-version-history-item
9+
level: error
10+
scope: raw
11+
raw:
12+
- '(?m)(?<=^#+[^\n]*\n\n)> [^-]|'
13+
- '^> - [^\n]*\n[^\n>`]'

doc/.vale/gitlab/LatinTerms.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ swap:
1515
e\. g\.: for example
1616
i\.e\.: that is
1717
i\. e\.: that is
18+
via: "with', 'through', or 'by using"

doc/.vale/gitlab/Prerequisites.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
# Error: gitlab.Prerequisites
3+
#
4+
# The "Prerequisites:" line should always be plural.
5+
#
6+
# For a list of all options, see https://vale.sh/docs/topics/styles/
7+
extends: existence
8+
message: "Pluralize 'Prerequisites', even if it includes only one item."
9+
link: https://docs.gitlab.com/ee/development/documentation/topic_types/task.html#task-prerequisites
10+
level: warning
11+
nonword: true
12+
scope: text
13+
raw:
14+
- '^Prerequisite:'

doc/.vale/gitlab/SubstitutionWarning.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ swap:
3030
ex: "for example"
3131
file name: "filename"
3232
filesystem: "file system"
33+
fullscreen: "full screen"
3334
info: "information"
3435
installation from source: self-compiled installation
3536
installations from source: self-compiled installations
3637
it is recommended: "you should"
3738
logged in user: "authenticated user"
3839
logged-in user: "authenticated user"
40+
machine-learning: "machine learning"
3941
modal dialog: "dialog"
4042
modal window: "dialog"
4143
modal: "dialog"
@@ -47,6 +49,8 @@ swap:
4749
once that: "after that"
4850
once the: "after the"
4951
once you: "after you"
52+
pack file: packfile
53+
pack files: packfiles
5054
pop-up window: "dialog"
5155
pop-up: "dialog"
5256
popup: "dialog"
@@ -59,6 +63,6 @@ swap:
5963
sub-group: "subgroup"
6064
sub-groups: "subgroups"
6165
timezone: "time zone"
62-
utilize: "use"
66+
utiliz(?:es?|ing): "use"
6367
we recommend: "you should"
6468
within: "in"

doc/.vale/gitlab/Substitutions.yml

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,58 +7,61 @@
77
# For a list of all options, see https://vale.sh/docs/topics/styles/
88
extends: substitution
99
message: "Use '%s' instead of '%s'."
10-
link: https://about.gitlab.com/handbook/communication/#top-misused-terms
10+
link: https://handbook.gitlab.com/handbook/communication/top-misused-terms/
1111
level: error
1212
ignorecase: true
1313
swap:
14+
admin user: administrator
15+
admin users: administrators
16+
administrator permission: administrator access
17+
administrator permissions: administrator access
18+
administrator role: administrator access
19+
at least the Owner role: the Owner role
20+
can login: can log in
21+
can log-in: can log in
22+
can signin: can sign in
23+
can sign-in: can sign in
1424
codequality: code quality
1525
Customer [Pp]ortal: Customers Portal
26+
developer access: the Developer role
27+
developer permission: the Developer role
28+
developer permissions: the Developer role
1629
disallow: prevent
30+
'(?<!GitLab )Duo': GitLab Duo
1731
frontmatter: front matter
32+
GitLab self hosted: GitLab self-managed # https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.html#gitlab-self-managed
33+
GitLab self-hosted: GitLab self-managed # https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.html#gitlab-self-managed
1834
GitLabber: GitLab team member
1935
GitLabbers: GitLab team members
2036
GitLab-shell: GitLab Shell
2137
gitlab omnibus: Linux package
38+
golang: Go
39+
guest access: the Guest role
40+
guest permission: the Guest role
41+
guest permissions: the Guest role
42+
maintainer access: the Maintainer role
43+
maintainer permission: the Maintainer role
44+
maintainer permissions: the Maintainer role
45+
owner access: the Owner role
46+
owner permission: the Owner role
47+
owner permissions: the Owner role
2248
param: parameter
2349
params: parameters
2450
pg: PostgreSQL
2551
'postgres$': PostgreSQL
26-
golang: Go
2752
raketask: Rake task
2853
raketasks: Rake tasks
2954
rspec: RSpec
30-
self hosted: self-managed
31-
self-hosted: self-managed
55+
reporter access: the Reporter role
56+
reporter permission: the Reporter role
57+
reporter permissions: the Reporter role
58+
self hosted GitLab: GitLab self-managed # https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.html#gitlab-self-managed
59+
self-hosted GitLab: GitLab self-managed # https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.html#gitlab-self-managed
3260
styleguide: style guide
61+
the administrator access level: administrator access
3362
to login: to log in
34-
can login: can log in
3563
to log-in: to log in
36-
can log-in: can log in
3764
to signin: to sign in
38-
can signin: can sign in
3965
to sign-in: to sign in
40-
can sign-in: can sign in
4166
x509: X.509
4267
yml: YAML
43-
admin user: administrator
44-
admin users: administrators
45-
administrator permission: administrator access
46-
administrator permissions: administrator access
47-
administrator role: administrator access
48-
the administrator access level: administrator access
49-
developer access: the Developer role
50-
developer permission: the Developer role
51-
developer permissions: the Developer role
52-
guest access: the Guest role
53-
guest permission: the Guest role
54-
guest permissions: the Guest role
55-
maintainer access: the Maintainer role
56-
maintainer permission: the Maintainer role
57-
maintainer permissions: the Maintainer role
58-
owner access: the Owner role
59-
owner permission: the Owner role
60-
owner permissions: the Owner role
61-
reporter access: the Reporter role
62-
reporter permission: the Reporter role
63-
reporter permissions: the Reporter role
64-
at least the Owner role: the Owner role

doc/.vale/gitlab/Wordy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ link: https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.
1010
level: suggestion
1111
ignorecase: true
1212
swap:
13+
a number of: "Specify the number or remove the phrase."
1314
as well as: "Use 'and' instead of 'as well as'."
1415
note that: "Remove the phrase 'note that'."
1516
please: "Use 'please' only if we've inconvenienced the user."

doc/.vale/gitlab/spelling-exceptions.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ bugfixed
109109
bugfixes
110110
bugfixing
111111
Bugzilla
112+
Buildah
112113
Buildkite
113114
buildpack
114115
buildpacks
@@ -176,6 +177,7 @@ Codecov
176177
codenames
177178
Codepen
178179
CodeSandbox
180+
Codey
179181
Cognito
180182
Coinbase
181183
colocate
@@ -282,6 +284,7 @@ devfiles
282284
DevOps
283285
Dhall
284286
dialogs
287+
Diffblue
285288
disambiguates
286289
discoverability
287290
dismissable
@@ -350,6 +353,7 @@ Fastly
350353
Fastzip
351354
favicon
352355
favorited
356+
Fediverse
353357
ffaker
354358
Figma
355359
Filebeat
@@ -370,6 +374,7 @@ Flycheck
370374
focusable
371375
Forgerock
372376
formatters
377+
Fortanix
373378
Fortinet
374379
FQDNs
375380
FreshBooks
@@ -525,6 +530,7 @@ LaunchDarkly
525530
ldapsearch
526531
Lefthook
527532
Leiningen
533+
Lemmy
528534
libFuzzer
529535
Libgcrypt
530536
Libravatar
@@ -644,6 +650,7 @@ OmniAuth
644650
onboarding
645651
OpenID
646652
OpenShift
653+
OpenTelemetry
647654
Opsgenie
648655
Opstrace
649656
ORMs
@@ -879,7 +886,6 @@ sharded
879886
sharding
880887
SHAs
881888
shfmt
882-
Shimo
883889
Shippo
884890
Shopify
885891
Sidekiq
@@ -958,6 +964,7 @@ subqueried
958964
subqueries
959965
subquery
960966
subquerying
967+
Subreddit
961968
substring
962969
substrings
963970
subtask

gitlab-ci-config/gitlab-com.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ rubocop:
308308

309309
# Perform documentation linting on Markdown files
310310
docs-lint markdown:
311-
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.18-vale-2.29.6-markdownlint-0.37.0-markdownlint2-0.10.0
311+
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.19-vale-3.0.7-markdownlint-0.39.0-markdownlint2-0.12.1
312312
stage: check
313313
cache: {}
314314
needs: []
@@ -325,18 +325,22 @@ docs-lint markdown:
325325

326326
# Perform link checks on published HTML files
327327
docs-lint links:
328-
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.18-ruby-3.2.2-08fa6df8
328+
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.19-ruby-3.2.3-eee6c4c0
329329
stage: check
330330
cache: {}
331331
needs: []
332332
before_script: []
333333
script:
334-
# Prepare docs for build
335-
- mv doc/ /tmp/gitlab-docs/content/omnibus
334+
# Put documentation in location expected by nanoc and configured in nanoc.yaml. For more information, see:
335+
# https://gitlab.com/gitlab-org/gitlab-docs/-/blob/eee6c4c03621ff13743828ad74a8f0e8b96dfe7c/nanoc.yaml#L43
336+
- mkdir /tmp/omnibus-gitlab
337+
- mv doc/ /tmp/omnibus-gitlab
336338
- cd /tmp/gitlab-docs
337339
# Build HTML from Markdown
338340
- make compile
339341
# Check the internal links and anchors (in parallel)
342+
# Links from the home page aren't checked because they aren't rendered here. For information, see:
343+
# https://gitlab.com/gitlab-org/gitlab-docs/-/blob/eee6c4c03621ff13743828ad74a8f0e8b96dfe7c/content/index.erb#L6
340344
- "parallel time bundle exec nanoc check ::: internal_links internal_anchors"
341345
rules:
342346
- if: '$PIPELINE_TYPE =~ /_TEST_PIPELINE$/'

0 commit comments

Comments
 (0)