From f51da3b4d7632e4fc183ab51de0c05152d29ec02 Mon Sep 17 00:00:00 2001
From: Damien Seguy <dams@php.net>
Date: Tue, 11 Feb 2003 11:16:57 +0000
Subject: [PATCH] use of entity safemode;

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@115772 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/migration4.xml | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/appendices/migration4.xml b/appendices/migration4.xml
index 323726babe..2565fbbdb7 100644
--- a/appendices/migration4.xml
+++ b/appendices/migration4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.28 $ -->
+<!-- $Revision: 1.29 $ -->
  <appendix id="migration4">
   <title>Migrating from PHP 3 to PHP 4</title>
 	
@@ -108,14 +108,32 @@ php_admin_flag [PHP directive name] [On|Off]
     There are two differences between the Admin values and the non admin values:
    </simpara>
    <itemizedlist>
-    <listitem><simpara>Admin values (or flags) can only appear in the server-wide apache configuration files (e.g., httpd.conf).</simpara></listitem>
-    <listitem><simpara>Standard values (or flags) cannot control certain PHP directives, for example - safe mode (if you could override safe mode settings in .htaccess files, it would defeat safe-mode's purpose).  In contrast, Admin values can modify the value of any PHP directive.</simpara></listitem>
+    <listitem>
+     <simpara>
+      Admin values (or flags) can only appear in the server-wide Apache configuration
+      files (e.g., httpd.conf).
+     </simpara>
+    </listitem>
+    <listitem>
+     <simpara>
+      Standard values (or flags) cannot control certain PHP directives, for example: 
+      &safemode; (if you could override safe mode settings in 
+      <filename>.htaccess</filename> files, it 
+      would defeat &safemode;'s purpose).  In contrast, Admin values can modify 
+      the value of any PHP directive.
+     </simpara>
+    </listitem>
    </itemizedlist>
    <simpara>
-    To make the transition process easier, PHP 4 is bundled with scripts that automatically convert your Apache configuration and .htaccess files to work with both PHP 3 and PHP 4. These scripts do NOT convert the mime type lines! You have to convert these yourself.
+    To make the transition process easier, PHP 4 is bundled with scripts 
+    that automatically convert your Apache configuration and 
+    <filename>.htaccess</filename> files 
+    to work with both PHP 3 and PHP 4. These scripts do NOT convert the mime 
+    type lines! You have to convert these yourself.
    </simpara>
    <para>
-    To convert your Apache configuration files, run the apconf-conv.sh script (available in the scripts/apache/ directory).  For example:
+    To convert your Apache configuration files, run the apconf-conv.sh 
+    script (available in the scripts/apache/ directory).  For example:
     <informalexample>
 		 <programlisting role="shell">
 <![CDATA[
@@ -128,17 +146,20 @@ php_admin_flag [PHP directive name] [On|Off]
     Your original configuration file will be saved in httpd.conf.orig.
    </simpara>
    <para>
-    To convert your .htaccess files, run the aphtaccess-conv.sh script (available in the scripts/apache/ directory as well):
+    To convert your <filename>.htaccess</filename> files, run the 
+    <filename>aphtaccess-conv.sh</filename> script (available in 
+    the <dirname>scripts/apache/<dirname> directory as well):
     <informalexample>
 		 <programlisting role="shell">
 <![CDATA[
 ~/php4/scripts/apache:#  find / -name .htaccess -exec ./aphtaccess-conv.sh {} \;
 ]]>
-		 </programlisting>
-		</informalexample>
+	 </programlisting>
+    </informalexample>
    </para>
    <simpara>
-    Likewise, your old .htaccess files will be saved with an .orig prefix.
+    Likewise, your old <filename>.htaccess</filename> files will be saved with 
+    an .orig prefix.
    </simpara>
    <simpara>
     The conversion scripts require awk to be installed.