diff --git a/functions/session.xml b/functions/session.xml
index fc6e7be8fd..ddbb8f7190 100644
--- a/functions/session.xml
+++ b/functions/session.xml
@@ -180,7 +180,7 @@ session_start();
 
 $foo++;
 
-?>
+?>
      </programlisting>
     </example>
    </para> 
@@ -235,7 +235,7 @@ close
      <listitem>
       <simpara>
        <literal>session.auto_start</literal> specifies whether the
-       session module start a session automatically on request
+       session module starts a session automatically on request
        startup. Defaults to <literal>0</literal> (disabled).
       </simpara>
      </listitem>
@@ -604,27 +604,25 @@ echo "The previous session name was $previous_name&lt;p&gt;";
   </refentry>
   
   <refentry id="function.session-unset">
-    <refnamediv>
-      <refname>session_unset</refname>
-      <refpurpose>
-        Free all session variables
-      </refpurpose>
-    </refnamediv>
-    <refsect1>
-      <title>Description</title>
-      <funcsynopsis>
+   <refnamediv>
+    <refname>session_unset</refname>
+    <refpurpose>
+     Free all session variables
+    </refpurpose>
+   </refnamediv>
+   <refsect1>
+    <title>Description</title>
+    <funcsynopsis>
      <funcprototype>
-         <funcdef>void 
-           <function>session_unset</function>
-         </funcdef>
-         <void/>
+      <funcdef>void <function>session_unset</function></funcdef>
+      <void/>
      </funcprototype>
-      </funcsynopsis>
-      <para>
-        The <function>session_unset</function> function free's all session variables
-        currently registered.
-      </para>
-    </refsect1>
+    </funcsynopsis>
+    <para>
+     The <function>session_unset</function> function free's all session variables
+     currently registered.
+    </para>
+   </refsect1>
   </refentry>
 
   <refentry id="function.session-is-registered">
@@ -656,79 +654,75 @@ echo "The previous session name was $previous_name&lt;p&gt;";
   </refentry>
   
   <refentry id="function.session-get-cookie-params">
-    <refnamediv>
-      <refname>session_get_cookie_params</refname>
-      <refpurpose>
-        Get the session cookie parameters
-      </refpurpose>
-    </refnamediv>
-    <refsect1>
-      <title>Description</title>
-      <funcsynopsis>
+   <refnamediv>
+    <refname>session_get_cookie_params</refname>
+    <refpurpose>
+     Get the session cookie parameters
+    </refpurpose>
+   </refnamediv>
+   <refsect1>
+    <title>Description</title>
+    <funcsynopsis>
      <funcprototype>
-         <funcdef>array 
-           <function>session_get_cookie_params</function>
-         </funcdef>
-         <void/>
+      <funcdef>
+       array <function>session_get_cookie_params</function>
+      </funcdef>
+      <void/>
      </funcprototype>
-      </funcsynopsis>
-      <para>
-        The <function>session_get_cookie_params</function> function returns an array
-        with the current session cookie information, the array contains the following
-        items:
-        <itemizedlist>
-          <listitem>
-            <simpara>
-              "lifetime" -  The lifetime of the cookie.
-            </simpara>
-          </listitem>
-          <listitem>
-            <simpara>
-              "path" -  The path where information is stored.
-            </simpara>
-          </listitem>
-          <listitem>
-            <simpara>
-              "domain" -  The domain of the cookie.
-            </simpara>
-          </listitem>
-        </itemizedlist>
-      </para>
-    </refsect1>
+    </funcsynopsis>
+    <para>
+     The <function>session_get_cookie_params</function> function returns an
+     array with the current session cookie information, the array contains
+     the following items:
+     <itemizedlist>
+      <listitem>
+       <simpara>
+        "lifetime" -  The lifetime of the cookie.
+       </simpara>
+      </listitem>
+      <listitem>
+       <simpara>
+        "path" -  The path where information is stored.
+       </simpara>
+      </listitem>
+      <listitem>
+       <simpara>
+        "domain" -  The domain of the cookie.
+       </simpara>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </refsect1>
   </refentry>
 
   <refentry id="function.session-set-cookie-params">
-    <refnamediv>
-      <refname>session_set_cookie_params</refname>
-      <refpurpose>
-        Set the session cookie parameters
-      </refpurpose>
-    </refnamediv>
-    <refsect1>
-      <title>Description</title>
-      <funcsynopsis>
+   <refnamediv>
+    <refname>session_set_cookie_params</refname>
+    <refpurpose>
+     Set the session cookie parameters
+    </refpurpose>
+   </refnamediv>
+   <refsect1>
+    <title>Description</title>
+    <funcsynopsis>
      <funcprototype>
-         <funcdef>void 
-           <function>session_set_cookie_params</function>
-         </funcdef>
-         <paramdef>int 
-           <parameter>lifetime</parameter>
-         </paramdef>
-         <paramdef>
-             string 
- 				      <parameter><optional>path</optional></parameter>
-         </paramdef>
-         <paramdef>
-             string 
-               <parameter><optional>domain</optional></parameter>
-         </paramdef>
+      <funcdef>void <function>session_set_cookie_params</function></funcdef>
+      <paramdef>
+       int <parameter>lifetime</parameter>
+      </paramdef>
+      <paramdef>
+       string <parameter><optional>path</optional></parameter>
+      </paramdef>
+      <paramdef>
+       string <parameter><optional>domain</optional></parameter>
+      </paramdef>
      </funcprototype>
-      </funcsynopsis>
-      <para>
-        Set cookie parameters defined in the php.ini file.  The effect of this function only lasts
-        for the duration of the script.
-      </para>
-    </refsect1>
+    </funcsynopsis>
+    <para>
+     Set cookie parameters defined in the php.ini file.  The effect of this
+     function only lasts for the duration of the script.
+    </para>
+   </refsect1>
   </refentry>
 
   <refentry id="function.session-decode">