From 13895f71ead11add378d126aa069020e2aaa3750 Mon Sep 17 00:00:00 2001
From: Philip Olson <philip@php.net>
Date: Thu, 5 Aug 2004 04:53:24 +0000
Subject: [PATCH] Implemented &ini.shorthandbytes; so people can understand how
 directives use this shorthand notation. This also closes bug #22158

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@165348 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/ini.xml          | 14 +++++++++++++-
 language-snippets.ent       |  3 +++
 reference/errorfunc/ini.xml |  5 ++++-
 reference/uodbc/ini.xml     |  5 ++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/appendices/ini.xml b/appendices/ini.xml
index 598c8258a9..0600ed4fb5 100644
--- a/appendices/ini.xml
+++ b/appendices/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 
  <appendix id="ini">
   <title>List of core &php.ini; directives</title>
@@ -276,6 +276,9 @@
         As of PHP 4.3.2, and when memory_limit is enabled, the PHP function 
         <function>memory_get_usage</function> is made available.
        </para>
+
+       &ini.shorthandbytes;
+
       </listitem>
      </varlistentry>
     </variablelist>
@@ -554,6 +557,9 @@
          <link linkend="ini.memory-limit">memory_limit</link> should be
          larger than <parameter>post_max_size</parameter>.
         </simpara>
+
+        &ini.shorthandbytes;
+
        </listitem>
       </varlistentry>
 
@@ -1002,6 +1008,9 @@ include_path=".;c:\php\includes"
          <link linkend="ini.upload-tmp-dir">upload_tmp_dir</link>, and 
          <link linkend="ini.post-max-size">post_max_size</link> directives.
         </para>
+
+        &ini.shorthandbytes;
+
        </listitem>
       </varlistentry>
 
@@ -1028,6 +1037,9 @@ include_path=".;c:\php\includes"
         <para>
          The maximum size of an uploaded file.
         </para>
+
+        &ini.shorthandbytes;
+
        </listitem>
       </varlistentry>
      </variablelist>
diff --git a/language-snippets.ent b/language-snippets.ent
index 2cc31de140..09cbbb9469 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -162,6 +162,9 @@ arrays may be disabled with the
 <link linkend="ini.register-long-arrays">register_long_arrays</link>
 directive.'>
 
+<!ENTITY ini.shorthandbytes '<simpara>When an <type>integer</type> is used, the 
+value is measured in bytes.  You may also use shorthand notation as described 
+in <link linkend="faq.using.shorthandbytes">this faq</link>.</simpara>'>
 
 <!-- Image (GD) Notes -->
 <!ENTITY note.config.t1lib '<note><simpara>This function is only available 
diff --git a/reference/errorfunc/ini.xml b/reference/errorfunc/ini.xml
index 07efb45f98..ea47c1d874 100644
--- a/reference/errorfunc/ini.xml
+++ b/reference/errorfunc/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
 <section id="errorfunc.configuration">
  &reftitle.runtime;
  &extension.runtime;
@@ -225,6 +225,9 @@
       This length is applied to logged errors, displayed errors and also to
       <link linkend="reserved.variables.phperrormsg">$php_errormsg</link>.
      </para>
+
+     &ini.shorthandbytes;
+
     </listitem>
    </varlistentry>
 
diff --git a/reference/uodbc/ini.xml b/reference/uodbc/ini.xml
index 3792364e60..b0fdb55684 100644
--- a/reference/uodbc/ini.xml
+++ b/reference/uodbc/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <section id="odbc.configuration">
  &reftitle.runtime;
  &extension.runtime;
@@ -176,6 +176,9 @@
      Handling of LONG fields. Specifies the number of bytes returned to
      variables.
     </para>
+
+    &ini.shorthandbytes;
+
    </listitem>
   </varlistentry>