From 29fa7302fc56c148487ae4aad65b1a44e484522d Mon Sep 17 00:00:00 2001
From: Damien Seguy <dams@php.net>
Date: Tue, 4 Feb 2003 13:27:38 +0000
Subject: [PATCH] php.ini, safemode entities, plus some cdata

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@114758 c90b9560-bf6c-de11-be94-00142212c4b1
---
 chapters/config.xml              | 5 ++---
 chapters/install.caudium.xml     | 6 +++---
 chapters/install.commandline.xml | 9 ++++-----
 chapters/install.openbsd.xml     | 5 ++---
 chapters/install.problems.xml    | 2 +-
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/chapters/config.xml b/chapters/config.xml
index 6678fa3ddc..38d47dee48 100644
--- a/chapters/config.xml
+++ b/chapters/config.xml
@@ -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 @@ include_path=".;c:\php\includes"
        <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)
diff --git a/chapters/install.caudium.xml b/chapters/install.caudium.xml
index 050bd69aaa..4f50906f3d 100644
--- a/chapters/install.caudium.xml
+++ b/chapters/install.caudium.xml
@@ -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>
diff --git a/chapters/install.commandline.xml b/chapters/install.commandline.xml
index c3c5141092..6080a803c3 100644
--- a/chapters/install.commandline.xml
+++ b/chapters/install.commandline.xml
@@ -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
diff --git a/chapters/install.openbsd.xml b/chapters/install.openbsd.xml
index 4efd460f50..690ac77bc1 100644
--- a/chapters/install.openbsd.xml
+++ b/chapters/install.openbsd.xml
@@ -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>
diff --git a/chapters/install.problems.xml b/chapters/install.problems.xml
index a818132ae8..0a3c839fb1 100644
--- a/chapters/install.problems.xml
+++ b/chapters/install.problems.xml
@@ -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>