From f657b399c31fef3682249e65835772bee1ae2a4b Mon Sep 17 00:00:00 2001
From: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>
Date: Tue, 6 Jan 2026 17:05:22 +0000
Subject: [PATCH 1/2] Add section on terminology to avoid to style guide
 (#1715)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---
 documentation/style-guide.rst | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/documentation/style-guide.rst b/documentation/style-guide.rst
index d90a14ce9..d263fb8f1 100644
--- a/documentation/style-guide.rst
+++ b/documentation/style-guide.rst
@@ -116,6 +116,24 @@ Don't use Latin abbreviations like "e.g." or "i.e." where English words will do,
 such as "for example" or "that is."
 
 
+Charged terminology to avoid
+============================
+
+Avoid terminology that may be considered insensitive or exclusionary.
+
+.. list-table::
+   :header-rows: 1
+
+   * - Avoid
+     - Instead
+   * - whitelist
+     - allowlist
+   * - blacklist
+     - blocklist, denylist
+   * - master/slave
+     - main, parent/child, server/client, primary/secondary
+
+
 .. index:: diataxis
 .. _diataxis:
 

From d5ca1b4aea6281aa66ce4b25b9889e6f89c0d2fe Mon Sep 17 00:00:00 2001
From: Rafael Weingartner-Ortner <38643099+RafaelWO@users.noreply.github.com>
Date: Sun, 25 Jan 2026 14:52:04 +0100
Subject: [PATCH 2/2] Merge macOS "Python 3.13+" and "Python 3.11-3.12" tabs
 (#1726)

---
 getting-started/setup-building.rst | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/getting-started/setup-building.rst b/getting-started/setup-building.rst
index df208f28c..110d718e9 100644
--- a/getting-started/setup-building.rst
+++ b/getting-started/setup-building.rst
@@ -858,18 +858,9 @@ some of CPython's modules (for example, ``zlib``).
 
          $ brew install pkg-config openssl@3 xz gdbm tcl-tk mpdecimal zstd
 
-      .. tab:: Python 3.13+
-
-         For Python 3.13 and newer::
+      .. tab:: Python 3.11+
 
-            $ GDBM_CFLAGS="-I$(brew --prefix gdbm)/include" \
-               GDBM_LIBS="-L$(brew --prefix gdbm)/lib -lgdbm" \
-               ./configure --with-pydebug \
-                           --with-openssl="$(brew --prefix openssl@3)"
-
-      .. tab:: Python 3.11-3.12
-
-         For Python 3.11 and 3.12::
+         For Python 3.11 and newer::
 
             $ GDBM_CFLAGS="-I$(brew --prefix gdbm)/include" \
                GDBM_LIBS="-L$(brew --prefix gdbm)/lib -lgdbm" \