diff --git a/features/safe-mode.xml b/features/safe-mode.xml
index 5b5c14b740..d05f9798d8 100644
--- a/features/safe-mode.xml
+++ b/features/safe-mode.xml
@@ -1,16 +1,16 @@
 <?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
  <chapter id="features.safe-mode">
-  <title>Safe mode</title>
+  <title>Safe Mode</title>
 
   <para>
    Safe Mode is an attempt to solve the shared-server security problem. It is
    architecturally incorrect to try to solve this problem at the PHP level, 
    but since the alternatives at the web server and OS levels aren't very 
-   realistic, many people, especially ISP's, use safe mode for now. 
+   realistic, many people, especially ISP's, use Safe Mode for now. 
   </para>
   <para>
-   The configuration directives that control safe mode are: 
+   The configuration directives that control Safe Mode are: 
    <programlisting role="ini">
 safe_mode = Off 
 open_basedir = 
@@ -34,7 +34,7 @@ disable_functions =
  readfile('/etc/passwd'); 
 ?&gt;  
    </programlisting>
-   results in this error when safe mode is enabled: 
+   results in this error when Safe Mode is enabled: 
    <programlisting role="php">
 Warning: SAFE MODE Restriction in effect. The script whose uid is 500 is not 
 allowed to access /etc/passwd owned by uid 0 in /docroot/script.php on line 2
@@ -70,15 +70,15 @@ Warning: readfile() has been disabled for security reasons in
   </para>
 
   <sect1 id="features.safe-mode.functions">
-   <title>Functions restricted/disabled by safe-mode</title>
+   <title>Functions restricted/disabled by Safe Mode</title>
    <para>
     This is a still probably incomplete and possibly incorrect listing
     of the functions limited by 
-    <link linkend="features.safe-mode">safe-mode</link>.
+    <link linkend="features.safe-mode">Safe Mode</link>.
     <!-- TODO: add &note.sm.*; to the functions mentioned here.
     That entity should link to this section -->
     <table>
-     <title>Safe-mode limited functions</title>
+     <title>Safe Mode limited functions</title>
      <tgroup cols="2">
       <thead>
        <row>
@@ -109,17 +109,17 @@ Warning: readfile() has been disabled for security reasons in
        </row>
        <row>
         <entry><function>ifx_*</function></entry>
-        <entry>sql_safe_mode restrictions, (!= safe-mode)</entry>
+        <entry>sql_safe_mode restrictions, (!= Safe Mode)</entry>
         <!-- TODO: more info on sql-safe-mode -->
        </row>
        <row>
         <entry><function>ingres_*</function></entry>
-        <entry>sql_safe_mode restrictions, (!= safe-mode)</entry>
+        <entry>sql_safe_mode restrictions, (!= Safe Mode)</entry>
         <!-- TODO: more info on sql-safe-mode -->
        </row>
        <row>
         <entry><function>mysql_*</function></entry>
-        <entry>sql_safe_mode restrictions, (!= safe-mode)</entry>
+        <entry>sql_safe_mode restrictions, (!= Safe Mode)</entry>
         <!-- TODO: more info on sql-safe-mode -->
        </row>
        <row>
@@ -243,7 +243,7 @@ Warning: readfile() has been disabled for security reasons in
        </row>
        <row>
         <entry><function>getallheaders</function></entry>
-        <entry>In safe-mode, headers beginning with 'authorization' 
+        <entry>In Safe Mode, headers beginning with 'authorization' 
         (case-insensitive)
         will not be returned. Warning: this is broken with the aol-server
         implementation of <function>getallheaders</function>!</entry>