Skip to content

Commit 4b16424

Browse files
committed
Making changes based on EA review issues. Updating multiple rules and style guide pages
1 parent 590d16e commit 4b16424

9 files changed

Lines changed: 53 additions & 13 deletions

File tree

ValeStyles/Couchbase/DirectionalLanguage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ link: https://docs.couchbase.com/styleguide/directional-language.html
66
tokens:
77
- left
88
- right
9-
- (?<=\bmove\s+)\bup\b
9+
- '(?<=\bmove\s+)\bup\b'
1010
- '(?<!(sign|set|back|signing|setting|backing)\s)up(?!\sto)'
1111
- '(?<!(shut)\s)down'
12-
- below
13-
- above
12+
- '\b(?:above|below|over) the\b'
13+
- 'is (?:above|below|over)\b'
1414
# exceptions:
1515
# - '(?<=set\s)up'
1616
# - 'up(?=\sto)'

ValeStyles/Couchbase/Italics.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ link: https://docs.couchbase.com/styleguide/italic.html
55
scope:
66
- raw
77
tokens:
8-
- '(?<!`)\b_\w.*?_\b(?!`)'
8+
- '(?<!`)\b_\w.*?_\b(?!`)'
9+
- '\|\s*_(.*?)_'

ValeStyles/Couchbase/Numbers.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
extends: existence
2+
message: Write all numbers as numerals.
3+
level: error
4+
link: https://docs.couchbase.com/styleguide/numbers.html
5+
6+
tokens:
7+
- one
8+
- two
9+
- three
10+
- four
11+
- five
12+
- six
13+
- seven
14+
- eight
15+
- nine
16+
- ten
17+
- eleven
18+
- twelve
19+
- thirteen
20+
- fourteen
21+
- fifteen
22+
- sixteen
23+
- seventeen
24+
- eighteen
25+
- nineteen
26+
- twenty

ValeStyles/Couchbase/ReferTo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extends: existence
22
message: Introduce links with 'For more information, see {link}'.
33
level: error
4-
# link: TBD
4+
link: https://docs.couchbase.com/styleguide/links.html
55

66
tokens:
77
- 'Refer to'

ValeStyles/Google/WordList.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ swap:
2121
'Google (?:I\-O|IO)': Google I/O
2222
'tap (?:&|and) hold': touch & hold
2323
'un(?:check|select)': clear
24-
above: preceding|later
25-
'(?:to access|access the)': see|edit|find|use|view
24+
#above: preceding|later
25+
'(?:to access|access the)': see|edit|find|open|use|view
2626
account name: username
2727
action bar: app bar
2828
admin: administrator

ValeStyles/config/vocabularies/Couchbase/accept.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ Couchbase Monitoring and Observability Stack
4040
Couchbase Server
4141
Couchbase
4242
Couchstore
43+
CPU
44+
CPUs
4345
curl
4446
Database Change Protocol
4547
datacenter
@@ -84,6 +86,8 @@ Java
8486
JavaScript
8587
JIRA
8688
JSON
89+
JVM
90+
JVMs
8791
Kafka
8892
[Kk]eyspace
8993
Kroki
@@ -129,6 +133,7 @@ rack awareness
129133
RA
130134
RBAC
131135
Read Committed
136+
[Rr]ebalance
132137
[Rr]ebase
133138
[Rr]epositories
134139
[Rr]etryable
@@ -173,6 +178,7 @@ vBuckets
173178
VBucketServerMap
174179
Views Service
175180
[Vv]irtualization
181+
[Vv]irtualized
176182
vmstat
177183
VMware
178184
Vue

styleguide/modules/ROOT/pages/directional-language.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ If the automatic Vale rule flags a use of directional language:
1717

1818
* If the usage is describing values, such as `a value above 10` or `a value below 20`, rewrite the sentence to use `a value greater than 10` or `a value less than 20`, respectively.
1919
20-
* If the usage is in a valid phrase, such as `back up`, let the tooling team know so that an exception can be added to the rule.
20+
* If the usage is in a valid phrase, such as `back up`, let the tooling team know so that an exception can be added to the rule.

styleguide/modules/ROOT/pages/links.adoc

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
= Links
22

3-
Follow the https://developers.google.com/style/link-text[Google Developer Style Guide^]'s guidance on how to write link text. In general, make it clear where a user ends up after they click a link.
3+
Follow the https://developers.google.com/style/link-text[Google Developer Style Guide^]'s guidance on how to write link text.
4+
In general, make it clear where a user ends up after they click a link.
45
5-
NOTE: This doesn't mean to just use the URL as the displayed link text. Try to write effective and useful link text for all links.
6+
NOTE: This does not mean to just use the URL as the displayed link text.
7+
Try to write effective and useful link text for all links.
8+
9+
Introduce all links with `For more information, see {link}.`
10+
Do not use `Refer to`, `For more details`, or other constructions.
11+
If you need to use another construction, try to have a good justification for that specific use case, and still try to keep the `For x, see y` construction.
612
713
Keep the following formatting and conventions in mind for <<internal>> and <<external>> in the Couchbase Documentation.
814
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
= Numbers
22

3-
Contrary to the https://developers.google.com/style/numbers[Google Style Guide^], we have decided to write out all numbers in the Couchbase Documentation.
3+
Contrary to the https://developers.google.com/style/numbers[Google Style Guide^], Couchbase style writes all numbers, regardless of size, as numerals instead of words.
44

5-
Always use the numeral, no matter the size of the number.
5+
Always use the numeral, no matter the size of the number.
66

77
For example:
88

99
* `1 or more`
10-
* `2-day total`
10+
* `2-day total`
11+
* `3-node cluster`

0 commit comments

Comments
 (0)