diff --git a/appendices/ini.core.xml b/appendices/ini.core.xml
index 1be2942eb231..1fe0c37978cf 100644
--- a/appendices/ini.core.xml
+++ b/appendices/ini.core.xml
@@ -1495,36 +1495,36 @@ include_path = ".:${USER}/pear/php"
        </note>
       </listitem>
      </varlistentry>
-     
+
      <varlistentry xml:id="ini.cgi.rfc2616-headers">
       <term>
        <parameter>cgi.rfc2616_headers</parameter>
-       <type>int</type>
+       <type>bool</type>
       </term>
       <listitem>
       <para>
         Tells PHP what type of headers to use when sending HTTP response
-        code. If it's set to 0, PHP sends a <link xlink:href="&url.rfc;3875">RFC 3875</link> 
-        "Status:" header that is supported by Apache and other web servers. When this option 
-        is set to 1, PHP will send <link xlink:href="&url.rfc;2616">RFC 2616</link> compliant
-        headers.  
+        code. If it is disabled, PHP sends a <link xlink:href="&url.rfc;3875">RFC 3875</link>
+        "Status:" header that is supported by Apache and other web servers. When this option
+        is enabled, PHP will send <link xlink:href="&url.rfc;2616">RFC 2616</link> compliant
+        headers.
        </para>
        <para>
         If this option is enabled, and you are running PHP in a CGI environment (e.g. PHP-FPM)
-        you should not use standard RFC 2616 style HTTP status response headers, you should 
-        instead use their RFC 3875 equivalent e.g. instead of header("HTTP/1.0 404 Not found"); 
+        you should not use standard RFC 2616 style HTTP status response headers, you should
+        instead use their RFC 3875 equivalent e.g. instead of header("HTTP/1.0 404 Not found");
         you should use header("Status: 404 Not Found");
        </para>
        <para>
-        Leave it set to 0 unless you know what you're doing.
+        Leave it disabled unless you know what you're doing.
        </para>
       </listitem>
      </varlistentry>
-     
+
      <varlistentry xml:id="ini.fastcgi.impersonate">
       <term>
        <parameter>fastcgi.impersonate</parameter>
-       <type>string</type>
+       <type>bool</type>
       </term>
       <listitem>
        <para>
@@ -1532,7 +1532,7 @@ include_path = ".:${USER}/pear/php"
         security tokens of the calling client. This allows IIS to define the
         security context that the request runs under. mod_fastcgi under Apache
         does not currently support this feature (03/17/2002)
-        Set to 1 if running under IIS. Default is zero.
+        Enable if running under IIS. Default is disabled.
        </para>
       </listitem>
      </varlistentry>
diff --git a/reference/mysqli/ini.xml b/reference/mysqli/ini.xml
index e9fe80224d8c..bb1c8faf1958 100644
--- a/reference/mysqli/ini.xml
+++ b/reference/mysqli/ini.xml
@@ -106,7 +106,7 @@
   <varlistentry xml:id="ini.mysqli.allow-local-infile">
    <term>
     <parameter>mysqli.allow_local_infile</parameter>
-    <type>int</type>
+    <type>bool</type>
    </term>
    <listitem>
     <para>
@@ -132,7 +132,7 @@
   <varlistentry xml:id="ini.mysqli.allow-persistent">
    <term>
     <parameter>mysqli.allow_persistent</parameter>
-    <type>int</type>
+    <type>bool</type>
    </term>
    <listitem>
     <para>