aboutsummaryrefslogtreecommitdiffstats
path: root/docs/history.txt
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-05-24 16:40:40 -0400
committerJason R. Coombs <jaraco@jaraco.com>2020-05-24 16:40:40 -0400
commit7306811598b51bfe726850ce4b061a6e389d5b80 (patch)
tree907882aecc017d26f925f70d003371124a507d0f /docs/history.txt
parent8f1f09b7f93f2fa86bafcd6502ec51d4680b4499 (diff)
parent52c394c1e87b863aec92949e4b494ab01a7cd234 (diff)
downloadexternal_python_setuptools-7306811598b51bfe726850ce4b061a6e389d5b80.tar.gz
external_python_setuptools-7306811598b51bfe726850ce4b061a6e389d5b80.tar.bz2
external_python_setuptools-7306811598b51bfe726850ce4b061a6e389d5b80.zip
Merge branch 'master' into docs_ci
Diffstat (limited to 'docs/history.txt')
-rw-r--r--docs/history.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/history.txt b/docs/history.txt
index 385cfa7e..faf7adfe 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -12,7 +12,7 @@ Credits
* The original design for the ``.egg`` format and the ``pkg_resources`` API was
co-created by Phillip Eby and Bob Ippolito. Bob also implemented the first
- version of ``pkg_resources``, and supplied the OS X operating system version
+ version of ``pkg_resources``, and supplied the macOS operating system version
compatibility algorithm.
* Ian Bicking implemented many early "creature comfort" features of