From 33b59843efb9cdd87025ccf85a5eb0304785839c Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Sat, 5 Oct 2013 08:59:53 +0000
Subject: [PATCH] #55023 tweak wording of now extensive configuration section
 of fpm to satisfy bug report

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@331690 c90b9560-bf6c-de11-be94-00142212c4b1
---
 install/fpm/configuration.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml
index 8ab4b6bffa..db30ee02f4 100644
--- a/install/fpm/configuration.xml
+++ b/install/fpm/configuration.xml
@@ -3,7 +3,7 @@
   <sect1 xml:id="install.fpm.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>Configuration</title>
    <para>
-    FPM uses &php.ini; syntax for its configuration file - <filename>php-fpm.conf</filename>.
+    FPM uses &php.ini; syntax for its configuration file - <filename>php-fpm.conf</filename>, and pool configuration files.
    </para>
    <sect2> 
     <title>List of global <filename>php-fpm.conf</filename> directives</title>
@@ -449,23 +449,23 @@
     </variablelist>
     <para>
      It's possible to pass additional environment variables and update PHP settings of a certain pool.
-     To do this, you need to add the following options to <filename>php-fpm.conf</filename>
+     To do this, you need to add the following options to the pool configuration file.
      <example>
       <title>Passing environment variables and PHP settings to a pool</title>
       <programlisting role="ini">
-       <![CDATA[
-       env[HOSTNAME] = $HOSTNAME
-       env[PATH] = /usr/local/bin:/usr/bin:/bin
-       env[TMP] = /tmp
-       env[TMPDIR] = /tmp
-       env[TEMP] = /tmp
+<![CDATA[
+env[HOSTNAME] = $HOSTNAME
+env[PATH] = /usr/local/bin:/usr/bin:/bin
+env[TMP] = /tmp
+env[TMPDIR] = /tmp
+env[TEMP] = /tmp
 
-       php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
-       php_flag[display_errors] = off
-       php_admin_value[error_log] = /var/log/fpm-php.www.log
-       php_admin_flag[log_errors] = on
-       php_admin_value[memory_limit] = 32M
-       ]]>
+php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
+php_flag[display_errors] = off
+php_admin_value[error_log] = /var/log/fpm-php.www.log
+php_admin_flag[log_errors] = on
+php_admin_value[memory_limit] = 32M
+]]>
       </programlisting>
      </example>
      PHP settings passed with <literal>php_value</literal> or