[112489] trunk/doc-new/guide/xml/installing.xml

[raimue at macports.org]

Revision: 112489
          https://trac.macports.org/changeset/112489
Author:   raimue at macports.org
Date:     2013-10-24 06:34:42 -0700 (Thu, 24 Oct 2013)
Log Message:
-----------
guide:
Avoid placeholders, use the version number from a entity variable.

Modified Paths:
--------------
    trunk/doc-new/guide/xml/installing.xml

Modified: trunk/doc-new/guide/xml/installing.xml
===================================================================
--- trunk/doc-new/guide/xml/installing.xml	2013-10-24 13:31:30 UTC (rev 112488)
+++ trunk/doc-new/guide/xml/installing.xml	2013-10-24 13:34:42 UTC (rev 112489)
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"[
+<!ENTITY macports-version "2.2.0">
+]>
 <chapter id="installing">
   <title>Installing MacPorts</title>
 
@@ -274,14 +276,14 @@
 
       <orderedlist>
         <listitem>
-          <para>Download the latest <filename>MacPorts-x.x.x.dmg</filename>
+          <para>Download the latest <filename>MacPorts-&macports-version;.dmg</filename>
           disk image (whose name does not contain -beta or -rc) from the <ulink
           url="https://distfiles.macports.org/MacPorts/">MacPorts
           download directory</ulink>.</para>
         </listitem>
 
         <listitem>
-          <para>Double-click the <filename>MacPorts-x.x.x.pkg</filename>
+          <para>Double-click the <filename>MacPorts-&macports-version;.pkg</filename>
           package installer on the disk image.</para>
         </listitem>
 
@@ -300,22 +302,21 @@
 
       <orderedlist>
         <listitem>
-          <para>Download and unzip the latest MacPorts tarball from the <ulink
-          url="https://distfiles.macports.org/MacPorts/">MacPorts
-          download directory</ulink>. Use the given commands in a terminal
-          window, replace the placeholders with the latest version number.</para>
+          <para>Download and extract the <ulink url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;.tar.bz2">
+          MacPorts &macports-version; tarball</ulink>. Either do so using your browser and the Finder, or use the given commands
+          in a terminal window.</para>
 
-          <programlisting><prompt>%%</prompt> <userinput>curl -O https://distfiles.macports.org/MacPorts/MacPorts-x.x.x.tar.bz2</userinput>
-<prompt>%%</prompt> <userinput>tar xf MacPorts-x.x.x.tar.bz2</userinput></programlisting>
+          <programlisting><prompt>%%</prompt> <userinput>curl -O https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;.tar.bz2</userinput>
+<prompt>%%</prompt> <userinput>tar xf MacPorts-&macports-version;.tar.bz2</userinput></programlisting>
         </listitem>
 
         <listitem>
-          <para>Afterwards, perform the commands shown below. If you wish
+          <para>Afterwards, perform the commands shown in the terminal window. If you wish
           to use a path other than <filename>/opt/local</filename>, follow
           the instructions for <link linkend="installing.macports.source.multiple">installing
           multiple copies of MacPorts</link> instead.</para>
 
-          <programlisting><prompt>%%</prompt> <userinput>cd MacPorts-x.x.x/</userinput>
+          <programlisting><prompt>%%</prompt> <userinput>cd MacPorts-&macports-version;/</userinput>
 <prompt>%%</prompt> <userinput>./configure</userinput>
 <prompt>%%</prompt> <userinput>make</userinput>
 <prompt>%%</prompt> <userinput>sudo make install</userinput></programlisting>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131024/61c903d2/attachment.html>