From 220bb39dee8044937a963e81be8796e99bd8508b Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 9 Sep 2014 13:56:29 -0400
Subject: [PATCH] doc: Reflect renaming of Mac OS X to OS X

bug #10528
---
 contrib/start-scripts/osx/PostgreSQL | 2 +-
 doc/src/sgml/client-auth.sgml        | 2 +-
 doc/src/sgml/dfunc.sgml              | 4 ++--
 doc/src/sgml/docguide.sgml           | 2 +-
 doc/src/sgml/installation.sgml       | 6 +++---
 doc/src/sgml/monitoring.sgml         | 2 +-
 doc/src/sgml/runtime.sgml            | 4 ++--
 doc/src/sgml/uuid-ossp.sgml          | 2 +-
 doc/src/sgml/wal.sgml                | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL
index 22ed9ff45e..24872b0944 100755
--- a/contrib/start-scripts/osx/PostgreSQL
+++ b/contrib/start-scripts/osx/PostgreSQL
@@ -4,7 +4,7 @@
 # PostgreSQL RDBMS Server
 ##
 
-# PostgreSQL boot time startup script for Darwin/Mac OS X. To install, change
+# PostgreSQL boot time startup script for OS X. To install, change
 # the "prefix", "PGDATA", "PGUSER", and "PGLOG" variables below as
 # necessary. Next, create a new directory, "/Library/StartupItems/PostgreSQL".
 # Then copy this script and the accompanying "StartupParameters.plist" file
diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index 0064302a8b..7704f73d96 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -1215,7 +1215,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">Mac OS X</>,
+    <systemitem class="osname">OS X</>,
     and <systemitem class="osname">Solaris</systemitem>.
    </para>
 
diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml
index b78537c1b7..5a368f6df0 100644
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -127,8 +127,8 @@ cc -shared -o foo.so foo.o
 
    <varlistentry>
     <term>
-     <systemitem class="osname">Mac OS X</>
-     <indexterm><primary>Mac OS X</><secondary>shared library</></>
+     <systemitem class="osname">OS X</>
+     <indexterm><primary>OS X</><secondary>shared library</></>
     </term>
     <listitem>
      <para>
diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index 816375f3e3..943ab5a0ef 100644
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -279,7 +279,7 @@ apt-get install docbook docbook-dsssl docbook-xsl openjade1.3 opensp xsltproc
   </sect2>
 
   <sect2>
-   <title>Mac OS X</title>
+   <title>OS X</title>
 
    <para>
     If you use MacPorts, the following will get you set up:
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 2e81bbb891..a3c9bea366 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -864,7 +864,7 @@ su - postgres
        <listitem>
         <para>
          Build with Bonjour support.  This requires Bonjour support
-         in your operating system.  Recommended on Mac OS X.
+         in your operating system.  Recommended on OS X.
         </para>
        </listitem>
       </varlistentry>
@@ -890,7 +890,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 Mac OS X, and can be obtained for other
+           Linux systems and in OS X, and can be obtained for other
            platforms as well
           </para>
          </listitem>
@@ -1990,7 +1990,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, Mac OS X, AIX, HP/UX, Solaris,
+   FreeBSD, OpenBSD, NetBSD, OS X, 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
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 5e9e735d2a..354165bf08 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -1923,7 +1923,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, Mac OS X, FreeBSD, NetBSD, and Oracle Linux.  The
+   on Solaris, OS X, 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
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index f337485736..639b288e06 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -925,8 +925,8 @@ option        SEMMAP=256
 
 
      <varlistentry>
-      <term><systemitem class="osname">Mac OS X</>
-      <indexterm><primary>Mac OS X</><secondary>IPC configuration</></>
+      <term><systemitem class="osname">OS X</>
+      <indexterm><primary>OS X</><secondary>IPC configuration</></>
       </term>
       <listitem>
        <para>
diff --git a/doc/src/sgml/uuid-ossp.sgml b/doc/src/sgml/uuid-ossp.sgml
index dbbea09313..e275febe4e 100644
--- a/doc/src/sgml/uuid-ossp.sgml
+++ b/doc/src/sgml/uuid-ossp.sgml
@@ -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, Mac OS X, and some other
+   core <filename>libc</> library.  On Linux, OS X, 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
diff --git a/doc/src/sgml/wal.sgml b/doc/src/sgml/wal.sgml
index c72253227e..0420610a01 100644
--- a/doc/src/sgml/wal.sgml
+++ b/doc/src/sgml/wal.sgml
@@ -115,7 +115,7 @@
 
     <listitem>
       <para>
-        On <productname>Mac OS X</productname>, write caching can be prevented by
+        On <productname>OS X</productname>, write caching can be prevented by
         setting <varname>wal_sync_method</> to <literal>fsync_writethrough</>.
       </para>
     </listitem>