badwords: dedupe invocation into a runnable script

Also:
- GHA/checksrc: merge two badwords CI jobs into a single one.
- re-add the more common bitness entries.

Closes #20874

.github/workflows/checkdocs.yml

@@ -115,27 +115,16 @@ jobs:
           pyspelling --version
           pyspelling --verbose --jobs 5 --config .github/scripts/pyspelling.yaml
 
-  badwords-synopsis:
-    name: 'badwords, synopsis'
+  synopsis-man-examples:
+    name: 'synopsis, man-examples'
     runs-on: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
-      - name: 'badwords'
-        run: ./scripts/badwords -w ./scripts/badwords.ok '**.md' projects/OS400/README.OS400 < ./scripts/badwords.txt
-
       - name: 'verify synopsis'
         run: .github/scripts/verify-synopsis.pl docs/libcurl/curl*.md
 
-  man-examples:
-    name: 'man-examples'
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-
       - name: 'verify examples'
         run: .github/scripts/verify-examples.pl docs/libcurl/curl*.md docs/libcurl/opts/*.md

.github/workflows/checksrc.yml

@@ -179,6 +179,4 @@ jobs:
         run: .github/scripts/yamlcheck.sh
 
       - name: 'badwords'
-        run: |
-          # we allow some extra in source code
-          grep -Ev '^(will:|But=|So=|And=| url=)' ./scripts/badwords.txt | ./scripts/badwords -a src lib include docs/examples
+        run: scripts/badwords-all

Makefile.am

@@ -183,5 +183,4 @@ clean-local:
 	(cd tests && $(MAKE) clean)
 
 badwords:
-	grep -Ev '^(will:|But=|So=|And=| url=)' ./scripts/badwords.txt | ./scripts/badwords -a src lib include docs/examples
-	./scripts/badwords -w ./scripts/badwords.ok '**.md' projects/OS400/README.OS400 < ./scripts/badwords.txt
+	$(top_srcdir)/scripts/badwords-all

scripts/Makefile.am

@@ -27,7 +27,7 @@ EXTRA_DIST = coverage.sh completion.pl firefox-db2pem.sh checksrc.pl          \
   cdall cd2cd managen dmaketgz maketgz release-tools.sh verify-release        \
   cmakelint.sh mdlinkcheck CMakeLists.txt perlcheck.sh pythonlint.sh          \
   spacecheck.pl randdisable wcurl top-complexity extract-unit-protos          \
-  .checksrc badwords badwords.ok badwords.txt
+  .checksrc badwords badwords-all badwords.ok badwords.txt
 
 dist_bin_SCRIPTS = wcurl
 

scripts/badwords-all

@@ -0,0 +1,12 @@
+#!/bin/sh
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+
+set -eu
+
+cd "$(dirname "${0}")"/..
+
+# we allow some extra in source code
+grep -Ev '^(will:|But=|So=|And=| url=)' scripts/badwords.txt | scripts/badwords -a src lib include docs/examples
+scripts/badwords -w scripts/badwords.ok '**.md' projects/OS400/README.OS400 < scripts/badwords.txt

scripts/badwords.txt

@@ -75,11 +75,18 @@ user name:username
 user names:usernames
 pass phrase:passphrase
 will:rewrite to present tense
-32 bit:32-bit
+7 bit:7-bit
+8 bit:8-bit
 16 bit:16-bit
+24 bit:24-bit
+32 bit:32-bit
+56 bit:56-bit
+63 bit:63-bit
 64 bit:64-bit
-32-bits:32 bits
+128 bit:128-bit
+8-bits:8 bits
 16-bits:16 bits
+32-bits:32 bits
 64-bits:64 bits
 very:rephrase using an alternative word
 just:rephrase using an alternative word