OSX ▶︎ OS X

Zearin · Zearin · commit 64d756feb986 · 2014-04-11T14:55:19.000-04:00
Also removed &ldquo;Mac&rdquo;, as the official name was officially shortened to &ldquo;OS&nbsp;X&rdquo; a few releases ago.
diff --git a/docs/scenarios/gui.rst b/docs/scenarios/gui.rst
@@ -18,7 +18,7 @@ and the mailinglist https://groups.google.com/forum/#!forum/project-camelot
 
 Cocoa
 -----
-.. note:: The Cocoa framework is only available on Mac OSX. Don't pick this if you're writing a cross-platform application!
+.. note:: The Cocoa framework is only available on OS&nbsp;X. Don't pick this if you're writing a cross-platform application!
 
 GTk
 ---
@@ -45,7 +45,7 @@ The main resource for information is the website: http://kivy.org
 
 PyObjC
 ~~~~~~
-.. note:: Only available on Mac OSX. Don't pick this if you're writing a cross-platform application.
+.. note:: Only available on OS&nbsp;X. Don't pick this if you're writing a cross-platform application.
 
 PySide
 ~~~~~~
diff --git a/docs/shipping/freezing.rst b/docs/shipping/freezing.rst
@@ -89,7 +89,7 @@ Prerequisite is to have installed :ref:`Python, Setuptools and pywin32 dependenc
 - `Manual <http://www.pyinstaller.org/export/d3398dd79b68901ae1edd761f3fe0f4ff19cfb1a/project/doc/Manual.html?format=raw>`_
 
 
-OSX
+OS&nbsp;X
 ---
 
 

-Original file line number
+Diff line change
 Cocoa
 -----
 -.. note:: The Cocoa framework is only available on Mac OSX. Don't pick this if you're writing a cross-platform application!
 +.. note:: The Cocoa framework is only available on OS X. Don't pick this if you're writing a cross-platform application!
 GTk
 ---
 PyObjC
 ~~~~~~
 -.. note:: Only available on Mac OSX. Don't pick this if you're writing a cross-platform application.
 +.. note:: Only available on OS X. Don't pick this if you're writing a cross-platform application.
 PySide
 ~~~~~~