<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[134582] trunk/doc-new/guide/xml</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/134582">134582</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-03-30 17:38:40 -0700 (Mon, 30 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>doc-new/guide/xml: grammar fixes: correctly use e.g. instead of i.e. when necessary, use a trailing comma.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdocnewguidexmlinternalsxml">trunk/doc-new/guide/xml/internals.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfilekeywordsxml">trunk/doc-new/guide/xml/portfile-keywords.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfilevariablesxml">trunk/doc-new/guide/xml/portfile-variables.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfilevariantsxml">trunk/doc-new/guide/xml/portfile-variants.xml</a></li>
<li><a href="#trunkdocnewguidexmlportfiledevxml">trunk/doc-new/guide/xml/portfiledev.xml</a></li>
<li><a href="#trunkdocnewguidexmlportgrouppythonxml">trunk/doc-new/guide/xml/portgroup-python.xml</a></li>
<li><a href="#trunkdocnewguidexmlprojectxml">trunk/doc-new/guide/xml/project.xml</a></li>
<li><a href="#trunkdocnewguidexmlusingxml">trunk/doc-new/guide/xml/using.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdocnewguidexmlinternalsxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/internals.xml (134581 => 134582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/internals.xml 2015-03-31 00:38:18 UTC (rev 134581)
+++ trunk/doc-new/guide/xml/internals.xml 2015-03-31 00:38:40 UTC (rev 134582)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><span class="cx"> <para><code>mportexec:</code> Given a port handle, executes a
</span><del>- target (i.e. install).</para>
</del><ins>+ target (e.g., install).</para>
</ins><span class="cx"> </listitem>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfilekeywordsxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfile-keywords.xml (134581 => 134582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfile-keywords.xml 2015-03-31 00:38:18 UTC (rev 134581)
+++ trunk/doc-new/guide/xml/portfile-keywords.xml 2015-03-31 00:38:40 UTC (rev 134582)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> <para>The name of the port. To avoid special interpretation by shells
</span><span class="cx"> and the like, names should contain only alphanumeric characters,
</span><span class="cx"> underscores, dashes or dots. For projects whose proper names contain
</span><del>- <quote>+</quote> characters, change these to <quote>x</quote> (i.e.
</del><ins>+ <quote>+</quote> characters, change these to <quote>x</quote> (e.g.,
</ins><span class="cx"> <quote>libstdc++</quote> becomes <quote>libstdcxx</quote>).</para>
</span><span class="cx">
</span><span class="cx"> <programlisting>name foo</programlisting>
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> </listitem>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>For addresses in other domains, e.g.
</del><ins>+ <para>For addresses in other domains, e.g.,
</ins><span class="cx"> <email>account@example.org</email>, use the convention
</span><span class="cx"> example.org:account to specify the address.</para>
</span><span class="cx"> </listitem>
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfilevariablesxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfile-variables.xml (134581 => 134582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfile-variables.xml 2015-03-31 00:38:18 UTC (rev 134581)
+++ trunk/doc-new/guide/xml/portfile-variables.xml 2015-03-31 00:38:40 UTC (rev 134582)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> <term>os.platform</term>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>The underlying operating system platform (i.e.
</del><ins>+ <para>The underlying operating system platform (e.g.,
</ins><span class="cx"> <quote>darwin</quote> on OS X, <quote>freebsd</quote>,
</span><span class="cx"> etc.).</para>
</span><span class="cx"> </listitem>
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> <term>os.version</term>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>The version number of the host operating system (i.e.
</del><ins>+ <para>The version number of the host operating system (e.g.,
</ins><span class="cx"> <quote>12.3.0</quote> for Darwin 12.3.0 a.k.a. OS X 10.8.3).</para>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> <term>os.major</term>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>The major version number of the host operating system (i.e.
</del><ins>+ <para>The major version number of the host operating system (e.g.,
</ins><span class="cx"> <quote>12</quote> for Darwin 12.x).</para>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfilevariantsxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfile-variants.xml (134581 => 134582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfile-variants.xml 2015-03-31 00:38:18 UTC (rev 134581)
+++ trunk/doc-new/guide/xml/portfile-variants.xml 2015-03-31 00:38:40 UTC (rev 134582)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx">
</span><span class="cx"> <note>
</span><span class="cx"> <para>Though a combination of OS version and hardware platform may be
</span><del>- specified in a single platform statement (i.e. darwin 8 i386), it is not
</del><ins>+ specified in a single platform statement (e.g., darwin 8 i386), it is not
</ins><span class="cx"> possible to specify a range of platforms with a single statement. For
</span><span class="cx"> example, to select Darwin versions 9 and 10 while excluding all others,
</span><span class="cx"> you would need two statements: <code>platform darwin 9</code> and
</span></span></pre></div>
<a id="trunkdocnewguidexmlportfiledevxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portfiledev.xml (134581 => 134582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portfiledev.xml 2015-03-31 00:38:18 UTC (rev 134581)
+++ trunk/doc-new/guide/xml/portfiledev.xml 2015-03-31 00:38:40 UTC (rev 134582)
</span><span class="lines">@@ -1177,7 +1177,7 @@
</span><span class="cx"> the possibility to build ones port(s) on specific builders.</para>
</span><span class="cx">
</span><span class="cx"> <para>Thus the buildbot helps to keep MacPorts consistent on various
</span><del>- OSX versions, i.e. a maintainer does not need access to these versions anymore in
</del><ins>+ OSX versions, i.e., a maintainer does not need access to these versions anymore in
</ins><span class="cx"> order to assure that the port(s) maintained build without problems. Currently only
</span><span class="cx"> the default port variants will be build and kept.</para>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdocnewguidexmlportgrouppythonxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/portgroup-python.xml (134581 => 134582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/portgroup-python.xml 2015-03-31 00:38:18 UTC (rev 134581)
+++ trunk/doc-new/guide/xml/portgroup-python.xml 2015-03-31 00:38:40 UTC (rev 134582)
</span><span class="lines">@@ -57,11 +57,11 @@
</span><span class="cx"> <term>python.default_version</term>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>For modules (i.e. name starts with <quote>py-</quote>), this sets the
</del><ins>+ <para>For modules (i.e., name starts with <quote>py-</quote>), this sets the
</ins><span class="cx"> subport that will be installed if the user asks to install <quote>py-foo</quote>
</span><del>- rather than e.g. <quote>py26-foo</quote> or <quote>py27-foo</quote>. If not explicitly set, a
</del><ins>+ rather than, e.g., <quote>py26-foo</quote> or <quote>py27-foo</quote>. If not explicitly set, a
</ins><span class="cx"> reasonable default is chosen from the list in <code>python.versions</code>.</para>
</span><del>- <para>For apps (i.e. name does not start with <quote>py-</quote>), this chooses
</del><ins>+ <para>For apps (i.e., name does not start with <quote>py-</quote>), this chooses
</ins><span class="cx"> which version of python to use, and must be set. It can be changed
</span><span class="cx"> in variants if desired.</para>
</span><span class="cx">
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> <term>python.lib</term>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>The Python dynamic library path, i.e.
</del><ins>+ <para>The Python dynamic library path, i.e.,
</ins><span class="cx"> <filename>${python.prefix}/Python</filename> (framework builds) or
</span><span class="cx"> <filename>${prefix}/lib/libpython2.4.dylib</filename> (python24).</para>
</span><span class="cx"> </listitem>
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> <term>python.libdir</term>
</span><span class="cx">
</span><span class="cx"> <listitem>
</span><del>- <para>The path to python's lib directory, i.e.
</del><ins>+ <para>The path to python's lib directory, i.e.,
</ins><span class="cx"> <filename>${python.prefix}/lib/python${python.branch}</filename>.</para>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span></span></pre></div>
<a id="trunkdocnewguidexmlprojectxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/project.xml (134581 => 134582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/project.xml 2015-03-31 00:38:18 UTC (rev 134581)
+++ trunk/doc-new/guide/xml/project.xml 2015-03-31 00:38:40 UTC (rev 134582)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> reporter and assignee who would like to be kept involved in the
</span><span class="cx"> development of the ticket. Multiple email addresses should be
</span><span class="cx"> separated with a comma and a space
</span><del>- (i.e. <literal>you@example.org, maintainer@macports.org</literal>).</para>
</del><ins>+ (e.g., <literal>you@example.org, maintainer@macports.org</literal>).</para>
</ins><span class="cx">
</span><span class="cx"> <para>When reporting port-related tickets, make sure you add the
</span><span class="cx"> port maintainers email address to the <guilabel>Cc:</guilabel> field
</span><span class="lines">@@ -876,7 +876,7 @@
</span><span class="cx">
</span><span class="cx"> <itemizedlist>
</span><span class="cx"> <listitem>
</span><del>- <para>approving new project members (i.e. granting commit
</del><ins>+ <para>approving new project members (i.e., granting commit
</ins><span class="cx"> rights);</para>
</span><span class="cx"> </listitem>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdocnewguidexmlusingxml"></a>
<div class="modfile"><h4>Modified: trunk/doc-new/guide/xml/using.xml (134581 => 134582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/doc-new/guide/xml/using.xml 2015-03-31 00:38:18 UTC (rev 134581)
+++ trunk/doc-new/guide/xml/using.xml 2015-03-31 00:38:40 UTC (rev 134582)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> Upgrade MacPorts itself and run the sync target
</span><span class="cx">
</span><del>---nosync Do not run the sync target, i.e. do not update the ports tree.
</del><ins>+--nosync Do not run the sync target, i.e., do not update the ports tree.
</ins><span class="cx"> Only checks for (and installs, if available) new versions of
</span><span class="cx"> MacPorts.</screen>
</span><span class="cx"> </section>
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx"> <varlistentry>
</span><span class="cx"> <term><option>--no-build</option></term>
</span><span class="cx"> <listitem>
</span><del>- <para>Exclude dependencies only required at build time, i.e. fetch, extract, and build
</del><ins>+ <para>Exclude dependencies only required at build time, i.e., fetch, extract, and build
</ins><span class="cx"> dependencies.</para>
</span><span class="cx"> </listitem>
</span><span class="cx"> </varlistentry>
</span><span class="lines">@@ -874,7 +874,7 @@
</span><span class="cx"> <listitem>
</span><span class="cx"> <para>If the installed variants do not match those requested, upgrade (and change variants) even
</span><span class="cx"> if the port is not outdated. You can use this to switch the variant selection on an
</span><del>- installed port, e.g. using</para>
</del><ins>+ installed port, e.g., using</para>
</ins><span class="cx">
</span><span class="cx"> <programlisting><prompt>$ </prompt><userinput>sudo port upgrade --enforce-variants apache2 -preforkmpm +workermpm</userinput></programlisting>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>