dams Tue Feb 4 08:27:38 2003 EDT
Modified files:
/phpdoc/en/chapters config.xml install.caudium.xml
install.commandline.xml install.openbsd.xml
install.problems.xml
Log:
php.ini, safemode entities, plus some cdata
Index: phpdoc/en/chapters/config.xml
diff -u phpdoc/en/chapters/config.xml:1.91 phpdoc/en/chapters/config.xml:1.92
--- phpdoc/en/chapters/config.xml:1.91 Wed Jan 22 02:02:19 2003
+++ phpdoc/en/chapters/config.xml Tue Feb 4 08:27:37 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.91 $ -->
+<!-- $Revision: 1.92 $ -->
<chapter id="configuration">
<title>Configuration</title>
@@ -970,8 +970,7 @@
<listitem>
<para>
PHP's "root directory" on the server. Only used if
- non-empty. If PHP is configured with <link
- linkend="ini.safe-mode">safe mode</link>, no files outside
+ non-empty. If PHP is configured with &safemode;, no files outside
this directory are served.
If PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
if you are running php as a CGI under any web server (other than IIS)
Index: phpdoc/en/chapters/install.caudium.xml
diff -u phpdoc/en/chapters/install.caudium.xml:1.5
phpdoc/en/chapters/install.caudium.xml:1.6
--- phpdoc/en/chapters/install.caudium.xml:1.5 Fri Nov 22 12:31:12 2002
+++ phpdoc/en/chapters/install.caudium.xml Tue Feb 4 08:27:38 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<sect1 id="install.caudium">
<title>Servers-Caudium</title>
<para>
@@ -45,8 +45,8 @@
When compiling PHP 4 with MySQL support you must make sure that
the normal MySQL client code is used. Otherwise there might be
conflicts if your Pike already has MySQL support. You do this by
- specifying a MySQL install directory the <link
- linkend="install.configure.with-mysql"> --with-mysql</link> option.
+ specifying a MySQL install directory the
+ <option role="configure"> --with-mysql</option> option.
</para>
</note>
</sect1>
Index: phpdoc/en/chapters/install.commandline.xml
diff -u phpdoc/en/chapters/install.commandline.xml:1.4
phpdoc/en/chapters/install.commandline.xml:1.5
--- phpdoc/en/chapters/install.commandline.xml:1.4 Wed Dec 25 05:49:35 2002
+++ phpdoc/en/chapters/install.commandline.xml Tue Feb 4 08:27:38 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<sect1 id="install.commandline">
<title>Servers-CGI/Commandline</title>
<para>
@@ -37,11 +37,10 @@
<simpara>
If you have built PHP 3 as a CGI program, you may benchmark your
build by typing <command>make bench</command>. Note that if
- <link linkend="features.safe-mode">Safe Mode</link>
- is on by default, the benchmark may not be able to finish if
+ &safemode; is on by default, the benchmark may not be able to finish if
it takes longer then the 30 seconds allowed. This is because the
- <function>set_time_limit</function> can not be used in safe
- mode. Use the <link
+ <function>set_time_limit</function> can not be used in
+ &safemode;. Use the <link
linkend="ini.max-execution-time">max_execution_time</link>
configuration setting to control this time for your own
scripts. <command>make bench</command> ignores the <link
Index: phpdoc/en/chapters/install.openbsd.xml
diff -u phpdoc/en/chapters/install.openbsd.xml:1.2
phpdoc/en/chapters/install.openbsd.xml:1.3
--- phpdoc/en/chapters/install.openbsd.xml:1.2 Fri Nov 1 13:31:14 2002
+++ phpdoc/en/chapters/install.openbsd.xml Tue Feb 4 08:27:38 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<sect1 id="install.openbsd">
<title>Unix/OpenBSD installs</title>
<para>
@@ -19,8 +19,7 @@
which contains the basic engine (plus gettext and iconv). Next, take a look
at the module packages, such as <filename>php4-mysql-4.2.3.tgz</filename>
or <filename>php4-imap-4.2.3.tgz</filename>. You need to use the
<command>phpxs</command>
- command to activate and deactivate these modules in your
<filename>php.ini</filename>
- file.
+ command to activate and deactivate these modules in your &php.ini;.
</simpara>
<example id="install.openbsd.ports.example">
<title>OpenBSD Package Install Example</title>
Index: phpdoc/en/chapters/install.problems.xml
diff -u phpdoc/en/chapters/install.problems.xml:1.1
phpdoc/en/chapters/install.problems.xml:1.2
--- phpdoc/en/chapters/install.problems.xml:1.1 Wed Jan 9 18:52:08 2002
+++ phpdoc/en/chapters/install.problems.xml Tue Feb 4 08:27:38 2003
@@ -28,7 +28,7 @@
If you want to get help on the mailing list, please try to be
precise and give the necessary details about your environment
(which operating system, what PHP version, what web server, if
- you are running PHP as CGI or a server module, etc.), and
+ you are running PHP as CGI or a server module, &safemode;, etc...), and
preferably enough code to make others able to reproduce and test
your problem.
</simpara>
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
