summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2011-11-30 10:18:07 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2011-11-30 10:18:07 +0000
commit66dd8c7559f678189f73cc8fd4293a47c2f2a752 (patch)
treef91fbc60d0b0e36a8b696dcb1bf01c19a608424b
parent16679a7e31ef76cfc6d2026278768d800bf31fbe (diff)
downloadpcre-66dd8c7559f678189f73cc8fd4293a47c2f2a752.tar.gz
Documentation update.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@772 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--doc/pcrecallout.39
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/pcrecallout.3 b/doc/pcrecallout.3
index d458653..6f6102d 100644
--- a/doc/pcrecallout.3
+++ b/doc/pcrecallout.3
@@ -160,9 +160,10 @@ same callout number. However, they are set for all callouts.
.P
The \fImark\fP field is present from version 2 of the \fIpcre_callout\fP
structure. In callouts from \fBpcre_exec()\fP it contains a pointer to the
-zero-terminated name of the most recently passed (*MARK) item in the match, or
-NULL if there are no (*MARK)s in the current matching path. In callouts from
-\fBpcre_dfa_exec()\fP this field always contains NULL.
+zero-terminated name of the most recently passed (*MARK), (*PRUNE), or (*THEN)
+item in the match, or NULL if no such items have been passed. Instances of
+(*PRUNE) or (*THEN) without a name do not obliterate a previous (*MARK). In
+callouts from \fBpcre_dfa_exec()\fP this field always contains NULL.
.
.
.SH "RETURN VALUES"
@@ -195,6 +196,6 @@ Cambridge CB2 3QH, England.
.rs
.sp
.nf
-Last updated: 26 August 2011
+Last updated: 30 November 2011
Copyright (c) 1997-2011 University of Cambridge.
.fi