diff --git a/styles/Canonical/003-Ubuntu-names-versions.yml b/styles/Canonical/003-Ubuntu-names-versions.yml index 79bbb90..1f1e023 100644 --- a/styles/Canonical/003-Ubuntu-names-versions.yml +++ b/styles/Canonical/003-Ubuntu-names-versions.yml @@ -16,8 +16,9 @@ scope: level: error tokens: # LTS releases should be followed by "LTS" suffix. - - 'Ubuntu \d?[02468]\.04(?! LTS)' - - 'Ubuntu 6\.06(?! LTS)' + # Use (?!\.\d| LTS) so point releases like "Ubuntu 24.04.4 LTS" are not flagged. + - 'Ubuntu \d?[02468]\.04(?!\.\d| LTS)' + - 'Ubuntu 6\.06(?!\.\d| LTS)' # Non-LTS releases should not be followed by "LTS" suffix. - 'Ubuntu \d?\d\.10 LTS' - 'Ubuntu \d?[13579]\.04 LTS' diff --git a/styles/Canonical/004-Canonical-product-names.yml b/styles/Canonical/004-Canonical-product-names.yml index 06fc941..cc1e24a 100644 --- a/styles/Canonical/004-Canonical-product-names.yml +++ b/styles/Canonical/004-Canonical-product-names.yml @@ -31,7 +31,8 @@ swap: Snapcraft: Snapcraft snapd: snapd # Vale seems to allow normal capitalisation, may need specific existence rule for Snapd Ubuntu Core: Ubuntu Core - (?<=Ubuntu )Pro: Pro + # \b ensures only "Ubuntu Pro" matches, not "Ubuntu project", "Ubuntu provides", etc. + (?<=Ubuntu )Pro\b: Pro Ubuntu Server: Ubuntu Server # Not working with multi-word terms that have the first word in the accept list diff --git a/styles/Canonical/400-Enforce-inclusive-terms.yml b/styles/Canonical/400-Enforce-inclusive-terms.yml index da8839b..4af4b6b 100644 --- a/styles/Canonical/400-Enforce-inclusive-terms.yml +++ b/styles/Canonical/400-Enforce-inclusive-terms.yml @@ -14,7 +14,7 @@ tokens: - black( )?hats? - white( )?hats? - illegal characters? - - masters? + - (?