goba Fri Jun 4 16:29:35 2004 EDT
Added files:
/phpdoc/en/install snippet.apache2.compat.xml
Modified files:
/phpdoc/en language-defs.ent language-snippets.ent
/phpdoc/en/install/windows apache1.xml apache2.xml
Log:
Several improvements around the new install part
- clearly separate the Apache 2 CGI and SAPI install instructions
- add small and big compatibility snippets appropriately, so we
can reference them in both the Windows and Unix install instructions
- move title snippets to language-defs, as it is supposed to be there
- also wrap tidy snippet to make it conform
http://cvs.php.net/diff.php/phpdoc/en/language-defs.ent?r1=1.15&r2=1.16&ty=u
Index: phpdoc/en/language-defs.ent
diff -u phpdoc/en/language-defs.ent:1.15 phpdoc/en/language-defs.ent:1.16
--- phpdoc/en/language-defs.ent:1.15 Fri Jun 20 15:22:57 2003
+++ phpdoc/en/language-defs.ent Fri Jun 4 16:29:34 2004
@@ -1,5 +1,6 @@
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
+<!-- Part titles used mostly in manual.xml itself -->
<!ENTITY PHPManual "PHP Manual">
<!ENTITY Date "Date:">
<!ENTITY GettingStarted "Getting Started">
@@ -18,3 +19,19 @@
<!ENTITY CHMEdition "HTML Help Edition">
<!ENTITY ReservedConstants "Predefined Constants">
<!ENTITY MissingStuff "Missing Stuff">
+
+<!-- These are used in reference/$extname/reference.xml and other
+supplemental files to mark section titles -->
+<!ENTITY reftitle.intro '<title>Introduction</title>'>
+<!ENTITY reftitle.required '<title>Requirements</title>'>
+<!ENTITY reftitle.install '<title>Installation</title>'>
+<!ENTITY reftitle.runtime '<title>Runtime Configuration</title>'>
+<!ENTITY reftitle.resources '<title>Resource Types</title>'>
+<!ENTITY reftitle.constants '<title>Predefined Constants</title>'>
+<!ENTITY reftitle.classes '<title>Predefined Classes</title>'>
+<!ENTITY reftitle.constructor '<title>Constructor</title>'>
+<!ENTITY reftitle.methods '<title>Methods</title>'>
+<!ENTITY reftitle.properties '<title>Properties</title>'>
+<!ENTITY reftitle.returnvalues '<title>Return values</title>'>
+<!ENTITY reftitle.examples '<title>Examples</title>'>
+<!ENTITY reftitle.seealso '<title>See Also</title>'>
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.92&r2=1.93&ty=u
Index: phpdoc/en/language-snippets.ent
diff -u phpdoc/en/language-snippets.ent:1.92 phpdoc/en/language-snippets.ent:1.93
--- phpdoc/en/language-snippets.ent:1.92 Mon May 24 21:27:50 2004
+++ phpdoc/en/language-snippets.ent Fri Jun 4 16:29:34 2004
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.92 $ -->
+<!-- $Revision: 1.93 $ -->
<!ENTITY warn.experimental '<warning><simpara>This extension is
<emphasis>EXPERIMENTAL</emphasis>. The behaviour of this extension --
@@ -262,22 +262,6 @@
been compiled into PHP or dynamically loaded at runtime.
</simpara>'>
-<!-- These are using in reference/$extname/reference.xml and other
-supplemental files to mark section titles -->
-<!ENTITY reftitle.intro '<title>Introduction</title>'>
-<!ENTITY reftitle.required '<title>Requirements</title>'>
-<!ENTITY reftitle.install '<title>Installation</title>'>
-<!ENTITY reftitle.runtime '<title>Runtime Configuration</title>'>
-<!ENTITY reftitle.resources '<title>Resource Types</title>'>
-<!ENTITY reftitle.constants '<title>Predefined Constants</title>'>
-<!ENTITY reftitle.classes '<title>Predefined Classes</title>'>
-<!ENTITY reftitle.constructor '<title>Constructor</title>'>
-<!ENTITY reftitle.methods '<title>Methods</title>'>
-<!ENTITY reftitle.properties '<title>Properties</title>'>
-<!ENTITY reftitle.returnvalues '<title>Return values</title>'>
-<!ENTITY reftitle.examples '<title>Examples</title>'>
-<!ENTITY reftitle.seealso '<title>See Also</title>'>
-
<!ENTITY note.extension.php5 '<note><simpara>
This extension requires PHP 5.</simpara></note>'>
@@ -339,9 +323,17 @@
<literal>config</literal> and <literal>encoding</literal> were
added in Tidy 2.0.</simpara></note>'>
-<!ENTITY tidy.conf-enc '<para>The <parameter>config</parameter> parameter can be
passed either as an array
-or as a string. If you pass it as a string, it means the name of the configuration
file, otherwise
-it is interpreted as the options themselves. Check <ulink
url="&url.tidy.conf;">&url.tidy.conf;</ulink>
-for an explanation about each option.</para><para>The <parameter>encoding</parameter>
parameter sets the
-encoding for input/output documents. The possible values for
<parameter>encoding</parameter> are:
-ascii, latin1, raw, utf8, iso2022, mac, win1252, utf16le, utf16be, utf16, big5 and
shiftjis.</para>'>
+<!ENTITY tidy.conf-enc '<para>The <parameter>config</parameter> parameter
+can be passed either as an array or as a string. If you pass it as a string,
+it means the name of the configuration file, otherwise it is interpreted as
+the options themselves. Check <ulink url="&url.tidy.conf;">&url.tidy.conf;</ulink>
+for an explanation about each option.</para><para>The
+<parameter>encoding</parameter> parameter sets the encoding for input/output
+documents. The possible values for <parameter>encoding</parameter> are:
+ascii, latin1, raw, utf8, iso2022, mac, win1252, utf16le, utf16be,
+utf16, big5 and shiftjis.</para>'>
+
+<!-- Snippets for the installation section -->
+<!ENTITY warn.apache2.compat '<warning><para>Do not use Apache 2.0.x
+and <literal>PHP</literal> in a production environment neither
+on Unix nor on Windows.</para></warning>'>
http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache1.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/install/windows/apache1.xml
diff -u phpdoc/en/install/windows/apache1.xml:1.2
phpdoc/en/install/windows/apache1.xml:1.3
--- phpdoc/en/install/windows/apache1.xml:1.2 Fri Jun 4 06:30:07 2004
+++ phpdoc/en/install/windows/apache1.xml Fri Jun 4 16:29:35 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<sect1 id="install.windows.apache1">
<title>Apache 1.3.x on Microsft Windows</title>
<para>
@@ -88,7 +88,7 @@
</simpara>
</sect2>
- <sect2 id="install.windows.apache1.cgi">
+ <sect2 id="install.windows.apache1.module">
<title>Installing as an Apache module</title>
<para>
http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache2.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/install/windows/apache2.xml
diff -u phpdoc/en/install/windows/apache2.xml:1.2
phpdoc/en/install/windows/apache2.xml:1.3
--- phpdoc/en/install/windows/apache2.xml:1.2 Fri Jun 4 06:30:07 2004
+++ phpdoc/en/install/windows/apache2.xml Fri Jun 4 16:29:35 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<sect1 id="install.windows.apache2">
<title>Apache 2.0.x on Microsoft Windows</title>
<para>
@@ -8,154 +8,108 @@
have <link linkend="install.windows.apache1">instructions and notes
for Apache 1.3.x users on a separate page</link>.
</para>
- <warning>
- <para>
- Do not use Apache 2.0.x and <literal>PHP</literal> in a production
- environment neither on Unix nor on Windows.
- </para>
- </warning>
+
+ &warn.apache2.compat;
+
<para>
You are highly encouraged to take a look at the
<ulink url="&url.apache2.docs;">Apache Documentation</ulink> to get
- a basic understanding of the Apache 2.0.x Server.
+ a basic understanding of the Apache 2.0.x Server. Also consider to
+ read the <ulink url="&url.apache2.windows;">Windows specific
+ notes</ulink> for Apache 2.0.x before reading on here.
</para>
+
+ &install.snippet.apache2.compat;
- <sect2 id="compat.apache2">
- <title>PHP and Apache 2.0.x compatibility notes</title>
- <para>
- The following versions of PHP are known to work with the most recent
- version of Apache 2.0.x:
- <itemizedlist spacing="compact">
- <listitem>
- <simpara>
- PHP 4.3.0 or later available at
- <ulink url="&url.php.downloads;">&url.php.downloads;</ulink>.
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- the latest stable development version.
- Get the source code <ulink url="&url.php.snapshots;php4-latest.tar.gz">
- &url.php.snapshots;php4-latest.tar.gz</ulink> or download binaries
- for Windows <ulink url="&url.php.snapshots;win32/php4-win32-latest.zip">
- &url.php.snapshots;win32/php4-win32-latest.zip</ulink>.
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- a prerelease version downloadable from
- <ulink url="&url.php.prerelease;">&url.php.prerelease;</ulink>.
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- you have always the option to obtain <literal>PHP</literal> through
- <ulink url="&url.php.anoncvs;">anonymous CVS</ulink>.
- </simpara>
- </listitem>
- </itemizedlist>
- These versions of <literal>PHP</literal> are compatible to Apache 2.0.40 and
later.
- </para>
- <note>
- <simpara>
- Apache 2.0 <literal>SAPI</literal>-support started with PHP 4.2.0.
- PHP 4.2.3 works with Apache 2.0.39, don't use any other version of Apache with
- PHP 4.2.3. However, the recommended setup is to use PHP 4.3.0 or later with
- the most recent version of Apache2.
- </simpara>
- <simpara>
- All mentioned versions of <literal>PHP</literal> will work still with
- Apache 1.3.x.
- </simpara>
- </note>
- </sect2>
-
- <sect2 id="install.windows.apache2">
- <title>PHP and Apache 2.0.x on Windows</title>
- <para>
- Consider to read the <ulink url="&url.apache2.windows;">
- Windows specific notes</ulink> for Apache 2.0.
- </para>
<warning>
<para>
- Apache 2.0 is designed to run on Windows NT 4.0, Windows 2000 or
+ Apache 2.0.x is designed to run on Windows NT 4.0, Windows 2000 or
Windows XP. At this time, support for Windows 9x is incomplete.
- Apache 2.0 is not expected to work on those platforms at this time.
+ Apache 2.0.x is not expected to work on those platforms at this time.
</para>
</warning>
<para>
Download the most recent version of <ulink url= "&url.apache;">
- Apache 2.0</ulink> and a fitting PHP version from the above mentioned places.
- Follow the <link linkend="install.windows.manual">Manual Installation
Steps</link>
- and come back to go on with the integration of <literal>PHP</literal>
- and Apache.
- </para>
- <para>
- There are two ways to set up <literal>PHP</literal> to work with
- Apache 2.0 on Windows. One is to use the CGI binary the other is to
- use the Apache module DLL. In either case you need to stop the Apache
- server, and edit your &httpd.conf; to configure Apache
- to work with <literal>PHP</literal>.
+ Apache 2.0.x</ulink> and a fitting PHP version.
+ Follow the <link linkend="install.windows.manual">Manual Installation
+ Steps</link> and come back to go on with the integration of PHP and Apache.
</para>
<para>
- You need to insert these three lines to your Apache &httpd.conf;
- configuration file to set up the <emphasis>CGI binary</emphasis>:
- <example>
- <title>PHP and Apache 2.0 as CGI</title>
- <programlisting role="apache">
+ There are two ways to set up PHP to work with Apache 2.0.x on Windows.
+ One is to use the CGI binary the other is to use the Apache module DLL.
+ In either case you need to edit your &httpd.conf; to configure Apache
+ to work with PHP and then restart the server.
+ </para>
+
+ <sect2 id="install.windows.apache2.cgi">
+ <title>Installing as a CGI binary</title>
+
+ <para>
+ You need to insert these three lines to your Apache &httpd.conf;
+ configuration file to set up the CGI binary:
+ <example>
+ <title>PHP and Apache 2.0 as CGI</title>
+ <programlisting role="apache">
<![CDATA[
ScriptAlias /php/ "c:/php/"
AddType application/x-httpd-php .php
Action application/x-httpd-php "/php/php.exe"
]]>
</programlisting>
- </example>
- </para>
- <para>
- If you would like to use <literal>PHP</literal> as a module in Apache 2.0,
- be sure to move <filename>php4ts.dll</filename> for PHP 4, or
- <filename>php5ts.dll</filename> for PHP 5, to
- <filename>winnt/system32</filename> (for Windows NT/2000) or
- <filename>windows/system32</filename> (for Windows XP),
- overwriting any older file. You need to insert these two lines to your
- Apache &httpd.conf; configuration file to set up the
- <emphasis>PHP-Module</emphasis> for Apache 2.0:
- <example>
- <title>PHP and Apache 2.0 as Module</title>
- <programlisting role="apache">
+ </example>
+ </para>
+ </sect2>
+
+ <sect2 id="install.windows.apache2.module">
+ <title>Installing as an Apache module</title>
+
+ <para>
+ If you would like to use PHP as a module in Apache 2.0.x,
+ be sure to move <filename>php4ts.dll</filename> for PHP 4, or
+ <filename>php5ts.dll</filename> for PHP 5, to
+ <filename>winnt/system32</filename> (for Windows NT/2000) or
+ <filename>windows/system32</filename> (for Windows XP),
+ overwriting any older file.
+ </para>
+ <para>
+ You need to insert these two lines to your
+ Apache &httpd.conf; configuration file to set up the
+ PHP module for Apache 2.0:
+ <example>
+ <title>PHP and Apache 2.0 as Module</title>
+ <programlisting role="apache">
<![CDATA[
-; For PHP 4 do something like this:
+# For PHP 4 do something like this:
LoadModule php4_module "c:/php/sapi/php4apache2.dll"
AddType application/x-httpd-php .php
-; For PHP 5 do something like this:
+# For PHP 5 do something like this:
LoadModule php5_module "c:/php/sapi/php5apache2.dll"
AddType application/x-httpd-php .php
]]>
</programlisting>
- </example>
- </para>
- <note>
- <simpara>
- Remember to substitute the <filename>c:/php/</filename> for your actual
- path to <literal>PHP</literal> in the above examples. Take care to use
- either <filename>php4apache2.dll</filename> or
- <filename>php5apache2.dll</filename> in your LoadModule directive and
- <emphasis>not</emphasis><filename>php4apache.dll</filename> or
- <filename>php5apache.dll</filename> as the latter ones are designed to
- run with <link linkend="install.windows.apache1">Apache 1.3.x</link>.
- </simpara>
- </note>
- <warning>
- <simpara>
- Don't mix up your installation with dll files from
- <emphasis>different PHP versions </emphasis>. You have the only choice
- to use the dll's and extensions that ship with your downloaded PHP version.
- </simpara>
- </warning>
- </sect2>
-
- </sect1>
+ </example>
+ </para>
+ <note>
+ <simpara>
+ Remember to substitute the <filename>c:/php/</filename> for your actual
+ path to PHP in the above examples. Take care to use
+ either <filename>php4apache2.dll</filename> or
+ <filename>php5apache2.dll</filename> in your LoadModule directive and
+ <emphasis>not</emphasis><filename>php4apache.dll</filename> or
+ <filename>php5apache.dll</filename> as the latter ones are designed to
+ run with <link linkend="install.windows.apache1">Apache 1.3.x</link>.
+ </simpara>
+ </note>
+ <warning>
+ <simpara>
+ Don't mix up your installation with DLL files from
+ <emphasis>different PHP versions</emphasis>. You have the only choice
+ to use the DLL's and extensions that ship with your downloaded PHP version.
+ </simpara>
+ </warning>
+ </sect2>
+ </sect1>
<!-- Keep this comment at the end of the file
Local variables:
http://cvs.php.net/co.php/phpdoc/en/install/snippet.apache2.compat.xml?r=1.1&p=1
Index: phpdoc/en/install/snippet.apache2.compat.xml
+++ phpdoc/en/install/snippet.apache2.compat.xml
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.1 $ -->
<note>
<title>PHP and Apache 2.0.x compatibility notes</title>
<para>
The following versions of PHP are known to work with the most recent
version of Apache 2.0.x:
<itemizedlist spacing="compact">
<listitem>
<simpara>
PHP 4.3.0 or later available at
<ulink url="&url.php.downloads;">&url.php.downloads;</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
the latest stable development version.
Get the source code <ulink url="&url.php.snapshots;php4-latest.tar.gz">
&url.php.snapshots;php4-latest.tar.gz</ulink> or download binaries
for Windows <ulink url="&url.php.snapshots;win32/php4-win32-latest.zip">
&url.php.snapshots;win32/php4-win32-latest.zip</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
a prerelease version downloadable from
<ulink url="&url.php.prerelease;">&url.php.prerelease;</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
you have always the option to obtain PHP through
<ulink url="&url.php.anoncvs;">anonymous CVS</ulink>.
</simpara>
</listitem>
</itemizedlist>
These versions of PHP are compatible to Apache 2.0.40 and later.
</para>
<para>
Apache 2.0 <literal>SAPI</literal>-support started with PHP 4.2.0.
PHP 4.2.3 works with Apache 2.0.39, don't use any other version of Apache with
PHP 4.2.3. However, the recommended setup is to use PHP 4.3.0 or later with
the most recent version of Apache2.
</para>
<para>
All mentioned versions of PHP will work still with
Apache 1.3.x.
</para>
</note>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
sgml-omittag:t
sgml-shorttag:t
sgml-minimize-attributes:nil
sgml-always-quote-attributes:t
sgml-indent-step:1
sgml-indent-data:t
indent-tabs-mode:nil
sgml-parent-document:nil
sgml-default-dtd-file:"../../manual.ced"
sgml-exposed-tags:nil
sgml-local-catalogs:nil
sgml-local-ecat-files:nil
End:
vim600: syn=xml fen fdm=syntax fdl=2 si
vim: et tw=78 syn=sgml
vi: ts=1 sw=1
-->
