From dcc9565166d5b8b4290fc3a2d757ea109d91f04c Mon Sep 17 00:00:00 2001
From: Philip Olson <philip@php.net>
Date: Tue, 16 Jul 2002 18:16:01 +0000
Subject: [PATCH] config      : Documented file_uploads directive file-upload :
 <note> Mentioned related directives, such as file_uploads

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@88813 c90b9560-bf6c-de11-be94-00142212c4b1
---
 chapters/config.xml      | 19 ++++++++++++++++++-
 features/file-upload.xml | 12 +++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/chapters/config.xml b/chapters/config.xml
index 59a2f43d05..f8b681944d 100644
--- a/chapters/config.xml
+++ b/chapters/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.68 $ -->
+<!-- $Revision: 1.69 $ -->
  <chapter id="configuration">
   <title>Configuration</title>
 
@@ -371,6 +371,23 @@ include_path = ".;c:\php\lib"
        </listitem>
       </varlistentry>
 
+      <varlistentry id="ini.file-uploads">
+       <term>
+        <parameter>file_uploads</parameter>
+        <type>boolean</type>
+       </term>
+       <listitem>
+        <para>
+         Whether or not to allow HTTP 
+         <link linkend="features.file-upload">file uploads</link>.  See also 
+         the 
+         <link linkend="ini.upload-max-filesize">upload_max_filesize</link>,
+         <link linkend="ini.upload-tmp-dir">upload_tmp_dir</link>, and 
+         <link linkend="ini.post-max-size">post_max_size</link> directives.
+        </para>
+       </listitem>
+      </varlistentry>
+      
       <varlistentry id="ini.html-errors">
        <term>
         <parameter>html_errors</parameter>
diff --git a/features/file-upload.xml b/features/file-upload.xml
index 831457ebfd..a6d8632757 100644
--- a/features/file-upload.xml
+++ b/features/file-upload.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.49 $ -->
+<!-- $Revision: 1.50 $ -->
  <chapter id="features.file-upload">
   <title>Handling file uploads</title>
 
@@ -15,6 +15,16 @@
     functions, you have full control over who is allowed to upload and
     what is to be done with the file once it has been uploaded.
    </simpara>
+   <note>
+    <title>Related Configurations Note</title>
+    <para>
+     See also the <link linkend="ini.file-uploads">file_uploads</link>, 
+     <link linkend="ini.upload-max-filesize">upload_max_filesize</link>,
+     <link linkend="ini.upload-tmp-dir">upload_tmp_dir</link>, and
+     <link linkend="ini.post-max-size">post_max_size</link> directives 
+     in &php.ini;
+    </para>
+   </note>
    <para>
     Note that PHP also supports PUT-method file uploads as used by
     Netscape Composer and W3C's Amaya clients.  See the <link