Changeset 120904 for trunk/doc-new


Ignore:
Timestamp:
Jun 11, 2014, 11:31:09 AM (5 years ago)
Author:
cal@…
Message:

guide: s/Mac OS X/OS X/ unless explicitly referring to older versions

Location:
trunk/doc-new/guide/xml
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/doc-new/guide/xml/installing.xml

    r120889 r120904  
    88
    99  <para>This chapter shows you how to install MacPorts and its prerequisites step-by-step. Note that the section about
    10   <link linkend="installing.xcode">installing Xcode</link> is Mac OS X-specific. If you wish to install MacPorts on
     10  <link linkend="installing.xcode">installing Xcode</link> is OS X-specific. If you wish to install MacPorts on
    1111  another platform, first make sure you have a working C compiler installed, skip ahead to <link
    1212    linkend="installing.macports.source">installing MacPorts from source</link>, and continue to the end of the
     
    1818    <para>
    1919      <ulink url="https://developer.apple.com/xcode/">Xcode</ulink> is a package provided by Apple containing compilers,
    20       libraries and additional tools required to develop applications for Mac OS X.
     20      libraries and additional tools required to develop applications for OS X.
    2121    </para>
    2222
    2323    <note>
    24       <para>Always make sure to install the latest available version of Xcode for your Mac OS X release; using outdated
    25         versions of Xcode may cause port install failures. Also note that Xcode is not updated via Mac OS X's Software
     24      <para>Always make sure to install the latest available version of Xcode for your OS X release; using outdated
     25        versions of Xcode may cause port install failures. Also note that Xcode is not updated via OS X's Software
    2626        Update utility on OS versions prior to 10.6, and is updated via the Mac App Store starting with 10.7.</para>
    2727    </note>
    2828
    29     <para>Follow the instructions for your version of Mac OS X:</para>
     29    <para>Follow the instructions for your version of OS X:</para>
    3030
    3131    <section id="installing.xcode.mavericks">
     
    151151    <title>Install MacPorts</title>
    152152
    153     <para>If you are using Mac OS X, you should install MacPorts using the Mac
    154     OS X package installer unless you do not wish to install it to
    155     <filename>/opt/local/</filename>, the default MacPorts location, or if you
    156     wish to install a pre-release version of MacPorts base. However, if you
    157     wish to <link linkend="installing.macports.source.multiple">install
    158     multiple copies of MacPorts</link> or install MacPorts on another OS
    159     platform, you must <link linkend="installing.macports.source">install
    160     MacPorts from the source code</link>.</para>
     153        <para>If you are using OS X, you should install MacPorts using the OS
     154        X package installer unless you do not wish to install it to
     155        <filename>/opt/local/</filename>, the default MacPorts location, or if you
     156        wish to install a pre-release version of MacPorts base. However, if you
     157        wish to <link linkend="installing.macports.source.multiple">install
     158                multiple copies of MacPorts</link> or install MacPorts on another OS
     159        platform, you must <link linkend="installing.macports.source">install
     160                MacPorts from the source code</link>.</para>
    161161
    162162    <note>
     
    170170
    171171    <section id="installing.macports.binary">
    172       <title>Mac OS X Package Install</title>
    173 
    174       <para>The Mac OS X package installer automatically installs MacPorts,
     172      <title>OS X Package Install</title>
     173
     174      <para>The OS X package installer automatically installs MacPorts,
    175175      <link linkend="installing.shell">sets the shell environment</link>, and
    176176      runs a <link linkend="using.port.selfupdate">selfupdate</link> operation
     
    445445
    446446    <para>MacPorts requires that some environment variables be set in the
    447     shell. When MacPorts is installed using the Mac OS X package installer, a
     447    shell. When MacPorts is installed using the OS X package installer, a
    448448    <quote>postflight</quote> script is run after installation that
    449449    automatically adds or modifies a shell configuration file in your home directory,
  • trunk/doc-new/guide/xml/macports.conf.xml

    r105465 r120904  
    109109
    110110        <listitem>
    111           <para>Directory to install MacPorts that install Mac OS X .app
    112           bundles.</para>
     111                  <para>Directory to install MacPorts that install OS X .app
     112                          bundles.</para>
    113113
    114114          <para>Default: <filename>/Applications/MacPorts</filename></para>
  • trunk/doc-new/guide/xml/portfile-keywords.xml

    r105189 r120904  
    199199      <listitem>
    200200        <para>The CPU architectures for which this port can be built. Archs currently
    201         supported by Mac OS X are: i386, ppc, ppc64, x86_64. If this option is not
     201        supported by OS X are: i386, ppc, ppc64, x86_64. If this option is not
    202202        set, it is assumed that the port can build for all archs. If a port does not
    203203        install any architecture-specific files, use the special value
  • trunk/doc-new/guide/xml/portfile-startupitem.xml

    r105189 r120904  
    88  programs that run continuously in the background, rather than under the
    99  direct control of a user; for example, mail servers, network listeners, etc.
    10   Ports that use StartupItem keywords create Mac OS X scripts for <ulink
     10  Ports that use StartupItem keywords create OS X scripts for <ulink
    1111  url="http://developer.apple.com/macosx/launchd.html">launchd</ulink>, which
    1212  is the Apple facility introduced with Mac OS X 10.4 to replace xinetd for
    1313  starting and managing daemons. To support <command>launchd</command>, a
    1414  program named <command>daemondo</command> is provided by MacPorts base that
    15   serves as an adapter between Mac OS X's <command>launchd</command> and
     15  serves as an adapter between OS X's <command>launchd</command> and
    1616  daemons (<quote>executable</quote> StartupItems) or traditional Unix startup
    1717  scripts that start daemons (<quote>script</quote> StartupItems).</para>
  • trunk/doc-new/guide/xml/portfile-variants.xml

    r105189 r120904  
    101101
    102102        <listitem>
    103           <para>When using MacPorts on Mac OS X, a universal variant is
     103          <para>When using MacPorts on OS X, a universal variant is
    104104          defined by default to configure ports with universal flags. The
    105105          variant can be overridden if the default code does not work (see the
     
    170170          <replaceable>version</replaceable></literal> can be used to handle
    171171          different tasks depending on the version of Darwin, the core
    172           operating system underlying Mac OS X.
     172          operating system underlying OS X.
    173173          <replaceable>version</replaceable> is the major version of Darwin,
    174174          and can be <literal>8</literal> for Mac OS X 10.4 Tiger,
  • trunk/doc-new/guide/xml/portfiledev.xml

    r111935 r120904  
    11051105      be necessary. If the port(s) in question are distributable their binary
    11061106      archives will be kept for subsequent distribution for the three most current
    1107       versions of the Mac OS X operating system.</para>
     1107      versions of the OS X operating system.</para>
    11081108     
    11091109      <para>If a build error occurred for a port its maintainer will be informed via
  • trunk/doc-new/guide/xml/portgroup-xcode.xml

    r87789 r120904  
    1212  <para>Using <code>PortGroup xcode</code> is a way to make your port able to
    1313  tolerate Xcode version updates because the PortGroup is tested against all
    14   supported Mac OS X and Xcode versions.</para>
     14  supported OS X and Xcode versions.</para>
    1515
    1616  <section id="reference.portgroup.xcode.keywords">
  • trunk/doc-new/guide/xml/using.xml

    r120903 r120904  
    9898      <option>selfupdate</option> actions. It synchronizes the ports tree, as
    9999      does <option>selfupdate</option>, but it does not check for upgrades to
    100       MacPorts base. On Mac OS X, unless there is a special reason not to do
     100      MacPorts base. On OS X, unless there is a special reason not to do
    101101      so, you should run <link
    102102      linkend="using.port.selfupdate">selfupdate</link>.</para>
    103103
    104104      <note>
    105         <para>For platforms other than Mac OS X, <option>sync</option> is the
     105        <para>For platforms other than OS X, <option>sync</option> is the
    106106        only way to get port updates because <option>selfupdate</option> is
    107         supported only on Mac OS X.</para>
     107        supported only on OS X.</para>
    108108      </note>
    109109    </section>
     
    767767      <para>Binary packages are standalone binary installers that are
    768768      precompiled; they do not require MacPorts on the target system. Binary
    769       files created with MacPorts may be either .pkg (Mac OS X Installer
     769      files created with MacPorts may be either .pkg (OS X Installer
    770770      Packages), or .rpm (RPM Package Manager) format. MacPorts may also
    771       process a .pkg package into a Mac OS X .dmg disk image file. You may
     771      process a .pkg package into a OS X .dmg disk image file. You may
    772772      create binary packages with the <command>port</command> command as shown
    773773      in these examples.</para>
     
    775775      <programlisting><prompt>%%</prompt> <userinput>sudo port pkg pstree</userinput></programlisting>
    776776
    777       <para>You may create a Mac OS X .dmg disk image file as shown.</para>
     777      <para>You may create a OS X .dmg disk image file as shown.</para>
    778778
    779779      <programlisting><prompt>%%</prompt> <userinput>sudo port dmg pstree</userinput></programlisting>
Note: See TracChangeset for help on using the changeset viewer.