cvs: phpdoc /en language-defs.ent language-snippets.ent /en/install/macos index.xml /en/install/windows apache1.xml apache2.xml

goba Sat Jun 5 16:47:48 2004 EDT Modified files: /phpdoc/en language-defs.ent language-snippets.ent /phpdoc/en/install/macos index.xml /phpdoc/en/install/windows apache1.xml apache2.xml Log: Fix DocBook validity problems (both for make test and make text_xml) Plus add apache slashes as note, so we can add it to Apache 2 as well Yep, right, the new install part is valid DocBook. The Unix part is not there yet. http://cvs.php.net/diff.php/phpdoc/en/language-defs.ent?r1=1.16&r2=1.17&ty=u Index: phpdoc/en/language-defs.ent diff -u phpdoc/en/language-defs.ent:1.16 phpdoc/en/language-defs.ent:1.17 --- phpdoc/en/language-defs.ent:1.16 Fri Jun 4 16:29:34 2004 +++ phpdoc/en/language-defs.ent Sat Jun 5 16:47:47 2004 @@ -1,9 +1,10 @@ -<!-- $Revision: 1.16 $ --> +<!-- $Revision: 1.17 $ --> <!-- Part titles used mostly in manual.xml itself --> <!ENTITY PHPManual "PHP Manual"> <!ENTITY Date "Date:"> <!ENTITY GettingStarted "Getting Started"> +<!ENTITY InstallAndConfigure "Installation and Configuration"> <!ENTITY Installation "Installation"> <!ENTITY LanguageReference "Language Reference"> <!ENTITY Features "Features"> http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.93&r2=1.94&ty=u Index: phpdoc/en/language-snippets.ent diff -u phpdoc/en/language-snippets.ent:1.93 phpdoc/en/language-snippets.ent:1.94 --- phpdoc/en/language-snippets.ent:1.93 Fri Jun 4 16:29:34 2004 +++ phpdoc/en/language-snippets.ent Sat Jun 5 16:47:47 2004 @@ -1,4 +1,4 @@ -<!-- $Revision: 1.93 $ --> +<!-- $Revision: 1.94 $ --> <!ENTITY warn.experimental '<warning><simpara>This extension is <emphasis>EXPERIMENTAL</emphasis>. The behaviour of this extension -- @@ -337,3 +337,8 @@ <!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>'> + +<!ENTITY note.apache.slashes '<note><simpara>Remember that when adding +path values in the Apache configuration files on Windows, all backslashes +such as <filename>c:\directory\file.ext</filename> must be converted to +forward slashes, as <filename>c:/directory/file.ext</filename>.</simpara></note>'> http://cvs.php.net/diff.php/phpdoc/en/install/macos/index.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/install/macos/index.xml diff -u phpdoc/en/install/macos/index.xml:1.4 phpdoc/en/install/macos/index.xml:1.5 --- phpdoc/en/install/macos/index.xml:1.4 Fri Jun 4 06:30:07 2004 +++ phpdoc/en/install/macos/index.xml Sat Jun 5 16:47:47 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <chapter id="install.macosx"> <title>Installation on Mac OS X</title> <para> @@ -9,9 +9,9 @@ PHP on both systems. Note that PHP is not available for MacOS 9 and earlier versions. </para> - &install.macosx.packages; - &install.macosx.server; - &install.macosx.client; + &install.macos.packages; + &install.macos.server; + &install.macos.client; </chapter> <!-- Keep this comment at the end of the file http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache1.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/install/windows/apache1.xml diff -u phpdoc/en/install/windows/apache1.xml:1.4 phpdoc/en/install/windows/apache1.xml:1.5 --- phpdoc/en/install/windows/apache1.xml:1.4 Sat Jun 5 05:33:45 2004 +++ phpdoc/en/install/windows/apache1.xml Sat Jun 5 16:47:47 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <sect1 id="install.windows.apache1"> <title>Apache 1.3.x on Microsft Windows</title> <para> @@ -17,11 +17,13 @@ you need to edit your &httpd.conf; to configure Apache to work with PHP, and then restart the server. </simpara> + <simpara> It is worth noting here that now the SAPI module has been made more stable under Windows, we recommend it's use above the CGI binary, since it is more transparent and secure. </simpara> + <simpara> Although there can be a few variations of configuring PHP under Apache, these are simple enough to be used by the @@ -29,6 +31,15 @@ configuration directives. </simpara> + <simpara> + After changing the configuration file, remember to restart the server, for + example, <command>NET STOP APACHE</command> followed by + <command>NET START APACHE</command>, if you run Apache as a Windows + Service, or use your regular shortcuts. + </simpara> + + &note.apache.slashes; + <sect2 id="install.windows.apache1.cgi"> <title>Installing as a CGI binary</title> @@ -140,23 +151,6 @@ will be syntax highlighted for the browser. </simpara> </sect2> - - <simpara> - After changing the configuration file, remember to restart the server, for - example, <command>NET STOP APACHE</command> followed by - <command>NET START APACHE</command>, if you run Apache as a Windows - Service, or use your regular shortcuts. - </simpara> - - <note> - <simpara> - Remember that when adding path values in the Apache configuration - files on Windows, all backslashes such as - <filename>c:\directory\file.ext</filename> - must be converted to forward slashes, as - <filename>c:/directory/file.ext</filename>. - </simpara> - </note> </sect1> <!-- Keep this comment at the end of the file http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache2.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/install/windows/apache2.xml diff -u phpdoc/en/install/windows/apache2.xml:1.4 phpdoc/en/install/windows/apache2.xml:1.5 --- phpdoc/en/install/windows/apache2.xml:1.4 Sat Jun 5 05:27:17 2004 +++ phpdoc/en/install/windows/apache2.xml Sat Jun 5 16:47:47 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <sect1 id="install.windows.apache2"> <title>Apache 2.0.x on Microsoft Windows</title> <para> @@ -40,6 +40,8 @@ In either case you need to edit your &httpd.conf; to configure Apache to work with PHP and then restart the server. </para> + + &note.apache.slashes; <sect2 id="install.windows.apache2.cgi"> <title>Installing as a CGI binary</title>