svn: /pear/peardoc/trunk/en/ chapters/faq/users.xml chapters/installation/getting.xml guide/users/installation/getting.xml

[email protected] (Christian Weiske) Thu, 24 Feb 2011 16:06:13 +0000
Newsgroups php.pear.doc
Message-ID <[email protected]>
cweiske                                  Thu, 24 Feb 2011 16:06:13 +0000

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

Log:
use go-pear.phar, not go-pear(.php)

Changed paths:
    U   pear/peardoc/trunk/en/chapters/faq/users.xml
    U   pear/peardoc/trunk/en/chapters/installation/getting.xml
    U   pear/peardoc/trunk/en/guide/users/installation/getting.xml
svn-diffs-308627.txt (text/x-diff, 8.6 KB)
Modified: pear/peardoc/trunk/en/chapters/faq/users.xml
===================================================================
--- pear/peardoc/trunk/en/chapters/faq/users.xml	2011-02-24 15:30:52 UTC (rev 308626)
+++ pear/peardoc/trunk/en/chapters/faq/users.xml	2011-02-24 16:06:13 UTC (rev 308627)
@@ -339,9 +339,8 @@
     to use it for other reasons, you have to install PEAR in your home directory.
    </para>
    <para>
-    Go to &url.pear.go;, save as <filename>gopear.php</filename> and do
-    <command>$ php gopear.php</command> or try
-    <command>$ lynx -source &url.pear.go; | php -q</command>.
+    Go to &url.pear.go;, save as <filename>gopear.phar</filename> and do
+    <command>$ php go-pear.phar</command>.
    </para>
    <para>
     Use <filename>/home/user/pear</filename> as prefix while installing PEAR, where user is your
@@ -397,17 +396,17 @@
  </section>

  <section xml:id="faq.gopearnotparsed"><info><title>
-    The downloaded go-pear.php isn't parsed by PHP! Why?
+    The downloaded go-pear.phar isn't parsed by PHP! Why?
    </title><titleabbrev>
-    Downloaded go-pear.php isn't parsed
+    Downloaded go-pear.phar isn't parsed
    </titleabbrev></info>


    <para>
     If you have followed <link linkend="installation.getting">the instructions
-    for getting go-pear.php</link> and you are using e.g. Windows and the
+    for getting go-pear.phar</link> and you are using e.g. Windows and the
     Internet Explorer, you might get the strange effect that -- although you
-    have named the file go-pear.php -- the file isn't parsed and the PHP source
+    have named the file go-pear.phar -- the file isn't parsed and the PHP source
     code of it is shown.
    </para>
    <para>

Modified: pear/peardoc/trunk/en/chapters/installation/getting.xml
===================================================================
--- pear/peardoc/trunk/en/chapters/installation/getting.xml	2011-02-24 15:30:52 UTC (rev 308626)
+++ pear/peardoc/trunk/en/chapters/installation/getting.xml	2011-02-24 16:06:13 UTC (rev 308627)
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook" version="lillet" xml:id="installation.getting"><info><title>Getting the manager</title></info>
+<section xmlns="http://docbook.org/ns/docbook" version="lillet" xml:id="installation.getting">
+ <info>
+  <title>Getting the manager</title>
+ </info>


    <section xml:id="installation.getting.unix"><info><title>Unix/Linux/BSD</title></info>

     <para>
-     When using PHP &gt;= 4.3.0, the PEAR Package Manager is already
+     When using PHP the PEAR Package Manager is already
      installed unless one has used the <filename>./configure</filename>
      option <literal>--without-pear</literal>.
     </para>
@@ -16,33 +19,15 @@
      in this case.
     </para>
     <para>
-     For all versions prior to 4.3.0 or if you want to re-install the
-     Package Manager, you can use the following provisional way:
+     If you want to manually install the Package Manager, you can use
+     the following provisional way:
      <screen>
       <userinput>
-&dollar; lynx -source &url.pear.go; | php
+&dollar; wget &url.pear.go;
+&dollar; php go-pear.phar
       </userinput>
      </screen>
     </para>
-    <note>
-     <para>
-      Some Linux distributions (e.g. Redhat) seem to be using
-      <filename>links</filename> instead of <filename>lynx</filename>
-      as the name for their command line browser. If this is the case
-      for you, you need to change the above line correspondingly.
-     </para>
-    </note>
-    <note>
-     <para>
-      You can also save &url.pear.go; as <filename>go-pear.php</filename>
-      and run it with:
-      <screen>
-       <userinput>
-php go-pear.php
-       </userinput>
-      </screen>
-     </para>
-    </note>
    </section>


@@ -64,12 +49,12 @@
      Prompt.
     </para>
     <para>
-     To update your PEAR installation from go-pear.org, request
+     To update your PEAR installation, request
      &url.pear.go; in your browser and save the output to a local
-     file <filename>go-pear.php</filename>. You can then run
+     file <filename>go-pear.phar</filename>. You can then run
      <screen>
       <userinput>
-php go-pear.php
+php go-pear.phar
       </userinput>
      </screen>
      in a Windows Command Prompt to start the update process.
@@ -77,7 +62,10 @@
    </section>


-   <section xml:id="installation.getting.hosted"><info><title>PEAR in hosting environments</title></info>
+   <section xml:id="installation.getting.hosted">
+    <info>
+     <title>PEAR in hosting environments</title>
+    </info>


     <para>
@@ -86,12 +74,13 @@
      can use the PEAR Installer using the Web Frontend.
     </para>
     <para>
-     Go to &url.pear.go; and save as <filename>go-pear.php</filename>. Copy
-     <filename>go-pear.php</filename> to
+     Go to &url.pear.go; and save as <filename>go-pear.phar</filename>. Copy
+     <filename>go-pear.phar</filename> to
      your server and open the corresponding URL in your browser, for
-     example http://example.com/pear/go-pear.php.
+     example http://example.com/pear/go-pear.phar.
     </para>
-    <warning xml:id="installation.web.prerequesites"><info><title>Prerequisites</title></info>
+    <warning xml:id="installation.web.prerequesites">
+     <info><title>Prerequisites</title></info>

      <para>
       Do not forget to protect the pear directory if you did not do
@@ -101,7 +90,10 @@
    </section>


-   <section xml:id="installation.getting.unattended"><info><title>Unattended installation</title></info>
+   <section xml:id="installation.getting.unattended">
+    <info>
+     <title>Unattended installation</title>
+    </info>


     <para>

Modified: pear/peardoc/trunk/en/guide/users/installation/getting.xml
===================================================================
--- pear/peardoc/trunk/en/guide/users/installation/getting.xml	2011-02-24 15:30:52 UTC (rev 308626)
+++ pear/peardoc/trunk/en/guide/users/installation/getting.xml	2011-02-24 16:06:13 UTC (rev 308627)
@@ -66,7 +66,7 @@
     </info>

     <para>
-     When using PHP &gt;= 4.3.0, the PEAR Package Manager is already
+     When using PHP, the PEAR Package Manager is already
      installed unless one has used the <filename>./configure</filename>
      option <literal>--without-pear</literal>.
     </para>
@@ -77,11 +77,12 @@
      in this case.
     </para>
     <para>
-     For all versions prior to 4.3.0 or if you want to re-install the
+     If you want to re-install the
      Package Manager, you can use the following provisional way:
      <screen>
       <userinput>
-&dollar; lynx -source &url.pear.go; | php
+&dollar; wget &url.pear.go;
+&dollar; php go-pear.phar
       </userinput>
      </screen>
     </para>
@@ -93,17 +94,6 @@
       for you, you need to change the above line correspondingly.
      </para>
     </note>
-    <note>
-     <para>
-      You can also save &url.pear.go; as <filename>go-pear.php</filename>
-      and run it with:
-      <screen>
-       <userinput>
-php go-pear.php
-       </userinput>
-      </screen>
-     </para>
-    </note>

     <para>
      Now <link linkend="installation.checking">check that PEAR works</link>.
@@ -125,27 +115,21 @@
      or re-install the PEAR Package Manager use the following command:
      <screen>
       <userinput>
-&dollar; curl &url.pear.go; | php
+&dollar; wget &url.pear.go;
+&dollar; php go-pear.phar
       </userinput>
      </screen>
     </para>
+
     <note>
      <para>
-      You can also save &url.pear.go; as <filename>go-pear.php</filename>
-      and run it with:
-      <screen>
-       <userinput>
-php go-pear.php
-       </userinput>
-      </screen>
-     </para>
-     <para>
       For a system-wide installation, you will need to execute the go-pear
       script with increased permissions. This is only recommended for advanced
       users.
       <screen>
        <userinput>
-&dollar; curl &url.pear.go; | sudo php
+&dollar; wget &url.pear.go;
+&dollar; sudo php go-pear.phar
        </userinput>
       </screen>
      </para>
@@ -171,10 +155,10 @@
     </para>
     <para>
      Go to <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&url.pear.go;">&url.pear.go;</link> and save as
-     <filename>go-pear.php</filename>.
-     Copy <filename>go-pear.php</filename> to
+     <filename>go-pear.phar</filename>.
+     Copy <filename>go-pear.phar</filename> to
      your server and open the corresponding URL in your browser, for
-     example <filename>http://example.com/pear/go-pear.php</filename>.
+     example <filename>http://example.com/pear/go-pear.phar</filename>.
     </para>
     <warning xml:id="installation.web.protect">
      <para>