# HG changeset patch
# User Armin Rigo <arigo@tunes.org>
# Date 1495141492 -7200
#      Thu May 18 23:04:52 2017 +0200
# Branch extradoc
# Node ID f8278c922a6e8ff7a6e22060b0195b3053e453e6
# Parent  3c445eee1b27e6ef126a561fb0b29868836f81f7
OS/X => OS X

diff --git a/compat.html b/compat.html
--- a/compat.html
+++ b/compat.html
@@ -140,7 +140,7 @@
 the program finishes running in the meantime).  See <a class="reference external" href="http://pypy.readthedocs.org/en/latest/cpython_differences.html#differences-related-to-garbage-collection-strategies">more details
 here</a>.</p>
 <p>Note that PyPy returns unused memory to the operating system if there
-is a madvise() system call (at least Linux, OS/X, BSD) or on Windows.  It is
+is a madvise() system call (at least Linux, OS X, BSD) or on Windows.  It is
 important to realize that you may not see this in <tt class="docutils literal">top</tt>.  The unused
 pages are marked with <tt class="docutils literal">MADV_FREE</tt>, which tells the system &ldquo;if you
 need more memory at some point, grab this page&rdquo;.  As long as memory is
diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -75,7 +75,7 @@
 as stable as the release, but they contain numerous bugfixes and
 performance improvements.</p>
 <p>We provide binaries for x86, ARM, PPC and s390x running on different operating systems such as
-Linux, Mac OS/X and Windows:</p>
+Linux, Mac OS X and Windows:</p>
 <ul class="simple">
 <li>the Python2.7 compatible release — <strong>PyPy2.7 v5.7.1</strong> — (<a class="reference external" href="http://doc.pypy.org/en/latest/release-v5.7.1.html">what's new in PyPy2.7?</a>)</li>
 <li>the Python3.5 compatible beta quality release — <strong>PyPy3.5 v5.7.1</strong> — (<a class="reference external" href="http://doc.pypy.org/en/latest/release-v5.7.1.html">what's new in PyPy3.5?</a>).</li>
@@ -125,7 +125,7 @@
 <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armhf-raspbian.tar.bz2">ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Raspbian)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
 <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armhf-raring.tar.bz2">ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Ubuntu Raring)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
 <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-linux-armel.tar.bz2">ARM Softfloat Linux binary (ARMEL/gnueabi, tar.bz2,  Ubuntu Precise)</a> (see <tt class="docutils literal">[1]</tt> below)</li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-osx64.tar.bz2">Mac OS/X binary (64bit)</a></li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-osx64.tar.bz2">Mac OS X binary (64bit)</a></li>
 <li>FreeBSD x86 and x86_64: see <a class="reference external" href="http://www.freshports.org/lang/pypy">FreshPorts</a></li>
 <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.1-win32.zip">Windows binary (32bit)</a> (you might need the VS 2008 runtime library
 installer <a class="reference external" href="http://www.microsoft.com/en-us/download/details.aspx?id=5582">vcredist_x86.exe</a>.)</li>
diff --git a/source/compat.txt b/source/compat.txt
--- a/source/compat.txt
+++ b/source/compat.txt
@@ -131,7 +131,7 @@
 here`_.
 
 Note that PyPy returns unused memory to the operating system if there
-is a madvise() system call (at least Linux, OS/X, BSD) or on Windows.  It is
+is a madvise() system call (at least Linux, OS X, BSD) or on Windows.  It is
 important to realize that you may not see this in ``top``.  The unused
 pages are marked with ``MADV_FREE``, which tells the system "if you
 need more memory at some point, grab this page".  As long as memory is
diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -13,7 +13,7 @@
   performance improvements.
 
 We provide binaries for x86, ARM, PPC and s390x running on different operating systems such as
-Linux, Mac OS/X and Windows:
+Linux, Mac OS X and Windows:
 
 * the Python2.7 compatible release — **PyPy2.7 v5.7.1** — (`what's new in PyPy2.7?`_)
 
@@ -87,7 +87,7 @@
 * `ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Raspbian)`__ (see ``[1]`` below)
 * `ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Ubuntu Raring)`__ (see ``[1]`` below)
 * `ARM Softfloat Linux binary (ARMEL/gnueabi, tar.bz2,  Ubuntu Precise)`__ (see ``[1]`` below)
-* `Mac OS/X binary (64bit)`__
+* `Mac OS X binary (64bit)`__
 * FreeBSD x86 and x86_64: see FreshPorts_
 * `Windows binary (32bit)`__ (you might need the VS 2008 runtime library
   installer `vcredist_x86.exe`_.)
diff --git a/source/tmdonate2.txt b/source/tmdonate2.txt
--- a/source/tmdonate2.txt
+++ b/source/tmdonate2.txt
@@ -278,14 +278,14 @@
 heavily on Linux- and clang-only features.  We believe it is a suitable
 restriction: a lot of multi- and many-core servers commonly available
 are nowadays x86-64 machines running Linux.  Nevertheless, non-Linux
-solutions appear to be possible as well.  OS/X (and likely the various
+solutions appear to be possible as well.  OS X (and likely the various
 BSDs) seems to handle ``mmap()`` better than Linux does, and can remap
 individual pages of an existing mapping to various pages without hitting
 a limit of 65536 like Linux.  Windows might also have a solution, although we
 didn't measure yet; but first we would need a 64-bit Windows PyPy, which has
 not seen much active support.
 
-We will likely explore the OS/X path (as well as the Windows path if Win64
+We will likely explore the OS X path (as well as the Windows path if Win64
 support grows in PyPy), but this is not part of this current
 donation proposal.
 
diff --git a/tmdonate2.html b/tmdonate2.html
--- a/tmdonate2.html
+++ b/tmdonate2.html
@@ -283,13 +283,13 @@
 heavily on Linux- and clang-only features.  We believe it is a suitable
 restriction: a lot of multi- and many-core servers commonly available
 are nowadays x86-64 machines running Linux.  Nevertheless, non-Linux
-solutions appear to be possible as well.  OS/X (and likely the various
+solutions appear to be possible as well.  OS X (and likely the various
 BSDs) seems to handle <tt class="docutils literal">mmap()</tt> better than Linux does, and can remap
 individual pages of an existing mapping to various pages without hitting
 a limit of 65536 like Linux.  Windows might also have a solution, although we
 didn't measure yet; but first we would need a 64-bit Windows PyPy, which has
 not seen much active support.</p>
-<p>We will likely explore the OS/X path (as well as the Windows path if Win64
+<p>We will likely explore the OS X path (as well as the Windows path if Win64
 support grows in PyPy), but this is not part of this current
 donation proposal.</p>
 <p>It might be possible to adapt the work done on x86-64 to the 64-bit