--- code/trunk/doc/pcre_dfa_exec.3	2007/02/24 21:40:52	79
+++ code/trunk/doc/pcre_dfa_exec.3	2007/03/06 12:27:42	99
@@ -7,7 +7,6 @@
 .B #include <pcre.h>
 .PP
 .SM
-.br
 .B int pcre_dfa_exec(const pcre *\fIcode\fP, "const pcre_extra *\fIextra\fP,"
 .ti +5n
 .B "const char *\fIsubject\fP," int \fIlength\fP, int \fIstartoffset\fP,
@@ -20,9 +19,9 @@
 .rs
 .sp
 This function matches a compiled regular expression against a given subject
-string, using a DFA matching algorithm (\fInot\fP Perl-compatible). Note that
-the main, Perl-compatible, matching function is \fBpcre_exec()\fP. The
-arguments for this function are:
+string, using an alternative matching algorithm that scans the subject string
+just once (\fInot\fP Perl-compatible). Note that the main, Perl-compatible,
+matching function is \fBpcre_exec()\fP. The arguments for this function are:
 .sp
   \fIcode\fP         Points to the compiled pattern
   \fIextra\fP        Points to an associated \fBpcre_extra\fP structure,
@@ -40,6 +39,10 @@
 The options are:
 .sp
   PCRE_ANCHORED      Match only at the first position
+  PCRE_NEWLINE_ANY   Recognize any Unicode newline sequence
+  PCRE_NEWLINE_CR    Set CR as the newline sequence
+  PCRE_NEWLINE_CRLF  Set CRLF as the newline sequence
+  PCRE_NEWLINE_LF    Set LF as the newline sequence
   PCRE_NOTBOL        Subject is not the beginning of a line
   PCRE_NOTEOL        Subject is not the end of a line
   PCRE_NOTEMPTY      An empty string is not a valid match
@@ -50,8 +53,8 @@
   PCRE_DFA_SHORTEST  Return only the shortest match
   PCRE_DFA_RESTART   This is a restart after a partial match
 .sp
-There are restrictions on what may appear in a pattern when matching using the
-DFA algorithm is requested. Details are given in the
+There are restrictions on what may appear in a pattern when using this matching
+function. Details are given in the
 .\" HREF
 \fBpcrematching\fP
 .\"
@@ -61,13 +64,15 @@
 .sp
   \fIflags\fP        Bits indicating which fields are set
   \fIstudy_data\fP   Opaque data from \fBpcre_study()\fP
-  \fImatch_limit\fP  Limit on internal recursion
+  \fImatch_limit\fP  Limit on internal resource use
+  \fImatch_limit_recursion\fP  Limit on internal recursion depth
   \fIcallout_data\fP Opaque data passed back to callouts
   \fItables\fP       Points to character tables or is NULL
 .sp
 The flag bits are PCRE_EXTRA_STUDY_DATA, PCRE_EXTRA_MATCH_LIMIT,
-PCRE_EXTRA_CALLOUT_DATA, and PCRE_EXTRA_TABLES. For DFA matching, the
-\fImatch_limit\fP field is not used, and must not be set.
+PCRE_EXTRA_MATCH_LIMIT_RECURSION, PCRE_EXTRA_CALLOUT_DATA, and
+PCRE_EXTRA_TABLES. For this matching function, the \fImatch_limit\fP and
+\fImatch_limit_recursion\fP fields are not used, and must not be set.
 .P
 There is a complete description of the PCRE native API in the
 .\" HREF