Merge pull request perlorg#269 from shlomif/correct-macOS

Correct away from "OS X" without the space.

docs/combust/install-osx.pod

@@ -1,5 +1,5 @@
 
-=head1 Combust Installation on OSX
+=head1 Combust Installation on macOS
 
 $Id$
 
@@ -15,7 +15,7 @@ really has nothing to do with anything else.)
 
 =head2 Preparation
 
-This installation was done on a PowerBook G4, running OSX 10.4.3.  The
+This installation was done on a PowerBook G4, running macOS 10.4.3.  The
 names have not been changed to protect the innocent.  Some file
 locations may be slightly different on Linux.
 

docs/learn/first_steps/index.html

@@ -9,7 +9,7 @@
     After <a href="/installing/">installing Perl</a> you will want to actually
     run some Perl code. You need to use
     a command line (<a href="/installing/windows_tools.html#command_line">Windows</a>,
-    <a href="/installing/osx_tools.html#command_line">Mac OSX</a>,
+    <a href="/installing/osx_tools.html#command_line">macOS</a>,
     <a href="/installing/unix_linux_tools.html#command_line">Unix/Linux</a>)
     program to do this.
 </p>
@@ -25,7 +25,7 @@
 </p>
 
 <p>Open a text editor (<a href="/installing/windows_tools.html#editors">Windows</a>,
-<a href="/installing/osx_tools.html#editors">Mac OSX</a>,
+<a href="/installing/osx_tools.html#editors">macOS</a>,
 <a href="/installing/unix_linux_tools.html#editors">Unix/Linux</a>) creating a new file with the following
     content</p>
          [% WRAPPER code_chunk -%]

docs/learn/first_steps/very_basics_01.html

@@ -13,7 +13,7 @@ <h4>You should always use...</h4>
 <h4>Useful to teach / install automatically?..</h4>
 <ul>
     <li>English</li>
-    <li>IPC::System::Simple (needed for IO::All on OSX)</li>
+    <li>IPC::System::Simple (needed for IO::All on macOS)</li>
     <li>use autodie qw(:all);</li>
     <li>Try::Tiny</li>
 </ul>
@@ -22,4 +22,4 @@ <h4>Useful to teach / install automatically?..</h4>
 <h4>What about these?</h4>
 <ul>
     <li>utf8::all ???</li>
-</ul>
+</ul>

docs/learn/installing/index.html

@@ -1,7 +1,7 @@
 [%- page.import({
     title => 'Installing Perl',
     section => 'installing',
-    description => "How to install Perl on Window, OSX and Unix/Linux",
+    description => "How to install Perl on Window, macOS and Unix/Linux",
     keywords => "Perl, Installing Perl, Perl setup",
 }) -%]
 
@@ -15,16 +15,16 @@ <h3>Installing Perl on Windows</h3>
     </a>
   </div>
   <div class="col-xs-12 col-sm-4 text-center">
-    <h3>Installing Perl on Mac OSX</h3>
-    <a href="osx.html"><img alt="Install Perl on Mac OSX" src=
+    <h3>Installing Perl on macOS</h3>
+    <a href="osx.html"><img alt="Install Perl on macOS" src=
     "/i/oses/mac.gif"></a>
     <a class="btn btn-success btn-block" href="osx.html" role="button">
       Get Started
     </a>
   </div>
   <div class="col-xs-12 col-sm-4 text-center">
     <h3>Installing Perl on Unix/Linux</h3>
-    <a href="unix_linux.html"><img alt="Install Perl on Mac OSX" src=
+    <a href="unix_linux.html"><img alt="Install Perl on macOS" src=
     "/i/oses/linux.gif"></a>
     <a class="btn btn-success btn-block" href="unix_linux.html" role="button">
     Get Started

docs/learn/installing/osx.html

@@ -1,19 +1,19 @@
 [%- page.import({
-        title => 'Installing Perl on OSX',
+        title => 'Installing Perl on macOS',
         section => 'installing',
-        description => "How to install Perl on OSX",
-        keywords => "Perl, OSX, Installing Perl on OSX, Perl setup on OSX",
+        description => "How to install Perl on macOS",
+        keywords => "Perl, OS X, Installing Perl on OS X, Perl setup on OS X, macOS",
     });
 
 -%]
 
 <h3>
-    A good setup for Perl on OSX:
+    A good setup for Perl on macOS:
 </h3>
 
 <ul class="installLinks">
     <li>
-        <a href="osx_tools.html">OSX Editors and Terminals</a>
+        <a href="osx_tools.html">macOS Editors and Terminals</a>
     </li>
 </ul>
 
@@ -43,25 +43,25 @@ <h3 id="explained">
 <ul class="explained">
     <li>To build and install Perl and many of the thousands of useful
         <a href="/modules/">Perl modules</a> you need to have a <a href=
-        "http://en.wikipedia.org/wiki/Compiler">compiler</a>. For OSX the
+        "http://en.wikipedia.org/wiki/Compiler">compiler</a>. For macOS the
         easiest way to get a compiler is to install
         "Command Line Tools for Xcode" (about 100 Megs), either directly or
         through Xcode (several Gigs), both available from
         <a href="https://developer.apple.com/downloads/">Apple Developer downloads</a>.
         Xcode is also available through the
         <a href=
         "http://itunes.apple.com/us/app/xcode/id422352214?mt=12&amp;ls=1">App
-        Store</a> application. Some versions of the OSX install DVD or SSD come with the
+        Store</a> application. Some versions of the macOS install DVD or SSD come with the
         'developer tools', which contains Xcode. Only the 'unix tools' section
         of Xcode is actually required, no specific version of Xcode is needed,
         the latest is available directly through the App Store.
     </li>
     <li>To interact with the command line and run Perl commands, a terminal
-    application is needed. OSX comes with Terminal.app by default, there are
+    application is needed. macOS comes with Terminal.app by default, there are
     <a href="/installing/osx_tools.html#command_line">alternatives</a>
     available as well.
     </li>
-    <li>OSX uses .bash_profile, but most other systems (and instructions) look
+    <li>macOS uses .bash_profile, but most other systems (and instructions) look
     for .bashrc, this code sets up .bash_profie to <em>also</em> run anything
     in .bashrc. There are <a href=
     "http://www.joshstaiger.org/archives/2005/07/bash_profile_vs.html">other

docs/learn/installing/osx_tools.html

@@ -1,5 +1,5 @@
 [%- page.import({
-        title => 'Tools for OSX',
+        title => 'Tools for macOS',
         section => 'installing',
 
     })
@@ -9,7 +9,7 @@
 <div class="row row-height">
   <div class="col-xs-12 col-sm-6">
     <h3 id="editors">
-        OSX Editors
+        macOS Editors
     </h3>
     <ul class="list-unstyled">
         <li>
@@ -23,7 +23,7 @@ <h3 id="editors">
         </li>
         <li>
             <img height="50" src="/i/app_icons/venturing_into_vim.jpeg"> <a href=
-            "http://sourceforge.net/projects/macosxvim/">vim</a> (graphical version, command line version comes with recent OSXs)
+            "http://sourceforge.net/projects/macosxvim/">vim</a> (graphical version, command line version comes with recent macOS versions)
         </li>
         <li>
             <img height="50" src="/i/app_icons/logo.png"> <a href=
@@ -33,7 +33,7 @@ <h3 id="editors">
   </div>
   <div class="col-xs-12 col-sm-6">
     <h3 id="command_line">
-        OSX Command line terminals
+        macOS Command line terminals
     </h3>
     <ul class="list-unstyled">
         <li>
@@ -42,7 +42,7 @@ <h3 id="command_line">
         </li>
         <li>
             <img height="50" src="/i/app_icons/iTerm2.png"> <a href=
-            "http://code.google.com/p/iterm2/">iTerm2</a>
+            "https://iterm2.com/">iTerm2</a>
         </li>
     </ul>
   </div>

docs/www/get.html

@@ -30,7 +30,7 @@ <h3>Unix/Linux</h3>
     </a>
   </div>
   <div class="col-xs-12 col-sm-4 text-center">
-    <h3>Mac OSX</h3>
+    <h3>macOS</h3>
     <img src="[% combust.static_url("/images/logos/mac.gif") %]" width="120" alt="macOS" style="margin:auto;"/>
     Included<br /><small>(may not be latest)</small><br/>
     <a class="btn btn-success btn-block" href="#osx" role="button">