cvs: phpdoc /en/reference/array/functions array-intersect-assoc.xml /en/reference/http/functions setcookie.xml /en/reference/var/functions empty.xml

didou Sun Jan 2 15:36:03 2005 EDT Modified files: /phpdoc/en/reference/array/functions array-intersect-assoc.xml /phpdoc/en/reference/http/functions setcookie.xml /phpdoc/en/reference/var/functions empty.xml Log: s/otherwords/other words http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/array-intersect-assoc.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/array/functions/array-intersect-assoc.xml diff -u phpdoc/en/reference/array/functions/array-intersect-assoc.xml:1.7 phpdoc/en/reference/array/functions/array-intersect-assoc.xml:1.8 --- phpdoc/en/reference/array/functions/array-intersect-assoc.xml:1.7 Mon Jul 26 06:08:51 2004 +++ phpdoc/en/reference/array/functions/array-intersect-assoc.xml Sun Jan 2 15:36:02 2005 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <refentry id="function.array-intersect-assoc"> <refnamediv> <refname>array_intersect_assoc</refname> @@ -55,7 +55,7 @@ <simpara> The two values from the <literal>key =&gt; value</literal> pairs are considered equal only if - <literal>(string) $elem1 === (string) $elem2 </literal>. In otherwords + <literal>(string) $elem1 === (string) $elem2 </literal>. In other words a strict type check is executed so the string representation must be the same. <!-- TODO: example of it... --> http://cvs.php.net/diff.php/phpdoc/en/reference/http/functions/setcookie.xml?r1=1.34&r2=1.35&ty=u Index: phpdoc/en/reference/http/functions/setcookie.xml diff -u phpdoc/en/reference/http/functions/setcookie.xml:1.34 phpdoc/en/reference/http/functions/setcookie.xml:1.35 --- phpdoc/en/reference/http/functions/setcookie.xml:1.34 Sun Jan 2 09:41:45 2005 +++ phpdoc/en/reference/http/functions/setcookie.xml Sun Jan 2 15:36:02 2005 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.34 $ --> +<!-- $Revision: 1.35 $ --> <!-- splitted from ./en/functions/http.xml, last change in rev 1.2 --> <refentry id="function.setcookie"> <refnamediv> @@ -90,7 +90,7 @@ <entry><parameter>expire</parameter></entry> <entry> The time the cookie expires. This is a Unix timestamp so is - in number of seconds since the epoch. In otherwords, you'll + in number of seconds since the epoch. In other words, you'll most likely set this with the <function>time</function> function plus the number of seconds before you want it to expire. Or you might use <function>mktime</function>. http://cvs.php.net/diff.php/phpdoc/en/reference/var/functions/empty.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc/en/reference/var/functions/empty.xml diff -u phpdoc/en/reference/var/functions/empty.xml:1.10 phpdoc/en/reference/var/functions/empty.xml:1.11 --- phpdoc/en/reference/var/functions/empty.xml:1.10 Thu Oct 28 10:08:18 2004 +++ phpdoc/en/reference/var/functions/empty.xml Sun Jan 2 15:36:03 2005 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <!-- splitted from ./en/functions/var.xml, last change in rev 1.2 --> <refentry id="function.empty"> <refnamediv> @@ -15,7 +15,7 @@ <para> <function>empty</function> returns &false; if <parameter>var</parameter> has a non-empty and non-zero value. In - otherwords, <literal>""</literal>, <literal>0</literal>, + other words, <literal>""</literal>, <literal>0</literal>, <literal>"0"</literal>, &null;, &false;, <literal>array()</literal>, and <literal>var $var;</literal> are all considered empty. In PHP 4 and earlier, objects with empty properties are considered empty. This is not @@ -59,7 +59,7 @@ <note> <para> <function>empty</function> only checks variables as anything else will - result in a parse error. In otherwords, the following will not work: + result in a parse error. In other words, the following will not work: <command>empty(addslashes($name))</command>. </para> </note>