Ticket #47305: various-docbook-fixes.diff

File various-docbook-fixes.diff, 36.3 KB (added by grimreaper (Eitan Adler), 10 years ago)

a collection of docbook fixes

  • installing.xml

     
    3030        <para>Follow the instructions for your version of OS X:</para>
    3131
    3232        <section id="installing.xcode.mavericks">
    33             <title>Install Xcode on OS X 10.9 or later</title>
     33            <title>Install Xcode on OS X 10.9 or Later</title>
    3434
    3535            <para>Download the latest version of Xcode <ulink
    3636                    url="https://developer.apple.com/downloads/index.action">from the Apple developer website</ulink> or
    … …  
    5454                    Store</ulink>.</para>
    5555
    5656            <section id="installing.xcode.lion.43">
    57                 <title>Xcode 4.3 and later</title>
     57                <title>Xcode 4.3 and Later</title>
    5858
    5959                <para>Xcode 4.3 and later do not automatically install the command line tools, but MacPorts requires
    6060                    them. To install them, open the Xcode application, go to the Preferences window, to the Downloads
    … …  
    7474
    7575            <para>If you are using Mac OS X 10.6, there are two branches of Xcode which could be considered to be the
    7676                latest, 3.2.x and 4.x. Xcode 4 costs money, but Xcode 3 is still available free of charge. There are two
    77                 options for downloading it:
     77                options for downloading it:</para>
    7878
    7979                <orderedlist>
    8080                    <listitem>
    … …  
    8888                    </listitem>
    8989                </orderedlist>
    9090
    91                 Both are available from the <ulink url="https://developer.apple.com/downloads/index.action">Apple
     91                <para>Both are available from the <ulink url="https://developer.apple.com/downloads/index.action">Apple
    9292                    developer website</ulink>. You may also be able to install Xcode 3.2 from your Mac OS X 10.6 DVD and
    9393                then run Software Update to get the latest version.</para>
    9494
    9595            <para>Ensure that those of the following options that are available in the installer for your version of
    96                 Xcode are selected:
     96                Xcode are selected:</para>
    9797
    9898                <itemizedlist>
    9999                    <listitem>
    100                         <guibutton>UNIX Development</guibutton>
     100                        <para><guibutton>UNIX Development</guibutton></para>
    101101                    </listitem>
    102102                    <listitem>
    103                         <guibutton>System Tools</guibutton>
     103                        <para><guibutton>System Tools</guibutton></para>
    104104                    </listitem>
    105105                    <listitem>
    106                         <guibutton>X11 SDK</guibutton>
     106                        <para><guibutton>X11 SDK</guibutton></para>
    107107                    </listitem>
    108108                    <listitem>
    109                         <guibutton>Command Line Support</guibutton>
     109                        <para><guibutton>Command Line Support</guibutton></para>
    110110                    </listitem>
    111111                </itemizedlist>
    112             </para>
    113112        </section>
    114113
    115114        <section id="installing.xcode.other">
    116             <title>Install Xcode on older releases of Mac OS X</title>
     115            <title>Install Xcode on Older Releases of Mac OS X</title>
    117116
    118117            <para>If you have an earlier release of Mac OS X, you may download the latest version of Xcode for OS X 10.5
    119118                (Xcode 3.0 and Xcode 3.1 Developer Tools) or 10.4 (Xcode 2.4.1 and Xcode 2.5 Developer Tools) from the
    … …  
    120119                <ulink url="https://developer.apple.com/downloads/index.action">Apple developer website</ulink>.</para>
    121120
    122121            <para>Ensure that those of the following options that are available in the installer for your version of
    123                 Xcode are selected:
     122                Xcode are selected:</para>
    124123
    125124                <itemizedlist>
    126125                    <listitem>
    127                         <guibutton>UNIX Development</guibutton>
     126                        <para><guibutton>UNIX Development</guibutton></para>
    128127                    </listitem>
    129128                    <listitem>
    130                         <guibutton>System Tools</guibutton>
     129                        <para><guibutton>System Tools</guibutton></para>
    131130                    </listitem>
    132131                    <listitem>
    133                         <guibutton>X11 SDK</guibutton>
     132                        <para><guibutton>X11 SDK</guibutton></para>
    134133                    </listitem>
    135134                    <listitem>
    136                         <guibutton>Command Line Support</guibutton>
     135                        <para><guibutton>Command Line Support</guibutton></para>
    137136                    </listitem>
    138137                </itemizedlist>
    139             </para>
    140138        </section>
    141139    </section>
    142140
    … …  
    167165            <orderedlist>
    168166                <listitem>
    169167                    <para>Download the latest
    170                         <filename>MacPorts-&macports-version;-<emphasis>...</emphasis>.pkg</filename> installer from the
     168                        <filename>MacPorts-&macports-version;-<replaceable>....</replaceable>pkg</filename> installer from the
    171169                        <ulink url="https://distfiles.macports.org/MacPorts/">MacPorts download directory</ulink>. Here
    172170                        are direct links for the latest versions of OS X:</para>
    173171
    … …  
    177175                                OS X 10.10 Yosemite:
    178176                            </term>
    179177                            <listitem>
    180                                 <ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;-10.10-Yosemite.pkg">MacPorts-&macports-version;-10.10-Yosemite.pkg</ulink>
     178                                <para><ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;-10.10-Yosemite.pkg">MacPorts-&macports-version;-10.10-Yosemite.pkg</ulink></para>
    181179                            </listitem>
    182180                        </varlistentry>
    183181                        <varlistentry>
    … …  
    185183                                OS X 10.9 Mavericks:
    186184                            </term>
    187185                            <listitem>
    188                                 <ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;-10.9-Mavericks.pkg">MacPorts-&macports-version;-10.9-Mavericks.pkg</ulink>
     186                                <para><ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;-10.9-Mavericks.pkg">MacPorts-&macports-version;-10.9-Mavericks.pkg</ulink></para>
    189187                            </listitem>
    190188                        </varlistentry>
    191189                    </variablelist>
    … …  
    199197                <listitem>
    200198                    <para>After this step you are done already, MacPorts is now installed and your shell environment was
    201199                        set up automatically by the installer. To confirm the installation is working as expected, now
    202                         try using the <command>port</command> command in a <emphasis>new</emphasis> terminal
     200                        try using <command>port</command> in a <emphasis>new</emphasis> terminal
    203201                        window.</para>
    204202
    205203                    <programlisting><prompt>$</prompt> <userinput>port version</userinput></programlisting>
    … …  
    284282                    <para>Build and Install MacPorts</para>
    285283
    286284                    <para>MacPorts uses autoconf and makefiles for installation. These commands will build and install
    287                         MacPorts to <filename>/opt/local</filename>. You can add the <option>--prefix</option> option to
     285                        MacPorts to <filename>/opt/local</filename>. You can add <option>--prefix</option> to
    288286                        <filename>./configure</filename> to relocate MacPorts to another directory if needed.</para>
    289287
    290288                    <programlisting><prompt>$</prompt> <userinput>cd /opt/mports/trunk/base</userinput>
    … …  
    365363                url="http://lists.macosforge.org/mailman/listinfo/macports-users">macports-users</ulink> mailing list
    366364            first.</para>
    367365
    368         <para>If you need to uninstall MacPorts, and your <command>port</command> command is functioning, first
     366        <para>If you need to uninstall MacPorts, and <command>port</command> is functioning, first
    369367        uninstall all the installed ports by running this command in the Terminal:</para>
    370368
    371369        <programlisting><prompt>$</prompt> <userinput>sudo port -fp uninstall installed</userinput></programlisting>
    … …  
    477475        </section>
    478476
    479477        <section id="installing.shell.verifyprofile">
    480             <title>Verify the configuration file</title>
     478            <title>Verify the Configuration File</title>
    481479
    482480            <para>To verify that the file containing the MacPorts variables is in effect, type <command>env</command> in
    483481                the terminal to verify the current environment settings after the file has been created. Example output
    484                 for the <command>env</command> command is shown below.</para>
     482                for <command>env</command> is shown below.</para>
    485483
    486484            <note>
    487485                <para>Changes to shell configuration files do not take effect until a new terminal session is

  • internals.xml

     
    209209
    210210            <listitem>
    211211              <para><code>mportexec:</code> Given a port handle, executes a
    212               target (i.e. install).</para>
     212              target (i.e., install).</para>
    213213            </listitem>
    214214
    215215            <listitem>
    216216              <para><code>mportinfo:</code> Given a port handle, this returns
    217217              the PortInfo array (as a flat list of array elements). This is a
    218               little tricky and unstable and only used by the
    219               <command>portindex</command> command.</para>
     218              little tricky and unstable and only used by
     219              <command>portindex</command>.</para>
    220220            </listitem>
    221221
    222222            <listitem>
    … …  
    321321      stored in a single file named <filename>registry.db</filename>, although
    322322      the additional directory <filename>portfiles</filename> is used
    323323      temporarily for extracting stored Portfiles from the registry.
    324       Furthermore, access to the registry may be locked using the
    325       <filename>.registry.lock</filename> file with the
     324      Furthermore, access to the registry may be locked using
     325      <filename>.registry.lock</filename> with the
    326326      <computeroutput>registry::exclusive_lock</computeroutput> and
    327327      <computeroutput>registry::exclusive_unlock</computeroutput> APIs.</para>
    328328

  • portfile-keywords.xml

     
    3737        <para>The name of the port. To avoid special interpretation by shells
    3838        and the like, names should contain only alphanumeric characters,
    3939        underscores, dashes or dots. For projects whose proper names contain
    40         <quote>+</quote> characters, change these to <quote>x</quote> (i.e.
     40        <quote>+</quote> characters, change these to <quote>x</quote> (i.e.,
    4141        <quote>libstdc++</quote> becomes <quote>libstdcxx</quote>).</para>
    4242
    4343        <programlisting>name                foo</programlisting>
    … …  
    122122          </listitem>
    123123
    124124          <listitem>
    125             <para>For addresses in other domains, e.g.
     125            <para>For addresses in other domains, e.g.,
    126126            <email>account@example.org</email>, use the convention
    127127            example.org:account to specify the address.</para>
    128128          </listitem>

  • portfile-phase.xml

    svn.revision 2100</programlisting> 
    10351035          distribution files, filenames must be included to associate files
    10361036          with their checksums.</para>
    10371037
    1038           <para>At least two checksum types (e.g., rmd160 and sha256) should be used to
     1038          <para>At least two checksum types (typically rmd160 and sha256) should be used to
    10391039          ensure the integrity of the distfiles.</para>
    10401040
    10411041          <itemizedlist>

  • portfile-startupitem.xml

     
    235235    <title>Script StartupItems</title>
    236236
    237237    <para>StartupItems of type <quote>script</quote> create a wrapper during
    238     port installation for <command>daemondo</command> that that will be used
     238    port installation for <command>daemondo</command> that will be used
    239239    to launch a daemon startup script present in an application's source
    240240    distribution (MacPorts does not create daemon startup scripts) for daemons
    241241    that require a script.</para>

  • portfile-variables.xml

     
    133133      <term>os.platform</term>
    134134
    135135      <listitem>
    136         <para>The underlying operating system platform (i.e.
     136        <para>The underlying operating system platform (i.e.,
    137137        <quote>darwin</quote> on OS X, <quote>freebsd</quote>,
    138138        etc.).</para>
    139139      </listitem>
    … …  
    152152      <term>os.version</term>
    153153
    154154      <listitem>
    155         <para>The version number of the host operating system (i.e.
    156         <quote>12.3.0</quote> for Darwin 12.3.0 a.k.a. OS X 10.8.3).</para>
     155        <para>The version number of the host operating system (i.e.,
     156        <quote>12.3.0</quote> for Darwin 12.3.0 aka OS X 10.8.3).</para>
    157157      </listitem>
    158158    </varlistentry>
    159159
    … …  
    170170      <term>os.major</term>
    171171
    172172      <listitem>
    173         <para>The major version number of the host operating system (i.e.
     173        <para>The major version number of the host operating system (i.e.,
    174174        <quote>12</quote> for Darwin 12.x).</para>
    175175      </listitem>
    176176    </varlistentry>

  • portfile-variants.xml

    platform darwin 8 powerpc { 
    201201
    202202    <note>
    203203      <para>Though a combination of OS version and hardware platform may be
    204       specified in a single platform statement (i.e. darwin 8 i386), it is not
     204      specified in a single platform statement (i.e., darwin 8 i386), it is not
    205205      possible to specify a range of platforms with a single statement. For
    206206      example, to select Darwin versions 9 and 10 while excluding all others,
    207207      you would need two statements: <code>platform darwin 9</code> and

  • portfiledev.xml

    variant sqlite description {Build sqlite support} 
    651651          <programlisting><prompt>%%</prompt> <userinput>cd ~/Downloads/foo-1.34</userinput>
    652652<prompt>%%</prompt> <userinput>diff -u src/Makefile.in.orig src/Makefile.in &gt; patch-src-Makefile.in.diff</userinput></programlisting>
    653653
    654           <para>You should execute the <command>diff</command> command from
     654          <para>You should execute <command>diff</command> from
    655655          the top-level directory of the unpacked source code, because during
    656656          the patch phase MacPorts by default uses the patch argument
    657657          <option>-p0</option>, which does not strip prefixes with any leading
    … … variant sqlite description {Build sqlite support} 
    675675          <para>A patch file that is a <quote>unified</quote> diff file is the
    676676          easiest to interpret by humans and this type should always be used
    677677          for ports. See the example below where a patch adds
    678           <varname>DESTDIR</varname> support to a
    679           <filename>Makefile.in</filename> file.</para>
     678          <varname>DESTDIR</varname> support to <filename>Makefile.in</filename> .</para>
    680679
    681680          <programlisting>--- src/Makefile.in.orig   2007-06-01 16:30:47.000000000 -0700
    682681+++ src/Makefile.in       2007-06-20 10:10:59.000000000 -0700
    … … variant sqlite description {Build sqlite support} 
    745744
    746745    <orderedlist>
    747746      <listitem>
    748         <para>Open the <filename>sources.conf</filename> file in a text
     747        <para>Open <filename>sources.conf</filename> in a text
    749748        editor. For example, to open it into TextEdit:</para>
    750749
    751750        <programlisting><prompt>%%</prompt> <userinput>open -e ${prefix}/etc/macports/sources.conf</userinput></programlisting>
    … … rsync://rsync.macports.org/release/ports [default] 
    762761        <note>
    763762          <para>The file URL should always appear before the rsync URL so that
    764763          local Portfiles can be tested that are duplicated in the MacPorts
    765           tree, because the <command>port</command> command will always
     764          tree, because <command>port</command> will always
    766765          operate on the first Portfile it encounters.</para>
    767766        </note>
    768767      </listitem>
    … … rsync://rsync.macports.org/release/ports [default] 
    794793      </listitem>
    795794
    796795      <listitem>
    797         <para>After you create or update your Portfile, use the MacPorts
    798         <command>portindex</command> command in the local repository's
     796        <para>After you create or update your Portfile, use
     797        <command>portindex</command> in the local repository's
    799798        directory to create or update the index of the ports in your local
    800799        repository.</para>
    801800
    … … revision 2</programlisting> 
    11771176      the possibility to build ones port(s) on specific builders.</para>
    11781177     
    11791178      <para>Thus the buildbot helps to keep MacPorts consistent on various
    1180       OSX versions, i.e. a maintainer does not need access to these versions anymore in
     1179      OSX versions, i.e., a maintainer does not need access to these versions anymore in
    11811180      order to assure that the port(s) maintained build without problems. Currently only
    11821181      the default port variants will be build and kept.</para>
    11831182

  • portgroup-python.xml

     
    5757        <term>python.default_version</term>
    5858
    5959        <listitem>
    60           <para>For modules (i.e. name starts with <quote>py-</quote>), this sets the
     60          <para>For modules (i.e., name starts with <quote>py-</quote>), this sets the
    6161          subport that will be installed if the user asks to install <quote>py-foo</quote>
    62           rather than e.g. <quote>py26-foo</quote> or <quote>py27-foo</quote>. If not explicitly set, a
     62          rather than e.g., <quote>py26-foo</quote> or <quote>py27-foo</quote>. If not explicitly set, a
    6363          reasonable default is chosen from the list in <code>python.versions</code>.</para>
    64           <para>For apps (i.e. name does not start with <quote>py-</quote>), this chooses
     64          <para>For apps (i.e., name does not start with <quote>py-</quote>), this chooses
    6565          which version of python to use, and must be set. It can be changed
    6666          in variants if desired.</para>
    6767
    … …  
    102102        <term>python.link_binaries_suffix</term>
    103103
    104104        <listitem>
    105           <para>Suffix to add the the names of the links created in
     105          <para>Suffix to add the names of the links created in
    106106          <filename>${prefix}/bin</filename> when <varname>${python.link_binaries}</varname>
    107107          is enabled. Can be cleared if no suffix is desired.</para>
    108108
    … …  
    187187        <term>python.lib</term>
    188188
    189189        <listitem>
    190           <para>The Python dynamic library path, i.e.
     190          <para>The Python dynamic library path, i.e.,
    191191          <filename>${python.prefix}/Python</filename> (framework builds) or
    192192          <filename>${prefix}/lib/libpython2.4.dylib</filename> (python24).</para>
    193193        </listitem>
    … …  
    197197        <term>python.libdir</term>
    198198
    199199        <listitem>
    200           <para>The path to python's lib directory, i.e.
     200          <para>The path to python's lib directory, i.e.,
    201201          <filename>${python.prefix}/lib/python${python.branch}</filename>.</para>
    202202        </listitem>
    203203      </varlistentry>

  • portgroups.xml

     
    33"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
    44<section id="reference.portgroup.intro">
    55
    6   <title>PortGroup introduction</title>
     6  <title>PortGroup Introduction</title>
    77
    88  <para>PortGroups are simply include files for portfiles. They can define as much or as little as
    99  a portgroup author feels is necessary to provide a set of definitions or behaviors common to a

  • project.xml

     
    55  <title>MacPorts Project</title>
    66
    77  <section id="project.tickets">
    8     <title>Using Trac for tickets</title>
     8    <title>Using Trac for Tickets</title>
    99
    1010    <para>The MacPorts Project uses a system called <ulink
    1111    url="http://trac.edgewall.org/">Trac</ulink> to file tickets to report bugs
    … …  
    1717    account to create tickets.</para>
    1818
    1919    <section id="project.tickets.prerequisites">
    20       <title>Before you file a new ticket</title>
     20      <title>Before Filing a New Ticket</title>
    2121
    2222      <itemizedlist>
    2323        <listitem>
    … …  
    3131            <quote>Skipping completed</quote> in the log for each
    3232            previously-completed phase that was skipped. Before filing a
    3333            ticket, <userinput>sudo port clean</userinput> the port that
    34             failed, then try again.
    35           </para>
     34            failed, then try again.</para>
    3635        </listitem>
    3736        <listitem>
    3837          <para>Check the problem hotlist</para>
    … …  
    4847          <para>Search to see if a Trac ticket has already been filed</para>
    4948          <para>
    5049            Avoid filing duplicate bugs. Search for duplicates by:
     50          </para>
    5151            <itemizedlist>
    5252                <listitem><para>using the search bar that appears on each page</para></listitem>
    5353                <listitem><para>using <ulink url="https://trac.macports.org/search?portsummarysearch=on">the search page</ulink></para></listitem>
    … …  
    5454                <listitem><para>browsing the list of <ulink url="https://trac.macports.org/report">categorized reports</ulink></para></listitem>
    5555                <listitem><para>making an advanced search by constructing a <ulink url="https://trac.macports.org/query">custom query</ulink></para></listitem>
    5656            </itemizedlist>
    57           </para>
    5857        </listitem>
    5958        <listitem>
    6059          <para>Is the problem an application error and not related to compiling and installing?</para>
    … …  
    280279          reporter and assignee who would like to be kept involved in the
    281280          development of the ticket. Multiple email addresses should be
    282281          separated with a comma and a space
    283           (i.e. <literal>you@example.org, maintainer@macports.org</literal>).</para>
    284          
     282          (i.e., <literal>you@example.org, maintainer@macports.org</literal>).</para>
     283
    285284          <para>When reporting port-related tickets, make sure you add the
    286285          port maintainers email address to the <guilabel>Cc:</guilabel> field
    287286          so they are notified of the ticket (unless you have commit access,
    … …  
    290289          <literal>port info --maintainers <replaceable>[port]</replaceable>
    291290          </literal></para>
    292291        </listitem>
    293        
     292
    294293        <listitem>
    295294          <para><guilabel>Assign To:</guilabel> Only users with commit access
    296295          can edit this field. If this is not you, see the section on the
    297296          <guimenu>Cc</guimenu> field above.</para>
    298          
     297
    299298          <para>For tickets on ports, enter
    300299          the email address of the port's maintainer (use <command>port info
    301300          &lt;portname&gt;</command> to find this). If multiple maintainers
    … … To use the current port, you must be in a port's d 
    757756
    758757      <para>A port may be considered abandoned if any of the following apply:</para>
    759758        <itemizedlist>
    760         <listitem>A bug has not been acknowledged for more than three weeks
    761             after a ticket is filed.</listitem>
    762         <listitem>All tickets filed against the port have been resolved
     759        <listitem><para>A bug has not been acknowledged for more than three weeks
     760            after a ticket is filed.</para></listitem>
     761        <listitem><para>All tickets filed against the port have been resolved
    763762            with no input from the maintainer, after the 72-hour timeout,
    764763            for a significant period of time (at least three weeks). This
    765764            needs to involve a reasonable number of tickets; one timeout
    766             doesn't make a port abandoned.</listitem>
    767         <listitem>The listed maintainer address bounces, and no alternate way
    768             of contacting the maintainer is known.</listitem>
     765            doesn't make a port abandoned.</para></listitem>
     766        <listitem><para>The listed maintainer address bounces, and no alternate way
     767            of contacting the maintainer is known.</para></listitem>
    769768        </itemizedlist>
    770769      <para>If you wish to initiate the Port Abandonment
    771770      protocol and optionally volunteer as the new maintainer:</para>
    … … To use the current port, you must be in a port's d 
    848847      </listitem>
    849848
    850849      <listitem>
    851         <para>the identity you'd like to use as a member of the project, A.K.A. the
     850        <para>the identity you'd like to use as a member of the project, aka the
    852851        &ldquo;handle&rdquo;, as part of your <literal><replaceable>handle</replaceable>@macports.org</literal>
    853852        alias.</para>
    854853      </listitem>
    … … To use the current port, you must be in a port's d 
    870869    Project. Its membership is usually determined by public elections among
    871870    project members; the current members of the team can be found on the
    872871    <ulink url="https://trac.macports.org/wiki/MacPortsDevelopers">MacPorts
    873     Developers wiki page</ulink>.
     872    Developers wiki page</ulink>.</para>
    874873
    875     They are responsible for matters such as:
     874    <para>They are responsible for matters such as:</para>
    876875
    877876    <itemizedlist>
    878877        <listitem>
    879           <para>approving new project members (i.e. granting commit
     878          <para>approving new project members (i.e., granting commit
    880879          rights);</para>
    881880        </listitem>
    882881
    … … To use the current port, you must be in a port's d 
    895894        <listitem>
    896895          <para>engineering releases.</para>
    897896        </listitem>
    898       </itemizedlist></para>
     897      </itemizedlist>
    899898
    900899  </section>
    901900</chapter>

  • using.xml

     
    99<chapter id="using">
    1010    <title>Using MacPorts</title>
    1111
    12     <para>This chapter describes using the <command>port</command> command, port variants, common tasks and port
     12    <para>This chapter describes using <command>port</command>, port variants, common tasks and port
    1313    binaries.</para>
    1414
    1515    <section id="using.port">
    1616        <title>The port Command</title>
    1717
    18         <para>The MacPorts <command>port</command> command is the main utility used to interact with MacPorts. It is
     18        <para><command>port</command> is the main utility used to interact with MacPorts. It is
    1919            used to update <filename>Portfile</filename>s and the MacPorts infrastructure, and install and manage
    2020            ports.</para>
    2121
    … …  
    2323            <title>port help</title>
    2424
    2525            <para>The <option>help</option> action shows some brief information about the specified action, or if no
    26                 action is specified, shows basic usage information for the <command>port</command> command in
    27                 general.</para>
     26                action is specified, shows basic usage information for <command>port</command> in general.</para>
    2827
    2928            <programlisting><prompt>$</prompt> <userinput>port help selfupdate</userinput></programlisting>
    3029
    … … Usage: selfupdate --nosync 
    3332
    3433Upgrade MacPorts itself and run the sync target
    3534
    36 --nosync   Do not run the sync target, i.e. do not update the ports tree.
     35--nosync   Do not run the sync target, i.e., do not update the ports tree.
    3736           Only checks for (and installs, if available) new versions of
    3837           MacPorts.</screen>
    3938        </section>
    … … Upgrade MacPorts itself and run the sync target 
    9897
    9998            <para>The <option>sync</option> action performs a subset of <option>selfupdate</option>. It synchronizes the
    10099                ports tree, as does <option>selfupdate</option>, but it does not check for MacPorts upgrades. On OS X,
    101                 unless there is a special reason not to do so, you should always run <link
     100                unless there is a special reason not to do so, run <link
    102101                    linkend="using.port.selfupdate">selfupdate</link>.</para>
    103102
    104103            <para><option>sync</option> does not accept any switches.</para>
    … … Maintainers: cal@macports.org</screen> 
    424423                <varlistentry>
    425424                    <term><option>--no-build</option></term>
    426425                    <listitem>
    427                         <para>Exclude dependencies only required at build time, i.e. fetch, extract, and build
     426                        <para>Exclude dependencies only required at build time, i.e., fetch, extract, and build
    428427                            dependencies.</para>
    429428                    </listitem>
    430429                </varlistentry>
    … … apache2 has the variants: 
    459458                Any <option>[]</option> are derived from the <filename>Portfile</filename>.
    460459                While <option>()</option> are derived from the <filename>variants.conf</filename>.
    461460                See <xref
    462                     linkend="internals.configuration-files.variants-conf" /> for more information on the
    463                 <filename>variants.conf</filename> file.</para>
     461                    linkend="internals.configuration-files.variants-conf" /> for more information on
     462                <filename>variants.conf</filename>.</para>
    464463        </section>
    465464
    466465        <section id="using.port.install">
    … … apache2 has the variants: 
    481480
    482481            <programlisting><prompt>$ </prompt><userinput>sudo port -v install apache2</userinput></programlisting>
    483482
    484             <para>All debug information is also kept in the <filename>main.log</filename> file for the port you
     483            <para>All debug information is also kept in <filename>main.log</filename> for the port you
    485484                installed. Its path will be printed automatically if the installation fails. You can manually get the
    486485                path using <command>port logfile <varname>&lt;portname&gt;</varname></command>. Note that logfiles will
    487486                automatically be deleted on successful installation.</para>
    … … apache2 has the variants: 
    531530                <varlistentry>
    532531                    <term><option>--unrequested</option></term>
    533532                    <listitem>
    534                         <para>By default, each port you install using the <option>install</option> (vs. as a dependency
     533                        <para>By default, each port you install using the <option>install</option> (versus as a dependency
    535534                            of a different port) is marked as <quote>requested</quote>. If you want MacPorts to treat
    536535                            a port you installed manually as if it was automatically installed as a dependency (e.g., if
    537536                            a dependency failed to build and you re-tried installing the dependency only), pass this
    … … The following ports are currently installed: 
    781780  yubico-pam @2.16_0 (active)
    782781  zlib @1.2.8_0 (active)</screen>
    783782
    784             <para>Use the <option>-v</option> option to also display the platform and CPU architecture(s) for which the
     783            <para>Use <option>-v</option> to also display the platform and CPU architecture(s) for which the
    785784                ports were built, and any variants which were explicitly negated.</para>
    786785
    787786            <programlisting><prompt>$ </prompt><userinput>port -v installed libsdl</userinput></programlisting>
    … … p5.16-ipc-run 0.910.0_1 &lt; 0.92 
    847846
    848847                <para>to go back to the old version.</para>
    849848
    850                 <para>If you do not want to keep the old versions around while upgrading, you can pass the
    851                     <option>-u</option> option when upgrading:</para>
     849                <para>If you do not want to keep the old versions around while upgrading, you can pass
     850                    <option>-u</option> when upgrading:</para>
    852851
    853852                <programlisting><prompt>$ </prompt><userinput>sudo port -u upgrade outdated</userinput></programlisting>
    854853
    … … p5.16-ipc-run 0.910.0_1 &lt; 0.92 
    874873                    <listitem>
    875874                        <para>If the installed variants do not match those requested, upgrade (and change variants) even
    876875                            if the port is not outdated. You can use this to switch the variant selection on an
    877                             installed port, e.g. using</para>
     876                            installed port, e.g., using</para>
    878877
    879878                        <programlisting><prompt>$ </prompt><userinput>sudo port upgrade --enforce-variants apache2 -preforkmpm +workermpm</userinput></programlisting>
    880879
    … … apache2 has the variants: 
    10201019                Any <option>[]</option> are derived from the <filename>Portfile</filename>.
    10211020                While <option>()</option> are derived from the <filename>variants.conf</filename>.
    10221021                See <xref
    1023                     linkend="internals.configuration-files.variants-conf" /> for more information on the
    1024             <filename>variants.conf</filename> file.</para>
     1022                    linkend="internals.configuration-files.variants-conf" /> for more information on
     1023            <filename>variants.conf</filename>.</para>
    10251024
    10261025        <section id="using.variants.invoking">
    10271026            <title>Invoking Variants</title>
    10281027
    1029             <para>A variant can only be invoked when a port is installed. After you have determined what variants
     1028            <para>A variant can only be selected when a port is installed. After you have determined what variants
    10301029                a given port has, if any, you may install a port using the variant by specifying its name preceded by
    10311030                a plus or minus sign on the command line, for example</para>
    10321031
    … … apache2 has the variants: 
    14991498<!--        -->DEBUG: Archive logrotate-3.8.6_2+gzip.darwin_13.x86_64.tbz2 packaged</screen>
    15001499
    15011500            <para>Binary archive files are placed in <filename>${prefix}/var/macports/software/</filename>. The archive
    1502                 file type is set in the <filename>macports.conf</filename> file using the
     1501                file type is set in <filename>macports.conf</filename> using the
    15031502                <option>portarchivetype</option> key. The default format is <option>tbz2</option>; other options are:
    15041503                <option>tar</option>, <option>tbz</option>, <option>tbz2</option>, <option>tgz</option>,
    15051504                <option>tlz</option>, <option>txz</option>, <option>xar</option>, <option>zip</option>,
    … … apache2 has the variants: 
    15141513                to users without relying on MacPorts for installation. Binary installers created with MacPorts are
    15151514                usually <option>.pkg</option> (OS X Installer Packages). MacPorts can also convert
    15161515                a <option>.pkg</option> package into an OS X <option>.dmg</option> disk image. You can create binary
    1517                 packages with the <command>port</command> command as shown in the following examples.</para>
     1516                packages using <command>port</command> as shown in the following examples.</para>
    15181517
    15191518            <warning>
    15201519                <para>If you want to create installer packages using MacPorts for redistribution, make sure you do not