[PHP-DOC] cvs: phpdoc /en/chapters copyright.xml intro.xml From: Jesus M. Castagnetto (jesusmc <email protected>)
Date: 10/11/00

jmcastagnetto Wed Oct 11 16:44:11 2000 EDT

  Modified files:
    /phpdoc/en/chapters intro.xml copyright.xml
  Log:
  Some minor updates. Fixed the ">" in the example in intro.xml, changed
  the last paragraph, and removed the "3.0" from the Copyright, so it is
  not version dependent, although I think that copyright.xml is not being
  used anywhere in the manual, so I had not changed the wording to indicate
  the new PHP License.
  
  
Index: phpdoc/en/chapters/intro.xml
diff -u phpdoc/en/chapters/intro.xml:1.10 phpdoc/en/chapters/intro.xml:1.11
--- phpdoc/en/chapters/intro.xml:1.10 Fri Sep 15 09:09:42 2000
+++ phpdoc/en/chapters/intro.xml Wed Oct 11 16:44:11 2000
@@ -14,18 +14,18 @@
     <example>
      <title>An introductory example</title>
      <programlisting role="php">
-&lt;html>
- &lt;head>
- &lt;title>Example&lt;/title>
- &lt;/head>
- &lt;body>
+&lt;html&gt;
+ &lt;head&gt;
+ &lt;title&gt;Example&lt;/title&gt;
+ &lt;/head&gt;
+ &lt;body&gt;
     
         &lt;?php
         echo "Hi, I'm a PHP script!";
- ?>
+ ?&gt;
         
- &lt;/body>
-&lt;/html>
+ &lt;/body&gt;
+&lt;/html&gt;
      </programlisting>
     </example>
    </para>
@@ -150,10 +150,9 @@
    </figure>
 -->
    <simpara>
- Also as of this writing, work is underway on the next generation
- of PHP, which will utilize the powerful <ulink
- url="&url.zend;">Zend</ulink> scripting engine to deliver higher
- performance, and will also support running under webservers other
+ The latest version (PHP 4) uses the powerful <ulink
+ url="&url.zend;">Zend</ulink> scripting engine to deliver higher
+ performance, and also supports running under webservers other
     than Apache as a native server module.
    </simpara>
   </sect1>
Index: phpdoc/en/chapters/copyright.xml
diff -u phpdoc/en/chapters/copyright.xml:1.2 phpdoc/en/chapters/copyright.xml:1.3
--- phpdoc/en/chapters/copyright.xml:1.2 Thu Dec 9 16:34:37 1999
+++ phpdoc/en/chapters/copyright.xml Wed Oct 11 16:44:11 2000
@@ -2,18 +2,18 @@
   <title>Copyright, distribution, version history</title>
 
   <simpara>
- PHP 3.0 is copyright (C) 1997 the PHP Development Team. The
+ PHP is copyright (C) 1997 the PHP Development Team. The
    members of this team are listed in the CREDITS file that comes with
- the PHP 3.0 source distribution.</simpara>
+ the PHP source distribution.</simpara>
 
   <simpara>
- PHP 3.0 is free software; you can redistribute it and/or modify it
+ PHP is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
    Free Software Foundation; either version 2 of the License, or (at your
    option) any later version.</simpara>
 
   <simpara>
- PHP 3.0 is distributed in the hope that it will be useful, but
+ PHP is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.</simpara>