Update OS X text

code/apps/Managed Software Center/Managed Software Center/FoundationPlist.py

@@ -13,7 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""FoundationPlist.py -- a tool to generate and parse MacOSX .plist files.
+"""FoundationPlist.py -- a tool to generate and parse OS X .plist files.
 
 This is intended as a drop-in replacement for Python's included plistlib,
 with a few caveats:

code/apps/MunkiStatus/MunkiStatus/FoundationPlist.py

@@ -14,7 +14,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""FoundationPlist.py -- a tool to generate and parse MacOSX .plist files.
+"""FoundationPlist.py -- a tool to generate and parse OS X .plist files.
 
 This is intended as a drop-in replacement for Python's included plistlib,
 with a few caveats:

code/client/makecatalogs

@@ -51,7 +51,7 @@ try:
 except ImportError:
     # munkilib is not available
     def listdir(path):
-        """OSX HFS+ string encoding safe listdir().
+        """OS X HFS+ string encoding safe listdir().
 
         Args:
             path: path to list contents of
@@ -60,7 +60,7 @@ except ImportError:
         """
         # if os.listdir() is supplied a unicode object for the path,
         # it will return unicode filenames instead of their raw fs-dependent
-        # version, which is decomposed utf-8 on OSX.
+        # version, which is decomposed utf-8 on OS X.
         #
         # we use this to our advantage here and have Python do the decoding
         # work for us, instead of decoding each item in the output list.

code/client/makepkginfo

@@ -587,7 +587,7 @@ def main():
         '--installer_choices_xml', '--installer-choices-xml',
         action='store_true',
         help=('Generate installer choices for metapackages. '
-              'Note: Requires Mac OS X 10.6.6 or later.')
+              'Note: Requires OS X 10.6.6 or later.')
         )
     apple_options.add_option(
         '--installer_environment', '--installer-environment', '-E',

code/client/munkilib/FoundationPlist.py

@@ -14,7 +14,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""FoundationPlist.py -- a tool to generate and parse MacOSX .plist files.
+"""FoundationPlist.py -- a tool to generate and parse OS X .plist files.
 
 This is intended as a drop-in replacement for Python's included plistlib,
 with a few caveats:

code/client/munkilib/munkicommon.py

@@ -2536,7 +2536,7 @@ def cleanUpTmpDir():
 
 
 def listdir(path):
-    """OSX HFS+ string encoding safe listdir().
+    """OS X HFS+ string encoding safe listdir().
 
     Args:
         path: path to list contents of
@@ -2545,7 +2545,7 @@ def listdir(path):
     """
     # if os.listdir() is supplied a unicode object for the path,
     # it will return unicode filenames instead of their raw fs-dependent
-    # version, which is decomposed utf-8 on OSX.
+    # version, which is decomposed utf-8 on OS X.
     #
     # we use this to our advantage here and have Python do the decoding
     # work for us, instead of decoding each item in the output list.

code/tools/pkginfo_hash_updater.py

@@ -21,14 +21,14 @@ This script will recursively update the '(un)installer_item_hash' key in all
 pkginfo plists in the pkgsinfo directory of a Munki repo with a SHA-256 hash of
 the corresponding package.
 
-This script will run from Mac OSX or Linux alike, and it is safe to run more
-than once on any pkginfo plist(s). However, it is recommended that you backup
-your plists before running this script!
+This script will run from OS X or Linux alike, and it is safe to run more than
+once on any pkginfo plist(s). However, it is recommended that you backup your
+plists before running this script!
 
 Dependencies:
 - Linux: Python2.6 or higher, or 2.4/2.5 with python-plistlib manually
          installed: http://docs.python.org/library/plistlib.html
-- Mac OSX: Python2.4 or higher.
+- OS X: Python2.4 or higher.
 
 Created on 2010-09-02.
 """