svn: /pear/peardoc/trunk/ en/guide/users/installation/getting.xml entities/global.ent

--106c56616dae1e52b8959f66301c22c5fd9825e8
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

kguest                                   Tue, 17 May 2016 21:10:38 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=339178

Log:
[Doc Bug #21065] Mac Install Instructions.

Bug: http://pear.php.net/bugs/21065 (unknown) 
      
Changed paths:
    U   pear/peardoc/trunk/en/guide/users/installation/getting.xml
    U   pear/peardoc/trunk/entities/global.ent

Modified: pear/peardoc/trunk/en/guide/users/installation/getting.xml
===================================================================
--- pear/peardoc/trunk/en/guide/users/installation/getting.xml	2016-05-17 20:41:56 UTC (rev 339177)
+++ pear/peardoc/trunk/en/guide/users/installation/getting.xml	2016-05-17 21:10:38 UTC (rev 339178)
@@ -14,8 +14,8 @@
      execute the batch file located in e.g.
      <filename>c:\php\go-pear.bat</filename>.
      Alternatively, download
-     <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&url.pear.go;">
-      &url.pear.go;</link>
+     <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&url.pear.go.https;">
+      &url.pear.go.https;</link>
      with your browser and save the output to a local
      file named <filename>go-pear.phar</filename>. You can then run
      <screen>
@@ -125,29 +125,65 @@
     </info>

     <para>
-     On Mac OS 10.4 and earlier, the PEAR Package Manager is already
-     installed in <filename>/usr/bin/pear</filename>.
-    </para>
-    <para>
-     If you are using Mac OS 10.5 (Leopard), would like to install a new copy,
-     or re-install the PEAR Package Manager use the following command:
+     Use curl as shown below to download the go-pear.phar file or just download the go-pear.phar file via your browser.
      <screen>
       <userinput>
-&dollar; wget &url.pear.go;
+&dollar; curl -O &url.pear.go.https;
 &dollar; php -d detect_unicode=0 go-pear.phar
       </userinput>
      </screen>
-     Please note, you may need to install the wget package prior to running these commands.
-     Alternatively, use curl as shown below or download the go-pear.phar file via your browser.
-     <screen>
-      <userinput>
-&dollar; curl -O &url.pear.go;
-&dollar; php -d detect_unicode=0 go-pear.phar
-      </userinput>
-     </screen>

     </para>

+    <para>
+    You're now ready to configure PEAR for installation.
+    </para>
+    <para>
+    First you need to change the Installation Base.
+    </para>
+    <orderedlist>
+    <listitem>
+    <para>
+    So type 1, and then press Enter.
+    </para>
+    </listitem>
+    <listitem>
+    <para>
+    Enter /usr/local/pear
+    </para>
+    </listitem>
+    <listitem>
+    <para>
+    Press Enter.
+    </para>
+    </listitem>
+    </orderedlist>
+
+    <para>
+    Then, you will need to change the Binaries directory.
+    </para>
+    <orderedlist>
+    <listitem>
+    <para>
+    Type 4, and then press Enter.
+    </para>
+    </listitem>
+    <listitem>
+    <para>
+    Enter /usr/local/bin
+    </para>
+    </listitem>
+    <listitem>
+    <para>
+    Press Enter.
+    </para>
+    </listitem>
+    </orderedlist>
+
+    <para>
+    Once you have changed the Installation Base and the Binaries Directory, press Enter to install PEAR.
+    </para>
+
     <note>
      <para>
       For a system-wide installation, you will need to execute the go-pear
@@ -155,7 +191,7 @@
       users.
       <screen>
        <userinput>
-&dollar; wget &url.pear.go;
+&dollar; curl -O &url.pear.go.https;
 &dollar; sudo php -d detect_unicode=0 go-pear.phar
        </userinput>
       </screen>

Modified: pear/peardoc/trunk/entities/global.ent
===================================================================
--- pear/peardoc/trunk/entities/global.ent	2016-05-17 20:41:56 UTC (rev 339177)
+++ pear/peardoc/trunk/entities/global.ent	2016-05-17 21:10:38 UTC (rev 339178)
@@ -103,6 +103,7 @@
 <!ENTITY url.pear.dtd.package2.xsd 'http://pear.php.net/dtd/package-2.0.xsd'>
 <!ENTITY url.pear.dtd.tasks1 'http://pear.php.net/dtd/tasks-1.0'>
 <!ENTITY url.pear.go 'http://pear.php.net/go-pear.phar'>
+<!ENTITY url.pear.go.https 'https://pear.php.net/go-pear.phar'>
 <!ENTITY url.pear.group 'http://pear.php.net/group/'>
 <!ENTITY url.pear.group.licenses 'http://pear.php.net/group/docs/20040402-la.php'>
 <!ENTITY url.pear.group.doc.proposals 'http://pear.php.net/group/docs/20040402-la.php'>

--106c56616dae1e52b8959f66301c22c5fd9825e8--