cvs: phpdoc(REF_STRUCT_DEV) /en/reference/regex reference.xml /en/reference/strings reference.xml

bjori Sat Oct 27 15:35:49 2007 UTC Modified files: (Branch: REF_STRUCT_DEV) /phpdoc/en/reference/strings reference.xml /phpdoc/en/reference/regex reference.xml Log: Upgrade markup

http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/strings/reference.xml?r1=1.8.2.2&r2=1.8.2.3&diff_format=u Index: phpdoc/en/reference/strings/reference.xml diff -u phpdoc/en/reference/strings/reference.xml:1.8.2.2 phpdoc/en/reference/strings/reference.xml:1.8.2.3 --- phpdoc/en/reference/strings/reference.xml:1.8.2.2 Sat Oct 27 13:51:48 2007 +++ phpdoc/en/reference/strings/reference.xml Sat Oct 27 15:35:48 2007 @@ -1,54 +1,53 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8.2.2 $ --> +<!-- $Revision: 1.8.2.3 $ --> <!-- Purpose: basic.text --> <!-- Membership: core --> -<part xml:id="ref.strings" xmlns="http://docbook.org/ns/docbook"> +<book xml:id="ref.strings" xmlns="http://docbook.org/ns/docbook"> <title>String Functions</title> <titleabbrev>Strings</titleabbrev> - <partintro> - <section xml:id="strings.intro"> - &reftitle.intro; - <para> - These functions all manipulate strings in various ways. Some more - specialized sections can be found in the regular expression and - <link linkend="ref.url">URL handling</link> sections. - </para> - <para> - For information on how strings behave, especially with regard to - usage of single quotes, double quotes, and escape sequences, see - the <link linkend="language.types.string">Strings</link> entry in - the <link linkend="language.types">Types</link> section of the - manual. - </para> - </section> - </partintro> + + <preface xml:id="strings.intro"> + &reftitle.intro; + <para> + These functions all manipulate strings in various ways. Some more + specialized sections can be found in the regular expression and + <link linkend="ref.url">URL handling</link> sections. + </para> + <para> + For information on how strings behave, especially with regard to + usage of single quotes, double quotes, and escape sequences, see + the <link linkend="language.types.string">Strings</link> entry in + the <link linkend="language.types">Types</link> section of the + manual. + </para> + </preface> <chapter xml:id="strings.setup"> <title>Installing/Configuring</title> - <section xml:id="strings.installation"> - &reftitle.install; - &no.install; - </section> - <section xml:id="strings.requirements"> &reftitle.required; &no.requirement; </section> + <section xml:id="strings.installation"> + &reftitle.install; + &no.install; + </section> + <section xml:id="strings.configuration"> &reftitle.runtime; &no.config; </section> - <section xml:id="strings.resource"> + <section xml:id="strings.resources"> &reftitle.resources; &no.resource; </section> </chapter> - + &reference.strings.constants; <reference xml:id="strings.functions" xmlns="http://docbook.org/ns/docbook"> @@ -68,7 +67,7 @@ &reference.strings.functions.entities; </reference> -</part> +</book> <!-- Keep this comment at the end of the file Local variables: mode: sgml http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/regex/reference.xml?r1=1.13.2.1&r2=1.13.2.2&diff_format=u Index: phpdoc/en/reference/regex/reference.xml diff -u phpdoc/en/reference/regex/reference.xml:1.13.2.1 phpdoc/en/reference/regex/reference.xml:1.13.2.2 --- phpdoc/en/reference/regex/reference.xml:1.13.2.1 Wed Oct 3 11:41:14 2007 +++ phpdoc/en/reference/regex/reference.xml Sat Oct 27 15:35:49 2007 @@ -1,68 +1,72 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.13.2.1 $ --> +<!-- $Revision: 1.13.2.2 $ --> <!-- Purpose: basic.text --> <!-- Membership: core --> - <reference xml:id="ref.regex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>Regular Expression Functions (POSIX Extended)</title> - <titleabbrev>POSIX Regex</titleabbrev> - - <partintro> - <section xml:id="regex.intro"> - &reftitle.intro; - <tip> - <para> - PHP also supports regular expressions using a Perl-compatible syntax - using the <link linkend="ref.pcre">PCRE functions</link>. Those functions - support non-greedy matching, assertions, conditional subpatterns, and a - number of other features not supported by the POSIX-extended regular - expression syntax. - </para> - </tip> - <warning> - <para> - These regular expression functions are not binary-safe. The <link - linkend="ref.pcre">PCRE functions</link> are. - </para> - </warning> - <para> - Regular expressions are used for complex string manipulation. - PHP uses the POSIX extended regular expressions as defined by POSIX - 1003.2. For a full description of POSIX regular expressions see the <link xlink:href="&url.regex.man;">regex - man pages</link> included in the regex directory in the PHP distribution. It's - in manpage format, so you'll want to do something along the lines of - <command>man /usr/local/src/regex/regex.7</command> in order to read it. - </para> - </section> - - <section xml:id="regex.requirements"> - &reftitle.required; - &no.requirement; - </section> - - &reference.regex.configure; - - <section xml:id="regex.configuration"> - &reftitle.runtime; - &no.config; - </section> - - <section xml:id="regex.resources"> - &reftitle.resources; - &no.resource; - </section> - - <section xml:id="regex.constants"> - &reftitle.constants; - &no.constants; - </section> - - <section xml:id="regex.examples"> - &reftitle.examples; - <para> - <example> - <title>Regular Expression Examples</title> - <programlisting role="php"> +<book xml:id="ref.regex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>Regular Expression Functions (POSIX Extended)</title> + <titleabbrev>POSIX Regex</titleabbrev> + + <preface xml:id="regex.intro"> + &reftitle.intro; + <tip> + <para> + PHP also supports regular expressions using a Perl-compatible syntax + using the <link linkend="ref.pcre">PCRE functions</link>. Those functions + support non-greedy matching, assertions, conditional subpatterns, and a + number of other features not supported by the POSIX-extended regular + expression syntax. + </para> + </tip> + <warning> + <para> + These regular expression functions are not binary-safe. The <link + linkend="ref.pcre">PCRE functions</link> are. + </para> + </warning> + <para> + Regular expressions are used for complex string manipulation. + PHP uses the POSIX extended regular expressions as defined by POSIX + 1003.2. For a full description of POSIX regular expressions see the <link xlink:href="&url.regex.man;">regex + man pages</link> included in the regex directory in the PHP distribution. It's + in manpage format, so you'll want to do something along the lines of + <command>man /usr/local/src/regex/regex.7</command> in order to read it. + </para> + </preface> + + <chapter xml:id="regex.setup"> + <title>Installing/Configuring</title> + + <section xml:id="regex.requirements"> + &reftitle.required; + &no.requirement; + </section> + + &reference.regex.configure; + + <section xml:id="regex.configuration"> + &reftitle.runtime; + &no.config; + </section> + + <section xml:id="regex.resources"> + &reftitle.resources; + &no.resource; + </section> + + </chapter> + + <appendix xml:id="regex.constants"> + &reftitle.constants; + &no.constants; + </appendix> + + <appendix xml:id="regex.examples"> + &reftitle.examples; + <para> + <example> + <title>Regular Expression Examples</title> + <programlisting role="php"> <![CDATA[ <?php // Returns true if "abc" is found anywhere in $string. @@ -75,14 +79,14 @@ ereg("abc$", $string); // Returns true if client browser is Netscape 2, 3 or MSIE 3. -eregi("(ozilla.[23]|MSIE.3)", $HTTP_USER_AGENT); +eregi("(ozilla.[23]|MSIE.3)", $_SERVER["HTTP_USER_AGENT"]); // Places three space separated words into $regs[1], $regs[2] and $regs[3]. ereg("([[:alnum:]]+) ([[:alnum:]]+) ([[:alnum:]]+)", $string, $regs); // Put a <br /> tag at the beginning of $string. $string = ereg_replace("^", "<br />", $string); - + // Put a <br /> tag at the end of $string. $string = ereg_replace("$", "<br />", $string); @@ -90,24 +94,26 @@ $string = ereg_replace("\n", "", $string); ?> ]]> - </programlisting> - </example> - </para> - </section> - - <section xml:id="regex.seealso"> - &reftitle.seealso; - <para> - For regular expressions in Perl-compatible syntax have a look at the - <link linkend="ref.pcre">PCRE functions</link>. The simpler shell style - wildcard pattern matching is provided by <function>fnmatch</function>. - </para> - </section> + </programlisting> + </example> + </para> + </appendix> + + <reference xml:id="regex.functions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>Regex Functions</title> + <partintro xml:id="regex.seealso"> + &reftitle.seealso; + <para> + For regular expressions in Perl-compatible syntax have a look at the + <link linkend="ref.pcre">PCRE functions</link>. The simpler shell style + wildcard pattern matching is provided by <function>fnmatch</function>. + </para> </partintro> &reference.regex.functions.entities; </reference> +</book> <!-- Keep this comment at the end of the file Local variables: mode: sgml