Skip to content

Commit da6c4f6

Browse files
tglsfdctglsfdc
committed
Refer to OS X as "macOS", except for the port name which is still "darwin".
We weren't terribly consistent about whether to call Apple's OS "OS X" or "Mac OS X", and the former is probably confusing to people who aren't Apple users. Now that Apple has rebranded it "macOS", follow their lead to establish a consistent naming pattern. Also, avoid the use of the ancient project name "Darwin", except as the port code name which does not seem desirable to change. (In short, this patch touches documentation and comments, but no actual code.) I didn't touch contrib/start-scripts/osx/, either. I suspect those are obsolete and due for a rewrite, anyway. I dithered about whether to apply this edit to old release notes, but those were responsible for quite a lot of the inconsistencies, so I ended up changing them too. Anyway, Apple's being ahistorical about this, so why shouldn't we be?
1 parent 98c2d33 commit da6c4f6

40 files changed

+102
-99
lines changed

‎config/c-library.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ AC_MSG_RESULT([$pgac_cv_snprintf_size_t_support])
292292

293293
# PGAC_TYPE_LOCALE_T
294294
# ------------------
295-
# Check for the locale_t type and find the right header file. Mac OS
296-
# X needs xlocale.h; standard is locale.h, but glibc also has an
295+
# Check for the locale_t type and find the right header file. macOS
296+
# needs xlocale.h; standard is locale.h, but glibc also has an
297297
# xlocale.h file that we should not use.
298298
#
299299
AC_DEFUN([PGAC_TYPE_LOCALE_T],

‎configure

+4-4
Original file line numberDiff line numberDiff line change
@@ -7658,9 +7658,9 @@ $as_echo "${python_libspec} ${python_additional_libs}" >&6; }
76587658

76597659
if test "$python_enable_shared" != 1; then
76607660
if test "$PORTNAME" = darwin; then
7661-
# OS X does supply a .dylib even though Py_ENABLE_SHARED does
7661+
# macOS does supply a .dylib even though Py_ENABLE_SHARED does
76627662
# not get set. The file detection logic below doesn't succeed
7663-
# on older OS X versions, so make it explicit.
7663+
# on older macOS versions, so make it explicit.
76647664
python_enable_shared=1
76657665
elif test "$PORTNAME" = win32; then
76667666
# Windows also needs an explicit override.
@@ -10120,7 +10120,7 @@ else
1012010120
fi
1012110121

1012210122
elif test "$with_uuid" = e2fs ; then
10123-
# On OS X, the UUID functions are in libc
10123+
# On macOS, the UUID functions are in libc
1012410124
ac_fn_c_check_func "$LINENO" "uuid_generate" "ac_cv_func_uuid_generate"
1012510125
if test "x$ac_cv_func_uuid_generate" = xyes; then :
1012610126
UUID_LIBS=""
@@ -12672,7 +12672,7 @@ cat >>confdefs.h <<_ACEOF
1267212672
#define HAVE_DECL_STRLCPY $ac_have_decl
1267312673
_ACEOF
1267412674

12675-
# This is probably only present on Darwin, but may as well check always
12675+
# This is probably only present on macOS, but may as well check always
1267612676
ac_fn_c_check_decl "$LINENO" "F_FULLFSYNC" "ac_cv_have_decl_F_FULLFSYNC" "#include <fcntl.h>
1267712677
"
1267812678
if test "x$ac_cv_have_decl_F_FULLFSYNC" = xyes; then :

‎configure.in

+6-6
Original file line numberDiff line numberDiff line change
@@ -943,9 +943,9 @@ if test "$with_python" = yes; then
943943

944944
if test "$python_enable_shared" != 1; then
945945
if test "$PORTNAME" = darwin; then
946-
# OS X does supply a .dylib even though Py_ENABLE_SHARED does
946+
# macOS does supply a .dylib even though Py_ENABLE_SHARED does
947947
# not get set. The file detection logic below doesn't succeed
948-
# on older OS X versions, so make it explicit.
948+
# on older macOS versions, so make it explicit.
949949
python_enable_shared=1
950950
elif test "$PORTNAME" = win32; then
951951
# Windows also needs an explicit override.
@@ -1182,7 +1182,7 @@ if test "$with_uuid" = bsd ; then
11821182
[UUID_LIBS=""],
11831183
[AC_MSG_ERROR([BSD UUID functions are not present])])
11841184
elif test "$with_uuid" = e2fs ; then
1185-
# On OS X, the UUID functions are in libc
1185+
# On macOS, the UUID functions are in libc
11861186
AC_CHECK_FUNC(uuid_generate,
11871187
[UUID_LIBS=""],
11881188
[AC_CHECK_LIB(uuid, uuid_generate,
@@ -1425,8 +1425,8 @@ esac
14251425
if test "$PORTNAME" != "win32"; then
14261426
AC_SYS_LARGEFILE
14271427
dnl Autoconf 2.69's AC_SYS_LARGEFILE believes it's a good idea to #define
1428-
dnl _DARWIN_USE_64_BIT_INODE, but it isn't: on OS X 10.5 that activates a
1429-
dnl bug that causes readdir() to sometimes return EINVAL. On later OS X
1428+
dnl _DARWIN_USE_64_BIT_INODE, but it isn't: on macOS 10.5 that activates a
1429+
dnl bug that causes readdir() to sometimes return EINVAL. On later macOS
14301430
dnl versions where the feature actually works, it's on by default anyway.
14311431
AH_VERBATIM([_DARWIN_USE_64_BIT_INODE],[])
14321432
fi
@@ -1479,7 +1479,7 @@ fi
14791479

14801480
AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
14811481
AC_CHECK_DECLS([strlcat, strlcpy])
1482-
# This is probably only present on Darwin, but may as well check always
1482+
# This is probably only present on macOS, but may as well check always
14831483
AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
14841484

14851485
HAVE_IPV6=no

‎doc/src/sgml/client-auth.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ omicron bryanh guest1
13061306
socket parameter, or similar mechanisms. Currently that includes
13071307
<systemitem class="osname">Linux</>,
13081308
most flavors of <systemitem class="osname">BSD</> including
1309-
<systemitem class="osname">OS X</>,
1309+
<systemitem class="osname">macOS</>,
13101310
and <systemitem class="osname">Solaris</systemitem>.
13111311
</para>
13121312

‎doc/src/sgml/dfunc.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ cc -shared -o foo.so foo.o
127127

128128
<varlistentry>
129129
<term>
130-
<systemitem class="osname">OS X</>
131-
<indexterm><primary>OS X</><secondary>shared library</></>
130+
<systemitem class="osname">macOS</>
131+
<indexterm><primary>macOS</><secondary>shared library</></>
132132
</term>
133133
<listitem>
134134
<para>

‎doc/src/sgml/docguide.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ apt-get install docbook docbook-dsssl docbook-xsl libxml2-utils openjade1.3 open
275275
</sect2>
276276

277277
<sect2>
278-
<title>OS X</title>
278+
<title>macOS</title>
279279

280280
<para>
281281
If you use MacPorts, the following will get you set up:

‎doc/src/sgml/install-windows.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<productname>MinGW-w64</productname>. These tools can also be used to
5252
cross-compile for 32 bit and 64 bit <productname>Windows</productname>
5353
targets on other hosts, such as <productname>Linux</productname> and
54-
<productname>Darwin</productname>.
54+
<productname>macOS</productname>.
5555
<productname>Cygwin</productname> is not recommended for running a
5656
production server, and it should only be used for running on
5757
older versions of <productname>Windows</productname> where

‎doc/src/sgml/installation.sgml

+3-3
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ su - postgres
874874
<listitem>
875875
<para>
876876
Build with Bonjour support. This requires Bonjour support
877-
in your operating system. Recommended on OS X.
877+
in your operating system. Recommended on macOS.
878878
</para>
879879
</listitem>
880880
</varlistentry>
@@ -900,7 +900,7 @@ su - postgres
900900
<para>
901901
<option>e2fs</> to use the UUID library created by
902902
the <literal>e2fsprogs</> project; this library is present in most
903-
Linux systems and in OS X, and can be obtained for other
903+
Linux systems and in macOS, and can be obtained for other
904904
platforms as well
905905
</para>
906906
</listitem>
@@ -2010,7 +2010,7 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
20102010
<para>
20112011
<productname>PostgreSQL</> can be expected to work on these operating
20122012
systems: Linux (all recent distributions), Windows (Win2000 SP4 and later),
2013-
FreeBSD, OpenBSD, NetBSD, OS X, AIX, HP/UX, Solaris,
2013+
FreeBSD, OpenBSD, NetBSD, macOS, AIX, HP/UX, Solaris,
20142014
and UnixWare. Other Unix-like systems may also work but are not currently
20152015
being tested. In most cases, all CPU architectures supported by
20162016
a given operating system will work. Look in

‎doc/src/sgml/monitoring.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2739,7 +2739,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
27392739
Currently, the
27402740
<ulink url="https://en.wikipedia.org/wiki/DTrace">DTrace</ulink>
27412741
utility is supported, which, at the time of this writing, is available
2742-
on Solaris, OS X, FreeBSD, NetBSD, and Oracle Linux. The
2742+
on Solaris, macOS, FreeBSD, NetBSD, and Oracle Linux. The
27432743
<ulink url="http://sourceware.org/systemtap/">SystemTap</ulink> project
27442744
for Linux provides a DTrace equivalent and can also be used. Supporting other dynamic
27452745
tracing utilities is theoretically possible by changing the definitions for

‎doc/src/sgml/release-7.4.sgml

+7-7
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268
</para>
269269

270270
<para>
271-
This behavior has been observed on BSD-derived kernels including OS X.
271+
This behavior has been observed on BSD-derived kernels including macOS.
272272
It resulted in an entirely-misleading startup failure complaining that
273273
the shared memory request size was too large.
274274
</para>
@@ -2437,7 +2437,7 @@ aggregate plan</para></listitem>
24372437
<listitem><para>Pretty-print UNION queries correctly</para></listitem>
24382438
<listitem><para>Make psql handle <literal>\r\n</> newlines properly in COPY IN</para></listitem>
24392439
<listitem><para><application>pg_dump</> handled ACLs with grant options incorrectly</para></listitem>
2440-
<listitem><para>Fix thread support for OS X and Solaris</para></listitem>
2440+
<listitem><para>Fix thread support for macOS and Solaris</para></listitem>
24412441
<listitem><para>Updated JDBC driver (build 215) with various fixes</para></listitem>
24422442
<listitem><para>ECPG fixes</para></listitem>
24432443
<listitem><para>Translation updates (various contributors)</para></listitem>
@@ -2627,7 +2627,7 @@ memory</> error during <command>COPY IN</></para></listitem>
26272627
TABLE AS</> from tables without OIDs</para></listitem>
26282628
<listitem><para>Fix problems with <filename>alter_table</> regression test
26292629
during parallel testing</para></listitem>
2630-
<listitem><para>Fix problems with hitting open file limit, especially on OS X (Tom)</para></listitem>
2630+
<listitem><para>Fix problems with hitting open file limit, especially on macOS (Tom)</para></listitem>
26312631
<listitem><para>Partial fix for Turkish-locale issues</para>
26322632
<para>initdb will succeed now in Turkish locale, but there are still some
26332633
inconveniences associated with the <literal>i/I</> problem.</para></listitem>
@@ -3256,7 +3256,7 @@ DROP SCHEMA information_schema CASCADE;
32563256
</para>
32573257
</listitem>
32583258

3259-
<listitem><para>Enable PAM for Mac OS X (Aaron Hillegass)</para></listitem>
3259+
<listitem><para>Enable PAM for macOS (Aaron Hillegass)</para></listitem>
32603260

32613261
<listitem>
32623262
<para>Make B-tree indexes fully WAL-safe (Tom)</para>
@@ -3539,9 +3539,9 @@ DROP SCHEMA information_schema CASCADE;
35393539
</listitem>
35403540

35413541
<listitem>
3542-
<para>Add Mac OS X Rendezvous server support (Chris Campbell)</para>
3542+
<para>Add macOS Rendezvous server support (Chris Campbell)</para>
35433543
<para>
3544-
This allows Mac OS X hosts to query the network for available
3544+
This allows macOS hosts to query the network for available
35453545
<productname>PostgreSQL</productname> servers.
35463546
</para>
35473547
</listitem>
@@ -4561,7 +4561,7 @@ DROP SCHEMA information_schema CASCADE;
45614561
<listitem><para>Fix locking code for s390x CPU (64-bit) (Tom)</para></listitem>
45624562
<listitem><para>Allow OpenBSD to use local ident credentials (William Ahern)</para></listitem>
45634563
<listitem><para>Make query plan trees read-only to executor (Tom)</para></listitem>
4564-
<listitem><para>Add Darwin startup scripts (David Wheeler)</para></listitem>
4564+
<listitem><para>Add macOS startup scripts (David Wheeler)</para></listitem>
45654565
<listitem><para>Allow libpq to compile with Borland C++ compiler (Lester Godwin, Karl Waclawek)</para></listitem>
45664566
<listitem><para>Use our own version of <function>getopt_long()</function> if needed (Peter)</para></listitem>
45674567
<listitem><para>Convert administration scripts to C (Peter)</para></listitem>

‎doc/src/sgml/release-8.0.sgml

+5-5
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345
</para>
346346

347347
<para>
348-
This behavior has been observed on BSD-derived kernels including OS X.
348+
This behavior has been observed on BSD-derived kernels including macOS.
349349
It resulted in an entirely-misleading startup failure complaining that
350350
the shared memory request size was too large.
351351
</para>
@@ -1715,7 +1715,7 @@
17151715

17161716
<para>
17171717
While this could theoretically happen anywhere, no standard build of
1718-
Perl did things this way ... until <productname>Mac OS X</> 10.5.
1718+
Perl did things this way ... until <productname>macOS</> 10.5.
17191719
</para>
17201720
</listitem>
17211721

@@ -2449,7 +2449,7 @@ Win32 to match the backend (Andrew)</para></listitem>
24492449
(Bruce)</para></listitem>
24502450

24512451
<listitem><para>Fix <application>pgxs</> <literal>-L</> library path
2452-
specification for Win32, Cygwin, OS X, AIX (Bruce)</para></listitem>
2452+
specification for Win32, Cygwin, macOS, AIX (Bruce)</para></listitem>
24532453

24542454
<listitem><para>Check that SID is enabled while checking for Win32 admin
24552455
privileges (Magnus)</para></listitem>
@@ -5224,7 +5224,7 @@ typedefs (Michael)</para></listitem>
52245224

52255225
<listitem>
52265226
<para>
5227-
Improvements to the Mac OS X startup scripts (Ray A.)
5227+
Improvements to the macOS startup scripts (Ray A.)
52285228
</para>
52295229
</listitem>
52305230

@@ -5328,7 +5328,7 @@ typedefs (Michael)</para></listitem>
53285328

53295329
<listitem>
53305330
<para>
5331-
Make libpq and ECPG build as proper shared libraries on OS X (Tom)
5331+
Make libpq and ECPG build as proper shared libraries on macOS (Tom)
53325332
</para>
53335333
</listitem>
53345334

‎doc/src/sgml/release-8.1.sgml

+5-5
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@
572572
</para>
573573

574574
<para>
575-
This behavior has been observed on BSD-derived kernels including OS X.
575+
This behavior has been observed on BSD-derived kernels including macOS.
576576
It resulted in an entirely-misleading startup failure complaining that
577577
the shared memory request size was too large.
578578
</para>
@@ -2188,7 +2188,7 @@
21882188

21892189
<para>
21902190
While this could theoretically happen anywhere, no standard build of
2191-
Perl did things this way ... until <productname>Mac OS X</> 10.5.
2191+
Perl did things this way ... until <productname>macOS</> 10.5.
21922192
</para>
21932193
</listitem>
21942194

@@ -2730,7 +2730,7 @@
27302730

27312731
<listitem>
27322732
<para>
2733-
Fix for Darwin (OS X) compilation (Tom)
2733+
Fix for macOS (Darwin) compilation (Tom)
27342734
</para>
27352735
</listitem>
27362736

@@ -3104,7 +3104,7 @@ Win32 to match the backend (Andrew)</para></listitem>
31043104
(Bruce)</para></listitem>
31053105

31063106
<listitem><para>Fix <application>pgxs</> <literal>-L</> library path
3107-
specification for Win32, Cygwin, OS X, AIX (Bruce)</para></listitem>
3107+
specification for Win32, Cygwin, macOS, AIX (Bruce)</para></listitem>
31083108

31093109
<listitem><para>Check that SID is enabled while checking for Win32 admin
31103110
privileges (Magnus)</para></listitem>
@@ -5225,7 +5225,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
52255225
<listitem>
52265226
<para>
52275227
Add support for <literal>fsync_writethrough</literal> on
5228-
Darwin (Chris Campbell)
5228+
macOS (Chris Campbell)
52295229
</para>
52305230
</listitem>
52315231

‎doc/src/sgml/release-8.2.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1487,7 +1487,7 @@
14871487
</para>
14881488

14891489
<para>
1490-
This behavior has been observed on BSD-derived kernels including OS X.
1490+
This behavior has been observed on BSD-derived kernels including macOS.
14911491
It resulted in an entirely-misleading startup failure complaining that
14921492
the shared memory request size was too large.
14931493
</para>
@@ -3765,7 +3765,7 @@
37653765

37663766
<para>
37673767
While this could theoretically happen anywhere, no standard build of
3768-
Perl did things this way ... until <productname>Mac OS X</> 10.5.
3768+
Perl did things this way ... until <productname>macOS</> 10.5.
37693769
</para>
37703770
</listitem>
37713771

‎doc/src/sgml/release-8.3.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3075,7 +3075,7 @@
30753075
</para>
30763076

30773077
<para>
3078-
This behavior has been observed on BSD-derived kernels including OS X.
3078+
This behavior has been observed on BSD-derived kernels including macOS.
30793079
It resulted in an entirely-misleading startup failure complaining that
30803080
the shared memory request size was too large.
30813081
</para>
@@ -8396,7 +8396,7 @@ current_date &lt; 2017-11-17
83968396
<listitem>
83978397
<para>
83988398
Use <acronym>SYSV</> semaphores rather than POSIX on Darwin
8399-
&gt;= 6.0, i.e., OS X 10.2 and up (Chris Marcellino)
8399+
&gt;= 6.0, i.e., macOS 10.2 and up (Chris Marcellino)
84008400
</para>
84018401
</listitem>
84028402

‎doc/src/sgml/release-8.4.sgml

+3-3
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240

241241
<listitem>
242242
<para>
243-
Fix linking of <application>libpython</> on OS X (Tom Lane)
243+
Fix linking of <application>libpython</> on macOS (Tom Lane)
244244
</para>
245245

246246
<para>
@@ -5334,7 +5334,7 @@
53345334
</para>
53355335

53365336
<para>
5337-
This behavior has been observed on BSD-derived kernels including OS X.
5337+
This behavior has been observed on BSD-derived kernels including macOS.
53385338
It resulted in an entirely-misleading startup failure complaining that
53395339
the shared memory request size was too large.
53405340
</para>
@@ -9764,7 +9764,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
97649764

97659765
<listitem>
97669766
<para>
9767-
Enable <application>DTrace</> support on <application>Mac OS X
9767+
Enable <application>DTrace</> support on <application>macOS
97689768
Leopard</> and other non-Solaris platforms (Robert Lor)
97699769
</para>
97709770
</listitem>

0 commit comments

Comments
 (0)