diff options
author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2007-04-16 13:25:10 +0000 |
---|---|---|
committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2007-04-16 13:25:10 +0000 |
commit | 88e1c64afcd55068b44b441995139eb18c36bb01 (patch) | |
tree | 250fb12b6851dde8a74e00fe7a1ca516def6dc9b | |
parent | ebe3a8b89cabe5b896b5e942e09211c96ceedde9 (diff) | |
download | pcre-88e1c64afcd55068b44b441995139eb18c36bb01.tar.gz |
Fix bugs in the documentation.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@148 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r-- | NON-UNIX-USE | 2 | ||||
-rw-r--r-- | doc/html/pcregrep.html | 2 | ||||
-rw-r--r-- | doc/html/pcrematching.html | 4 | ||||
-rw-r--r-- | doc/html/pcrepartial.html | 2 | ||||
-rw-r--r-- | doc/html/pcretest.html | 4 | ||||
-rw-r--r-- | doc/pcre.txt | 11 | ||||
-rw-r--r-- | doc/pcregrep.1 | 2 | ||||
-rw-r--r-- | doc/pcrematching.3 | 4 | ||||
-rw-r--r-- | doc/pcrepartial.3 | 2 | ||||
-rw-r--r-- | doc/pcretest.1 | 4 |
10 files changed, 18 insertions, 19 deletions
diff --git a/NON-UNIX-USE b/NON-UNIX-USE index 13dbc97..fa1f895 100644 --- a/NON-UNIX-USE +++ b/NON-UNIX-USE @@ -157,7 +157,7 @@ The Cygwin home page (http://www.cygwin.com/) says this: On both MinGW and Cygwin, PCRE should build correctly using: ./configure && make && make install - + This should create two libraries called libpcre and libpcreposix, and, if you have enabled building the C++ wrapper, a third one called libpcrecpp. diff --git a/doc/html/pcregrep.html b/doc/html/pcregrep.html index 428c4b3..12eee36 100644 --- a/doc/html/pcregrep.html +++ b/doc/html/pcregrep.html @@ -341,7 +341,7 @@ Force the patterns to match only whole words. This is equivalent to having \b at the start and end of the pattern. </P> <P> -<b>-x</b>, <b>--line-regex</b>, \fP--line-regexp\fP +<b>-x</b>, <b>--line-regex</b>, <b>--line-regexp</b> Force the patterns to be anchored (each must start matching at the beginning of a line) and in addition, require them to match entire lines. This is equivalent to having ^ and $ characters at the start and end of each diff --git a/doc/html/pcrematching.html b/doc/html/pcrematching.html index fdac718..8ba2bbb 100644 --- a/doc/html/pcrematching.html +++ b/doc/html/pcrematching.html @@ -61,8 +61,8 @@ correspond to the two matching algorithms provided by PCRE. </P> <br><a name="SEC3" href="#TOC1">THE STANDARD MATCHING ALGORITHM</a><br> <P> -In the terminology of Jeffrey Friedl's book \fIMastering Regular -Expressions\fP, the standard algorithm is an "NFA algorithm". It conducts a +In the terminology of Jeffrey Friedl's book "Mastering Regular +Expressions", the standard algorithm is an "NFA algorithm". It conducts a depth-first search of the pattern tree. That is, it proceeds along a single path through the tree, checking that the subject matches what is required. When there is a mismatch, the algorithm tries any alternatives at the current point, diff --git a/doc/html/pcrepartial.html b/doc/html/pcrepartial.html index 449c36c..d54ed23 100644 --- a/doc/html/pcrepartial.html +++ b/doc/html/pcrepartial.html @@ -178,7 +178,7 @@ bytes at the start of the buffer. always produce exactly the same result as matching over one single long string. The difference arises when there are multiple matching possibilities, because a partial match result is given only when there are no completed matches in a -call to fBpcre_dfa_exec()\fP. This means that as soon as the shortest match has +call to <b>pcre_dfa_exec()</b>. This means that as soon as the shortest match has been found, continuation to a new subject segment is no longer possible. Consider this <b>pcretest</b> example: <pre> diff --git a/doc/html/pcretest.html b/doc/html/pcretest.html index 818ba3c..e35f732 100644 --- a/doc/html/pcretest.html +++ b/doc/html/pcretest.html @@ -275,7 +275,7 @@ pattern. If the pattern is studied, the results of that are also output. </P> <P> The <b>/D</b> modifier is a PCRE debugging feature, and is equivalent to -<b>/BI</b>, that is, both the \fP/B\fP and the <b>/I</b> modifiers. +<b>/BI</b>, that is, both the <b>/B</b> and the <b>/I</b> modifiers. </P> <P> The <b>/F</b> modifier causes <b>pcretest</b> to flip the byte order of the @@ -653,7 +653,7 @@ result is undefined. <br><a name="SEC13" href="#TOC1">SEE ALSO</a><br> <P> <b>pcre</b>(3), <b>pcreapi</b>(3), <b>pcrecallout</b>(3), <b>pcrematching</b>(3), -<b>pcrepartial</b>(d), \fPpcrepattern\fP(3), <b>pcreprecompile</b>(3). +<b>pcrepartial</b>(d), <b>pcrepattern</b>(3), <b>pcreprecompile</b>(3). </P> <br><a name="SEC14" href="#TOC1">AUTHOR</a><br> <P> diff --git a/doc/pcre.txt b/doc/pcre.txt index f554049..3adee5d 100644 --- a/doc/pcre.txt +++ b/doc/pcre.txt @@ -521,8 +521,8 @@ REGULAR EXPRESSIONS AS TREES THE STANDARD MATCHING ALGORITHM - In the terminology of Jeffrey Friedl's book Mastering Regular Expres- - sions, the standard algorithm is an "NFA algorithm". It conducts a + In the terminology of Jeffrey Friedl's book "Mastering Regular Expres- + sions", the standard algorithm is an "NFA algorithm". It conducts a depth-first search of the pattern tree. That is, it proceeds along a single path through the tree, checking that the subject matches what is required. When there is a mismatch, the algorithm tries any alterna- @@ -4527,10 +4527,9 @@ MULTI-SEGMENT MATCHING WITH pcre_dfa_exec() not always produce exactly the same result as matching over one single long string. The difference arises when there are multiple matching possibilities, because a partial match result is given only when there - are no completed matches in a call to fBpcre_dfa_exec(). This means - that as soon as the shortest match has been found, continuation to a - new subject segment is no longer possible. Consider this pcretest - example: + are no completed matches in a call to pcre_dfa_exec(). This means that + as soon as the shortest match has been found, continuation to a new + subject segment is no longer possible. Consider this pcretest example: re> /dog(sbody)?/ data> do\P\D diff --git a/doc/pcregrep.1 b/doc/pcregrep.1 index d1be896..b7003bb 100644 --- a/doc/pcregrep.1 +++ b/doc/pcregrep.1 @@ -280,7 +280,7 @@ the patterns are the ones that are found. Force the patterns to match only whole words. This is equivalent to having \eb at the start and end of the pattern. .TP -\fB-x\fP, \fB--line-regex\fP, \fP--line-regexp\fP +\fB-x\fP, \fB--line-regex\fP, \fB--line-regexp\fP Force the patterns to be anchored (each must start matching at the beginning of a line) and in addition, require them to match entire lines. This is equivalent to having ^ and $ characters at the start and end of each diff --git a/doc/pcrematching.3 b/doc/pcrematching.3 index 516102b..f1f1a43 100644 --- a/doc/pcrematching.3 +++ b/doc/pcrematching.3 @@ -41,8 +41,8 @@ correspond to the two matching algorithms provided by PCRE. .SH "THE STANDARD MATCHING ALGORITHM" .rs .sp -In the terminology of Jeffrey Friedl's book \fIMastering Regular -Expressions\fP, the standard algorithm is an "NFA algorithm". It conducts a +In the terminology of Jeffrey Friedl's book "Mastering Regular +Expressions", the standard algorithm is an "NFA algorithm". It conducts a depth-first search of the pattern tree. That is, it proceeds along a single path through the tree, checking that the subject matches what is required. When there is a mismatch, the algorithm tries any alternatives at the current point, diff --git a/doc/pcrepartial.3 b/doc/pcrepartial.3 index fbee7b8..19bb4ea 100644 --- a/doc/pcrepartial.3 +++ b/doc/pcrepartial.3 @@ -157,7 +157,7 @@ bytes at the start of the buffer. always produce exactly the same result as matching over one single long string. The difference arises when there are multiple matching possibilities, because a partial match result is given only when there are no completed matches in a -call to fBpcre_dfa_exec()\fP. This means that as soon as the shortest match has +call to \fBpcre_dfa_exec()\fP. This means that as soon as the shortest match has been found, continuation to a new subject segment is no longer possible. Consider this \fBpcretest\fP example: .sp diff --git a/doc/pcretest.1 b/doc/pcretest.1 index cbaa0d1..9236fc7 100644 --- a/doc/pcretest.1 +++ b/doc/pcretest.1 @@ -237,7 +237,7 @@ so on). It does this by calling \fBpcre_fullinfo()\fP after compiling a pattern. If the pattern is studied, the results of that are also output. .P The \fB/D\fP modifier is a PCRE debugging feature, and is equivalent to -\fB/BI\fP, that is, both the \fP/B\fP and the \fB/I\fP modifiers. +\fB/BI\fP, that is, both the \fB/B\fP and the \fB/I\fP modifiers. .P The \fB/F\fP modifier causes \fBpcretest\fP to flip the byte order of the fields in the compiled pattern that contain 2-byte and 4-byte numbers. This @@ -669,7 +669,7 @@ result is undefined. .rs .sp \fBpcre\fP(3), \fBpcreapi\fP(3), \fBpcrecallout\fP(3), \fBpcrematching\fP(3), -\fBpcrepartial\fP(d), \fPpcrepattern\fP(3), \fBpcreprecompile\fP(3). +\fBpcrepartial\fP(d), \fBpcrepattern\fP(3), \fBpcreprecompile\fP(3). . . .SH AUTHOR |