diff --git a/doc/_vale/RedHat/CaseSensitiveTerms.yml b/doc/_vale/RedHat/CaseSensitiveTerms.yml
index 5039ef07..f76d87ed 100644
--- a/doc/_vale/RedHat/CaseSensitiveTerms.yml
+++ b/doc/_vale/RedHat/CaseSensitiveTerms.yml
@@ -9,18 +9,29 @@ action:
   name: replace
 swap:
   "(?<!/)var": VAR
-  # Bind: BIND
-  '(?<!\.)yaml|Yaml': YAML
   "(?<!Business )Resource Planner|(?<!Business Resource )Planner": Business Resource Planner
-  '(?<!JBoss )EAP|(?<!Red Hat )JBoss(?!\sCommunity|\sBroker|\sClients|\sConsole|\sAMQ|\sData\sGrid|\sBRMS|\sBPMS|\sEnterprise\sApplication\sPlatform|\.org|\sInterconnect|\sEAP|\sBPM\sSuite)': JBoss EAP
   "(?<!Microsoft )Azure": Microsoft Azure
   "(?<!Microsoft Azure )On-Demand Marketplace": Microsoft Azure On-Demand Marketplace
-  '(?<!Realtime )Decision\sServer': Realtime Decision Server
   "(?<!Red Hat )Customer Portal": Red Hat Customer Portal
   "(?<!Red Hat )JBoss Enterprise Application Platform": Red Hat JBoss Enterprise Application Platform
   "(?<!Red Hat )OpenStack Platform|RHOS|RH-OSP": Red Hat OpenStack Platform
   "(?<!Red Hat JBoss )BRMS(?! engine)": inference engine
   "(?<!Red Hat JBoss )BRMS|BRM|(?<!Red Hat )JBoss BRMS": Red Hat JBoss BRMS
+  "[dD]ay-0|day 0": Day 0
+  "[dD]ay-1|day 1": Day 1
+  "[dD]ay-2|day 2": Day 2
+  "BPMS|(?<!Red Hat )JBoss BPMS|(?<!Red Hat JBoss )BPM(?! Suite)": Red Hat JBoss BPM Suite
+  "DM(?![ -]Multipath)|directory manager": Directory Manager
+  "JBoss Broker|Red Hat Broker|The AMQ Broker": AMQ Broker
+  "JBoss Console|Red Hat Console": AMQ Console
+  "Kernel(?!-based Virtual Machine)": kernel
+  "OCM|(?<!Red Hat OpenShift )Cluster Manager|(?<!Red Hat )OpenShift Cluster Manager|the OpenShift Cluster Manager": Red Hat OpenShift Cluster Manager
+  "OD": Red Hat OpenShift Dedicated
+  "(?<!.-)javadocs?": Javadoc|API documentation|Java API documentation
+  '(?<!\.)IM': instant message
+  '(?<!\.)yaml|Yaml': YAML
+  '(?<!JBoss )EAP|(?<!Red Hat )JBoss(?!\sCommunity|\sBroker|\sClients|\sConsole|\sAMQ|\sData\sGrid|\sBRMS|\sBPMS|\sEnterprise\sApplication\sPlatform|\.org|\sInterconnect|\sEAP|\sBPM\sSuite)': JBoss EAP
+  '(?<!Realtime )Decision\sServer': Realtime Decision Server
   '[nN]odejs|[nN]ode\.JS|node\.js': Node.js
   '\s\.Net Core|\s\.Net|\s\.NET\sCore|dotNet': .NET
   'A-MQ(?!\sBroker|\sClient|\sConsole|\sInterconnect)': AMQ
@@ -31,43 +42,38 @@ swap:
   'ack\spacket|ACK(?!\sflag)|ack': ACK flag
   'ActiveMQ\sArtemis|ActiveMQ(?!\sArtemis)': built-in messaging|JBoss EAP built-in messaging|JBoss EAP messaging
   'Admin\sPortal|webadmin\sportal|webadmin|Administrator\sPortal|Administration\sportal': Administration Portal
-  "BPMS|(?<!Red Hat )JBoss BPMS|(?<!Red Hat JBoss )BPM(?! Suite)": Red Hat JBoss BPM Suite
   'BRMS\sengine': inference engine
-  "[dD]ay-0|day 0": Day 0
-  "[dD]ay-1|day 1": Day 1
-  "[dD]ay-2|day 2": Day 2
-  "DM(?![ -]Multipath)|directory manager": Directory Manager
   'GUI\seditor|Business\sCentral\seditor': guided editor
-  "JBoss Broker|Red Hat Broker|The AMQ Broker": AMQ Broker
-  "JBoss Console|Red Hat Console": AMQ Console
   'JBoss\.org': JBoss Community
   'JBoss\sAMQ': AMQ
   'JBoss\sInterconnect': AMQ Interconnect
-  "Kernel(?!-based Virtual Machine)": kernel
   'Kie(?!\sServer)': KIE
   'Kie\sServer': Intelligent Process Server
   'O\.K\.D|okd|OpenShift Kubernetes Distribution|OpenShift\sOrigin': OKD
-  "OCM|(?<!Red Hat OpenShift )Cluster Manager|(?<!Red Hat )OpenShift Cluster Manager|the OpenShift Cluster Manager": Red Hat OpenShift Cluster Manager
-  "OD": Red Hat OpenShift Dedicated
   'Red\sHat\sInterconnect': AMQ Interconnect
   'Red\sHat\sVirtualization\sHypervisor|RHV\sHost|RHV-H': Red Hat Virtualization Host
   'RHVM|RHV-M|RHV\sManager': Red Hat Virtualization Manager
   'self-hosted\sengine\svirtual\smachine|engine\sVM': Manager virtual machine
+  "sub version|(?<!Apache )Subversion": sub-version
+  Ansible playbook: Ansible Playbook
   Appliance Console: Appliance console
   Applix|ApplixWare: Applixware
+  application stream|Application stream: Application Stream
+  Appstream|appstream: AppStream repository
   asciidoctor|AsciiDoctor: Asciidoctor
   asciidoc|Asciidoc: AsciiDoc
   assertj|Assertj: AssertJ
   auto-link|AutoLink: autolink
-  basic authentication|Basic Authentication|basic auth|Basic auth|Basic Auth: Basic HTTP authentication (first instance)|Basic authentication
-  BC: Business Central
+  basic authentication|Basic Authentication|basic auth|Basic auth|Basic Auth: Basic HTTP authentication|Basic authentication
+  "(?<!T-)BC": Business Central
+  Bean: bean
   Bios: BIOS
   blue print|BluePrint: blueprint
   bluestore|Blue Store: BlueStore
   btrfs: Btrfs
   Capex|capex|capEx: CapEx
   Capsule server: Capsule Server
-  CD 1: CD #1
+  CD 1: "CD #1"
   CDS|Cds: CDs
   Ceph Ansible: ceph-ansible
   Ceph block device|Ceph block devices: Ceph Block Device
@@ -127,6 +133,7 @@ swap:
   Gpl|gpl: GPL
   Graalvm|graalVM: GraalVM
   Greenboot|green boots: greenboot
+  grpc|GRPC: gRPC
   Grub: GRUB
   GTK|Gtk|gtk: GTK+
   hot rod|HotRod|hotrod: Hot Rod
@@ -134,10 +141,12 @@ swap:
   HTTP interface: management console
   hyperthreading|hyper-threading: Hyper-Threading
   HyperVisor|Hyperviser: hypervisor
+  i-fix|i-Fix|ifix|iFix: interim fix
   IA64|ia64: Itanium
   IBM z Systems: IBM Z
   Ignite|Fuse Ignite: Fuse Online|Red Hat Fuse Online|Syndesis
   ignition config: Ignition config
+  IM: instant message
   Image Builder: image builder
   INSTALL_DIR|installDir: FUSE_HOME
   Iops|IOPs: IOPS
@@ -147,6 +156,7 @@ swap:
   ipv6|IPV6|Ipv6: IPv6
   iSeries: ISeries
   iso: ISO
+  Istio Service Mesh: Istio service mesh
   Itanium2: Itanium 2
   jar file: JAR file
   Jbang|jbang: JBang
@@ -192,6 +202,7 @@ swap:
   Objective-C: Objective C
   OCP: Red Hat OpenShift Container Platform
   ODF: Red Hat OpenShift Data Foundation
+  OK button|okay|ok: OK
   Open InfiniBand|Infiniband: InfiniBand
   openid connect|Openid Connect: OpenID Connect
   openrewrite|Openrewrite|Open Rewrite: OpenRewrite
@@ -199,6 +210,7 @@ swap:
   Operating Environment: operating environment
   Operator Hub|Operator hub|Operatorhub|operatorhub: OperatorHub
   Opex|Opex|OPEX|opEx: OpEx
+  ORAN: O-RAN
   Organization administrator|Org Admin|org admin: Organization Administrator
   OS|Operating System: operating system
   Overcloud: overcloud
@@ -238,6 +250,10 @@ swap:
   RHDS: Red Hat Directory Server
   RHEL host|RHEL-H: Red Hat Enterprise Linux host
   RHV: Red Hat Virtualization
+  rolling application stream: Rolling Application Stream
+  rolling application streams: Rolling Application Streams
+  rolling stream: Rolling Stream
+  rolling streams: Rolling Streams
   Rom|rom: ROM
   rpm: RPM
   s-record|S-Record|s-Record|SREC: S-record
@@ -251,6 +267,7 @@ swap:
   smart NIC|Smart-NIC: SmartNIC
   Smart State|smart state|Smart state|Smartstate|Analysis: SmartState analysis
   socks: SOCKS
+  SoftIRQ: softirq
   software collection|Software collection: Software Collection
   Source Navigator: Source-Navigator^TM^
   Spec: spec
@@ -295,6 +312,7 @@ swap:
   web-UI|webUI: web UI
   Webauthn|webAuthn|WebAuthN: WebAuthn
   websocket|Websocket: WebSocket
+  WiFi|Wifi|wi-fi: Wi-Fi
   Window-Maker|WindowMaker: Window Maker
   Xemacs: XEmacs
   xplat-cli|x-plat-cli|xplat cli|x-plat cli|X-PLAT CLI|X-PLAT-CLI|XPLAT-CLI|XPLAT CLI: Microsoft Azure Cross-Platform Command-Line Interface
diff --git a/doc/_vale/RedHat/ConsciousLanguage.yml b/doc/_vale/RedHat/ConsciousLanguage.yml
index 6a445c05..1952a05d 100644
--- a/doc/_vale/RedHat/ConsciousLanguage.yml
+++ b/doc/_vale/RedHat/ConsciousLanguage.yml
@@ -3,12 +3,11 @@ extends: substitution
 ignorecase: true
 level: warning
 link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/consciouslanguage/
-message: Use '%s' rather than '%s.'
-# source: "https://redhat-documentation.github.io/supplementary-style-guide/#conscious-language"
+message: Use %s rather than '%s'.
 action:
   name: replace
 swap:
   blacklist: blocklist
-  whitelist: allowlist
   master(?! broker): primary|source|initiator|requester|controller|host|director|supplier
-  slave(?! broker): secondary|replica|responder|device|worker|proxy|performer|consumer
+  slave(?! broker): secondary|replica|responder|device|worker|proxy|performer|consumer|child
+  whitelist: allowlist
diff --git a/doc/_vale/RedHat/Definitions.yml b/doc/_vale/RedHat/Definitions.yml
index 47007659..c476a050 100644
--- a/doc/_vale/RedHat/Definitions.yml
+++ b/doc/_vale/RedHat/Definitions.yml
@@ -48,6 +48,7 @@ exceptions:
   - DRL
   - DSL
   - EIP
+  - ELB
   - ERROR
   - FAQ
   - FQDN
@@ -121,12 +122,14 @@ exceptions:
   - POST
   - PPP
   - PROM
+  - PTP
   - PXE
   - QCOW2
   - QEMU
   - RADOS
   - RAID
   - RAM
+  - RAN
   - RBAC
   - RBD
   - REPL
diff --git a/doc/_vale/RedHat/DoNotUseTerms.yml b/doc/_vale/RedHat/DoNotUseTerms.yml
new file mode 100644
index 00000000..1d2ff1c9
--- /dev/null
+++ b/doc/_vale/RedHat/DoNotUseTerms.yml
@@ -0,0 +1,26 @@
+---
+extends: substitution
+ignorecase: true
+level: warning
+link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/donotuse/
+message: "%s"
+swap:
+  # Start each error message with "Do not use ..."
+  # Error messages must be single quoted.
+  'ACK(?! flag)': 'Do not use "ACK" as acronym for "acknowledgement". When writing about the acknowledgement flag ("ACK flag") in a TCP packet, use "ACK flag".'
+  'future-proof': Do not use "future-proof" in a statement about the benefits, characteristics, or performance of a Red Hat product or service.'
+  'out of the box|out-of-the-box': 'Do not use "out of the box" or "out-of-the-box". Use text that is suitable for the context and the noun to which this adjective applies.'
+  and/or: 'Do not use "and/or". Depending on the context, use one of the following constructions: a and b, a or b, or a, b, or both.'
+  basically: 'Do not use "basically". "Basically" is another term for "in principle" or "fundamentally".'
+  congratulations: 'Do not use "congratulations" in technical information."'
+  debuggable: 'Do not use "debuggable". Rephrase the sentence to use the verb or noun debug. For example, change rebuild the debuggable version to rebuild the version that can be debugged.'
+  foo: 'Do not use "foo". This term is technical jargon in code and as shorthand for fubar, an acronym of profanity in code.'
+  fubar: 'Do not use "fubar". This term is an acronym of a profanity that is sometimes used by developers in code.'
+  kerberize|kerberized: 'Do not use "kerberize" to refer to applications or services that use Kerberos authentication. Refer to such applications as "Kerberos-aware" or "Kerberos-enabled", or rewrite the sentence.'
+  native interface: 'Do not use "native interface" to refer to the command line interface for the JBoss EAP management tool.'
+  overhead: 'Do not use "overhead". Use terminology that is more specific. For example, write "running large queries can increase processor usage".'
+  please: 'Do not use "please" in technical documentation.'
+  quiescent: 'Do not use "quiescent". If a system is, or needs to be inactive, write "inactive". If a system is, or needs to be safe, write "safe".'
+  resides: 'Do not use "resides" if a simpler verb is possible.'
+  respective|respectively: 'Do not use "respective" or "respectively". Rewrite to avoid using these words.'
+  time-tested: 'Do not use "time-tested". Time-tested implies a claim of suitability or reliability.'
diff --git a/doc/_vale/RedHat/HeadingPunctuation.yml b/doc/_vale/RedHat/HeadingPunctuation.yml
index 9a4c083e..04646ad3 100644
--- a/doc/_vale/RedHat/HeadingPunctuation.yml
+++ b/doc/_vale/RedHat/HeadingPunctuation.yml
@@ -1,15 +1,11 @@
 ---
-extends: existence
+extends: substitution
 level: warning
 link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/headingpunctuation/
 message: "Do not use end punctuation in headings."
 nonword: true
 scope: heading
-# source: "IBM - Periods in headings and titles, p. 61"
 action:
-  name: edit
-  params:
-    - remove
-    - ".?!"
-tokens:
-  - '[a-z0-9][.?!](?:\s|$)'
+  name: replace
+swap:
+  '[.?!]$': ''
diff --git a/doc/_vale/RedHat/Headings.yml b/doc/_vale/RedHat/Headings.yml
index 9e96c777..ea5544c0 100644
--- a/doc/_vale/RedHat/Headings.yml
+++ b/doc/_vale/RedHat/Headings.yml
@@ -79,6 +79,8 @@ exceptions:
   - Flathub
   - Flatpak
   - Flatpak Builder
+  - Fluentd
+  - Flyway
   - Fortran
   - Funqy
   - GCC
@@ -93,6 +95,7 @@ exceptions:
   - GraalVM
   - Gradle
   - GraphQL
+  - Graylog
   - Grayscale
   - GTK
   - HTTP
@@ -114,9 +117,12 @@ exceptions:
   - Infinispan
   - Intelephense
   - IntelliJ
+  - Istio
   - Itanium
   - JAR file
   - JBang
+  - JBoss Log Manager
+  - JBoss Logging
   - JUnit
   - JVM
   - Jakarta
@@ -136,6 +142,7 @@ exceptions:
   - Kubespray
   - Kylin
   - Laravel
+  - Logstash
   - Lombok
   - Makefile
   - Mandrel
@@ -226,6 +233,7 @@ exceptions:
   - WebSocket
   - Webview
   - Webviews
+  - WebView
   - Wildfly
   - Window Maker
   - Windows
@@ -238,10 +246,12 @@ exceptions:
   - Zowe
   - cgroup
   - eServer
+  - gRPC
   - mutual TLS
   - mTLS
   - qeth
   - startx
   - vNIC
   - vNUMA
+  - xDS
   - xterm
diff --git a/doc/_vale/RedHat/Hyphens.yml b/doc/_vale/RedHat/Hyphens.yml
new file mode 100644
index 00000000..0085dee9
--- /dev/null
+++ b/doc/_vale/RedHat/Hyphens.yml
@@ -0,0 +1,230 @@
+---
+extends: substitution
+ignorecase: true
+level: warning
+link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/hyphens/
+message: Use %s rather than '%s'.
+action:
+  name: replace
+# swap maps tokens in the form "bad: good"
+swap:
+  '(?<!.-)addon': add-on
+  'broad cast|broad-cast': broadcast
+  'call out|call-out': callout
+  'comma delimited|commadelimited': comma-delimited
+  'command driven|commanddriven': command-driven
+  'meta-data|meta data': metadata
+  'open-source|OpenSource|opensource': open source
+  'over-ride|over ride': override
+  'plug-ins|plug ins': plugins
+  'plug-in|plug in': plugin
+  'super-user|super user': superuser
+  'timeframe|time-frame': time frame
+  'up-grade|up grade': upgrade
+  'up-selling|up selling': upselling
+  'up-stream|up stream': upstream
+  'up-time|up time': uptime
+  ad-hoc: ad hoc
+  auto-configure: autoconfigure
+  auto-generated: autogenerate
+  auto-install: autoinstall
+  auto-number: autonumber
+  back-up: backup
+  bench-mark: benchmark
+  bi-annual: biannual
+  bi-directional: bidirectional
+  bi-monthly: bimonthly
+  bi-weekly: biweekly
+  bilevel: bi-level
+  check-out: checkout
+  checkin: check-in
+  client-server: client/server
+  cloud-bursting: cloudbursting
+  cloud-washing: cloudwashing
+  co-author: coauthor
+  co-existence: coexistence
+  co-locate|collocate: colocate
+  co-location: colocation
+  co-operate: cooperate
+  co-ordinate: coordinate
+  co-requisite: corequisite
+  co-worker: coworker
+  comma separated: comma-separated
+  command-language: command language
+  container based: container-based
+  counter-clockwise: counterclockwise
+  counter-measures: countermeasures
+  cross reference: cross-reference
+  cross site scripting: cross-site scripting
+  crossplatform|cross platform: cross-platform
+  cyber-attack: cyberattack
+  cyber-crime: cybercrime
+  cyber-security: cybersecurity
+  cyber-space: cyberspace
+  daisy-chain|daisychain: daisy chain
+  de-bias: debias
+  de-bug: debug
+  desk top|desk-top: desktop
+  disklabel|disk-label: disk label
+  domainname|domain-name: domain name
+  dotted-decimal: dotted decimal
+  double byte: double-byte
+  double click: double-click
+  double-click on: double-click
+  double-word: doubleword
+  down-load|down load: download
+  down-stream|down stream: downstream
+  e-book: ebook
+  e-mail: email
+  extra-linguistic: extralinguistic
+  extra-partition: extrapartition
+  firm ware|firm-ware: firmware
+  floating-point: floating point
+  fly-out: flyout
+  fore-ground|forground: foreground
+  frontend: front end|front-end
+  gray-scale|gray scale: grayscale
+  helpdesk|help-desk: help desk
+  hot-line: hotline
+  hotadd|hot-add: hot add
+  hotplug|hot-plug: hot plug
+  hotswap|hot-swap: hot swap
+  hyper-active: hyperactive
+  hyper-converged: hyperconverged
+  hyper-sensitive: hypersensitive
+  in line|in-line: inline
+  infra-red: infrared
+  infra-structure: infrastructure
+  inter-active: interactive
+  inter-cept: intercept
+  inter-related: interrelated
+  intra-node: intranode
+  intra-partition: intrapartition
+  intra-record: intrarecord
+  intra-system: intrasystem
+  load-balance: load balance
+  load-balancing: load balancing
+  macro-instruction: macroinstruction
+  macro-structure: macrostructure
+  meta-class: metaclass
+  meta-file: metafile
+  meta-table: metatable
+  micro-chip: microchip
+  micro-circuit: microcircuit
+  micro-code: microcode
+  mid-day: midday
+  mid-term: midterm
+  mid-year: midyear
+  mini-computer: minicomputer
+  mini-course: minicourse
+  mini-disk: minidisk
+  mouse-button|mousebutton: mouse button
+  multi site|multi-site: multisite
+  multi-channel: multichannel
+  multi-cloud: multicloud
+  multi-factor: multifactor
+  multi-media: multimedia
+  multi-path: multipath
+  multi-plexer: multiplexer
+  multi-point: multipoint
+  multi-processing: multiprocessing
+  multi-processor: multiprocessor
+  multi-schema: multischema
+  multi-table: multitable
+  multi-tenant: multitenant
+  multi-tier: multitiered
+  multi-tiered: multitiered
+  multi-vendor: multivendor
+  multicore: multi-core
+  multiinstance: multi-instance
+  new-line: newline
+  non-compliant: noncompliant
+  non-contiguous: noncontiguous
+  non-heap: nonheap
+  non-interactive: noninteractive
+  non-linear: nonlinear
+  non-negotiable: nonnegotiable
+  non-paired: nonpaired
+  non-system: nonsystem
+  non-zero: nonzero
+  nonnative: non-native
+  off-boarding: offboarding
+  off-load: offload
+  omni-channel: omnichannel
+  on-boarding: onboarding
+  on-line: online
+  op-code: opcode
+  over-lay: overlay
+  over-ride: override
+  over-strike: overstrike
+  post-editing: postediting
+  post-installation: postinstallation
+  post-mortem: postmortem
+  post-operation: postoperation
+  post-requisite: postrequisite
+  power down: turn off|power off 
+  power up: power on|turn on
+  poweroff: power-off
+  pre-apply: preapply
+  pre-assembled: preassembled
+  pre-cache: precache
+  pre-compile: precompile
+  pre-defined: predefined
+  pre-enrollment: preenrollment
+  pre-establish: preestablish
+  pre-formatted: preformatted
+  pre-installation: preinstallation
+  pre-operational: preoperational
+  pre-process: preprocess
+  pre-processor: preprocessor
+  pre-runtime: preruntime
+  pseudo code|pseudo-code: pseudocode
+  pseudo ops|pseudoops: pseudo-ops
+  pseudo-code: pseudocode
+  pseudo-random: pseudorandom
+  pseudo-text: pseudotext
+  pulldown|pull down: pull-down
+  re-direct: redirect
+  re-edit: reedit
+  re-examine: reexamine
+  re-synchronize: resynchronize
+  recreate: re-create
+  reenable: re-enable
+  remote-access: remote access
+  run level|run-level: runlevel
+  run-time: run time|runtime
+  semi-colon: semicolon
+  semi-conductor: semiconductor
+  serverside: server-side|server side
+  set-up: setup
+  soundcard|sound-card: sound card
+  stand-alone: standalone
+  straight forward|straight-forward: straightforward
+  sub-address: subaddress
+  sub-area: subarea
+  sub-capacity: subcapacity
+  sub-class: subclass
+  sub-command: subcommand
+  sub-directory: subdirectory
+  sub-menu: submenu
+  sub-net: subnet
+  sub-network: subnetwork
+  sub-package: subpackage
+  sub-tab: subtab
+  super-class: superclass
+  super-object: superobject
+  super-script: superscript
+  text based: text-based
+  textmode|text-mode: text mode
+  time-out: timeout|time out
+  trade-off|trade off: tradeoff
+  un-available: unavailable
+  un-committed: uncommitted
+  un-formatted: unformatted
+  un-install: uninstall
+  un-ordered: unordered
+  under-lying: underlying
+  under-run: underrun
+  under-used: underused
+  up-sell: upsell
+  video-mode|videomode: video mode
diff --git a/doc/_vale/RedHat/OxfordComma.yml b/doc/_vale/RedHat/OxfordComma.yml
index 7595d80c..2f9d1080 100644
--- a/doc/_vale/RedHat/OxfordComma.yml
+++ b/doc/_vale/RedHat/OxfordComma.yml
@@ -3,6 +3,7 @@ extends: existence
 level: suggestion
 link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/oxfordcomma/
 message: "Use the Oxford comma in '%s'."
-# source: "IBM - Commas between clauses, p.45"
+scope: sentence
+nonword: true
 tokens:
-  - '(?:[^,]+,){1,}\s\w+\sand'
+  - '(?:[^\s,]+,){1,} \w+ (?:and|or) \w+[.?!]'
diff --git a/doc/_vale/RedHat/PascalCamelCase.yml b/doc/_vale/RedHat/PascalCamelCase.yml
index ad73734d..fc8a8778 100644
--- a/doc/_vale/RedHat/PascalCamelCase.yml
+++ b/doc/_vale/RedHat/PascalCamelCase.yml
@@ -120,11 +120,13 @@ exceptions:
   - OpenIPMI
   - OpenJDK
   - OpenRewrite
+  - OpenRAN
   - OpenSCAP
   - OpenShift
   - OpenSSH
   - OpenSSL
   - OpenStack
+  - OpenTelemetry
   - OpenTracing
   - OperatorHub
   - OpEx
diff --git a/doc/_vale/RedHat/SimpleWords.yml b/doc/_vale/RedHat/SimpleWords.yml
index f5b650b4..a712c322 100644
--- a/doc/_vale/RedHat/SimpleWords.yml
+++ b/doc/_vale/RedHat/SimpleWords.yml
@@ -4,8 +4,10 @@ ignorecase: true
 level: suggestion
 link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/simplewords/
 message: "Use simple language. Consider using '%s' rather than '%s'."
-# source: "IBM - Conversational style; http://www.plainlanguage.gov/howto/wordsuggestions/simplewords.cfm"
+action:
+  name: replace
 swap:
+  "(?<!an |the |IP |IPv[46] |MAC |sub-)address": discuss
   "approximate(?:ly)?": about
   "objective(?! C?)": aim|goal
   absent: none|not here
@@ -20,7 +22,6 @@ swap:
   accurate: right|exact
   acquiesce: agree
   acquire: get|buy
-  "(?<!an |the |IP |IPv[46] |MAC )address": discuss
   addressees: you
   adjacent to: next to
   adjustment: change
diff --git a/doc/_vale/RedHat/Slash.yml b/doc/_vale/RedHat/Slash.yml
index f69f41d5..69fd9757 100644
--- a/doc/_vale/RedHat/Slash.yml
+++ b/doc/_vale/RedHat/Slash.yml
@@ -18,3 +18,5 @@ exceptions:
   - "z/OSMF"
   - "0/"
   - "C/C"
+  - "TCP/IP"
+  - '\d{1,4}\/\d{1,4}'
diff --git a/doc/_vale/RedHat/Spelling.yml b/doc/_vale/RedHat/Spelling.yml
index f3cd8b3d..b982a15c 100644
--- a/doc/_vale/RedHat/Spelling.yml
+++ b/doc/_vale/RedHat/Spelling.yml
@@ -4,88 +4,149 @@ extends: spelling
 level: warning
 link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/spelling/
 message: "Use correct American English spelling. Did you really mean '%s'?"
-# source: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/spelling/
 # A "filter" is a case-sensitive regular expression specifying words to ignore during spell checking.
 # Spelling rule applies to individual words
+# There is no need to add plural forms (s?) to th regex
 filters:
-  - '\.NET'
-  - 'I/O'
-  - 'Node\.js'
   - "[aA]ccessor"
   - "[aA]llowlist"
+  - "[aA]utogenerate"
+  - "[aA]utoinstall"
+  - "[aA]utomount"
+  - "[aA]utonumber"
   - "[aA]utostart"
   - "[bB]ackfilling"
   - "[bB]ackported"
   - "[bB]acktrace"
   - "[bB]indable"
   - "[bB]oolean"
+  - "[bB]ootable"
   - "[bB]reakpoint"
   - "[bB]reakpoints"
   - "[cC]he"
+  - "[cC]hrony"
   - "[cC]lassloading"
+  - "[cC]lasspath"
   - "[cC]olocate"
+  - "[cC]olocation"
   - "[cC]onfig"
+  - "[cC]orequisite"
+  - "[cC]ustomizer"
+  - "[cC]yberattack"
+  - "[cC]ybercrime"
+  - "[cC]ybersecurity"
+  - "[dD]atasource"
   - "[dD]eclaratively"
   - "[dD]ecompiler"
   - "[dD]eserialization"
+  - "[dD]eserialized"
   - "[dD]esynchronize"
   - "[dD]esynchronized"
+  - "[dD]ev"
   - "[dD]ev[wW]orkspace"
   - "[dD]evfile"
   - "[dD]evfiles"
   - "[dD]ownstream"
   - "[dD]ownstreaming"
   - "[eE]xposal"
+  - "[eE]xtrapartition"
   - "[Ff]actories"
   - "[Ff]actory"
   - "[fF]ailback"
   - "[fF]ailover"
+  - "[fF]indability"
   - "[gG]bps"
   - "[gG]it"
+  - "[gG]lock"
+  - "[gG]radle"
   - "[gG]rafana"
   - "[hH]ardcoding"
   - "[hH]eatmap"
   - "[hH]ostname"
   - "[hH]yperconverged"
   - "[iI]node"
+  - "[iI]ntranode"
+  - "[iI]ntrapartition"
+  - "[iI]ntrarecord"
+  - "[iI]ntrasystem"
   - "[iI]tem"
   - "[jJ]et[bB]rains"
   - "[jJ]ournald"
   - "[jJ]ournaling"
+  - "[kK]dump"
   - "[kK]eycloak"
   - "[kK]eylime"
   - "[kK]eyring"
   - "[kK]eyrings"
+  - "[kK]eytab"
   - "[lL]ibvirt"
   - "[lL]icensor"
+  - "[lL]iquibase"
   - "[lL]iveness"
   - "[lL]oopback"
+  - "[mM]acrostructure"
   - "[mM]atrixes"
   - "[mM]ebibytes"
+  - "[mM]etaclass"
+  - "[mM]etafile"
+  - "[mM]etamodel"
+  - "[mM]etatable"
   - "[mM]iddleware"
   - "[mM]illicores"
+  - "[mM]inicourse"
+  - "[mM]inidisk"
   - "[mM]ixin"
   - "[mM]ixins"
   - "[mM]odularization"
+  - "[Mm]onospace"
+  - "[mM]ulticloud"
   - "[mM]ulticluster"
+  - "[mM]ultifactor"
   - "[mM]ultihost"
   - "[mM]ultinode"
-  - "[mM]ultithread"
+  - "[mM]ultipath"
+  - "[mM]ultipoint"
+  - "[mM]ultisite"
+  - "[mM]ultitable"
   - "[mM]ultitenant"
+  - "[mM]ultithread"
+  - "[mM]ultitiered"
   - "[mM]ultiuser"
+  - "[mM]ultivendor"
   - "[mM]ultizone"
   - "[nN]amespace"
   - "[nN]amespaces"
+  - "[nN]onheap"
+  - "[nN]oninteractive"
+  - "[nN]onpaired"
+  - "[nN]onsystem"
+  - "[oO]ffboarding"
+  - "[oO]mnichannel"
   - "[oO]nboarding"
   - "[oO]perator"
   - "[oO]verridable"
+  - "[oO]verstrike"
+  - "[pP]ostediting"
+  - "[pP]ostinstallation"
+  - "[pP]ostoperation"
+  - "[pP]ostrequisite"
+  - "[pP]recompile"
   - "[pP]reconfigured"
+  - "[pP]reenrollment"
+  - "[pP]reformatted"
   - "[pP]regenerated"
-  - "[pP]ulldown"
+  - "[pP]reinstallation"
+  - "[pP]reoperational"
   - "[pP]repend"
   - "[pP]repended"
+  - "[pP]reprocess"
+  - "[pP]reprocessor"
   - "[pP]roductize"
   - "[pP]roductized"
+  - "[pP]seudocode"
+  - "[pP]seudorandom"
+  - "[pP]seudotext"
+  - "[pP]ulldown"
   - "[rR]eadonly"
   - "[rR]ebalance"
   - "[rR]ebalances"
@@ -108,13 +169,14 @@ filters:
   - "[rR]untime"
   - "[rR]untimes"
   - "[sS]crollbar"
-  - "[sS]erializer"
-  - "[sS]erialization"
+  - "[sS]earchability"
   - "[sS]erializable"
+  - "[sS]erialization"
+  - "[sS]erializer"
   - "[sS]erverless"
   - "[sS]ervlet"
+  - "[sS]etter"
   - "[sS]harding"
-  - "[sS]ysctl"
   - "[Ss]u"
   - "[sS]ubcommand"
   - "[sS]ubcommands"
@@ -134,14 +196,19 @@ filters:
   - "[sS]ubusers"
   - "[sS]ubvolume"
   - "[sS]ubvolumes"
+  - "[sS]ysctl"
+  - "[sS]yslog"
   - "[sS]ystemd"
   - "[tT]emplated"
   - "[tT]heia"
   - "[tT]olerations"
   - "[tT]raceback"
   - "[tT]ruststore"
+  - "[uU]mask"
   - "[uU]ncomment"
   - "[uU]ndercloud"
+  - "[uU]nderrun"
+  - "[uU]nformatted"
   - "[uU]ninstallation"
   - "[uU]nmount"
   - "[uU]nmounting"
@@ -152,6 +219,10 @@ filters:
   - "[uU]pselling"
   - "[vV]alidator"
   - "Let\\'s Encrypt"
+  - '\.NET'
+  - 'I/O'
+  - 'Node\.js'
+  - ACLs
   - adoc
   - AGPLv
   - Agroal
@@ -166,6 +237,7 @@ filters:
   - aws
   - AWS
   - Azure
+  - bcrypt
   - Bierner
   - Bitbucket
   - BOM
@@ -174,6 +246,7 @@ filters:
   - btn
   - Btrfs
   - Bugzilla
+  - Buildah
   - camelCase
   - CentOS
   - Ceph
@@ -183,13 +256,11 @@ filters:
   - Ciphertext
   - Civetweb
   - classloader
-  - classpath
   - Cloudbursting
   - Cloudwashing
   - CodeReady
-  - ConfigMaps?
+  - ConfigMap
   - Containerfile
-  - Containerfiles
   - Cookiecutter
   - CPUs
   - CR
@@ -229,8 +300,11 @@ filters:
   - firewalld
   - Flathub
   - Flatpak
+  - Fluentd
+  - Flyway
   - Fortran
   - Funqy
+  - Galera
   - GCC
   - GIDs
   - GitHub
@@ -238,11 +312,12 @@ filters:
   - Gluster
   - GNUPro
   - GraalVM
-  - Gradle
   - GraphQL
-  - greenboot
+  - Graylog
   - Grayscale
-  - GTIDs?
+  - greenboot
+  - gRPC
+  - GTID
   - GUI
   - Hashicorp
   - Helgrind
@@ -259,11 +334,11 @@ filters:
   - Infinispan
   - Intelephense
   - IntelliJ
-  - IPsec
-  - ISeries
   - IPPool
   - IPsec
   - IPv
+  - ISeries
+  - Istio
   - ISVs
   - Itanium
   - Jakarta
@@ -280,6 +355,7 @@ filters:
   - JVM
   - Kafka
   - kbd
+  - Kerberos
   - keystore
   - Kibana
   - Knative
@@ -287,13 +363,17 @@ filters:
   - Kogito
   - Kompose
   - kubelet
+  - Kubernetes
   - Kubespray
   - Kylin
   - Laravel
   - LGPLv
+  - libOSMesa
   - librados
   - librbd
-  - libOSMesa
+  - Libreswan
+  - Liquibase
+  - Logstash
   - Lombok
   - Makefile
   - Mattermost
@@ -305,7 +385,6 @@ filters:
   - Mirantis
   - Mockito
   - MongoDB
-  - Multipath
   - MySQL
   - Nagios
   - Narayana
@@ -332,8 +411,10 @@ filters:
   - OSBuild
   - osd
   - OSs
+  - OSTree
   - PCIe
-  - PDFs?
+  - PDF
+  - Petitboot
   - PHP
   - PIDs
   - Podman
@@ -368,11 +449,13 @@ filters:
   - SELinux
   - Semeru
   - Shadowman
+  - Skopeo
   - SLAs
   - SmallRye
   - Spotify
   - startx
   - STMicroelectronics
+  - Stratis
   - Suchow
   - SVG
   - Symfony
@@ -384,9 +467,9 @@ filters:
   - Traefik
   - Uber
   - UIDs
-  - URIs?
+  - URI
   - url
-  - URLs?
+  - URL
   - USBGuard
   - Vale
   - Valgrind
@@ -401,6 +484,7 @@ filters:
   - WebAuthn
   - Webpack
   - WebSocket
+  - WebView
   - Wildfly
   - Woopra
   - Wordpress
diff --git a/doc/_vale/RedHat/Symbols.yml b/doc/_vale/RedHat/Symbols.yml
new file mode 100644
index 00000000..ab9570ce
--- /dev/null
+++ b/doc/_vale/RedHat/Symbols.yml
@@ -0,0 +1,9 @@
+---
+extends: existence
+level: suggestion
+link: https://redhat-documentation.github.io/supplementary-style-guide/#_symbols
+message: "Do not use the '%s' symbol."
+nonword: true
+tokens:
+  - '(?<![":])\!(?![":])'
+  - '(?<!")\&(?!")'
diff --git a/doc/_vale/RedHat/TermsErrors.yml b/doc/_vale/RedHat/TermsErrors.yml
index 40ab4134..1aa98938 100644
--- a/doc/_vale/RedHat/TermsErrors.yml
+++ b/doc/_vale/RedHat/TermsErrors.yml
@@ -4,326 +4,465 @@ ignorecase: true
 level: error
 link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/termserrors/
 message: "Use '%s' rather than '%s'."
-# source: "https://redhat-documentation.github.io/supplementary-style-guide/#glossary-terms-conventions; IBM - Appendix C. Word usage, p. 300"
 action:
   name: replace
 # swap maps tokens in form of bad: good
 swap:
-  "(?:Ctrl|control)-click": press Ctrl and click
+  "(?<!-)healthcheck|health-check": health check
+  "(?<!-)pm": PM
+  "(?<!-|I )am": AM
+  "(?<!.)io": I/O
+  "(?<!as well )as per": according to|as|as in
   "(?<!kernel )oops": kernel oops
-  "(?<!make the )transition": "make the transition|move|migrate|change"
   "(?<!mobile |cell )phone": "telephone|cell phone|mobile phone"
   "(?<!Mozilla )Firefox": Mozilla Firefox
   "(?<!Mozilla )Thunderbird": Mozilla Thunderbird
-  "[bB]asic [aA]uth": Basic HTTP authentication (first instance)|Basic authentication
+  "(?<!pseudo-)ops": operations
+  "(?<!self-)hosted engine|hosted-engine": self-hosted engine
+  "[bB]asic [aA]uth": Basic HTTP authentication|Basic authentication
   "a lot(?: of)?": many|much
   "AI": Assisted Installer
-  "backward(?:-)?compatible": compatible with earlier versions
+  "best of breed|best-of-breed": best in class
   "bottle neck|bottle-neck": bottleneck
-  "bottom(?:-)?left": lower left|lower-left
-  "bottom(?:-)?right": lower right|lower-right
-  "broad cast|broad-cast": broadcast
+  "Christian name|forename|first name": given name
   "down(?:-)?level": earlier|previous|not at the latest level
   "IPI": installer-provisioned infrastructure
-  "mash(?: )?up": create
-  "non-English(?!-language?)": in languages other than English|non-English-language
   "pop-up (?:blocker|killer)": software to block pop-up ad windows
   "re(?:-)?occur": recur
+  "sanity test|sanity check": test|evaluate|validate|verify
+  "single quote mark|single quote(?! mark)": single quotation mark
   "sort(?:-|/)?merge": sort|merge
   "top(?:-)?left": upper left|upper right|upper-left|upper-right
   "top(?:-)?right": upper left|upper right|upper-left|upper-right
   "UPI": user-provisioned infrastructure
-  # "app(?:.)": app
-  '(?<!\/)etc(?!\/)': and so on
+  "w/(?!o) ": "with "
+  "w/o": without
   '(?<!IBM\s)S\/390|S90|S\s390': IBM S/390
-  '(?<!self-)hosted engine(?! host)|hosted-engine(?! host)': self-hosted engine
-  '(?<!virtual )floppy disk': diskette|diskette drive
-  '(?<!virtual )floppy drive': diskette|diskette drive
-  '(?<!virtual )floppy(?!\sdisk|\sdrive)': diskette|diskette drive
-  '(?<!virtual )hard drive': hard disk|hard disk drive
-  '\b(?:eg|e\.g\.)[\s,]': for example
-  '\b(?:ie|i\.e\.)[\s,]': that is
-  'fixed\sdisk\sdrive': hard disk drive
-  'virtual\shard\sdisk': virtual hard drive
+  'backwards?\scompatible': compatible with earlier versions
+  10BASE-2: 10BASE2
+  10BASET: 10BASE-T
+  24/7: 24x7
+  32-bit Windows operating system: Windows 32-bit operating system
   a number of: several
   abort: cancel|stop
+  ac: AC
+  accelerator key: keyboard shortcut
+  acknowledgement: acknowledgment
+  adapter card: adapter|card
+  adaptor: adapter
   administrate: administer
-  advisor: adviser
+  adviser: advisor
   air wall: air gap
-  all caps: uppercase
+  aka: also known as
+  alphameric: alphanumeric
+  alphanumerical: alphanumeric
   alright|all right: "correct|as expected"
+  amongst: among
+  analogue: analog
   analyse: analyze
-  and/or: a or b|a, b, or both
+  anticlockwise: counterclockwise
+  appendices: appendixes
+  application program interface: application programming interface
+  artefact: artifact
+  article-based information: topic-based information
   as long as: if|provided that
-  as per: according to|as|as in
   autodetect: auto-detect
+  back slash: backslash
   back-level: earlier|previous|not at the latest level
-  bi-monthly: bimonthly
-  bi-weekly: biweekly
+  backside: back|rear
+  barcode: bar code
+  Bidi: bidi
   Big Blue: IBM
+  bit map: bitmap
+  bitfield: bit field
+  bitness: bit version|bit value
+  bitrate: bit rate
+  bitstring: bit string
+  black hat hacker: attacker
   blink: flash
   blue screen of death: stop error
   boot diskette: boot disk
   bootloader: boot loader
   breadcrumbing: breadcrumb trail
-  bugfix: bug fix
+  break point: breakpoint
+  bring up: start|power on|open|turn on
+  bufferpool: buffer pool
   builtin|built in: built-in
+  busmaster: bus master
+  busses: buses
   byte code: bytecode
+  Camelcase|CamelCase: camel case
+  cancelation: cancellation
+  cancelled: canceled
+  cancelling: canceling
   canned: preplanned|preconfigured|predefined
+  cardreader: card reader
+  carry out: test|run
   case insensitive: not case-sensitive
+  catalogue: catalog
   catastrophic error: unrecoverable error
   CBE: Common Base Event
   CBTS: CICS BTS|BTS
   CD burner|burner: CD writer
   centre: center
+  check box: checkbox
+  check list: checklist
+  check mark: checkmark
+  chipset: chip set
+  chronologic: chronological
   cipher text|cyphertext|cypher text|cipher-text|cypher-text: ciphertext
-  cloud-bursting: cloudbursting
-  cloud-washing: cloudwashing
-  co-locate|collocate: colocate
+  codepage: code page
+  codepoint: code point
+  codeset: code set
   cold backup: offline backup
   cold boot: hardware restart
   cold start: hardware restart
-  colour: color
+  colours?: color|colors
+  combo box: combination box
   comes with: includes
-  comma delimited|commadelimited: comma-delimited
-  comma-delimited values|comma delimited values|comma separated values: comma-separated values
-  command driven|commanddriven: command-driven
-  command-language: command language
-  componentization: component-based development|component model|component architecture|shared components
-  componentize: develop components
+  CommServer: Communications Server
   comprised of: consist of
   computer farm|computer ranch: server cluster|server farm
   connect with: connect to
-  container based: container-based
   containerised: containerized
   context menu: menu|pop-up menu
   contextual help: help|context-sensitive help
-  cross site scripting: cross-site scripting
-  crossplatform|cross platform: cross-platform
-  daisy-chain|daisychain: daisy chain
+  control point logical unit: control logical unit
+  controlling logical unit: control logical unit
+  convertor: converter
+  copy book: copybook
+  cyber attack: cyberattack
+  cyber attacker: cyberattacker
+  cyber crime: cybercrime
+  cyber defense: cyberdefense
+  cyber hacker: cyberhacker
+  cyber intelligence: cyberintelligence
+  cyber security: cybersecurity
+  cyber space: cyberspace
+  cyber terror: cyberterror
+  cyber threat: cyberthreat
+  cyberresilience: cyber resilience
+  data base: database
   datacenter|data-center|data centre|datacentre: data center
+  datafile: data file
+  dataflow: data flow
+  datamart: data mart
   datamirroring|data-mirroring: data mirroring
   datapath: data path
+  datapool: data pool
+  dataset: data set
+  datasheet: data sheet
   datum: data
-  de-bug: debug
-  debuggable: debug
+  daylight savings time: Daylight Saving Time
+  dc: DC
+  DDNAME: ddname
   deconfigure: unconfigure
   deinstall: uninstall
   deinstallation: uninstallation
   demilitarized zone: DMZ
   demon: daemon
+  demount: dismount|unmount
   deployment configuration: deployment
   depress: press|type
   deregister: unregister
-  desire: want|required
-  desire|wish: need
-  desk top|desk-top: desktop
-  destroy: delete from the database
+  descendent: descendant
   details pane: details view
+  diagnostic tests: diagnostics
   different than|different to: different from
-  disklabel|disk-label: disk label
-  dismount: demount|unmount|remove
+  dismiss: close
+  disrupter: disruptor
   domain mode: managed domain
-  domainname|domain-name: domain name
-  down-load|down load: download
-  down-stream|down stream: downstream
-  downgrade: upgrade|fallback|fall back|rollback|roll back
-  downward compatible: compatible with earlier versions
-  drag and drop: drag
+  DOS environment: DOS session
+  double quote: double quotation mark
+  double word: doubleword
+  down time: downtime
+  downwards? compatible: compatible with earlier versions
   drill up: navigate
   dualboot|dual boot: dual-boot
-  e-fix: fix|interim fix
-  eFix: fix|interim fix
+  dumpfile: dump file
+  eFix|e-fix: fix|interim fix
+  Elastic Load Balancer: Elastic Load Balancing
   emphasise: emphasize
   end user: user
   end-user interface: graphical interface|interface
   enum: data enumeration
   env: environment
   EUI: graphical user interface|interface
+  evangelist: influencer|advocate|ambassador
+  fatal: unrecoverable
   fill in: complete|enter|specify
   finalise: finalize
-  firm ware|firm-ware: firmware
+  fire up: start
+  fixed disk drive: hard disk drive
   flavor: version|method
-  floating-point: floating point
   focussed: focused
-  fore-ground|forground: foreground
   forward compatible: compatible with later versions
-  gray-scale|gray scale: grayscale
-  gzip: compress
-  gzipped: archive|compressed file
+  freezes: hangs|stops responding
+  G11N|g11n: globalization
+  gage: gauge
+  grayed out: not displayed|unavailable
+  grey: gray
+  gzipped file: archive|compressed file
+  hard boot: restart
+  hard copy: hardcopy
   hard file: hard disk|hard disk drive
   hardcode: hard code
   hardcoded: hard-coded
-  healthcheck|health-check: health check
-  helpdesk|help-desk: help desk
+  health care: healthcare
+  heart beat: heartbeat
   hence: therefore
-  hosted engine host|hosted-engine host|self-hosted engine host|(?<!self-)hosted engine node|hosted-engine node: self-hosted engine node
   hostgroup: host group
-  hot-line: hotline
-  hotadd|hot-add: hot add
-  hotplug|hot-plug: hot plug
-  hotswap|hot-swap: hot swap
-  hyper-converged: hyperconverged
-  i-fix: interim fix
-  i-Fix: interim fix
-  IBM's: IBM
-  ifix: interim fix
-  iFix: interim fix
-  in order to: to
+  hotkey: hot key
+  HOWTO: how-to
+  imbed: embed
+  in depth: in-depth
   in other words: for example|that is
   in spite of: regardless of|despite
   in the event: in case|if|when
   inactivate: deactivate
+  incent: motivate|encourage
+  incentivize: motivate|encourage
+  inch pound: inch-pound
   information technology: IT
-  insure: ensure
+  initial caps: initial capital letters
   Internet address: IP address|URL|Internet email address|web address
+  Intranet: intranet
+  invoke: start|call
   irrecoverable: unrecoverable
+  JavaBean: JavaBeans
+  joblog: job log
+  jobstream: job stream
+  judgement: judgment
   keep in mind: remember
   kernelspace: kernel-space
+  kick off: start
+  L10N|l10n: localization
+  labelled: labeled
   labour: labor
-  laptop: notebook
   large page|super page: huge page
-  launch: start|open
+  last name: surname
+  learnings: lessons|training events|experiences
   learnt: learned
   leave out: omit
+  left most: leftmost
+  left-arrow key: Left Arrow key
   left-hand: left
-  leverage: use
+  left-justified: left-aligned
+  left-justify: left-align
+  left-most: leftmost
   line cord: power cable|power cord
-  Linux specific|chip specific: specific
+  link edit: link-edit
+  link editing: link-editing
   live broker: master broker
   live only: live-only
-  load-balance|load-balancing: load balance
-  look at: examine
+  loadtime: load time|load-time
+  log into: log in to
+  log off of: log off from
+  log onto: log on to
+  logfile: log file
   lots of|bunches of: many
   main directory: root directory
-  make sure: verify
+  make file: makefile
+  man day: person day
+  man hour: person hour|labor hour
+  manipulation button: right mouse button
   manpage: man page
+  masterbrand: corporate brand
   matrices: matrixes
   memory stick: USB flash drive
   menu driven|menudriven: menu-driven
+  menubar: menu bar
   microcomputer: PC
   motherboard: system board
+  mountpoint: mount point
+  mouse button 1: left mouse button
+  mouse button 2: right mouse button
   mouse over: point to|move the mouse pointer over
-  mouse-button|mousebutton: mouse button
-  multi site|multi-site: multisite
-  multi-processing: multiprocessing
-  multi-tenant: multitenant
+  multijobbing: multitasking
+  MV: major vector
+  nameserver: name server
   network-centric computing: network computing
+  newsfeed: news feed
+  nextgen: next generation
   nonrecoverable: unrecoverable
   nonsecure|non-secure: insecure
   notion: concept
+  NWSAA: NetWare for SAA
   offline storage: auxiliary storage
-  OK button: OK
-  okay: OK
-  on ramp: access method
+  on demand: on-demand
+  on ramp|on-ramp: access method
   on the fly: dynamically|as needed|in real time|immediately
   on the other hand: however|alternatively|conversely
-  on-ramp: access method
-  op-code: opcode
   openshit: OpenShift
-  open-source|OpenSource|opensource: open source
   organise: organize
   organised: organized
   organising: organizing
-  over-ride|over ride: override
+  orientate: orient
   pain point: challenge|concern|difficulty|issue
   parent task: parent process
+  parent/child: parent-child
   passive broker: slave broker
+  pathname: path name
+  PCOMM: Personal Communications
   perfcounter: performance counter
   perimeter network: DMZ
+  phillips screw: Phillips screw
+  phillips screwdriver: Phillips screwdriver
+  PL/1: PL/I
   plaintext|plain-text|cleartext|clear text: plain text
-  plug in|plug ins: plugin
+  planar board: system board
+  Plug-and-Play: plug-and-play
+  pod cast|Podcast|Pod Cast: podcast
   pojo: data model
-  power down: turn off
-  power off: turn off
-  power on: turn on
-  preload: preinstall|preinstalled
-  preloaded: preinstall|preinstalled
-  prepend: add a prefix to
-  proof of concepts: proofs of concept|proofs of concept
-  pseudo ops|pseudoops: pseudo-ops
-  pull-down: pulldown
+  pop-up list: list
+  pop-up menu: menu
+  pop-up window: window
+  pops up: opens
+  pow wow: meeting|session
+  poweron: power-on
+  practise: practice
+  preventative: preventive
+  print friendly: printer friendly
+  prior to: before
+  program product: licensed program
+  programmed operator: program operator
+  Programming Language/I: PL/I
+  proof of concepts: proofs of concept
+  pub/sub|publish-subscribe: publish/subscribe
+  quickstart|Quickstart: quick start
+  read-write: read/write
   recognise: recognize
+  Red Hat Java: Red Hat build of OpenJDK
+  Red Hat OpenJDK|RHOJDK|Red Hat Open Java Development Kit: Red Hat build of OpenJDK
   regex: regular expression
-  remote-access server: remote access server
-  remote-access: remote access
-  right double-click: double right-click
+  requestor: requester
   right now: now
   right-hand: right
+  right-justified: right-aligned
+  right-justify: right-align
+  right-most: rightmost
   round table: roundtable
+  round-robin task dispatching: round-robin scheduling
   rule of thumb: rule
-  run level|run-level: runlevel
-  sanity check: test|evaluate|validate|verify
-  sanity test: test|evaluate|validate|verify
+  schemata: schemas
+  screencap: screen capture
   screensaver: screen saver
   scroll bar|scroll-bar: scrollbar
+  second name: surname
   secondary storage: auxiliary storage
+  segregate: separate
+  segregation: separation|segmentation
   selection button: left mouse button
   send out: emit
   serial database: nonpartitioned database environment
   sharename|Sharename: share name
-  shift-click: press Shift and click
-  ship: include|included
+  ships with|is shipped with: includes
+  short cut: shortcut
+  shortcut key: keyboard shortcut
+  shortcut menu: menu
+  sign into: sign in to
+  sign off of: sign off from
+  signoff: sign-off
+  signon: sign on to
   Simple Object Access Protocol: SOAP
-  single quote mark: single quotation mark
-  single quote: single quotation mark
+  single signon: single sign-on
+  smartcard: smart card
+  smartpaper: smart paper
   SME routine: session management exit routine
   snapset|snapsets: snapshot set
-  soundcard|sound-card: sound card
+  so long as: if|when
+  sockets interface: socket interface
+  socksified: SOCKS-enabled
+  soft boot: restart the system
+  soft copy: softcopy
   specfile: spec file
   spelt: spelled
-  stand-alone: standalone
+  spend: expense|expenditure|outlay
   standalone mode: standalone server
-  start up: start
-  straight forward|straight-forward: straightforward
-  sub version|(?<!Apache )Subversion: sub-version
-  sub-command: subcommand
-  sub-directory: subdirectory
-  sub-menu: submenu
-  sub-package: subpackage
   sunset: withdraw from service|withdraw from marketing|discontinue|no longer support
-  super-user|super user: superuser
   swapspace: swap space
   switch off: turn off
-  switch on: turn on
+  synch: sync|synchronize
+  syncpoint: sync point
   sysprep tool|sysprep process|sysprep function: sysprep
-  tarball: tar file
-  terminate: end|stop
-  text based: text-based
-  textmode|text-mode: text mode
+  system engineer: systems engineer
+  tablespace: table space
+  TCP/IP network: Internet Protocol network|IP network
+  teleprocessing line: telecommunication line|transmission line
+  testcase: test case
   the installer: installation program
   thin provisioned|thinly provisioned|thinly-provisioned: thin-provisioned
+  third-party software vendor: independent software vendor
   thru: through|throughput
+  thumb drive: USB flash drive
   thumbstick: USB flash drive
-  thus: therefore
   tier-one|tier 1: tier-1
-  timeframe|time-frame: time frame
+  time box: timebox
+  time line: timeline
+  time stamp: timestamp
+  timeslice: time slice
+  timezone: time zone
   toggle off: toggle
+  tool bar: toolbar
+  tool box: toolbox
+  tool kit: toolkit
+  tool tip: tooltip
+  ToolTip: tooltip
+  totalled: totaled
+  touch base: contact|communicate
   touchscreen: touch-sensitive screen
+  trouble shoot: troubleshoot
   trust store: truststore
+  try and: try to
+  twisty: twistie
+  TY-RAP: cable tie
   typo: typing error|typographical error
+  unallocate: deallocate
   uncheck: clear
+  uncompilation: decompilation
+  uncompile: decompile
   uncompress: decompress
   undeploy: remove|withdraw
+  underbar: underscore
+  unencrypt: decrypt
   unselect: clear|deselect
   untar: extract
   unzip: extract|decompress
-  up-grade|up grade: upgrade
-  up-sell: upsell
-  up-selling|up selling: upselling
-  up-stream|up stream: upstream
-  up-time|up time: uptime
+  upgradable: upgradeable
   upward compatible: compatible with later versions
+  USB thumb drive: USB flash drive
+  useable: usable
   utilize: use
+  vanilla: uncustomized
   versus: compared to
-  video-mode|videomode: video mode
   virtual diskette drive: virtual floppy drive
-  virtual diskette: virtual floppy disk
-  vs: compared to
+  virtual diskette(?! drive): virtual floppy disk
+  virtual DOS machine: DOS session
+  virtual hard disk: virtual hard drive
+  virtual-equals-real: nonpageable
+  virtual-equals-virtual: pageable
+  wait condition: wait state
+  war room: center of operations|command center|control room
+  warmstart|warm boot: warm start
   warning notice: attention notice
+  web cast: webcast
+  web site: website
   web-enable: enable for the web
+  webmistress|web master: webmaster
+  white hat hacker: offensive security researcher
+  whitepaper: white paper
+  wild card: wildcard
+  wiring closet: telecommunications closet
   wish: want
   wish|would like: want
+  work flow: workflow
+  work group: workgroup
+  work load: workload
+  work space: workspace
+  work station: workstation
+  XSA: extended subarea addressing
   xsite: cross-site replication
   zero out: zero
+  zeroes: zeros
   zonegroup|zone-group: zone group
+  Zulu time: Coordinated Universal Time
diff --git a/doc/_vale/RedHat/TermsSuggestions.yml b/doc/_vale/RedHat/TermsSuggestions.yml
index ebe1025a..44257bae 100644
--- a/doc/_vale/RedHat/TermsSuggestions.yml
+++ b/doc/_vale/RedHat/TermsSuggestions.yml
@@ -4,37 +4,50 @@ ignorecase: false
 level: suggestion
 link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/termssuggestions/
 message: "Depending on the context, consider using '%s' rather than '%s'."
-# source: "https://redhat-documentation.github.io/supplementary-style-guide/#glossary-terms-conventions; IBM - Appendix C. Word usage, p. 300"
 action:
   name: replace
 swap:
-  "(?<!,) which": ", which (non restrictive clause preceded by a comma)|that (restrictive clause without a comma)"
-  "(?<!by) using": by using|that uses
-  "(?<!such )as": because|while
-  ", that": ", which (non restrictive clause preceded by a comma)|that (restrictive clause without a comma)"
-  "[Bb]are metal|[Bb]are-metal(?! clusters?| compute| configuration| controls?| environments?| equipment| events?| hardware| hosts?| infrastructure| installations?| installers?| machines?| media| nodes?| provisioning| servers?| workers?)": bare metal (noun)|bare-metal (adjective)
+  "(?<!,| in| on| at| to| for| from| of| with| without| against) which": ", which| that"
+  "(?<!.-)jar": compress|archive
+  "(?<!by) using": " by using| that uses"
+  ", that": ", which| that"
+  "[Bb]are metal(?= clusters?| compute| configuration| controls?| environments?| equipment| events?| hardware| hosts?| infrastructure| installations?| installers?| machines?| media| nodes?| provisioning| servers?| workers?)": bare-metal
+  "[Bb]are-metal(?! clusters?| compute| configuration| controls?| environments?| equipment| events?| hardware| hosts?| infrastructure| installations?| installers?| machines?| media| nodes?| provisioning| servers?| workers?)": bare metal
+  "[Nn]avigate": click|select|browse|go to
+  "bottom(?:-)?left": lower left|lower-left
+  "bottom(?:-)?right": lower right|lower-right
   "shell(?! prompt| script)": shell prompt
-  and so on: "appropriate descriptive wording, unless you list a clear sequence of elements"
-  between: " - ' to indicate a 'range of numbers"
-  Bps|bps: Bps (bytes per second)|bps (bits per second)
-  CD|cd: cd (change directory command)|CD (compact disc)
-  channel: repository
-  client side|client-side: client-side (adjective)| client side (noun)
-  code: write
-  crash: fail|lock up|stop|stop responding
-  functionality: functions # IBM
-  Hammer|x86_64|x86-64|x64|64-bit x86: AMD64
-  input|type: enter (followed by the text to enter in monospace) # https://redhat-documentation.github.io/supplementary-style-guide/#text-entry
-  jar: compress|archive (verb)
-  Navigate|navigate: '"click", "select", "browse", or "go to"'
-  recommend: direct users to take the recommended action
+  "x64|x86-64|(?<!64-bit )x86": 64-bit x86|x86_64
+  '(?<![\.\-])(?:zip|gzip|tar)(?! file| archive)': compress
+  '(?<!\.)tar file': ".tar file"
+  '(?<!\.)zip file': ".zip file"
+  above: later|previous|preceding
+  afterwards: afterward
+  all caps: uppercase
+  below: earlier|later|following
+  bottom left: lower left
+  bottom right: lower right
+  bugfix: bug fix
+  can not: cannot
+  choose: select
+  componentization: component-based development|component model|component architecture|shared components
+  componentize: develop components|divide into components|re-engineer into reusable software components
+  consumes: uses
+  drag and drop: drag
+  executable(?! program| routine| files?): executable program
+  frontend: front end|front-end
+  higher: later
+  hit: press|type
+  in order to: to
+  information on: information about
+  launch: start|open
+  legacy: existing|traditional|established|classic|earlier|previous
+  once: after|when
   refer to: see
-  roll-out|roll out|rollout: roll out (verb)|rollout (noun)
-  Router: AMQ Interconnect
   segfault: segmentation fault
-  tar: compress|archive
-  thru|through: "' - ' (range)|by using|finished|completed"
-  unjar: extract (verb)
-  user space|userspace|user-space: user space (noun)| user-space (modifier)
-  zip: compress
-  information on: information about
+  spawn: create
+  start up: start
+  tarball: ".tar file"
+  thus: therefore
+  translate: convert|transform
+  via: through|by|from|on|by using
diff --git a/doc/_vale/RedHat/TermsWarnings.yml b/doc/_vale/RedHat/TermsWarnings.yml
index 9ba2600e..5a35db25 100644
--- a/doc/_vale/RedHat/TermsWarnings.yml
+++ b/doc/_vale/RedHat/TermsWarnings.yml
@@ -4,19 +4,59 @@ ignorecase: true
 level: warning
 link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/termswarnings/
 message: "Consider using '%s' rather than '%s' unless updating existing content that uses the term."
-# source: "https://redhat-documentation.github.io/supplementary-style-guide/#glossary-terms-conventions; IBM - Appendix C. Word usage, p. 300"
 action:
   name: replace
 swap:
-  CRUD: create, retrieve, update, and delete (CRUD)
-  "I(?!/O)": you
+  "(?:Ctrl|control)-click": press Ctrl and click
+  "(?<!make the )transition": "make the transition|move|migrate|change"
+  "bottom(?:-)?left": lower left|lower-left
+  "bottom(?:-)?right": lower right|lower-right
+  "non-English(?!-language?)": in languages other than English|non-English-language
+  '(?<!.-)like': such as
+  '(?<!\/)etc(?!\/)': and so on
+  '\b(?:eg)': for example
+  '\b(?:ie)': that is
+  'I(?!/O)': you
+  'is updatable|are updatable': can be updated|can be changed
+  all caps: uppercase
+  architected: designed
+  as well as(?! per): and
+  BIOS: firmware
+  bottom left: lower left
+  bottom right: lower right
+  bugfix: bug fix
+  can not: cannot
+  click on: click
+  deselect: clear
+  desired: needed|required
+  desire|wish: want|require|need
+  destroy|destroyed: delete|deleted
+  double click|double-click on: double-click
+  downgrade: upgrade|fallback|fall back|rollback|roll back
+  entitlement: repository|subscription
+  execute: run|issue|start|enter
   he|she: you
   host name: hostname
-  may: might (for possiblity)|can (for ability)
+  illegal: invalid|not allowed|incorrect
+  in order to: to
+  ingests?: import|load|obtain|process
+  insure: ensure
+  kill: end|stop
+  kilobytes?: KB|kB
+  leverage: use
+  look at: examine
+  may: might|can
   on-premises|on-prem|on premise: on-premise|on-site|in-house
-  entitlement: repository|subscription
-  plug-in: plugin
+  preload: preinstall
+  preloaded: preinstalled
+  right double-click: double right-click
   sane: accurate|valid|verified
+  shift-click: press Shift and click
+  spawn: create
+  start up: start
+  switch on: turn on
+  tap on: tap
+  tarball: tar file
+  terminate: end|stop
   tooling: tool|tools
-  via: through|by|from|on|by using
-  BIOS: firmware
+  vs: compared to
diff --git a/doc/_vale/RedHat/Usage.yml b/doc/_vale/RedHat/Usage.yml
deleted file mode 100644
index 0538969c..00000000
--- a/doc/_vale/RedHat/Usage.yml
+++ /dev/null
@@ -1,151 +0,0 @@
----
-extends: existence
-ignorecase: true
-level: suggestion
-link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/usage/
-message: "Verify your use of '%s' with the word usage guidelines."
-# source: "https://redhat-documentation.github.io/supplementary-style-guide/#glossary-terms-conventions; IBM - Appendix C. Word usage, p. 300"
-tokens:
-  - "pop-up (?:help|menu)"
-  - "redbook(:s)?"
-  - above
-  - across
-  - actionable
-  - allow
-  - alpha
-  - alphabetic
-  - alphabetical
-  - architect
-  - architected
-  - as well as
-  - assembler
-  - attach
-  - below
-  - best-of-breed
-  - billion
-  - bitness
-  - black box
-  - board
-  - both
-  - bring up
-  - business partner
-  - cache
-  - carry out
-  - catch
-  - central processing unit
-  - check
-  - choose
-  - combination box
-  - combo box
-  - command console
-  - Common Base Event
-  - complete
-  - congratulations
-  - connect
-  - consumability
-  - consume
-  - could
-  - customers
-  - daughterboard
-  - decompress
-  - decompressed
-  - deploy
-  - designed to
-  - display
-  - domestic
-  - done
-  - either
-  - EPUB
-  - execute
-  - fatal
-  - foo
-  - foobar
-  - foreign
-  - free
-  - freeze
-  - fubar
-  - geography
-  - green screen
-  - guarantee
-  - hard boot
-  - hash
-  - hash sign
-  - higher
-  - hit
-  - hover help
-  - illegal
-  - impact
-  - info center
-  - infocenter
-  - information center
-  - ingest
-  - internationalize
-  - invoke
-  - itself
-  - Java Development Kit # IBM
-  - JDK #IBM
-  - kill
-  - latest
-  - legacy
-  - let
-  - like
-  - lite
-  - localize
-  - look and feel
-  - look-and-feel
-  - master and slave
-  - migrate
-  - native
-  - new
-  - once
-  - out-of-the-box
-  - overhead
-  - panel
-  - partner
-  - permit
-  - please
-  - pound sign
-  - program temporary fix
-  - proper
-  - pull-down
-  - quote
-  - quoted
-  - repair
-  - reside
-  - respective
-  - respectively
-  - sanity
-  - select
-  - selected
-  - should
-  - simply
-  - since
-  - slave
-  - so
-  - soft boot
-  - Solution Partnership Centers
-  - store
-  - tab
-  - text entry field
-  - text field
-  - themselves
-  - then
-  - there are
-  - there is
-  - this means
-  - throw
-  - throwable
-  - time to value
-  - time-tested
-  - translate
-  - trillion
-  - twistie
-  - twisty
-  - uncompressed
-  - unmount
-  - updatable
-  - very
-  - we
-  - whether or not
-  - while
-  - would
diff --git a/doc/_vale/RedHat/UserReplacedValues.yml b/doc/_vale/RedHat/UserReplacedValues.yml
index 93b02f27..658bdad3 100644
--- a/doc/_vale/RedHat/UserReplacedValues.yml
+++ b/doc/_vale/RedHat/UserReplacedValues.yml
@@ -1,7 +1,7 @@
 ---
-# source: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/userreplacedvalues/
 extends: substitution
 message: '%s, rather than %s'
+link: https://redhat-documentation.github.io/vale-at-red-hat/docs/main/reference-guide/userreplacedvalues/
 level: suggestion
 scope: raw
 swap: