philip Thu Aug 5 00:53:24 2004 EDT
Modified files:
/phpdoc/en language-snippets.ent
/phpdoc/en/appendices ini.xml
/phpdoc/en/reference/errorfunc ini.xml
/phpdoc/en/reference/uodbc ini.xml
Log:
Implemented &ini.shorthandbytes; so people can understand how directives use this
shorthand notation.
This also closes bug #22158
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.113&r2=1.114&ty=u
Index: phpdoc/en/language-snippets.ent
diff -u phpdoc/en/language-snippets.ent:1.113 phpdoc/en/language-snippets.ent:1.114
--- phpdoc/en/language-snippets.ent:1.113 Wed Aug 4 15:55:42 2004
+++ phpdoc/en/language-snippets.ent Thu Aug 5 00:53:24 2004
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.113 $ -->
+<!-- $Revision: 1.114 $ -->
<!-- Keep 'em sorted -->
@@ -162,6 +162,9 @@
<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
http://cvs.php.net/diff.php/phpdoc/en/appendices/ini.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/appendices/ini.xml
diff -u phpdoc/en/appendices/ini.xml:1.6 phpdoc/en/appendices/ini.xml:1.7
--- phpdoc/en/appendices/ini.xml:1.6 Wed Aug 4 08:32:46 2004
+++ phpdoc/en/appendices/ini.xml Thu Aug 5 00:53:24 2004
@@ -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 @@
<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 @@
<para>
The maximum size of an uploaded file.
</para>
+
+ &ini.shorthandbytes;
+
</listitem>
</varlistentry>
</variablelist>
http://cvs.php.net/diff.php/phpdoc/en/reference/errorfunc/ini.xml?r1=1.22&r2=1.23&ty=u
Index: phpdoc/en/reference/errorfunc/ini.xml
diff -u phpdoc/en/reference/errorfunc/ini.xml:1.22
phpdoc/en/reference/errorfunc/ini.xml:1.23
--- phpdoc/en/reference/errorfunc/ini.xml:1.22 Tue Jul 27 08:55:10 2004
+++ phpdoc/en/reference/errorfunc/ini.xml Thu Aug 5 00:53:24 2004
@@ -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>
http://cvs.php.net/diff.php/phpdoc/en/reference/uodbc/ini.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/reference/uodbc/ini.xml
diff -u phpdoc/en/reference/uodbc/ini.xml:1.3 phpdoc/en/reference/uodbc/ini.xml:1.4
--- phpdoc/en/reference/uodbc/ini.xml:1.3 Thu May 1 17:52:58 2003
+++ phpdoc/en/reference/uodbc/ini.xml Thu Aug 5 00:53:24 2004
@@ -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>