1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00

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?
This commit is contained in:
Tom Lane
2016-09-25 15:40:57 -04:00
parent 98c2d3332b
commit da6c4f6ca8
40 changed files with 102 additions and 99 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -1541,7 +1541,7 @@
<listitem>
<para>
Warn if OS X's <function>setlocale()</> starts an unwanted extra
Warn if macOS's <function>setlocale()</> starts an unwanted extra
thread inside the postmaster (Noah Misch)
</para>
</listitem>
@ -2093,7 +2093,7 @@
<listitem>
<para>
Fix linking of <application>libpython</> on OS X (Tom Lane)
Fix linking of <application>libpython</> on macOS (Tom Lane)
</para>
<para>
@ -5895,7 +5895,7 @@
<listitem>
<para>
Fix incorrect quoting of log file name in Mac OS X start script
Fix incorrect quoting of log file name in macOS start script
(Sidar Lopez)
</para>
</listitem>
@ -10745,7 +10745,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
</para>
<para>
Bonjour support now requires <productname>OS X</> 10.3 or later.
Bonjour support now requires <productname>macOS</> 10.3 or later.
The older API has been deprecated by Apple.
</para>
</listitem>

View File

@ -599,7 +599,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
<para>
This dodges a portability problem on FreeBSD-derived platforms
(including OS X).
(including macOS).
</para>
</listitem>
@ -2937,7 +2937,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
<listitem>
<para>
Warn if OS X's <function>setlocale()</> starts an unwanted extra
Warn if macOS's <function>setlocale()</> starts an unwanted extra
thread inside the postmaster (Noah Misch)
</para>
</listitem>
@ -3574,7 +3574,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
<listitem>
<para>
Fix linking of <application>libpython</> on OS X (Tom Lane)
Fix linking of <application>libpython</> on macOS (Tom Lane)
</para>
<para>
@ -8443,7 +8443,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
<listitem>
<para>
Fix incorrect quoting of log file name in Mac OS X start script
Fix incorrect quoting of log file name in macOS start script
(Sidar Lopez)
</para>
</listitem>

View File

@ -629,7 +629,7 @@
<para>
This dodges a portability problem on FreeBSD-derived platforms
(including OS X).
(including macOS).
</para>
</listitem>
@ -3190,7 +3190,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
<listitem>
<para>
Warn if OS X's <function>setlocale()</> starts an unwanted extra
Warn if macOS's <function>setlocale()</> starts an unwanted extra
thread inside the postmaster (Noah Misch)
</para>
</listitem>
@ -3899,7 +3899,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
<listitem>
<para>
Fix linking of <application>libpython</> on OS X (Tom Lane)
Fix linking of <application>libpython</> on macOS (Tom Lane)
</para>
<para>

View File

@ -812,7 +812,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
<para>
This dodges a portability problem on FreeBSD-derived platforms
(including OS X).
(including macOS).
</para>
</listitem>
@ -3021,7 +3021,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
<listitem>
<para>
Silence some build warnings on OS X (Tom Lane)
Silence some build warnings on macOS (Tom Lane)
</para>
</listitem>
@ -4092,7 +4092,7 @@ Branch: REL9_0_STABLE [2e4946169] 2015-01-07 22:46:20 -0500
<listitem>
<para>
Warn if OS X's <function>setlocale()</> starts an unwanted extra
Warn if macOS's <function>setlocale()</> starts an unwanted extra
thread inside the postmaster (Noah Misch)
</para>
</listitem>
@ -5743,7 +5743,7 @@ Branch: REL8_4_STABLE [ae41bb4be] 2014-05-30 18:18:32 -0400
<listitem>
<para>
Fix linking of <application>libpython</> on OS X (Tom Lane)
Fix linking of <application>libpython</> on macOS (Tom Lane)
</para>
<para>
@ -10710,7 +10710,7 @@ ALTER EXTENSION hstore UPDATE;
<listitem>
<para>
Add <link linkend="docguide-toolsets">instructions</link> for setting
up the documentation tool chain on Mac <productname>OS X</>
up the documentation tool chain on <productname>macOS</>
(Peter Eisentraut)
</para>
</listitem>

View File

@ -929,7 +929,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
<para>
This dodges a portability problem on FreeBSD-derived platforms
(including OS X).
(including macOS).
</para>
</listitem>
@ -5254,7 +5254,7 @@ Branch: REL9_3_STABLE [6347bdb31] 2015-04-05 13:01:55 -0400
<listitem>
<para>
Silence some build warnings on OS X (Tom Lane)
Silence some build warnings on macOS (Tom Lane)
</para>
</listitem>
@ -5813,7 +5813,7 @@ Branch: REL9_0_STABLE [2e4946169] 2015-01-07 22:46:20 -0500
<listitem>
<para>
Warn if OS X's <function>setlocale()</> starts an unwanted extra
Warn if macOS's <function>setlocale()</> starts an unwanted extra
thread inside the postmaster (Noah Misch)
</para>
</listitem>

View File

@ -2023,7 +2023,7 @@ Branch: REL9_1_STABLE [e56acbe2a] 2016-02-10 19:30:12 -0500
<para>
This dodges a portability problem on FreeBSD-derived platforms
(including OS X).
(including macOS).
</para>
</listitem>

View File

@ -3299,7 +3299,7 @@ New BeOS port (David Reid, Cyril Velter)
Add proofreader's changes to docs (Addison-Wesley, Bruce)
New Alpha spinlock code (Adriaan Joubert, Compaq)
UnixWare port overhaul (Peter E)
New Darwin/Mac OS X port (Peter Bierman, Bruce Hartzler)
New macOS (Darwin) port (Peter Bierman, Bruce Hartzler)
New FreeBSD Alpha port (Alfred)
Overhaul shared memory segments (Tom)
Add IBM S/390 support (Neale Ferguson)

View File

@ -1006,12 +1006,12 @@ option SEMMAP=256
<varlistentry>
<term><systemitem class="osname">OS X</>
<indexterm><primary>OS X</><secondary>IPC configuration</></>
<term><systemitem class="osname">macOS</>
<indexterm><primary>macOS</><secondary>IPC configuration</></>
</term>
<listitem>
<para>
The recommended method for configuring shared memory in OS X
The recommended method for configuring shared memory in macOS
is to create a file named <filename>/etc/sysctl.conf</>,
containing variable assignments such as:
<programlisting>
@ -1021,13 +1021,13 @@ kern.sysv.shmmni=32
kern.sysv.shmseg=8
kern.sysv.shmall=1024
</programlisting>
Note that in some OS X versions,
Note that in some macOS versions,
<emphasis>all five</> shared-memory parameters must be set in
<filename>/etc/sysctl.conf</>, else the values will be ignored.
</para>
<para>
Beware that recent releases of OS X ignore attempts to set
Beware that recent releases of macOS ignore attempts to set
<varname>SHMMAX</> to a value that isn't an exact multiple of 4096.
</para>
@ -1036,7 +1036,7 @@ kern.sysv.shmall=1024
</para>
<para>
In older OS X versions, you will need to reboot to have changes in the
In older macOS versions, you will need to reboot to have changes in the
shared memory parameters take effect. As of 10.5 it is possible to
change all but <varname>SHMMNI</> on the fly, using
<application>sysctl</>. But it's still best to set up your preferred
@ -1045,7 +1045,7 @@ kern.sysv.shmall=1024
</para>
<para>
The file <filename>/etc/sysctl.conf</> is only honored in OS X
The file <filename>/etc/sysctl.conf</> is only honored in macOS
10.3.9 and later. If you are running a previous 10.3.x release,
you must edit the file <filename>/etc/rc</>
and change the values in the following commands:
@ -1057,12 +1057,12 @@ sysctl -w kern.sysv.shmseg
sysctl -w kern.sysv.shmall
</programlisting>
Note that
<filename>/etc/rc</> is usually overwritten by OS X system updates,
<filename>/etc/rc</> is usually overwritten by macOS system updates,
so you should expect to have to redo these edits after each update.
</para>
<para>
In OS X 10.2 and earlier, instead edit these commands in the file
In macOS 10.2 and earlier, instead edit these commands in the file
<filename>/System/Library/StartupItems/SystemTuning/SystemTuning</>.
</para>
</listitem>

View File

@ -169,7 +169,7 @@ SELECT uuid_generate_v3(uuid_ns_url(), 'http://www.postgresql.org');
platforms. <filename>uuid-ossp</> can now be built without the OSSP
library on some platforms. On FreeBSD, NetBSD, and some other BSD-derived
platforms, suitable UUID creation functions are included in the
core <filename>libc</> library. On Linux, OS X, and some other
core <filename>libc</> library. On Linux, macOS, and some other
platforms, suitable functions are provided in the <filename>libuuid</>
library, which originally came from the <literal>e2fsprogs</> project
(though on modern Linux it is considered part

View File

@ -115,7 +115,7 @@
<listitem>
<para>
On <productname>OS X</productname>, write caching can be prevented by
On <productname>macOS</productname>, write caching can be prevented by
setting <varname>wal_sync_method</> to <literal>fsync_writethrough</>.
</para>
</listitem>