svn: /phpdoc/de/trunk/ appendices/aliases.xml reference/datetime/functions/date.xml reference/exec/functions/proc-open.xml reference/pdo/drivers.xml reference/pdo/error-handling.xml
[email protected] (Nikita Popov)
| Newsgroups | php.doc.de |
|---|---|
| Message-ID | <[email protected]> |
nikic Thu, 14 Jul 2011 12:37:35 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=313245
Log:
Sync some DE docs to EN
Changed paths:
U phpdoc/de/trunk/appendices/aliases.xml
U phpdoc/de/trunk/reference/datetime/functions/date.xml
U phpdoc/de/trunk/reference/exec/functions/proc-open.xml
U phpdoc/de/trunk/reference/pdo/drivers.xml
U phpdoc/de/trunk/reference/pdo/error-handling.xml
Modified: phpdoc/de/trunk/appendices/aliases.xml
===================================================================
--- phpdoc/de/trunk/appendices/aliases.xml 2011-07-14 12:32:08 UTC (rev 313244)
+++ phpdoc/de/trunk/appendices/aliases.xml 2011-07-14 12:37:35 UTC (rev 313245)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hholzgra Status: ready -->
+<!-- EN-Revision: 303248 Maintainer: hholzgra Status: ready -->
<appendix xml:id="aliases" xmlns="http://docbook.org/ns/docbook">
<title>Liste der Funktions-Aliase</title>
<para>
Modified: phpdoc/de/trunk/reference/datetime/functions/date.xml
===================================================================
--- phpdoc/de/trunk/reference/datetime/functions/date.xml 2011-07-14 12:32:08 UTC (rev 313244)
+++ phpdoc/de/trunk/reference/datetime/functions/date.xml 2011-07-14 12:37:35 UTC (rev 313245)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 312626 Maintainer: simp Status: ready -->
+<!-- EN-Revision: 313168 Maintainer: simp Status: ready -->
<!-- Credits: sammywg -->
<refentry xml:id="function.date" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@@ -514,6 +514,7 @@
<member><function>mktime</function></member>
<member><function>strftime</function></member>
<member><function>time</function></member>
+ <member><function>strtotime</function></member>
<member><link linkend="datetime.constants.types">Vordefinierte DateTime-Konstanten</link></member>
</simplelist>
</para>
Modified: phpdoc/de/trunk/reference/exec/functions/proc-open.xml
===================================================================
--- phpdoc/de/trunk/reference/exec/functions/proc-open.xml 2011-07-14 12:32:08 UTC (rev 313244)
+++ phpdoc/de/trunk/reference/exec/functions/proc-open.xml 2011-07-14 12:37:35 UTC (rev 313245)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: sammywg Status: ready -->
+<!-- EN-Revision: 313230 Maintainer: sammywg Status: ready -->
<refentry xml:id='function.proc-open' xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>proc_open</refname>
@@ -144,10 +144,12 @@
<literal>context</literal>: Streamcontext, der beim Öffnen von Dateien
verwendet wird (erstellt mit <function>stream_context_create</function>.
</member>
+ <!-- FIXME PHP_6
<member>
<literal>binary_pipes</literal>: Öffnet Pipes im Binärmodus anstatt
das übliche <literal>stream_encoding</literal> zu verwenden.
</member>
+ -->
</simplelist>
</para>
</listitem>
@@ -177,6 +179,7 @@
</row>
</thead>
<tbody>
+ <!-- FIXME PHP_6
<row>
<entry>6.0.0</entry>
<entry>
@@ -185,6 +188,7 @@
<parameter>other_options</parameter> hinzugefügt.
</entry>
</row>
+ -->
<row>
<entry>5.2.1</entry>
<entry>
Modified: phpdoc/de/trunk/reference/pdo/drivers.xml
===================================================================
--- phpdoc/de/trunk/reference/pdo/drivers.xml 2011-07-14 12:32:08 UTC (rev 313244)
+++ phpdoc/de/trunk/reference/pdo/drivers.xml 2011-07-14 12:37:35 UTC (rev 313245)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 305103 Maintainer: fa Status: ready -->
+<!-- EN-Revision: 313179 Maintainer: fa Status: ready -->
<!-- Purpose: database.abstract -->
<!-- Membership: pecl, bundled -->
<part xml:id="pdo.drivers" xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink">
+xmlns:xlink="http://www.w3.org/1999/xlink">
<title>PDO-Treiber</title>
-
+
<partintro>
<para>
Die folgenden Treiber implementieren momentan die PDO-Schnittstelle:
@@ -61,6 +61,10 @@
<entry>SQLite 3 und SQLite 2</entry>
</row>
<row>
+ <entry><link linkend="ref.pdo-sqlsrv">PDO_SQLSRV</link></entry>
+ <entry>Microsoft SQL Server / SQL Azure</entry>
+ </row>
+ <row>
<entry><link linkend="ref.pdo-4d">PDO_4D</link></entry>
<entry>4D</entry>
</row>
@@ -76,6 +80,7 @@
&reference.pdo-ibm.reference;
&reference.pdo-informix.reference;
&reference.pdo-mysql.reference;
+ &reference.pdo-sqlsrv.reference;
&reference.pdo-oci.reference;
&reference.pdo-odbc.reference;
&reference.pdo-pgsql.reference;
Modified: phpdoc/de/trunk/reference/pdo/error-handling.xml
===================================================================
--- phpdoc/de/trunk/reference/pdo/error-handling.xml 2011-07-14 12:32:08 UTC (rev 313244)
+++ phpdoc/de/trunk/reference/pdo/error-handling.xml 2011-07-14 12:37:35 UTC (rev 313245)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 313120 Maintainer: fa Status: ready -->
+<!-- EN-Revision: 313193 Maintainer: fa Status: ready -->
<chapter xml:id="pdo.error-handling" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Fehler und Fehlerbehandlung</title>
@@ -71,11 +71,10 @@
treiberspezifische Fehlermeldung enthält.
</para>
- <refsect1 role="examples">
- &reftitle.examples;
- <para>
- <example><title>Eine PDO Instanz erstellen und den Error Mode setzen</title>
- <programlisting role="php">
+ <para>
+ <example>
+ <title>Eine PDO Instanz erstellen und den Error Mode setzen</title>
+ <programlisting role="php">
<![CDATA[
<?php
$dsn = 'mysql:dbname=testdb;host=127.0.0.1';
@@ -91,10 +90,9 @@
?>
]]>
- </programlisting>
- </example>
- </para>
- </refsect1>
+ </programlisting>
+ </example>
+ </para>
</chapter>
<!-- Keep this comment at the end of the file