goba            Tue Jul 10 06:07:56 2001 EDT

  Modified files:              
    /phpdoc/en/faq      general.xml 
  Log:
  XML errors corrected, OK, the english manual will
  build now with the new FAQ section. It will show
  up tomorow morning online :) Please always do make
  test before committing such new things :)
  
  
  
Index: phpdoc/en/faq/general.xml
diff -u phpdoc/en/faq/general.xml:1.4 phpdoc/en/faq/general.xml:1.5
--- phpdoc/en/faq/general.xml:1.4       Tue Jul 10 05:58:47 2001
+++ phpdoc/en/faq/general.xml   Tue Jul 10 06:07:56 2001
@@ -4,34 +4,35 @@
 
   <partintro>
    <para>
-    This section holds the most general questions about PHP : 
+    This section holds the most general questions about PHP:
     what it is and what it does.
    </para>
   </partintro>
 
   <refentry id="faq.general.what">
    <refnamediv>
-    <refname>What is PHP ?</refname>
-    <refpurpose>What is PHP ?</refpurpose>
+    <refname>What is PHP?</refname>
+    <refpurpose>What is PHP?</refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
     <para>
-     From the <ulink url="&faqurl.php.manual;">manual</ulink> : 
-    <para>
+     From the <ulink url="&faqurl.php.manual;">manual</ulink>:
     </para>
+    <para>
      PHP is an HTML-embedded scripting language. Much of
      its syntax is borrowed from C, Java and Perl with a couple of unique
      PHP-specific features thrown in. The goal of the language is to
      allow web developers to write dynamically generated pages quickly.
-    <para>
     </para>
-    A nice introduction to PHP by Stig Sæther Bakken can be found 
-    <ulink url="&faqurl.zend.introduction;">here</ulink> on the Zend
-    website.
+    <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.
     </para>
    </refsect1>
   </refentry>
+
   <refentry id="faq.general.relation-between-versions">
    <refnamediv>
     <refname>What is the relation between the versions?</refname>
@@ -42,23 +43,26 @@
     <para>
      PHP/FI 2.0 is an early and no longer supported version of PHP. PHP 3
      is the successor to PHP/FI 2.0 and is a lot nicer. PHP 4 is the latest
-     generation of PHP, which uses the <ulink url="&faqurl.zend;">Zend engine</ulink>
-     under the hood.
+     generation of PHP, which uses the <ulink url="&faqurl.zend;">Zend
+     engine</ulink> under the hood.
     </para>
    </refsect1>
   </refentry>
+
   <refentry id="faq.general.running-concurent-versions">
    <refnamediv>
+    <refname>Can I run several versions of PHP at the same time?</refname>
     <refpurpose>Can I run several versions of PHP at the same time?</refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
     <para>
-      Yes. See the <filename>INSTALL</filename> file that is included in the PHP 4 
-      source distribution.
+      Yes. See the <filename>INSTALL</filename> file that is included
+      in the PHP 4 source distribution.
     </para>
    </refsect1>
   </refentry>
+
   <refentry id="faq.general.differences-php3-php4">
    <refnamediv>
     <refname>What are the differences between PHP 3 and PHP 4?</refname>
@@ -67,37 +71,39 @@
    <refsect1>
     <title>Description</title>
     <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 the more important new features:
-    <itemizedlist>
-     <listitem>
-         <simpara>Extended API module.</simpara>
-        </listitem>
-     <listitem>
-         <simpara>Generalized build process under UNIX</simpara>
-        </listitem>
-     <listitem>
-         <simpara>Generic web server interface that also supports multi-threaded web 
servers</simpara>
-        </listitem>
-     <listitem>
-         <simpara>Improved syntax highlighter</simpara>
-        </listitem>
-     <listitem>
-         <simpara>Native HTTP session support</simpara>
-        </listitem>
-     <listitem>
-         <simpara>Output buffering support</simpara>
-        </listitem>
-     <listitem>
-         <simpara>More powerful configuration system</simpara>
-        </listitem>
-     <listitem>
-         <simpara>Reference counting</simpara>
-        </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.
+     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
+     the more important new features:
+     <itemizedlist>
+      <listitem>
+       <simpara>Extended API module.</simpara>
+      </listitem>
+      <listitem>
+       <simpara>Generalized build process under UNIX</simpara>
+      </listitem>
+      <listitem>
+       <simpara>Generic web server interface that also supports
+       multi-threaded web servers</simpara>
+      </listitem>
+      <listitem>
+       <simpara>Improved syntax highlighter</simpara>
+      </listitem>
+      <listitem>
+       <simpara>Native HTTP session support</simpara>
+      </listitem>
+      <listitem>
+       <simpara>Output buffering support</simpara>
+      </listitem>
+      <listitem>
+       <simpara>More powerful configuration system</simpara>
+      </listitem>
+      <listitem>
+       <simpara>Reference counting</simpara>
+      </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.
     </para>
    </refsect1>
   </refentry>


Reply via email to