cvs: phpdoc-da /reference/array constants.xml /reference/array/functions array-multisort.xml array-slice.xml sort.xml /reference/dir/functions closedir.xml /reference/filesystem ini.xml
[email protected] ("Jesper Laursen") Thu, 07 Apr 2005 17:07:38 -0000
| Newsgroups | php.doc.da |
|---|---|
| Message-ID | <cvslauer1112893658@cvsserver> |
lauer Thu Apr 7 13:07:38 2005 EDT
Modified files:
/phpdoc-da/reference/array constants.xml
/phpdoc-da/reference/array/functions array-multisort.xml
array-slice.xml sort.xml
/phpdoc-da/reference/dir/functions closedir.xml
/phpdoc-da/reference/filesystem ini.xml
Log:
Sync with EN
http://cvs.php.net/diff.php/phpdoc-da/reference/array/constants.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc-da/reference/array/constants.xml
diff -u phpdoc-da/reference/array/constants.xml:1.3 phpdoc-da/reference/array/constants.xml:1.4
--- phpdoc-da/reference/array/constants.xml:1.3 Sat Mar 26 08:13:16 2005
+++ phpdoc-da/reference/array/constants.xml Thu Apr 7 13:07:36 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.7 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.9 Maintainer: lauer Status: ready -->
<section id="array.constants">
&reftitle.constants;
&extension.constants.core;
@@ -113,7 +113,7 @@
<listitem>
<simpara>
<constant>SORT_LOCALE_STRING</constant> bruges til at sammenligne elementer
- som strenge, baseret på det aktuelle sprogvalg. Tilføjet in PHP 5.0.2.
+ som strenge, baseret på det aktuelle sprogvalg. Tilføjet i PHP 4.3.12 og PHP 5.0.2.
</simpara>
</listitem>
</varlistentry>
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-multisort.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc-da/reference/array/functions/array-multisort.xml
diff -u phpdoc-da/reference/array/functions/array-multisort.xml:1.3 phpdoc-da/reference/array/functions/array-multisort.xml:1.4
--- phpdoc-da/reference/array/functions/array-multisort.xml:1.3 Fri Mar 25 21:32:07 2005
+++ phpdoc-da/reference/array/functions/array-multisort.xml Thu Apr 7 13:07:37 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.15 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.16 Maintainer: lauer Status: ready -->
<refentry id="function.array-multisort">
<refnamediv>
<refname>array_multisort</refname>
@@ -119,32 +119,38 @@
<programlisting role="php">
<![CDATA[
<?php
-$ar = array(array("10", 100, 100, "a"), array(1, 3, "2", 1));
+$ar = array(
+ array("10", 11, 100, 100, "a"),
+ array(1, 2, "2", 3, 1)
+ );
array_multisort($ar[0], SORT_ASC, SORT_STRING,
$ar[1], SORT_NUMERIC, SORT_DESC);
+var_dump($ar);
?>
]]>
</programlisting>
<para>
I dette eksempel vil, efter sortering, den første array indeholde
- "10", 100, 100, "a" (det blev sorteret som strenge i stigende
- rækkefølge). Det andet array vil indeholde 1, 3, "2", 1
+ "10", 100, 100, 11, "a" (det blev sorteret som strenge i stigende
+ rækkefølge). Det andet array vil indeholde 1, 3, "2", 2, 1
(sorteret som numrer i faldende rækkefølge).
</para>
<screen>
<![CDATA[
array(2) {
- [0]=> array(4) {
+ [0]=> array(5) {
[0]=> string(2) "10"
[1]=> int(100)
[2]=> int(100)
- [3]=> string(1) "a"
+ [3]=> int(11)
+ [4]=> string(1) "a"
}
- [1]=> array(4) {
+ [1]=> array(5) {
[0]=> int(1)
[1]=> int(3)
[2]=> string(1) "2"
- [3]=> int(1)
+ [3]=> int(2)
+ [4]=> int(1)
}
}
]]>
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-slice.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc-da/reference/array/functions/array-slice.xml
diff -u phpdoc-da/reference/array/functions/array-slice.xml:1.2 phpdoc-da/reference/array/functions/array-slice.xml:1.3
--- phpdoc-da/reference/array/functions/array-slice.xml:1.2 Mon Nov 1 17:52:40 2004
+++ phpdoc-da/reference/array/functions/array-slice.xml Thu Apr 7 13:07:37 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- EN-Revision: 1.10 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.3 $ -->
+<!-- EN-Revision: 1.11 Maintainer: lauer Status: ready -->
<refentry id="function.array-slice">
<refnamediv>
<refname>array_slice</refname>
@@ -22,7 +22,7 @@
parameterne.
</para>
<para>
- Hvis <parameter>offset</parameter> er positiv, vil rækken af elementer
+ Hvis <parameter>offset</parameter> ikke er negativ, vil rækken af elementer
starte fra det punkt i <parameter>array</parameter>. Hvis
<parameter>offset</parameter> er negativ, vil rækken starte så langt fra
enden af <parameter>array</parameter> som der er angivet.
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/sort.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc-da/reference/array/functions/sort.xml
diff -u phpdoc-da/reference/array/functions/sort.xml:1.4 phpdoc-da/reference/array/functions/sort.xml:1.5
--- phpdoc-da/reference/array/functions/sort.xml:1.4 Sat Mar 26 08:13:16 2005
+++ phpdoc-da/reference/array/functions/sort.xml Thu Apr 7 13:07:37 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.18 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.19 Maintainer: lauer Status: ready -->
<refentry id="function.sort">
<refnamediv>
<refname>sort</refname>
@@ -77,7 +77,7 @@
</listitem>
<listitem>
<simpara><constant>SORT_LOCALE_STRING</constant> - sorterer værdierne
- som strenge, udfra den lokale tegnsætning. Tilføjet i PHP 5.0.1.</simpara>
+ som strenge, udfra den lokale tegnsætning. Tilføjet i PHP 4.3.12 og 5.0.2.</simpara>
</listitem>
</itemizedlist>
</para>
http://cvs.php.net/diff.php/phpdoc-da/reference/dir/functions/closedir.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc-da/reference/dir/functions/closedir.xml
diff -u phpdoc-da/reference/dir/functions/closedir.xml:1.2 phpdoc-da/reference/dir/functions/closedir.xml:1.3
--- phpdoc-da/reference/dir/functions/closedir.xml:1.2 Mon Nov 1 17:52:51 2004
+++ phpdoc-da/reference/dir/functions/closedir.xml Thu Apr 7 13:07:37 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- EN-Revision: 1.4 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.3 $ -->
+<!-- EN-Revision: 1.5 Maintainer: lauer Status: ready -->
<refentry id="function.closedir">
<refnamediv>
<refname>closedir</refname>
@@ -17,6 +17,26 @@
<parameter>dir_handle</parameter>. Forbindelsen skal før have være åbnet
med <function>opendir</function>.
</para>
+ <para>
+ <example>
+ <title><function>closedir</function> eksempel</title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+$dir = "/etc/php5/";
+
+// Åbner en kendt mappe, læser mappen ind i en variable og lukker
+if (is_dir($dir)) {
+ if ($dh = opendir($dir)) {
+ $directory = readdir($dh);
+ closedir($dh);
+ }
+}
+?>
+]]>
+ </programlisting>
+ </example>
+ </para>
</refsect1>
</refentry>
http://cvs.php.net/diff.php/phpdoc-da/reference/filesystem/ini.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc-da/reference/filesystem/ini.xml
diff -u phpdoc-da/reference/filesystem/ini.xml:1.1 phpdoc-da/reference/filesystem/ini.xml:1.2
--- phpdoc-da/reference/filesystem/ini.xml:1.1 Sun Mar 6 04:23:25 2005
+++ phpdoc-da/reference/filesystem/ini.xml Thu Apr 7 13:07:37 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- EN-Revision: 1.10 Maintainer: mnv Status: ready -->
+<!-- EN-Revision: 1.11 Maintainer: mnv Status: ready -->
<section id="filesystem.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -124,7 +124,7 @@
<varlistentry id="ini.from">
<term>
- <parameter>from="[email protected]"</parameter>
+ <parameter>from</parameter>
<type>string</type>
</term>
<listitem>