dams Thu Mar 8 02:47:18 2001 EDT
Modified files:
/phpdoc/en/functions pcre.xml posix.xml recode.xml regex.xml
yaz.xml gmp.xml
Log:
Fixing a bunch of mis-named functions.
Index: phpdoc/en/functions/pcre.xml
diff -u phpdoc/en/functions/pcre.xml:1.45 phpdoc/en/functions/pcre.xml:1.46
--- phpdoc/en/functions/pcre.xml:1.45 Wed Feb 28 16:22:02 2001
+++ phpdoc/en/functions/pcre.xml Thu Mar 8 02:47:17 2001
@@ -941,9 +941,11 @@
</literallayout>
</refsect1>
- <refsect1>
+ <refsect1 id="regexp.reference">
<title>Regular Expression Details</title>
- <literallayout>
+ <refsect2 id="regexp.introduction">
+ <title>Introduction</title>
+ <literallayout>
The syntax and semantics of the regular expressions sup-
ported by PCRE are described below. Regular expressions are
also described in the Perl documentation and in a number of
@@ -960,7 +962,13 @@
The quick brown fox
matches a portion of a subject string that is identical to
- itself. The power of regular expressions comes from the
+ itself.
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.meta">
+ <title>Meta-caracters</title>
+ <literallayout>
+ The power of regular expressions comes from the
ability to include alternatives and repetitions in the pat-
tern. These are encoded in the pattern by the use of <emphasis>meta</emphasis>-
<emphasis>characters</emphasis>, which do not stand for themselves but instead
@@ -998,10 +1006,11 @@
The following sections describe the use of each of the
meta-characters.
-
-
-
-BACKSLASH
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.backslash">
+ <title>backslash</title>
+ <literallayout>
The backslash character has several uses. Firstly, if it is
followed by a non-alphameric character, it takes away any
special meaning that character may have. This use of
@@ -1156,12 +1165,11 @@
\Z and \z is that \Z matches before a newline that is the
last character of the string as well as at the end of the
string, whereas \z matches only at the end.
-
-
-
-
-
-CIRCUMFLEX AND DOLLAR
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.circudollar">
+ <title>Cicumflex and dollar</title>
+ <literallayout>
Outside a character class, in the default matching mode, the
circumflex character is an assertion which is true only if
the current matching point is at the start of the subject
@@ -1207,10 +1215,11 @@
the start and end of the subject in both modes, and if all
branches of a pattern start with \A is it always anchored,
whether PCRE_MULTILINE is set or not.
-
-
-
-FULL STOP (PERIOD, DOT)
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.dot">
+ <title>FULL STOP</title>
+ <literallayout>
Outside a character class, a dot in the pattern matches any
one character in the subject, including a non-printing
character, but not (by default) newline. If the PCRE_DOTALL
@@ -1219,10 +1228,11 @@
cumflex and dollar, the only relationship being that they
both involve newline characters. Dot has no special meaning
in a character class.
-
-
-
-SQUARE BRACKETS
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.squarebrackets">
+ <title>Square brackets</title>
+ <literallayout>
An opening square bracket introduces a character class, ter-
minated by a closing square bracket. A closing square
bracket on its own is not special. If a closing square
@@ -1297,10 +1307,11 @@
All non-alphameric characters other than \, -, ^ (at the
start) and the terminating ] are non-special in character
classes, but it does no harm if they are escaped.
-
-
-
-VERTICAL BAR
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.verticalbar">
+ <title>Vertical bar</title>
+ <literallayout>
Vertical bar characters are used to separate alternative
patterns. For example, the pattern
@@ -1314,10 +1325,11 @@
subpattern (defined below), "succeeds" means matching the
rest of the main pattern as well as the alternative in the
subpattern.
-
-
-
-INTERNAL OPTION SETTING
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.internal_options">
+ <title>Internal option setting</title>
+ <literallayout>
The settings of PCRE_CASELESS, PCRE_MULTILINE, PCRE_DOTALL,
and PCRE_EXTENDED can be changed from within the pattern by
a sequence of Perl option letters enclosed between "(?" and
@@ -1382,10 +1394,11 @@
setting is special in that it must always occur earlier in
the pattern than any of the additional features it turns on,
even when it is at top level. It is best put at the start.
-
-
-
-SUBPATTERNS
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.subpatterns">
+ <title>subpatterns</title>
+ <literallayout>
Subpatterns are delimited by parentheses (round brackets),
which can be nested. Marking part of a pattern as a subpat-
tern does two things:
@@ -1444,10 +1457,11 @@
reset until the end of the subpattern is reached, an option
setting in one branch does affect subsequent branches, so
the above patterns match "SUNDAY" as well as "Saturday".
-
-
-
-REPETITION
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.repetition">
+ <title>Repetition</title>
+ <literallayout>
Repetition is specified by quantifiers, which can follow any
of the following items:
@@ -1583,10 +1597,11 @@
matches "aba" the value of the second captured substring is
"b".
-
-
-
-BACK REFERENCES
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.back_references">
+ <title>BACK REFERENCES</title>
+ <literallayout>
Outside a character class, a backslash followed by a digit
greater than 0 (and possibly further digits) is a back
reference to a capturing subpattern earlier (i.e. to its
@@ -1649,10 +1664,11 @@
that the first iteration does not need to match the back
reference. This can be done using alternation, as in the
example above, or by a quantifier with a minimum of zero.
-
-
-
-ASSERTIONS
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.assertions">
+ <title>Assertions</title>
+ <literallayout>
An assertion is a test on the characters following or
preceding the current matching point that does not actually
consume any characters. The simple assertions coded as \b,
@@ -1769,10 +1785,11 @@
Assertions count towards the maximum of 200 parenthesized
subpatterns.
-
-
-
-ONCE-ONLY SUBPATTERNS
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.onlyonce">
+ <title>Once-only subpatterns</title>
+ <literallayout>
With both maximizing and minimizing repetition, failure of
what follows normally causes the repeated item to be re-
evaluated to see if a different number of repeats allows the
@@ -1878,8 +1895,11 @@
sequences of non-digits cannot be broken, and failure hap-
pens quickly.
-
-CONDITIONAL SUBPATTERNS
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.conditional">
+ <title>Conditional subpatterns</title>
+ <literallayout>
It is possible to cause the matching process to obey a sub-
pattern conditionally or to choose between two alternative
subpatterns, depending on the result of an assertion, or
@@ -1934,10 +1954,11 @@
matched against the second. This pattern matches strings in
one of the two forms dd-aaa-dd or dd-dd-dd, where aaa are
letters and dd are digits.
-
-
-
-COMMENTS
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.comments">
+ <title>Comments</title>
+ <literallayout>
The sequence (?# marks the start of a comment which
continues up to the next closing parenthesis. Nested
parentheses are not permitted. The characters that make up a
@@ -1946,10 +1967,11 @@
If the PCRE_EXTENDED option is set, an unescaped # character
outside a character class introduces a comment that contin-
ues up to the next newline character in the pattern.
-
-
-
-RECURSIVE PATTERNS
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.recursive">
+ <title>Recursive patterns</title>
+ <literallayout>
Consider the problem of matching a string in parentheses,
allowing for unlimited nested parentheses. Without the use
of recursion, the best that can be done is to use a pattern
@@ -2005,10 +2027,11 @@
saves data for the first 15 capturing parentheses only, as
there is no way to give an out-of-memory error from within a
recursion.
-
-
-
-PERFORMANCE
+ </literallayout>
+ </refsect2>
+ <refsect2 id="regexp.reference.performances">
+ <title>Performances</title>
+ <literallayout>
Certain items that may appear in patterns are more efficient
than others. It is more efficient to use a character class
like [aeiou] than a set of alternatives such as (a|e|i|o|u).
@@ -2072,7 +2095,8 @@
instantly when applied to a whole line of "a" characters,
whereas the latter takes an appreciable time with strings
longer than about 20 characters.
- </literallayout>
+ </literallayout>
+ </refsect2>
</refsect1>
</refentry>
</reference>
Index: phpdoc/en/functions/posix.xml
diff -u phpdoc/en/functions/posix.xml:1.8 phpdoc/en/functions/posix.xml:1.9
--- phpdoc/en/functions/posix.xml:1.8 Fri Feb 23 13:03:42 2001
+++ phpdoc/en/functions/posix.xml Thu Mar 8 02:47:17 2001
@@ -570,7 +570,7 @@
<title>Description</title>
<funcsynopsis>
<funcprototype>
- <funcdef>bool <function>posix_getcwd</function></funcdef>
+ <funcdef>bool <function>posix_mkfifo</function></funcdef>
<paramdef>string <parameter>pathname</parameter></paramdef>
<paramdef>int <parameter>mode</parameter></paramdef>
</funcprototype>
Index: phpdoc/en/functions/recode.xml
diff -u phpdoc/en/functions/recode.xml:1.7 phpdoc/en/functions/recode.xml:1.8
--- phpdoc/en/functions/recode.xml:1.7 Thu Nov 9 22:02:49 2000
+++ phpdoc/en/functions/recode.xml Thu Mar 8 02:47:17 2001
@@ -62,14 +62,14 @@
<title>Description</title>
<funcsynopsis>
<funcprototype>
- <funcdef>string <function>recode_string</function></funcdef>
+ <funcdef>string <function>recode</function></funcdef>
<paramdef>string <parameter>request</parameter></paramdef>
<paramdef>string <parameter>string</parameter></paramdef>
</funcprototype>
</funcsynopsis>
<note>
<simpara>
- This is an alias for <function>recode_string</function>. It has
+ This is an alias for <function>recode</function>. It has
been added in PHP 4.
</simpara>
</note>
Index: phpdoc/en/functions/regex.xml
diff -u phpdoc/en/functions/regex.xml:1.16 phpdoc/en/functions/regex.xml:1.17
--- phpdoc/en/functions/regex.xml:1.16 Mon Feb 12 12:09:57 2001
+++ phpdoc/en/functions/regex.xml Thu Mar 8 02:47:17 2001
@@ -384,7 +384,7 @@
<title>Description</title>
<funcsynopsis>
<funcprototype>
- <funcdef>array <function>split</function></funcdef>
+ <funcdef>array <function>spliti</function></funcdef>
<paramdef>string <parameter>pattern</parameter></paramdef>
<paramdef>string <parameter>string</parameter></paramdef>
<paramdef>int
@@ -393,13 +393,14 @@
</funcprototype>
</funcsynopsis>
<para>
- This function is identical to <function>split</function> except
+ This function is identical to <function>spliti</function> except
that this ignores case distinction when matching alphabetic
characters.
</para>
<para>
- See also: <function>split</function>,
- <function>explode</function>, and <function>implode</function>.
+ See also : <function>split</function>,
+ <function>explode</function> and
+ <function>implode</function>.
</para>
</refsect1>
</refentry>
Index: phpdoc/en/functions/yaz.xml
diff -u phpdoc/en/functions/yaz.xml:1.9 phpdoc/en/functions/yaz.xml:1.10
--- phpdoc/en/functions/yaz.xml:1.9 Sun Feb 18 12:10:08 2001
+++ phpdoc/en/functions/yaz.xml Thu Mar 8 02:47:17 2001
@@ -278,7 +278,7 @@
<title>Description</title>
<funcsynopsis>
<funcprototype>
- <funcdef>int <function>yaz_range</function></funcdef>
+ <funcdef>int <function>yaz_element</function></funcdef>
<paramdef>int <parameter>id</parameter></paramdef>
<paramdef>string <parameter>elementset</parameter></paramdef>
</funcprototype>
Index: phpdoc/en/functions/gmp.xml
diff -u phpdoc/en/functions/gmp.xml:1.6 phpdoc/en/functions/gmp.xml:1.7
--- phpdoc/en/functions/gmp.xml:1.6 Sat Jan 20 13:08:27 2001
+++ phpdoc/en/functions/gmp.xml Thu Mar 8 02:47:17 2001
@@ -367,7 +367,7 @@
<title>Description</title>
<funcsynopsis>
<funcprototype>
- <funcdef>resource <function>gmp_divexact</function></funcdef>
+ <funcdef>resource <function>gmp_div</function></funcdef>
<paramdef>resource <parameter>a</parameter></paramdef>
<paramdef>resource <parameter>b</parameter></paramdef>
</funcprototype>
