<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-guide.
</pre>
<p><a href="https://github.com/macports/macports-guide/commit/c4b197fe37927d2e6de99b86a7fcacd2d17ff5e4">https://github.com/macports/macports-guide/commit/c4b197fe37927d2e6de99b86a7fcacd2d17ff5e4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c4b197fe37927d2e6de99b86a7fcacd2d17ff5e4
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Thu Oct 19 16:54:32 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> installing: Rename to macOS where appropriate
</span>---
guide/xml/installing.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/installing.xml b/guide/xml/installing.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index b5d6f05..3a9064d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/installing.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/installing.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> <title>Installing MacPorts</title>
<para>This chapter shows you how to install MacPorts and its prerequisites step-by-step. Note that the section about
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <link linkend="installing.xcode">installing Xcode</link> is OS X-specific. If you wish to install MacPorts on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <link linkend="installing.xcode">installing Xcode</link> is macOS-specific. If you wish to install MacPorts on
</span> another platform, first make sure you have a working C compiler installed, skip ahead to <link
linkend="installing.macports.source">installing MacPorts from source</link>, and continue to the end of the
chapter.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,16 +18,16 @@
</span> <title>Install Xcode</title>
<para><ulink url="https://developer.apple.com/xcode/">Xcode</ulink> is a package provided by Apple containing
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compilers, libraries and additional tools required to develop applications for OS X.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers, libraries and additional tools required to develop applications for macOS.</para>
</span>
<note>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>Always make sure to install the latest available version of Xcode for your OS X release; using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>Always make sure to install the latest available version of Xcode for your macOS release; using
</span> outdated versions of Xcode may cause port install failures. Also note that Xcode is not updated via OS
X's Software Update utility on OS versions prior to 10.6, and is updated via the Mac App Store starting
with 10.7.</para>
</note>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>Follow the instructions for your version of OS X:</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>Follow the instructions for your version of macOS:</para>
</span>
<section id="installing.xcode.mavericks">
<title>Install Xcode on OS X 10.9 or Later</title>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +141,7 @@
</span> <section id="installing.macports">
<title>Install MacPorts</title>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>If you are using OS X, you should install MacPorts using the OS X package installer unless you do not wish
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>If you are using macOS, you should install MacPorts using the macOS package installer unless you do not wish
</span> to install it to <filename>/opt/local/</filename>, the default MacPorts location, or if you wish to install
a pre-release version of MacPorts base. However, if you wish to <link
linkend="installing.macports.source.multiple">install multiple copies of MacPorts</link> or install
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,9 +149,9 @@
</span> the source code</link>.</para>
<section id="installing.macports.binary">
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <title>OS X Package Install</title>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <title>macOS Package Install</title>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>The OS X package installer automatically installs MacPorts, <link linkend="installing.shell">sets the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>The macOS package installer automatically installs MacPorts, <link linkend="installing.shell">sets the
</span> shell environment</link>, and runs a <link linkend="using.port.selfupdate">selfupdate</link>
operation to update the ports tree and MacPorts base with the latest release.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,7 +160,7 @@
</span> <para>Download the latest
<filename>MacPorts-&macports-version;-<replaceable>....</replaceable>pkg</filename> installer from the releases
<ulink url="https://github.com/macports/macports-base/releases/">on GitHub</ulink>. Here
<span style='display:block; white-space:pre;background:#ffe0e0;'>- are direct links for the latest versions of OS X:</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ are direct links for the latest versions of macOS:</para>
</span>
<variablelist>
<varlistentry>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -405,7 +405,7 @@
</span> <title>MacPorts and the Shell</title>
<para>MacPorts requires that some environment variables be set in the shell. When MacPorts is installed using
<span style='display:block; white-space:pre;background:#ffe0e0;'>- the OS X package installer, a <quote>postflight</quote> script is run after installation that automatically
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the macOS package installer, a <quote>postflight</quote> script is run after installation that automatically
</span> adds or modifies a shell configuration file in your home directory, ensuring that it defines variables
according to the rules described in the following section. Those <link
linkend="installing.macports.source">installing MacPorts from source code</link> must modify their
</pre><pre style='margin:0'>
</pre>