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?

Author: tglsfdc

config/c-library.m4

@@ -292,8 +292,8 @@ AC_MSG_RESULT([$pgac_cv_snprintf_size_t_support])
 
 # PGAC_TYPE_LOCALE_T
 # ------------------
-# Check for the locale_t type and find the right header file.  Mac OS
-# X needs xlocale.h; standard is locale.h, but glibc also has an
+# Check for the locale_t type and find the right header file.  macOS
+# needs xlocale.h; standard is locale.h, but glibc also has an
 # xlocale.h file that we should not use.
 #
 AC_DEFUN([PGAC_TYPE_LOCALE_T],

configure

@@ -7658,9 +7658,9 @@ $as_echo "${python_libspec} ${python_additional_libs}" >&6; }
 
   if test "$python_enable_shared" != 1; then
     if test "$PORTNAME" = darwin; then
-      # OS X does supply a .dylib even though Py_ENABLE_SHARED does
+      # macOS does supply a .dylib even though Py_ENABLE_SHARED does
       # not get set.  The file detection logic below doesn't succeed
-      # on older OS X versions, so make it explicit.
+      # on older macOS versions, so make it explicit.
       python_enable_shared=1
     elif test "$PORTNAME" = win32; then
       # Windows also needs an explicit override.
@@ -10120,7 +10120,7 @@ else
 fi
 
 elif test "$with_uuid" = e2fs ; then
-  # On OS X, the UUID functions are in libc
+  # On macOS, the UUID functions are in libc
   ac_fn_c_check_func "$LINENO" "uuid_generate" "ac_cv_func_uuid_generate"
 if test "x$ac_cv_func_uuid_generate" = xyes; then :
   UUID_LIBS=""
@@ -12672,7 +12672,7 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_STRLCPY $ac_have_decl
 _ACEOF
 
-# This is probably only present on Darwin, but may as well check always
+# This is probably only present on macOS, but may as well check always
 ac_fn_c_check_decl "$LINENO" "F_FULLFSYNC" "ac_cv_have_decl_F_FULLFSYNC" "#include <fcntl.h>
 "
 if test "x$ac_cv_have_decl_F_FULLFSYNC" = xyes; then :

configure.in

@@ -943,9 +943,9 @@ if test "$with_python" = yes; then
 
   if test "$python_enable_shared" != 1; then
     if test "$PORTNAME" = darwin; then
-      # OS X does supply a .dylib even though Py_ENABLE_SHARED does
+      # macOS does supply a .dylib even though Py_ENABLE_SHARED does
       # not get set.  The file detection logic below doesn't succeed
-      # on older OS X versions, so make it explicit.
+      # on older macOS versions, so make it explicit.
       python_enable_shared=1
     elif test "$PORTNAME" = win32; then
       # Windows also needs an explicit override.
@@ -1182,7 +1182,7 @@ if test "$with_uuid" = bsd ; then
     [UUID_LIBS=""],
     [AC_MSG_ERROR([BSD UUID functions are not present])])
 elif test "$with_uuid" = e2fs ; then
-  # On OS X, the UUID functions are in libc
+  # On macOS, the UUID functions are in libc
   AC_CHECK_FUNC(uuid_generate,
     [UUID_LIBS=""],
     [AC_CHECK_LIB(uuid, uuid_generate,
@@ -1425,8 +1425,8 @@ esac
 if test "$PORTNAME" != "win32"; then
    AC_SYS_LARGEFILE
    dnl Autoconf 2.69's AC_SYS_LARGEFILE believes it's a good idea to #define
-   dnl _DARWIN_USE_64_BIT_INODE, but it isn't: on OS X 10.5 that activates a
-   dnl bug that causes readdir() to sometimes return EINVAL.  On later OS X
+   dnl _DARWIN_USE_64_BIT_INODE, but it isn't: on macOS 10.5 that activates a
+   dnl bug that causes readdir() to sometimes return EINVAL.  On later macOS
    dnl versions where the feature actually works, it's on by default anyway.
    AH_VERBATIM([_DARWIN_USE_64_BIT_INODE],[])
 fi
@@ -1479,7 +1479,7 @@ fi
 
 AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
 AC_CHECK_DECLS([strlcat, strlcpy])
-# This is probably only present on Darwin, but may as well check always
+# This is probably only present on macOS, but may as well check always
 AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
 
 HAVE_IPV6=no

doc/src/sgml/client-auth.sgml

@@ -1306,7 +1306,7 @@ omicron         bryanh                  guest1
     socket parameter, or similar mechanisms.  Currently that includes
     <systemitem class="osname">Linux</>,
     most flavors of <systemitem class="osname">BSD</> including
-    <systemitem class="osname">OS X</>,
+    <systemitem class="osname">macOS</>,
     and <systemitem class="osname">Solaris</systemitem>.
    </para>
 

doc/src/sgml/dfunc.sgml

@@ -127,8 +127,8 @@ cc -shared -o foo.so foo.o
 
    <varlistentry>
     <term>
-     <systemitem class="osname">OS X</>
-     <indexterm><primary>OS X</><secondary>shared library</></>
+     <systemitem class="osname">macOS</>
+     <indexterm><primary>macOS</><secondary>shared library</></>
     </term>
     <listitem>
      <para>

doc/src/sgml/docguide.sgml

@@ -275,7 +275,7 @@ apt-get install docbook docbook-dsssl docbook-xsl libxml2-utils openjade1.3 open
   </sect2>
 
   <sect2>
-   <title>OS X</title>
+   <title>macOS</title>
 
    <para>
     If you use MacPorts, the following will get you set up:

doc/src/sgml/install-windows.sgml

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

doc/src/sgml/installation.sgml

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

doc/src/sgml/monitoring.sgml

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

doc/src/sgml/release-7.4.sgml

@@ -268,7 +268,7 @@
      </para>
 
      <para>
-      This behavior has been observed on BSD-derived kernels including OS X.
+      This behavior has been observed on BSD-derived kernels including macOS.
       It resulted in an entirely-misleading startup failure complaining that
       the shared memory request size was too large.
      </para>
@@ -2437,7 +2437,7 @@ aggregate plan</para></listitem>
 <listitem><para>Pretty-print UNION queries correctly</para></listitem>
 <listitem><para>Make psql handle <literal>\r\n</> newlines properly in COPY IN</para></listitem>
 <listitem><para><application>pg_dump</> handled ACLs with grant options incorrectly</para></listitem>
-<listitem><para>Fix thread support for OS X and Solaris</para></listitem>
+<listitem><para>Fix thread support for macOS and Solaris</para></listitem>
 <listitem><para>Updated JDBC driver (build 215) with various fixes</para></listitem>
 <listitem><para>ECPG fixes</para></listitem>
 <listitem><para>Translation updates (various contributors)</para></listitem>
@@ -2627,7 +2627,7 @@ memory</> error during <command>COPY IN</></para></listitem>
 TABLE AS</> from tables without OIDs</para></listitem>
 <listitem><para>Fix problems with <filename>alter_table</> regression test
 during parallel testing</para></listitem>
-<listitem><para>Fix problems with hitting open file limit, especially on OS X (Tom)</para></listitem>
+<listitem><para>Fix problems with hitting open file limit, especially on macOS (Tom)</para></listitem>
 <listitem><para>Partial fix for Turkish-locale issues</para>
 <para>initdb will succeed now in Turkish locale, but there are still some
 inconveniences associated with the <literal>i/I</> problem.</para></listitem>
@@ -3256,7 +3256,7 @@ DROP SCHEMA information_schema CASCADE;
     </para>
    </listitem>
 
-   <listitem><para>Enable PAM for Mac OS X (Aaron Hillegass)</para></listitem>
+   <listitem><para>Enable PAM for macOS (Aaron Hillegass)</para></listitem>
 
    <listitem>
     <para>Make B-tree indexes fully WAL-safe (Tom)</para>
@@ -3539,9 +3539,9 @@ DROP SCHEMA information_schema CASCADE;
    </listitem>
 
    <listitem>
-    <para>Add Mac OS X Rendezvous server support (Chris Campbell)</para>
+    <para>Add macOS Rendezvous server support (Chris Campbell)</para>
     <para>
-     This allows Mac OS X hosts to query the network for available
+     This allows macOS hosts to query the network for available
      <productname>PostgreSQL</productname> servers.
     </para>
    </listitem>
@@ -4561,7 +4561,7 @@ DROP SCHEMA information_schema CASCADE;
    <listitem><para>Fix locking code for s390x CPU (64-bit) (Tom)</para></listitem>
    <listitem><para>Allow OpenBSD to use local ident credentials (William Ahern)</para></listitem>
    <listitem><para>Make query plan trees read-only to executor (Tom)</para></listitem>
-   <listitem><para>Add Darwin startup scripts (David Wheeler)</para></listitem>
+   <listitem><para>Add macOS startup scripts (David Wheeler)</para></listitem>
    <listitem><para>Allow libpq to compile with Borland C++ compiler (Lester Godwin, Karl Waclawek)</para></listitem>
    <listitem><para>Use our own version of <function>getopt_long()</function> if needed (Peter)</para></listitem>
    <listitem><para>Convert administration scripts to C (Peter)</para></listitem>

doc/src/sgml/release-8.0.sgml

@@ -345,7 +345,7 @@
      </para>
 
      <para>
-      This behavior has been observed on BSD-derived kernels including OS X.
+      This behavior has been observed on BSD-derived kernels including macOS.
       It resulted in an entirely-misleading startup failure complaining that
       the shared memory request size was too large.
      </para>
@@ -1715,7 +1715,7 @@
 
      <para>
       While this could theoretically happen anywhere, no standard build of
-      Perl did things this way ... until <productname>Mac OS X</> 10.5.
+      Perl did things this way ... until <productname>macOS</> 10.5.
      </para>
     </listitem>
 
@@ -2449,7 +2449,7 @@ Win32 to match the backend (Andrew)</para></listitem>
 (Bruce)</para></listitem>
 
 <listitem><para>Fix <application>pgxs</> <literal>-L</> library path
-specification for Win32, Cygwin, OS X, AIX (Bruce)</para></listitem>
+specification for Win32, Cygwin, macOS, AIX (Bruce)</para></listitem>
 
 <listitem><para>Check that SID is enabled while checking for Win32 admin
 privileges (Magnus)</para></listitem>
@@ -5224,7 +5224,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Improvements to the Mac OS X startup scripts (Ray A.)
+       Improvements to the macOS startup scripts (Ray A.)
       </para>
      </listitem>
 
@@ -5328,7 +5328,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Make libpq and ECPG build as proper shared libraries on OS X (Tom)
+       Make libpq and ECPG build as proper shared libraries on macOS (Tom)
       </para>
      </listitem>
 

doc/src/sgml/release-8.1.sgml

@@ -572,7 +572,7 @@
      </para>
 
      <para>
-      This behavior has been observed on BSD-derived kernels including OS X.
+      This behavior has been observed on BSD-derived kernels including macOS.
       It resulted in an entirely-misleading startup failure complaining that
       the shared memory request size was too large.
      </para>
@@ -2188,7 +2188,7 @@
 
      <para>
       While this could theoretically happen anywhere, no standard build of
-      Perl did things this way ... until <productname>Mac OS X</> 10.5.
+      Perl did things this way ... until <productname>macOS</> 10.5.
      </para>
     </listitem>
 
@@ -2730,7 +2730,7 @@
 
     <listitem>
      <para>
-      Fix for Darwin (OS X) compilation (Tom)
+      Fix for macOS (Darwin) compilation (Tom)
      </para>
     </listitem>
 
@@ -3104,7 +3104,7 @@ Win32 to match the backend (Andrew)</para></listitem>
 (Bruce)</para></listitem>
 
 <listitem><para>Fix <application>pgxs</> <literal>-L</> library path
-specification for Win32, Cygwin, OS X, AIX (Bruce)</para></listitem>
+specification for Win32, Cygwin, macOS, AIX (Bruce)</para></listitem>
 
 <listitem><para>Check that SID is enabled while checking for Win32 admin
 privileges (Magnus)</para></listitem>
@@ -5225,7 +5225,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
      <listitem>
       <para>
        Add support for <literal>fsync_writethrough</literal> on
-       Darwin (Chris Campbell)
+       macOS (Chris Campbell)
       </para>
      </listitem>
 

doc/src/sgml/release-8.2.sgml

@@ -1487,7 +1487,7 @@
      </para>
 
      <para>
-      This behavior has been observed on BSD-derived kernels including OS X.
+      This behavior has been observed on BSD-derived kernels including macOS.
       It resulted in an entirely-misleading startup failure complaining that
       the shared memory request size was too large.
      </para>
@@ -3765,7 +3765,7 @@
 
      <para>
       While this could theoretically happen anywhere, no standard build of
-      Perl did things this way ... until <productname>Mac OS X</> 10.5.
+      Perl did things this way ... until <productname>macOS</> 10.5.
      </para>
     </listitem>
 

doc/src/sgml/release-8.3.sgml

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

doc/src/sgml/release-8.4.sgml

@@ -240,7 +240,7 @@
 
     <listitem>
      <para>
-      Fix linking of <application>libpython</> on OS X (Tom Lane)
+      Fix linking of <application>libpython</> on macOS (Tom Lane)
      </para>
 
      <para>
@@ -5334,7 +5334,7 @@
      </para>
 
      <para>
-      This behavior has been observed on BSD-derived kernels including OS X.
+      This behavior has been observed on BSD-derived kernels including macOS.
       It resulted in an entirely-misleading startup failure complaining that
       the shared memory request size was too large.
      </para>
@@ -9764,7 +9764,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Enable <application>DTrace</> support on <application>Mac OS X
+       Enable <application>DTrace</> support on <application>macOS
        Leopard</> and other non-Solaris platforms (Robert Lor)
       </para>
      </listitem>