doc: Reflect renaming of Mac OS X to OS X

bug #10528

diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL
index 22ed9ff45e84c3691794aad2cc0d454eb14e2f06..24872b0944d992cd06aefc68c435ea86a58c7ec2 100755 (executable)
--- 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 0064302a8bb3af32e60998fabe9bc87648d888a0..7704f73d9620daeee653f553585d0fa36510b86f 100644 (file)
--- 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
     Linux,
     most flavors of BSD including
-    Mac OS X,
+    OS X,
     and Solaris.
    
 

diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml
index b78537c1b73c41f8ec03ed8c3154cc42375a6ff8..5a368f6df04d27c287bf306f827527d1c07e1449 100644 (file)
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -127,8 +127,8 @@ cc -shared -o foo.so foo.o
 
    
     
-     Mac OS X
-     Mac OS Xshared library
+     OS X
+     OS Xshared library
     
     
      

diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index 816375f3e3e59ce170127032fb10ba6cdfac8bef..943ab5a0ef220791b1487178b2ff529adfe25603 100644 (file)
--- 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
   
 
   
-   <span class="marked">Mac </span>OS X
+   OS X
 
    
     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 2e81bbb891b63b11f78c681de4839c08790e7e47..a3c9bea3665176045a17680b2580369e7b50582b 100644 (file)
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -864,7 +864,7 @@ su - postgres
        
         
          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.
         
        
       
@@ -890,7 +890,7 @@ su - postgres
           
            e2fs to use the UUID library created by
            the 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
           
          
@@ -1990,7 +1990,7 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
   
    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 5e9e735d2a95a06789df9e29e95f0e94602d89c1..354165bf083058d232f71362815723a3c8dedd5e 100644 (file)
--- 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
    DTrace
    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
    SystemTap 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 f3374857363bbb35c64000f0ec24740cf922f37c..639b288e0629c99be4409ae9d40d3de0414f5d8a 100644 (file)
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -925,8 +925,8 @@ option        SEMMAP=256
 
 
      
-      Mac OS X
-      Mac OS XIPC configuration
+      OS X
+      OS XIPC configuration
       
       
        

diff --git a/doc/src/sgml/uuid-ossp.sgml b/doc/src/sgml/uuid-ossp.sgml
index dbbea09313a4681b0297e069312b2780b40c8238..e275febe4e6672f62dcf6734108d96d98f82ce49 100644 (file)
--- 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.  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 libc library.  On Linux, Mac OS X, and some other
+   core libc library.  On Linux, OS X, and some other
    platforms, suitable functions are provided in the libuuid
    library, which originally came from the 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 c72253227e48e8ef57f6a60601a21ef293a719ab..0420610a011330fbbb8d5a93b6a3c3cf6d41c579 100644 (file)
--- a/doc/src/sgml/wal.sgml
+++ b/doc/src/sgml/wal.sgml
@@ -115,7 +115,7 @@
 
     
       
-        On Mac OS X, write caching can be prevented by
+        On OS X, write caching can be prevented by
         setting wal_sync_method to fsync_writethrough.