[PHP-DOC] cvs: phpdoc /en/faq general.xml

[Philip Olson]

philip          Fri Nov  2 03:56:03 2001 EDT

  Modified files:              
    /phpdoc/en/faq      general.xml 
  Log:
  Added some links.
  
  
Index: phpdoc/en/faq/general.xml
diff -u phpdoc/en/faq/general.xml:1.11 phpdoc/en/faq/general.xml:1.12
--- phpdoc/en/faq/general.xml:1.11      Sun Oct 14 07:55:30 2001
+++ phpdoc/en/faq/general.xml   Fri Nov  2 03:56:03 2001
@@ -1,5 +1,5 @@
 <?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <chapter id="faq.general">
   <title>General Information</title>
   <titleabbrev>General Information</titleabbrev>
@@ -27,7 +27,8 @@
      <para>
       A nice introduction to PHP by Stig S&aelig;ther Bakken can be found 
       <ulink url="&faqurl.zend.introduction;">here</ulink> on the Zend
-      website.
+      website.  Also, much of the 
+      <ulink url="&url.php.conf">PHP Conference Material</ulink> is freely available.
      </para>
     </answer>
    </qandaentry>
@@ -53,7 +54,8 @@
     <answer>
      <para>
        Yes. See the <filename>INSTALL</filename> file that is included
-       in the PHP 4 source distribution.
+       in the PHP 4 source distribution.  Also, read the related 
+       <link linkend="migration4.php4.with.php3">appendix</link>.
      </para>
     </answer>
    </qandaentry>
@@ -65,7 +67,7 @@
     <answer>
      <para>
       There are <ulink url="&faqurl.zend.articles;">a couple of articles</ulink>
-      written on this by the authors of PHP4. Here's a list of some of
+      written on this by the authors of PHP 4. Here's a list of some of
       the more important new features:
       <itemizedlist>
        <listitem>
@@ -95,8 +97,9 @@
        </listitem>
       </itemizedlist>
       Please see the <ulink url="&faqurl.zend.new;">What's new in
-      PHP4 overview</ulink> for a detailed explanation of these
-      features and more.
+      PHP 4 overview</ulink> for a detailed explanation of these
+      features and more.  If you're migrating from PHP 3 to PHP 4, 
+      also read the related <link linkend="migration4">appendix</link>.
      </para>
     </answer>
    </qandaentry>