From 13abb9e9e0dfe74d94a6401fe0768e4193128839 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Thu, 29 Jan 2015 12:49:55 +0000
Subject: [PATCH] We really need both, in global options, and in pool options

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

diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml
index ec74c473ef..ab1c11aa02 100644
--- a/install/fpm/configuration.xml
+++ b/install/fpm/configuration.xml
@@ -150,6 +150,54 @@
        </para> 
       </listitem>
      </varlistentry>
+     <varlistentry xml:id="rlimit-files">
+      <term>
+       <parameter>rlimit_files</parameter>
+       <type>int</type>
+      </term>
+      <listitem>
+       <para>
+        Set open file descriptor rlimit for the master process.
+        Default value: Set open file descriptor rlimit for the master process.
+       </para> 
+      </listitem>
+     </varlistentry>
+     <varlistentry xml:id="rlimit-core">
+      <term>
+       <parameter>rlimit_core</parameter>
+       <type>int</type>
+      </term>
+      <listitem>
+       <para>
+        Set max core size rlimit for the master process.
+        Default value: 0.
+       </para> 
+      </listitem>
+     </varlistentry>
+     <varlistentry xml:id="rlimit-files-master">
+      <term>
+       <parameter>rlimit_files</parameter>
+       <type>int</type>
+      </term>
+      <listitem>
+       <para>
+        Set open file descriptor rlimit for the master process.
+        Default value: Set open file descriptor rlimit for the master process.
+       </para> 
+      </listitem>
+     </varlistentry>
+     <varlistentry xml:id="rlimit-core-master">
+      <term>
+       <parameter>rlimit_core</parameter>
+       <type>int</type>
+      </term>
+      <listitem>
+       <para>
+        Set max core size rlimit for the master process.
+        Default value: 0.
+       </para> 
+      </listitem>
+     </varlistentry>
      <varlistentry xml:id="events-mechanism">
       <term>
        <parameter>events.mechanism</parameter>
@@ -501,7 +549,7 @@
       </term>
       <listitem>
        <para>
-        Set open file descriptor rlimit. Default value: system defined value.
+        Set open file descriptor rlimit for child processes in this pool. Default value: system defined value.
        </para> 
       </listitem>
      </varlistentry>
@@ -512,7 +560,7 @@
       </term>
       <listitem>
        <para>
-        Set max core size rlimit. Possible Values: 'unlimited' or an integer greater or equal to 0.
+        Set max core size rlimit for child processes in this pool. Possible Values: 'unlimited' or an integer greater or equal to 0.
         Default value: system defined value.
        </para> 
       </listitem>