Merge pull request electron#290 from ergenekonyigit/master

Rename OS X to macOS

Author: zeke

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/electron/electron-api-demos.svg?branch=master)](https://travis-ci.org/electron/electron-api-demos)
 [![JavaScript Standard Style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com)
 
-This is a desktop app that interactively and with sample code demonstrates core features of the [Electron](http://electron.atom.io) API. It's built with Electron, too, of course. This app works on Windows, OS X and Linux operating systems.
+This is a desktop app that interactively and with sample code demonstrates core features of the [Electron](http://electron.atom.io) API. It's built with Electron, too, of course. This app works on Windows, macOS and Linux operating systems.
 
 Use this app to see what you can do with Electron and use the source code to learn how to create a basic Electron app.
 

sections/communication/ipc.html

@@ -16,7 +16,7 @@ <h3>The <code>ipc</code> (inter-process communication) module allows you to send
     <div class="demo">
       <div class="demo-wrapper">
         <button id="async-msg-demo-toggle" class="js-container-target demo-toggle-button">Asynchronous messages
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">
@@ -37,7 +37,7 @@ <h5>Main Process</h5>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="sync-msg-demo-toggle" class="js-container-target demo-toggle-button">Synchronous messages
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">
@@ -57,7 +57,7 @@ <h5>Main Process</h5>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="invis-msg-demo-toggle" class="js-container-target demo-toggle-button">Communicate with an invisible window
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">

sections/media/desktop-capturer.html

@@ -15,7 +15,7 @@ <h3>The <code>desktopCapturer</code> module in Electron can be used to access an
     <div class="demo">
       <div class="demo-wrapper">
         <button id="print-pdf-demo-toggle" class="js-container-target demo-toggle-button">Take a Screenshot
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux | Process: Renderer</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux | Process: Renderer</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">

sections/media/pdf.html

@@ -15,7 +15,7 @@ <h3>The <code>browser window</code> module in Electron has a property, <code>web
     <div class="demo">
       <div class="demo-wrapper">
         <button id="print-pdf-demo-toggle" class="js-container-target demo-toggle-button">Print to PDF
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">

sections/menus/menus.html

@@ -17,7 +17,7 @@ <h3>The <code>Menu</code> and <code>MenuItem</code> modules can be used to creat
     <div class="demo">
       <div class="demo-wrapper">
         <button id="application-menu-demo-toggle" class="js-container-target demo-toggle-button">Create an application menu
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
         </button>
         <div class="demo-box">
           <p>The <code>Menu</code> and <code>MenuItem</code> modules allow you to customize your application menu. If you don't set any menu, Electron will generate a minimal menu for your app by default.</p>
@@ -32,7 +32,7 @@ <h2>ProTip</h2>
             <p>When designing an app for multiple operating systems it's important to be mindful of the ways application menu conventions differ on each operating system.</p>
             <p>For instance, on Windows, accelerators are set with an <code>&</code>. Naming conventions also vary, like between "Settings" or "Preferences". Below are resources for learning operating system specific standards.</p>
             <ul>
-              <li><a href="https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/OSXHIGuidelines/MenuBarMenus.html#//apple_ref/doc/uid/20000957-CH29-SW1">OS X<span class="u-visible-to-screen-reader">(opens in new window)</span></a></li>
+              <li><a href="https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/OSXHIGuidelines/MenuBarMenus.html#//apple_ref/doc/uid/20000957-CH29-SW1">macOS<span class="u-visible-to-screen-reader">(opens in new window)</span></a></li>
               <li><a href="https://msdn.microsoft.com/en-us/library/windows/desktop/bb226797(v=vs.85).aspx">Windows<span class="u-visible-to-screen-reader">(opens in new window)</span></a></li>
               <li><a href="https://developer.gnome.org/hig/stable/menu-bars.html.en">Linux<span class="u-visible-to-screen-reader">(opens in new window)</span></a></li>
             </ul>
@@ -44,7 +44,7 @@ <h2>ProTip</h2>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="context-menu-demo-toggle" class="js-container-target demo-toggle-button">Create a context menu
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">

sections/menus/shortcuts.html

@@ -31,7 +31,7 @@ <h3>The <code>globalShortcut</code> and <code>Menu</code> modules can be used to
     <div class="demo">
       <div class="demo-wrapper">
         <button id="shortcuts-demo-toggle" class="js-container-target demo-toggle-button">Register a global keyboard shortcut
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
         </button>
         <div class="demo-box">
           <p>
@@ -58,7 +58,7 @@ <h2>ProTip</h2>
             </p>
 
             <ul>
-              <li><a class="u-exlink" href="https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/OSXHIGuidelines/Keyboard.html">OS X</a></li>
+              <li><a class="u-exlink" href="https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/OSXHIGuidelines/Keyboard.html">macOS</a></li>
               <li><a class="u-exlink" href="http://windows.microsoft.com/en-us/windows-10/keyboard-shortcuts">Windows</a></li>
               <li><a class="u-exlink" href="https://developer.gnome.org/hig/stable/keyboard-input.html.en">Linux</a></li>
             </ul>

sections/native-ui/dialogs.html

@@ -17,7 +17,7 @@ <h3>The <code>dialog</code> module in Electron allows you to use native system d
     <div class="demo">
       <div class="demo-wrapper">
         <button id="open-file-demo-toggle" class="js-container-target demo-toggle-button">Open a File or Directory
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">
@@ -32,8 +32,8 @@ <h5>Main Process</h5>
 
           <div class="demo-protip">
             <h2>ProTip</h2>
-            <strong>The sheet-style dialog on OS X.</strong>
-            <p>On OS X you can choose between a "sheet" dialog or a default dialog. The sheet version descends from the top of the window. To use sheet version, pass the <code>window</code> as the first argument in the dialog method.</p>
+            <strong>The sheet-style dialog on macOS.</strong>
+            <p>On macOS you can choose between a "sheet" dialog or a default dialog. The sheet version descends from the top of the window. To use sheet version, pass the <code>window</code> as the first argument in the dialog method.</p>
             <pre><code class="language-js">const ipc = require('electron').ipcMain
 const dialog = require('electron').dialog
 const BrowserWindow = require('electron').BrowserWindow
@@ -51,7 +51,7 @@ <h2>ProTip</h2>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="error-dialog-demo-toggle" class="js-container-target demo-toggle-button">Error Dialog
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">
@@ -71,7 +71,7 @@ <h5>Main Process</h5>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="information-dialog-demo-toggle" class="js-container-target demo-toggle-button">Information Dialog
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">
@@ -80,7 +80,7 @@ <h5>Main Process</h5>
           </div>
           <p>In this demo, the <code>ipc</code> module is used to send a message from the renderer process instructing the main process to launch the information dialog. Options may be provided for responses which can then be relayed back to the renderer process.</p>
 
-          <p>Note: The <code>title</code> property is not displayed in OS X.</p>
+          <p>Note: The <code>title</code> property is not displayed in macOS.</p>
 
           <p>An information dialog can contain an icon, your choice of buttons, title and message.</p>
           <h5>Renderer Process</h5>
@@ -94,7 +94,7 @@ <h5>Main Process</h5>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="save-dialog-demo-toggle" class="js-container-target demo-toggle-button">Save Dialog
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Main</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">

sections/native-ui/ex-links-file-manager.html

@@ -16,7 +16,7 @@ <h3>The <code>shell</code> module in Electron allows you to access certain nativ
     <div class="demo">
       <div class="demo-wrapper">
         <button id="open-file-manager-demo-toggle" class="js-container-target demo-toggle-button">Open Path in File Manager
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">
@@ -33,7 +33,7 @@ <h5>Renderer Process</h5>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="open-ex-links-demo-toggle" class="js-container-target demo-toggle-button">Open External Links
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">

sections/native-ui/tray.html

@@ -16,7 +16,7 @@ <h3>The <code>tray</code> module allows you to create an icon in the operating s
     <div class="demo">
       <div class="demo-wrapper">
         <button id="tray-demo-toggle" class="js-container-target demo-toggle-button">Tray
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux | Process: Main</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux | Process: Main</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">

sections/system/app-sys-information.html

@@ -14,7 +14,7 @@ <h3>With a few Node.js and Electron modules you can gather information about the
     <div class="demo">
       <div class="demo-wrapper">
         <button id="app-info-demo-toggle" class="js-container-target demo-toggle-button">Get app information
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">
@@ -35,7 +35,7 @@ <h5>Main Process</h5>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="app-info-demo-toggle" class="js-container-target demo-toggle-button">Get version information
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">
@@ -66,7 +66,7 @@ <h2>ProTip</h2>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="sys-info-demo-toggle" class="js-container-target demo-toggle-button">Get system information
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">
@@ -86,7 +86,7 @@ <h5>Renderer Process</h5>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="screen-info-demo-toggle" class="js-container-target demo-toggle-button">Get screen information
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">

sections/system/clipboard.html

@@ -16,7 +16,7 @@ <h3>The <code>clipboard</code> module provides methods to perform copy and paste
     <div class="demo">
       <div class="demo-wrapper">
         <button id="copy-to-demo-toggle" class="js-container-target demo-toggle-button">Copy
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">
@@ -33,7 +33,7 @@ <h5>Renderer Process</h5>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="paste-to-demo-toggle" class="js-container-target demo-toggle-button">Paste
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS, Linux <span class="demo-meta-divider">|</span> Process: Both</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">

sections/system/protocol-handler.html

@@ -16,20 +16,20 @@ <h3>The <code>app</code> module provides methods for handling protocols.</h3>
     <div class="demo">
       <div class="demo-wrapper">
         <button id="copy-to-demo-toggle" class="js-container-target demo-toggle-button">Launch app from URL in another app
-          <div class="demo-meta u-avoid-clicks">Supports: Win, OS X <span class="demo-meta-divider">|</span> Process: Main</div>
+          <div class="demo-meta u-avoid-clicks">Supports: Win, macOS <span class="demo-meta-divider">|</span> Process: Main</div>
         </button>
         <div class="demo-box">
           <div class="demo-controls">
             <button class="demo-button" id="protocol-handler">View Demo</button>
           </div>
           <p>You can set your app as the default app to open for a specific protocol. For instance, in this demo we set this app as the default for <code>electron-api-demos://</code>. The demo button above will launch a page in your default browser with a link. Click that link and it will re-launch this app.</p>
           <h5>Packaging</h5>
-          <p>This feature will only work on OS X when your app is packaged. It will not work when you're launching it in development from the command-line. When you package your app you'll need to make sure the OS X <code>plist</code> for the app is updated to include the new protocol handler. If you're using <code>electron-packager</code> then you can add the flag <code>--extend-info</code> with a path to the <code>plist</code> you've created. The one for this app is below.</p>
+          <p>This feature will only work on macOS when your app is packaged. It will not work when you're launching it in development from the command-line. When you package your app you'll need to make sure the macOS <code>plist</code> for the app is updated to include the new protocol handler. If you're using <code>electron-packager</code> then you can add the flag <code>--extend-info</code> with a path to the <code>plist</code> you've created. The one for this app is below.</p>
           <h5>Renderer Process</h5>
           <pre><code data-path="renderer-process/system/protocol-handler.js"></pre></code>
           <h5>Main Process</h5>
           <pre><code data-path="main-process/system/protocol-handler.js"></pre></code>
-          <h5>OS X plist</h5>
+          <h5>macOS plist</h5>
           <pre><code class="language-xml" data-path="assets/mac/info.plist"></pre></code>
         </div>
       </div>