svn: /phpdoc/de/trunk/ faq/installation.xml reference/dba/functions/dba-fetch.xml reference/dba/setup.xml reference/mssql/functions/mssql-connect.xml reference/mssql/functions/mssql-init.xml reference/mssql/functions/mssql-pconnect.xml reference/pcre/configure.xml reference/pcre/functions/preg-filter.xml reference/pcre/functions/preg-grep.xml reference/pcre/functions/preg-match-all.xml reference/pcre/functions/preg-match.xml reference/pcre/functions/preg-replace-callback.xml reference/pcre/funct
[email protected] (Martin Samesch)
| Newsgroups | php.doc.de |
|---|---|
| Message-ID | <[email protected]> |
samesch Wed, 15 Jun 2011 11:32:52 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312187
Log:
synced with EN
Changed paths:
U phpdoc/de/trunk/faq/installation.xml
U phpdoc/de/trunk/reference/dba/functions/dba-fetch.xml
U phpdoc/de/trunk/reference/dba/setup.xml
U phpdoc/de/trunk/reference/mssql/functions/mssql-connect.xml
U phpdoc/de/trunk/reference/mssql/functions/mssql-init.xml
U phpdoc/de/trunk/reference/mssql/functions/mssql-pconnect.xml
U phpdoc/de/trunk/reference/pcre/configure.xml
U phpdoc/de/trunk/reference/pcre/functions/preg-filter.xml
U phpdoc/de/trunk/reference/pcre/functions/preg-grep.xml
U phpdoc/de/trunk/reference/pcre/functions/preg-match-all.xml
U phpdoc/de/trunk/reference/pcre/functions/preg-match.xml
U phpdoc/de/trunk/reference/pcre/functions/preg-replace-callback.xml
U phpdoc/de/trunk/reference/pcre/functions/preg-replace.xml
U phpdoc/de/trunk/reference/pcre/functions/preg-split.xml
U phpdoc/de/trunk/reference/pcre/pattern.modifiers.xml
U phpdoc/de/trunk/reference/pcre/pattern.xml
U phpdoc/de/trunk/reference/regex/functions/split.xml
U phpdoc/de/trunk/reference/regex/functions/spliti.xml
U phpdoc/de/trunk/reference/session/examples.xml
U phpdoc/de/trunk/reference/session/functions/session-name.xml
svn-diffs-312187.txt
(text/x-diff, 23.6 KB)
Modified: phpdoc/de/trunk/faq/installation.xml
===================================================================
--- phpdoc/de/trunk/faq/installation.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/faq/installation.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 306787 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 311461 Maintainer: samesch Status: ready -->
<chapter xml:id="faq.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Installation</title>
<titleabbrev>Installation</titleabbrev>
@@ -42,15 +42,10 @@
Schwachstellen ins System von PHP einfließen.
</para>
<para>
- Falls Sie das Gefühl haben, threaded MPM benutzen zu müssen, sollten Sie
- nach einer FastCGI-Konfiguration schauen, in der PHP in seinem eigenen
+ Falls Sie threaded MPM benutzen wollen, sollten Sie nach einer
+ FastCGI-Konfiguration schauen, in der PHP in seinem eigenen
Speicherbereich läuft.
</para>
- <para>
- Und schließlich: diese Warnung gegen die Verwendung von threaded MPM
- gilt nicht so stark für Windows-Systeme, weil die Bibliotheken auf
- dieser Plattform tendenziell threadsicher sind.
- </para>
</answer>
</qandaentry>
Modified: phpdoc/de/trunk/reference/dba/functions/dba-fetch.xml
===================================================================
--- phpdoc/de/trunk/reference/dba/functions/dba-fetch.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/dba/functions/dba-fetch.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 311057 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-fetch" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_fetch</refname>
@@ -91,7 +91,7 @@
</thead>
<tbody>
<row>
- <entry>4.3</entry>
+ <entry>4.3.0</entry>
<entry>
Der Parameter <parameter>skip</parameter> steht zur Verfügung,
um die Fähigkeit von cdb zu unterstützen, mehrere Schlüssel mit dem
Modified: phpdoc/de/trunk/reference/dba/setup.xml
===================================================================
--- phpdoc/de/trunk/reference/dba/setup.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/dba/setup.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 300152 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 308547 Maintainer: samesch Status: ready -->
<chapter xml:id="dba.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
&reftitle.setup;
Modified: phpdoc/de/trunk/reference/mssql/functions/mssql-connect.xml
===================================================================
--- phpdoc/de/trunk/reference/mssql/functions/mssql-connect.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/mssql/functions/mssql-connect.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 302468 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 308253 Maintainer: samesch Status: ready -->
<refentry xml:id="function.mssql-connect" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>mssql_connect</refname>
@@ -14,7 +14,7 @@
<methodparam choice="opt"><type>string</type><parameter>servername</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>new_link</parameter></methodparam>
+ <methodparam choice="opt"><type>bool</type><parameter>new_link</parameter><initializer>false</initializer></methodparam>
</methodsynopsis>
<para>
<function>mssql_connect</function> baut eine Verbindung zu einem MS SQL
Modified: phpdoc/de/trunk/reference/mssql/functions/mssql-init.xml
===================================================================
--- phpdoc/de/trunk/reference/mssql/functions/mssql-init.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/mssql/functions/mssql-init.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 307144 Maintainer: samesch Status: ready -->
<refentry xml:id='function.mssql-init' xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>mssql_init</refname>
@@ -63,8 +63,8 @@
<![CDATA[
<?php
// Mit MSSQL verbinden und Datenbank auswählen
-mssql_connect('KALLESPC\SQLEXPRESS', 'sa', 'phpfi');
-mssql_select_db('php');
+$verbindung = mssql_connect('KALLESPC\SQLEXPRESS', 'sa', 'phpfi');
+mssql_select_db('php', $verbindung);
// Eine neue Anweisung erzeugen
$anweisung = mssql_init('AnweisungTest', $verbindung);
Modified: phpdoc/de/trunk/reference/mssql/functions/mssql-pconnect.xml
===================================================================
--- phpdoc/de/trunk/reference/mssql/functions/mssql-pconnect.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/mssql/functions/mssql-pconnect.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 308253 Maintainer: samesch Status: ready -->
<refentry xml:id="function.mssql-pconnect" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>mssql_pconnect</refname>
@@ -14,7 +14,7 @@
<methodparam choice="opt"><type>string</type><parameter>servername</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>new_link</parameter></methodparam>
+ <methodparam choice="opt"><type>bool</type><parameter>new_link</parameter><initializer>false</initializer></methodparam>
</methodsynopsis>
<para>
<function>mssql_pconnect</function> verhält sich, von zwei wesentlichen
Modified: phpdoc/de/trunk/reference/pcre/configure.xml
===================================================================
--- phpdoc/de/trunk/reference/pcre/configure.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/pcre/configure.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 301091 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 310717 Maintainer: samesch Status: ready -->
<section xml:id="pcre.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
&reftitle.install;
<para>
@@ -46,6 +46,16 @@
</thead>
<tbody>
<row>
+ <entry>5.3.6</entry>
+ <entry>8.11</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>5.3.4</entry>
+ <entry>8.10</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry>5.3.3</entry>
<entry>8.02</entry>
<entry></entry>
Modified: phpdoc/de/trunk/reference/pcre/functions/preg-filter.xml
===================================================================
--- phpdoc/de/trunk/reference/pcre/functions/preg-filter.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/pcre/functions/preg-filter.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 303177 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 307739 Maintainer: samesch Status: ready -->
<refentry xml:id="function.preg-filter" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>preg_filter</refname>
@@ -98,6 +98,7 @@
&reftitle.seealso;
<para>
<simplelist>
+ <member><link linkend="pcre.pattern">PCRE-Suchmuster</link></member>
<member><function>preg_replace</function></member>
<member><function>preg_replace_callback</function></member>
<member><function>preg_grep</function></member>
Modified: phpdoc/de/trunk/reference/pcre/functions/preg-grep.xml
===================================================================
--- phpdoc/de/trunk/reference/pcre/functions/preg-grep.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/pcre/functions/preg-grep.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 300271 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 307739 Maintainer: samesch Status: ready -->
<refentry xml:id="function.preg-grep" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>preg_grep</refname>
@@ -124,6 +124,7 @@
&reftitle.seealso;
<para>
<simplelist>
+ <member><link linkend="pcre.pattern">PCRE-Suchmuster</link></member>
<member><function>preg_match_all</function></member>
<member><function>preg_filter</function></member>
<member><function>preg_last_error</function></member>
Modified: phpdoc/de/trunk/reference/pcre/functions/preg-match-all.xml
===================================================================
--- phpdoc/de/trunk/reference/pcre/functions/preg-match-all.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/pcre/functions/preg-match-all.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 305275 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 308256 Maintainer: samesch Status: ready -->
<refentry xml:id="function.preg-match-all" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>preg_match_all</refname>
@@ -13,7 +13,7 @@
<type>int</type><methodname>preg_match_all</methodname>
<methodparam><type>string</type><parameter>pattern</parameter></methodparam>
<methodparam><type>string</type><parameter>subject</parameter></methodparam>
- <methodparam><type>array</type><parameter role="reference">matches</parameter></methodparam>
+ <methodparam><!-- choice="opt" --><type>array</type><parameter role="reference">matches</parameter></methodparam>
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>PREG_PATTERN_ORDER</constant></initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
@@ -206,6 +206,12 @@
</thead>
<tbody>
<row>
+ <entry>5.4.0</entry>
+ <entry>
+ Der Parameter <parameter>matches</parameter> ist nun optional.
+ </entry>
+ </row>
+ <row>
<entry>5.2.2</entry>
<entry>
Benannte Teilsuchmuster (named subpatterns) akzeptieren nun die
@@ -365,6 +371,7 @@
&reftitle.seealso;
<para>
<simplelist>
+ <member><link linkend="pcre.pattern">PCRE-Suchmuster</link></member>
<member><function>preg_match</function></member>
<member><function>preg_replace</function></member>
<member><function>preg_split</function></member>
Modified: phpdoc/de/trunk/reference/pcre/functions/preg-match.xml
===================================================================
--- phpdoc/de/trunk/reference/pcre/functions/preg-match.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/pcre/functions/preg-match.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 305275 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 307739 Maintainer: samesch Status: ready -->
<refentry xml:id="function.preg-match" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>preg_match</refname>
@@ -332,6 +332,7 @@
&reftitle.seealso;
<para>
<simplelist>
+ <member><link linkend="pcre.pattern">PCRE-Suchmuster</link></member>
<member><function>preg_match_all</function></member>
<member><function>preg_replace</function></member>
<member><function>preg_split</function></member>
Modified: phpdoc/de/trunk/reference/pcre/functions/preg-replace-callback.xml
===================================================================
--- phpdoc/de/trunk/reference/pcre/functions/preg-replace-callback.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/pcre/functions/preg-replace-callback.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 306477 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 307739 Maintainer: samesch Status: ready -->
<refentry xml:id="function.preg-replace-callback" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>preg_replace_callback</refname>
@@ -233,6 +233,7 @@
&reftitle.seealso;
<para>
<simplelist>
+ <member><link linkend="pcre.pattern">PCRE-Suchmuster</link></member>
<member><function>preg_replace</function></member>
<member><function>preg_last_error</function></member>
<member><function>create_function</function></member>
Modified: phpdoc/de/trunk/reference/pcre/functions/preg-replace.xml
===================================================================
--- phpdoc/de/trunk/reference/pcre/functions/preg-replace.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/pcre/functions/preg-replace.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 304409 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 307739 Maintainer: samesch Status: ready -->
<refentry xml:id="function.preg-replace" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>preg_replace</refname>
@@ -36,13 +36,10 @@
oder ein Array mit Zeichenketten sein.
</para>
<para>
- Mit dem Modifikator <literal>e</literal> wird der Parameter
- <parameter>replacement</parameter> nach den entsprechenden Ersetzungen
- der Referenzen von <function>preg_replace</function> wie PHP-Code
- behandelt. Tipp: Stellen Sie sicher, dass
- <parameter>replacement</parameter> gültigen PHP-Code erzeugt, weil sich
- PHP sonst über einen Syntaxfehler (parse error) in der Zeile beschwert,
- die den Aufruf von <function>preg_replace</function> enthält.
+ Es stehen auch einige <link
+ linkend="reference.pcre.pattern.modifiers">PCRE-Modifikatoren</link>
+ zur Verfügung, inklusive '<literal>e</literal>' (PREG_REPLACE_EVAL),
+ der speziell für diese Funktion ist.
</para>
</listitem>
</varlistentry>
@@ -368,6 +365,7 @@
&reftitle.seealso;
<para>
<simplelist>
+ <member><link linkend="pcre.pattern">PCRE-Suchmuster</link></member>
<member><function>preg_filter</function></member>
<member><function>preg_match</function></member>
<member><function>preg_replace_callback</function></member>
Modified: phpdoc/de/trunk/reference/pcre/functions/preg-split.xml
===================================================================
--- phpdoc/de/trunk/reference/pcre/functions/preg-split.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/pcre/functions/preg-split.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 306477 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 307739 Maintainer: samesch Status: ready -->
<refentry xml:id="function.preg-split" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>preg_split</refname>
@@ -235,6 +235,7 @@
&reftitle.seealso;
<para>
<simplelist>
+ <member><link linkend="pcre.pattern">PCRE-Suchmuster</link></member>
<member><function>implode</function></member>
<member><function>preg_match</function></member>
<member><function>preg_match_all</function></member>
Modified: phpdoc/de/trunk/reference/pcre/pattern.modifiers.xml
===================================================================
--- phpdoc/de/trunk/reference/pcre/pattern.modifiers.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/pcre/pattern.modifiers.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 308190 Maintainer: samesch Status: ready -->
<!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 -->
<article xml:id="reference.pcre.pattern.modifiers" xmlns="http://docbook.org/ns/docbook">
<title>Suchmuster-Modifikatoren</title>
@@ -87,10 +87,20 @@
(<literal>\</literal>) und NULL-Zeichen werden in den ersetzten
Rückreferenzen mit einem Backslash maskiert.
</simpara>
- <para>
- Dieser Modifikator wird nur von <function>preg_replace</function>
- verwendet; von anderen PCRE-Funktionen wird er ignoriert.
- </para>
+ <tip>
+ <para>
+ Stellen Sie sicher, dass <parameter>replacement</parameter> gültigen
+ PHP-Code erzeugt, weil sich PHP sonst über einen Parse Error in der
+ Zeile beschwert, die den Aufruf von <function>preg_replace</function>
+ enthält.
+ </para>
+ </tip>
+ <note>
+ <para>
+ Dieser Modifikator wird nur von <function>preg_replace</function>
+ verwendet; von anderen PCRE-Funktionen wird er ignoriert.
+ </para>
+ </note>
</listitem>
</varlistentry>
<varlistentry>
@@ -144,6 +154,13 @@
durch ein Fragezeichen hinter dem Quantifikator (z.B.
<literal>.*?</literal>) gesetzt werden.
</simpara>
+ <note>
+ <para>
+ Im Ungreedy-Modus ist es nicht möglich, mehr als <link
+ linkend="ini.pcre.backtrack-limit">pcre.backtrack_limit</link>
+ Übereinstimmungen zu treffen.
+ </para>
+ </note>
</listitem>
</varlistentry>
<varlistentry>
Modified: phpdoc/de/trunk/reference/pcre/pattern.xml
===================================================================
--- phpdoc/de/trunk/reference/pcre/pattern.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/pcre/pattern.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 307895 Maintainer: samesch Status: ready -->
<part xml:id="pcre.pattern">
<title>PCRE-Suchmuster</title>
-
+ &reference.pcre.pattern.syntax;
&reference.pcre.pattern.modifiers;
&reference.pcre.pattern.differences;
&reference.pcre.pattern.posix;
- &reference.pcre.pattern.syntax;
-
</part>
<!-- Keep this comment at the end of the file
Modified: phpdoc/de/trunk/reference/regex/functions/split.xml
===================================================================
--- phpdoc/de/trunk/reference/regex/functions/split.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/regex/functions/split.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 308253 Maintainer: samesch Status: ready -->
<refentry xml:id="function.split" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>split</refname>
@@ -13,7 +13,7 @@
<type>array</type><methodname>split</methodname>
<methodparam><type>string</type><parameter>pattern</parameter></methodparam>
<methodparam><type>string</type><parameter>string</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>limit</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
</methodsynopsis>
<para>
Zerlegt <parameter>string</parameter> anhand eines regulären Ausdrucks in
Modified: phpdoc/de/trunk/reference/regex/functions/spliti.xml
===================================================================
--- phpdoc/de/trunk/reference/regex/functions/spliti.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/regex/functions/spliti.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 308253 Maintainer: samesch Status: ready -->
<refentry xml:id="function.spliti" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>spliti</refname>
@@ -13,7 +13,7 @@
<type>array</type><methodname>spliti</methodname>
<methodparam><type>string</type><parameter>pattern</parameter></methodparam>
<methodparam><type>string</type><parameter>string</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>limit</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
</methodsynopsis>
<para>
Zerlegt <parameter>string</parameter> anhand eines regulären Ausdrucks in
Modified: phpdoc/de/trunk/reference/session/examples.xml
===================================================================
--- phpdoc/de/trunk/reference/session/examples.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/session/examples.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 310851 Maintainer: samesch Status: ready -->
<appendix xml:id="session.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
&reftitle.examples;
<section xml:id="session.examples.basic">
+ <title>Grundlegende Anwendung</title>
<note>
<para>
Ab PHP 4.1.0 steht <varname>$_SESSION</varname> genau wie
Modified: phpdoc/de/trunk/reference/session/functions/session-name.xml
===================================================================
--- phpdoc/de/trunk/reference/session/functions/session-name.xml 2011-06-15 11:17:55 UTC (rev 312186)
+++ phpdoc/de/trunk/reference/session/functions/session-name.xml 2011-06-15 11:32:52 UTC (rev 312187)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 300430 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 310527 Maintainer: samesch Status: ready -->
<refentry xml:id="function.session-name" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>session_name</refname>
@@ -36,11 +36,12 @@
<term><parameter>name</parameter></term>
<listitem>
<para>
- Der Sessionname referenziert die Session-ID in Cookies und URLs. Er
- sollte nur alphanumerische Zeichen enthalten und sollte kurz und
- beschreibend sein (z.B. für Benutzer mit aktivierter Cookie-Warnung).
- Wenn <parameter>name</parameter> angegeben wird, wird der Name der
- aktuellen Session durch dessen Wert ersetzt.
+ Der Sessionname referenziert den Namen der Session, der in Cookies und
+ URLs verwendet wird (z.B. <literal>PHPSESSID</literal>). Er sollte nur
+ alphanumerische Zeichen enthalten und sollte kurz und beschreibend sein
+ (z.B. für Benutzer mit aktivierter Cookie-Warnung). Wenn
+ <parameter>name</parameter> angegeben wird, wird der Name der aktuellen
+ Session durch dessen Wert ersetzt.
</para>
<para>
<warning>