Replace OS X and Mac OS with macOS

CONTRIBUTING.md

@@ -269,7 +269,7 @@ If you want to read about using Atom or developing packages in Atom, the [Atom F
     * :non-potable_water: `:non-potable_water:` when plugging memory leaks
     * :memo: `:memo:` when writing docs
     * :penguin: `:penguin:` when fixing something on Linux
-    * :apple: `:apple:` when fixing something on Mac OS
+    * :apple: `:apple:` when fixing something on macOS
     * :checkered_flag: `:checkered_flag:` when fixing something on Windows
     * :bug: `:bug:` when fixing a bug
     * :fire: `:fire:` when removing code or files

README.md

@@ -1,6 +1,6 @@
 ![Atom](https://cloud.githubusercontent.com/assets/72919/2874231/3af1db48-d3dd-11e3-98dc-6066f8bc766f.png)
 
-[![OS X Build Status](https://travis-ci.org/atom/atom.svg?branch=master)](https://travis-ci.org/atom/atom) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/1tkktwh654w07eim?svg=true)](https://ci.appveyor.com/project/Atom/atom)
+[![macOS Build Status](https://travis-ci.org/atom/atom.svg?branch=master)](https://travis-ci.org/atom/atom) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/1tkktwh654w07eim?svg=true)](https://ci.appveyor.com/project/Atom/atom)
 [![Dependency Status](https://david-dm.org/atom/atom.svg)](https://david-dm.org/atom/atom)
 [![Join the Atom Community on Slack](http://atom-slack.herokuapp.com/badge.svg)](http://atom-slack.herokuapp.com/)
 
@@ -25,7 +25,7 @@ The [API reference](https://atom.io/docs/api) for developing packages is also do
 ### Prerequisites
 - [Git](https://git-scm.com/)
 
-### OS X
+### macOS
 
 Download the latest [Atom release](https://github.com/atom/atom/releases/latest).
 
@@ -95,6 +95,6 @@ repeat these steps to upgrade to future releases.
 ## Building
 
 * [Linux](docs/build-instructions/linux.md)
-* [OS X](docs/build-instructions/os-x.md)
+* [macOS](docs/build-instructions/os-x.md)
 * [FreeBSD](docs/build-instructions/freebsd.md)
 * [Windows](docs/build-instructions/windows.md)

build/tasks/build-task.coffee

@@ -141,7 +141,7 @@ module.exports = (grunt) ->
     ignoredPaths.push "#{_.escapeRegExp(path.sep)}linker\\.lock$"
     ignoredPaths.push "#{_.escapeRegExp(path.join('build', 'Release') + path.sep)}.+\\.node\\.dSYM"
 
-    # Hunspell dictionaries are only not needed on OS X.
+    # Hunspell dictionaries are only not needed on macOS.
     if process.platform is 'darwin'
       ignoredPaths.push path.join('spellchecker', 'vendor', 'hunspell_dictionaries')
     ignoredPaths = ignoredPaths.map (ignoredPath) -> "(#{ignoredPath})"

build/tasks/codesign-task.coffee

@@ -5,7 +5,7 @@ request = require 'request'
 module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
 
-  # Mac OS X code signing
+  # macOS code signing
 
   grunt.registerTask 'codesign:app', 'CodeSign Atom.app', ->
     done = @async()

docs/README.md

@@ -10,7 +10,7 @@ In this directory you can only find very specific build and API level documentat
 
 Instructions for building Atom on various platforms from source.
 
-* [OS X](build-instructions/os-x.md)
+* [macOS](build-instructions/os-x.md)
 * [Windows](build-instructions/windows.md)
 * [Linux](build-instructions/linux.md)
 * [FreeBSD](build-instructions/freebsd.md)

docs/build-instructions/os-x.md

@@ -1,8 +1,8 @@
-# OS X
+# macOS
 
 ## Requirements
 
-  * OS X 10.8 or later
+  * macOS 10.8 or later
   * [Node.js](https://nodejs.org/en/download/) (0.10.x or above)
   * Command Line Tools for [Xcode](https://developer.apple.com/xcode/downloads/) (run `xcode-select --install` to install)
 

docs/native-profiling.md

@@ -1,4 +1,4 @@
-# Profiling the Atom Render Process on OS X with Instruments
+# Profiling the Atom Render Process on macOS with Instruments
 
 ![Instruments](https://cloud.githubusercontent.com/assets/1789/14193295/d503db7a-f760-11e5-88bf-fe417c0cd913.png)
 

dot-atom/keymap.cson

@@ -22,7 +22,7 @@
 # * http://flight-manual.atom.io/behind-atom/sections/keymaps-in-depth/
 #
 # If you're having trouble with your keybindings not working, try the
-# Keybinding Resolver: `Cmd+.` on OS X and `Ctrl+.` on other platforms. See the
+# Keybinding Resolver: `Cmd+.` on macOS and `Ctrl+.` on other platforms. See the
 # Debugging Guide for more information:
 # * http://flight-manual.atom.io/hacking-atom/sections/debugging/#check-the-keybindings
 #

spec/auto-update-manager-spec.js

@@ -76,7 +76,7 @@ describe('AutoUpdateManager (renderer)', () => {
 
   describe('::platformSupportsUpdates', () => {
     let state, releaseChannel
-    it('returns true on OS X and Windows when in stable', () => {
+    it('returns true on macOS and Windows when in stable', () => {
       spyOn(autoUpdateManager, 'getState').andCallFake(() =>  state)
       spyOn(atom, 'getReleaseChannel').andCallFake(() => releaseChannel)
 

spec/fixtures/git/repo-with-submodules/jstips/README.md

@@ -297,7 +297,7 @@ Add a element at the end of the array is easy with push(), but there is a way mo
 var arr = [1,2,3,4,5];
 
 arr.push(6);
-arr[arr.length] = 6; // 43% faster in Chrome 47.0.2526.106 on Mac OS X 10.11.1
+arr[arr.length] = 6; // 43% faster in Chrome 47.0.2526.106 on macOS 10.11.1
 ```
 Both methods modify the original array. Don't believe me? Check the [jsperf](http://jsperf.com/push-item-inside-an-array)
 
@@ -307,7 +307,7 @@ Now we are trying to add an item to the beginning of the array
 var arr = [1,2,3,4,5];
 
 arr.unshift(0);
-[0].concat(arr); // 98% faster in Chrome 47.0.2526.106 on Mac OS X 10.11.1
+[0].concat(arr); // 98% faster in Chrome 47.0.2526.106 on macOS 10.11.1
 ```
 Here is a little bit detail, unshift edit the original array, concat return a new array. [jsperf](http://jsperf.com/unshift-item-inside-an-array)
 

spec/integration/startup-spec.coffee

@@ -169,7 +169,7 @@ describe "Starting Atom", ->
           .then ->
             expect(win1Position.x).toBeGreaterThan(win0Position.x)
             # Ideally we'd test the y coordinate too, but if the window's
-            # already as tall as it can be, then OS X won't move it down outside
+            # already as tall as it can be, then macOS won't move it down outside
             # the screen.
             # expect(win1Position.y).toBeGreaterThan(win0Position.y)
 

src/environment-helpers.js

@@ -9,7 +9,7 @@ import os from 'os'
 function getRawShellEnv () {
   let shell = getUserShell()
 
-  // The `-ilc` set of options was tested to work with the OS X v10.11
+  // The `-ilc` set of options was tested to work with the macOS v10.11
   // default-installed versions of bash, zsh, sh, and ksh. It *does not*
   // work with csh or tcsh.
   let results = spawnSync(shell, ['-ilc', 'env'], {encoding: 'utf8'})

src/main-process/atom-application.coffee

@@ -368,7 +368,7 @@ class AtomApplication
       else
         @sendCommandToFirstResponder(command)
 
-  # Translates the command into OS X action and sends it to application's first
+  # Translates the command into macOS action and sends it to application's first
   # responder.
   sendCommandToFirstResponder: (command) ->
     return false unless process.platform is 'darwin'
@@ -666,7 +666,7 @@ class AtomApplication
   #
   # options -
   #   :type - A String which specifies the type of the dialog, could be 'file',
-  #           'folder' or 'all'. The 'all' is only available on OS X.
+  #           'folder' or 'all'. The 'all' is only available on macOS.
   #   :devMode - A Boolean which controls whether any newly opened windows
   #              should be in dev mode or not.
   #   :safeMode - A Boolean which controls whether any newly opened windows
@@ -687,7 +687,7 @@ class AtomApplication
         else throw new Error("#{type} is an invalid type for promptForPath")
 
     # Show the open dialog as child window on Windows and Linux, and as
-    # independent dialog on OS X. This matches most native apps.
+    # independent dialog on macOS. This matches most native apps.
     parentWindow =
       if process.platform is 'darwin'
         null

src/text-editor-component.coffee

@@ -253,7 +253,7 @@ class TextEditorComponent
 
   detectAccentedCharacterMenu: ->
     # We need to get clever to detect when the accented character menu is
-    # opened on OS X. Usually, every keydown event that could cause input is
+    # opened on macOS. Usually, every keydown event that could cause input is
     # followed by a corresponding keypress. However, pressing and holding
     # long enough to open the accented character menu causes additional keydown
     # events to fire that aren't followed by their own keypress and textInput
@@ -369,7 +369,7 @@ class TextEditorComponent
 
     return unless @isInputEnabled()
 
-    # Workaround of the accented character suggestion feature in OS X.
+    # Workaround of the accented character suggestion feature in macOS.
     # This will only occur when the user is not composing in IME mode.
     # When the user selects a modified character from the OSX menu, `textInput`
     # will occur twice, once for the initial character, and once for the

src/workspace.coffee

@@ -190,7 +190,7 @@ class Workspace extends Model
     document.title = titleParts.join(" \u2014 ")
     @applicationDelegate.setRepresentedFilename(representedPath)
 
-  # On OS X, fades the application window's proxy icon when the current file
+  # On macOS, fades the application window's proxy icon when the current file
   # has been modified.
   updateDocumentEdited: =>
     modified = @getActivePaneItem()?.isModified?() ? false