From 2b57c673134b486dd3d4e81b5454ff5773a7d4f3 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Sat, 30 May 2026 16:50:44 +0200
Subject: [PATCH v4.1.pe 3/3] Spelling nitpicks

---
 .github/workflows/postgresql-ci.yml  | 24 ++++++++++++------------
 src/tools/ci/ci_macports_packages.sh |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/postgresql-ci.yml b/.github/workflows/postgresql-ci.yml
index 685b526ae9f..7392f669ee2 100644
--- a/.github/workflows/postgresql-ci.yml
+++ b/.github/workflows/postgresql-ci.yml
@@ -1,6 +1,6 @@
 # GitHub Actions CI configuration for PostgreSQL
 
-name: Github Actions CI
+name: GitHub Actions CI
 
 on:
   push:
@@ -245,12 +245,12 @@ jobs:
   # - Uses PG_TEST_PG_COMBINEBACKUP_MODE=--copy-file-range
   #
   # Meson:
-  # - Test both 64 and 32 bit builds
+  # - Test both 64- and 32-bit builds
   # - Uses undefined behaviour and alignment sanitizers, (sanitizer failures
   #   are typically printed in the server log)
   # - Uses io_method=io_uring
   # - Uses meson feature autodetection
-  # - 32 bit build tests with LANG=C to give ICU some buildfarm-uncovered
+  # - 32-bit build tests with LANG=C to give ICU some buildfarm-uncovered
   #   coverage. Also, newer Python insists on changing LC_CTYPE away from C,
   #   prevent that with PYTHONCOERCECLOCALE.
   #
@@ -294,7 +294,7 @@ jobs:
               **/*.diffs
               **/regress_log_*
 
-          - name: Meson (64bit)
+          - name: Meson (64-bit)
             slug: meson-64
             cc: ccache gcc
             cxx: ccache g++
@@ -314,7 +314,7 @@ jobs:
               meson test ${MTEST_ARGS} -C build --num-processes ${TEST_JOBS}
             logs_paths: *log_paths
 
-          - name: Meson (32bit)
+          - name: Meson (32-bit)
             slug: meson-32
             cc: ccache gcc -m32
             cxx: ccache g++ -m32
@@ -452,7 +452,7 @@ jobs:
       BUILD_JOBS: 4
       # Test performance regresses noticeably when using all cores. 8 works OK.
       # https://postgr.es/m/20220927040208.l3shfcidovpzqxfh%40awork3.anarazel.de
-      # Fix: Needs to be re-tested for Github Actions.
+      # Fix: Needs to be re-tested for GitHub Actions.
       TEST_JOBS: 8
 
       CCACHE_DIR: ${{ github.workspace }}/ccache_dir
@@ -536,20 +536,20 @@ jobs:
           key: ${{ steps.mpkey.outputs.key }}
           restore-keys: ${{ steps.mpkey.outputs.restore-key }}
 
-      # Use macports, even though homebrew is installed. The installation
+      # Use MacPorts, even though Homebrew is installed. The installation
       # of the additional packages we need would take quite a while with
-      # homebrew, even if we cache the downloads. We can't cache all of
-      # homebrew, because it's already large. So we use macports. To cache
+      # Homebrew, even if we cache the downloads. We can't cache all of
+      # Homebrew, because it's already large. So we use MacPorts. To cache
       # the installation we create a .dmg file that we mount if it already
       # exists.
       # XXX: The reason for the direct p5.34* references is that we'd need
-      # the large macport tree around to figure out that p5-io-tty is
+      # the large MacPort tree around to figure out that p5-io-tty is
       # actually p5.34-io-tty. Using the unversioned name works, but
-      # updates macports every time.
+      # updates MacPorts every time.
       - name: Install dependencies (MacPorts)
         env:
           # Pass token so the script's GitHub API call to list MacPorts
-          # releases isn't subject to the 60/hr/IP unauthenticated rate
+          # releases isn't subject to the 60/h/IP unauthenticated rate
           # limit (shared across all jobs on the runner's IP).
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
diff --git a/src/tools/ci/ci_macports_packages.sh b/src/tools/ci/ci_macports_packages.sh
index 4c79f90fed0..18a06f96119 100755
--- a/src/tools/ci/ci_macports_packages.sh
+++ b/src/tools/ci/ci_macports_packages.sh
@@ -21,7 +21,7 @@ echo "macOS major version: $macos_major_version"
 macports_release_list_url="https://api.github.com/repos/macports/macports-base/releases"
 macports_version_pattern="2\.10\.1"
 # Authenticate the GitHub API request when a token is available (e.g. on
-# GitHub Actions). Unauthenticated requests share a 60/hr/IP rate limit
+# GitHub Actions). Unauthenticated requests share a 60/h/IP rate limit
 # with every other job on the runner's IP and frequently return an error
 # JSON, leaving $macports_url empty and breaking the subsequent curl.
 auth_header=""
-- 
2.54.0