[120904] trunk/doc-new/guide/xml
cal at macports.org
cal at macports.org
Wed Jun 11 04:31:10 PDT 2014
Revision: 120904
https://trac.macports.org/changeset/120904
Author: cal at macports.org
Date: 2014-06-11 04:31:09 -0700 (Wed, 11 Jun 2014)
Log Message:
-----------
guide: s/Mac OS X/OS X/ unless explicitly referring to older versions
Modified Paths:
--------------
trunk/doc-new/guide/xml/installing.xml
trunk/doc-new/guide/xml/macports.conf.xml
trunk/doc-new/guide/xml/portfile-keywords.xml
trunk/doc-new/guide/xml/portfile-startupitem.xml
trunk/doc-new/guide/xml/portfile-variants.xml
trunk/doc-new/guide/xml/portfiledev.xml
trunk/doc-new/guide/xml/portgroup-xcode.xml
trunk/doc-new/guide/xml/using.xml
Modified: trunk/doc-new/guide/xml/installing.xml
===================================================================
--- trunk/doc-new/guide/xml/installing.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/installing.xml 2014-06-11 11:31:09 UTC (rev 120904)
@@ -7,7 +7,7 @@
<title>Installing MacPorts</title>
<para>This chapter shows you how to install MacPorts and its prerequisites step-by-step. Note that the section about
- <link linkend="installing.xcode">installing Xcode</link> is Mac OS X-specific. If you wish to install MacPorts on
+ <link linkend="installing.xcode">installing Xcode</link> is OS X-specific. If you wish to install MacPorts on
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>
@@ -17,16 +17,16 @@
<para>
<ulink url="https://developer.apple.com/xcode/">Xcode</ulink> is a package provided by Apple containing compilers,
- libraries and additional tools required to develop applications for Mac OS X.
+ libraries and additional tools required to develop applications for OS X.
</para>
<note>
- <para>Always make sure to install the latest available version of Xcode for your Mac OS X release; using outdated
- versions of Xcode may cause port install failures. Also note that Xcode is not updated via Mac OS X's Software
+ <para>Always make sure to install the latest available version of Xcode for your OS X release; using 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>
- <para>Follow the instructions for your version of Mac OS X:</para>
+ <para>Follow the instructions for your version of OS X:</para>
<section id="installing.xcode.mavericks">
<title>Install Xcode on OS X 10.9 or later</title>
@@ -150,14 +150,14 @@
<section id="installing.macports">
<title>Install MacPorts</title>
- <para>If you are using Mac OS X, you should install MacPorts using the Mac
- OS X package installer unless you do not wish 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 MacPorts on another OS
- platform, you must <link linkend="installing.macports.source">install
- MacPorts from the source code</link>.</para>
+ <para>If you are using OS X, you should install MacPorts using the OS
+ X package installer unless you do not wish 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 MacPorts on another OS
+ platform, you must <link linkend="installing.macports.source">install
+ MacPorts from the source code</link>.</para>
<note>
<para>Though a distinction is made between pre-release and release
@@ -169,9 +169,9 @@
</note>
<section id="installing.macports.binary">
- <title>Mac OS X Package Install</title>
+ <title>OS X Package Install</title>
- <para>The Mac OS X package installer automatically installs MacPorts,
+ <para>The OS X package installer automatically installs MacPorts,
<link linkend="installing.shell">sets the 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
@@ -444,7 +444,7 @@
<title>MacPorts and the Shell</title>
<para>MacPorts requires that some environment variables be set in the
- shell. When MacPorts is installed using the Mac OS X package installer, a
+ shell. When MacPorts is installed using the OS X package installer, a
<quote>postflight</quote> script is run after installation that
automatically adds or modifies a shell configuration file in your home directory,
ensuring that it defines variables
Modified: trunk/doc-new/guide/xml/macports.conf.xml
===================================================================
--- trunk/doc-new/guide/xml/macports.conf.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/macports.conf.xml 2014-06-11 11:31:09 UTC (rev 120904)
@@ -108,8 +108,8 @@
<term>applications_dir</term>
<listitem>
- <para>Directory to install MacPorts that install Mac OS X .app
- bundles.</para>
+ <para>Directory to install MacPorts that install OS X .app
+ bundles.</para>
<para>Default: <filename>/Applications/MacPorts</filename></para>
</listitem>
Modified: trunk/doc-new/guide/xml/portfile-keywords.xml
===================================================================
--- trunk/doc-new/guide/xml/portfile-keywords.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/portfile-keywords.xml 2014-06-11 11:31:09 UTC (rev 120904)
@@ -198,7 +198,7 @@
<listitem>
<para>The CPU architectures for which this port can be built. Archs currently
- supported by Mac OS X are: i386, ppc, ppc64, x86_64. If this option is not
+ supported by OS X are: i386, ppc, ppc64, x86_64. If this option is not
set, it is assumed that the port can build for all archs. If a port does not
install any architecture-specific files, use the special value
<option>noarch</option>.</para>
Modified: trunk/doc-new/guide/xml/portfile-startupitem.xml
===================================================================
--- trunk/doc-new/guide/xml/portfile-startupitem.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/portfile-startupitem.xml 2014-06-11 11:31:09 UTC (rev 120904)
@@ -7,12 +7,12 @@
<para>A StartupItem is a MacPorts facility to run <quote>daemons,</quote> a Unix term for
programs that run continuously in the background, rather than under the
direct control of a user; for example, mail servers, network listeners, etc.
- Ports that use StartupItem keywords create Mac OS X scripts for <ulink
+ Ports that use StartupItem keywords create OS X scripts for <ulink
url="http://developer.apple.com/macosx/launchd.html">launchd</ulink>, which
is the Apple facility introduced with Mac OS X 10.4 to replace xinetd for
starting and managing daemons. To support <command>launchd</command>, a
program named <command>daemondo</command> is provided by MacPorts base that
- serves as an adapter between Mac OS X's <command>launchd</command> and
+ serves as an adapter between OS X's <command>launchd</command> and
daemons (<quote>executable</quote> StartupItems) or traditional Unix startup
scripts that start daemons (<quote>script</quote> StartupItems).</para>
@@ -467,4 +467,4 @@
[... trimmed ...]</programlisting>
</section>
-</section>
\ No newline at end of file
+</section>
Modified: trunk/doc-new/guide/xml/portfile-variants.xml
===================================================================
--- trunk/doc-new/guide/xml/portfile-variants.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/portfile-variants.xml 2014-06-11 11:31:09 UTC (rev 120904)
@@ -100,7 +100,7 @@
<term>universal_variant</term>
<listitem>
- <para>When using MacPorts on Mac OS X, a universal variant is
+ <para>When using MacPorts on OS X, a universal variant is
defined by default to configure ports with universal flags. The
variant can be overridden if the default code does not work (see the
<link linkend="reference.phases.configure.universal">Configure
@@ -169,7 +169,7 @@
<para><literal>platform darwin
<replaceable>version</replaceable></literal> can be used to handle
different tasks depending on the version of Darwin, the core
- operating system underlying Mac OS X.
+ operating system underlying OS X.
<replaceable>version</replaceable> is the major version of Darwin,
and can be <literal>8</literal> for Mac OS X 10.4 Tiger,
<literal>9</literal> for 10.5 Leopard, <literal>10</literal> for
Modified: trunk/doc-new/guide/xml/portfiledev.xml
===================================================================
--- trunk/doc-new/guide/xml/portfiledev.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/portfiledev.xml 2014-06-11 11:31:09 UTC (rev 120904)
@@ -1104,7 +1104,7 @@
the buildbot will check whether a rebuild of the corresponding port(s) would
be necessary. If the port(s) in question are distributable their binary
archives will be kept for subsequent distribution for the three most current
- versions of the Mac OS X operating system.</para>
+ versions of the OS X operating system.</para>
<para>If a build error occurred for a port its maintainer will be informed via
an email so that problems which did not surface on the maintainer's machine will
Modified: trunk/doc-new/guide/xml/portgroup-xcode.xml
===================================================================
--- trunk/doc-new/guide/xml/portgroup-xcode.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/portgroup-xcode.xml 2014-06-11 11:31:09 UTC (rev 120904)
@@ -11,7 +11,7 @@
<para>Using <code>PortGroup xcode</code> is a way to make your port able to
tolerate Xcode version updates because the PortGroup is tested against all
- supported Mac OS X and Xcode versions.</para>
+ supported OS X and Xcode versions.</para>
<section id="reference.portgroup.xcode.keywords">
<title>xcode PortGroup Specific Keywords</title>
Modified: trunk/doc-new/guide/xml/using.xml
===================================================================
--- trunk/doc-new/guide/xml/using.xml 2014-06-11 11:26:31 UTC (rev 120903)
+++ trunk/doc-new/guide/xml/using.xml 2014-06-11 11:31:09 UTC (rev 120904)
@@ -97,14 +97,14 @@
<para>The <option>sync</option> action performs a subset of
<option>selfupdate</option> actions. It synchronizes the ports tree, as
does <option>selfupdate</option>, but it does not check for upgrades to
- MacPorts base. On Mac OS X, unless there is a special reason not to do
+ MacPorts base. On OS X, unless there is a special reason not to do
so, you should run <link
linkend="using.port.selfupdate">selfupdate</link>.</para>
<note>
- <para>For platforms other than Mac OS X, <option>sync</option> is the
+ <para>For platforms other than OS X, <option>sync</option> is the
only way to get port updates because <option>selfupdate</option> is
- supported only on Mac OS X.</para>
+ supported only on OS X.</para>
</note>
</section>
@@ -766,15 +766,15 @@
<para>Binary packages are standalone binary installers that are
precompiled; they do not require MacPorts on the target system. Binary
- files created with MacPorts may be either .pkg (Mac OS X Installer
+ files created with MacPorts may be either .pkg (OS X Installer
Packages), or .rpm (RPM Package Manager) format. MacPorts may also
- process a .pkg package into a Mac OS X .dmg disk image file. You may
+ process a .pkg package into a OS X .dmg disk image file. You may
create binary packages with the <command>port</command> command as shown
in these examples.</para>
<programlisting><prompt>%%</prompt> <userinput>sudo port pkg pstree</userinput></programlisting>
- <para>You may create a Mac OS X .dmg disk image file as shown.</para>
+ <para>You may create a OS X .dmg disk image file as shown.</para>
<programlisting><prompt>%%</prompt> <userinput>sudo port dmg pstree</userinput></programlisting>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140611/da47be0a/attachment.html>
More information about the macports-changes
mailing list