nicobn Mon Sep 3 06:26:17 2007 UTC
Modified files:
/phpdoc/en/reference/filesystem/functions file-get-contents.xml
Log:
Fixed bug #42524
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/filesystem/functions/file-get-contents.xml?r1=1.29&r2=1.30&diff_format=u
Index: phpdoc/en/reference/filesystem/functions/file-get-contents.xml
diff -u phpdoc/en/reference/filesystem/functions/file-get-contents.xml:1.29
phpdoc/en/reference/filesystem/functions/file-get-contents.xml:1.30
--- phpdoc/en/reference/filesystem/functions/file-get-contents.xml:1.29 Sat Aug
18 18:36:56 2007
+++ phpdoc/en/reference/filesystem/functions/file-get-contents.xml Mon Sep
3 06:26:17 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.29 $ -->
+<!-- $Revision: 1.30 $ -->
<refentry xmlns="http://docbook.org/ns/docbook"
xml:id="function.file-get-contents">
<refnamediv>
<refname>file_get_contents</refname>
@@ -11,8 +11,8 @@
<methodsynopsis>
<type>string</type><methodname>file_get_contents</methodname>
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
- <methodparam
choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
<methodparam
choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+ <methodparam
choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
<methodparam
choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
<methodparam
choice="opt"><type>int</type><parameter>maxlen</parameter></methodparam>
</methodsynopsis>
@@ -49,16 +49,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>context</parameter></term>
- <listitem>
- <para>
- A valid context resource created with
- <function>stream_context_create</function>. If you don't need to use a
- custom context, you can skip this parameter by &null;.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
<term><parameter>flags</parameter></term>
<listitem>
<warning>
@@ -127,6 +117,16 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><parameter>context</parameter></term>
+ <listitem>
+ <para>
+ A valid context resource created with
+ <function>stream_context_create</function>. If you don't need to use a
+ custom context, you can skip this parameter by &null;.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><parameter>offset</parameter></term>
<listitem>
<para>