summaryrefslogtreecommitdiff
path: root/doc/html
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2019-10-17 16:39:38 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2019-10-17 16:39:38 +0000
commit0095a26167b24f75016fd2007a97d966cd7d618e (patch)
tree9840cfd609f8863f3d521e05f007d1afd1f227b1 /doc/html
parentaeb1ba019ce21ada87fd59613743d0355c3fc85f (diff)
downloadpcre2-0095a26167b24f75016fd2007a97d966cd7d618e.tar.gz
Source tidies (trailing spaces) etc. for 10.34-RC1.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1180 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'doc/html')
-rw-r--r--doc/html/pcre2_compile.html2
-rw-r--r--doc/html/pcre2_get_match_data_size.html2
-rw-r--r--doc/html/pcre2_jit_compile.html4
-rw-r--r--doc/html/pcre2api.html10
-rw-r--r--doc/html/pcre2compat.html2
-rw-r--r--doc/html/pcre2grep.html2
-rw-r--r--doc/html/pcre2matching.html4
-rw-r--r--doc/html/pcre2partial.html6
-rw-r--r--doc/html/pcre2pattern.html20
-rw-r--r--doc/html/pcre2syntax.html2
-rw-r--r--doc/html/pcre2test.html10
-rw-r--r--doc/html/pcre2unicode.html10
12 files changed, 37 insertions, 37 deletions
diff --git a/doc/html/pcre2_compile.html b/doc/html/pcre2_compile.html
index d865fb3..f6485f2 100644
--- a/doc/html/pcre2_compile.html
+++ b/doc/html/pcre2_compile.html
@@ -65,7 +65,7 @@ The option bits are:
PCRE2_EXTENDED Ignore white space and # comments
PCRE2_FIRSTLINE Force matching to be before newline
PCRE2_LITERAL Pattern characters are all literal
- PCRE2_MATCH_INVALID_UTF Enable support for matching invalid UTF
+ PCRE2_MATCH_INVALID_UTF Enable support for matching invalid UTF
PCRE2_MATCH_UNSET_BACKREF Match unset backreferences
PCRE2_MULTILINE ^ and $ match newlines within data
PCRE2_NEVER_BACKSLASH_C Lock out the use of \C in patterns
diff --git a/doc/html/pcre2_get_match_data_size.html b/doc/html/pcre2_get_match_data_size.html
index 83a6893..113ecaa 100644
--- a/doc/html/pcre2_get_match_data_size.html
+++ b/doc/html/pcre2_get_match_data_size.html
@@ -25,7 +25,7 @@ SYNOPSIS
DESCRIPTION
</b><br>
<P>
-This function returns the size, in bytes, of the match data block that is its
+This function returns the size, in bytes, of the match data block that is its
argument.
</P>
<P>
diff --git a/doc/html/pcre2_jit_compile.html b/doc/html/pcre2_jit_compile.html
index e6060c8..873d0dd 100644
--- a/doc/html/pcre2_jit_compile.html
+++ b/doc/html/pcre2_jit_compile.html
@@ -41,8 +41,8 @@ bits:
PCRE2_JIT_PARTIAL_SOFT compile code for soft partial matching
PCRE2_JIT_PARTIAL_HARD compile code for hard partial matching
</pre>
-There is also an obsolete option called PCRE2_JIT_INVALID_UTF, which has been
-superseded by the <b>pcre2_compile()</b> option PCRE2_MATCH_INVALID_UTF. The old
+There is also an obsolete option called PCRE2_JIT_INVALID_UTF, which has been
+superseded by the <b>pcre2_compile()</b> option PCRE2_MATCH_INVALID_UTF. The old
option is deprecated and may be removed in the future.
</P>
<P>
diff --git a/doc/html/pcre2api.html b/doc/html/pcre2api.html
index fc0d98c..a47e918 100644
--- a/doc/html/pcre2api.html
+++ b/doc/html/pcre2api.html
@@ -2040,7 +2040,7 @@ letters), the following code could be used:
re = pcre2_compile(..., ccontext);
</pre>
The locale name "fr_FR" is used on Linux and other Unix-like systems; if you
-are using Windows, the name for the French locale is "french".
+are using Windows, the name for the French locale is "french".
</P>
<P>
The pointer that is passed (via the compile context) to <b>pcre2_compile()</b>
@@ -2282,8 +2282,8 @@ actually inspect the previous character.
</P>
<P>
Note that this information is useful for multi-segment matching only
-if the pattern contains no nested lookbehinds. For example, the pattern
-(?&#60;=a(?&#60;=ba)c) returns a maximum lookbehind of 2, but when it is processed, the
+if the pattern contains no nested lookbehinds. For example, the pattern
+(?&#60;=a(?&#60;=ba)c) returns a maximum lookbehind of 2, but when it is processed, the
first lookbehind moves back by two characters, matches one character, then the
nested lookbehind also moves back by two characters. This puts the matching
point three characters earlier than it was at the start.
@@ -2743,8 +2743,8 @@ Your program may crash or loop indefinitely or give wrong results.
</pre>
These options turn on the partial matching feature. A partial match occurs if
the end of the subject string is reached successfully, but there are not enough
-subject characters to complete the match. In addition, either at least one
-character must have been inspected or the pattern must contain a lookbehind, or
+subject characters to complete the match. In addition, either at least one
+character must have been inspected or the pattern must contain a lookbehind, or
the pattern must be one that could match an empty string.
</P>
<P>
diff --git a/doc/html/pcre2compat.html b/doc/html/pcre2compat.html
index b2aa3d3..0c72a9a 100644
--- a/doc/html/pcre2compat.html
+++ b/doc/html/pcre2compat.html
@@ -207,7 +207,7 @@ the start of a pattern that set overall options that cannot be changed within
the pattern.
<br>
<br>
-(m) PCRE2 supports non-atomic positive lookaround assertions. This is an
+(m) PCRE2 supports non-atomic positive lookaround assertions. This is an
extension to the lookaround facilities. The default, Perl-compatible
lookarounds are atomic.
</P>
diff --git a/doc/html/pcre2grep.html b/doc/html/pcre2grep.html
index bcc1c3a..f5b72f3 100644
--- a/doc/html/pcre2grep.html
+++ b/doc/html/pcre2grep.html
@@ -709,7 +709,7 @@ but one option).
</P>
<P>
<b>--om-capture</b>=<i>number</i>
-Set the number of capturing parentheses that can be accessed by <b>-o</b>. The
+Set the number of capturing parentheses that can be accessed by <b>-o</b>. The
default is 50.
</P>
<P>
diff --git a/doc/html/pcre2matching.html b/doc/html/pcre2matching.html
index 340078e..4b71c8f 100644
--- a/doc/html/pcre2matching.html
+++ b/doc/html/pcre2matching.html
@@ -189,7 +189,7 @@ code unit) at a time, for all active paths through the tree.
supported. (*FAIL) is supported, and behaves like a failing negative assertion.
</P>
<P>
-10. The PCRE2_MATCH_INVALID_UTF option for <b>pcre2_compile()</b> is not
+10. The PCRE2_MATCH_INVALID_UTF option for <b>pcre2_compile()</b> is not
supported by <b>pcre2_dfa_match()</b>.
</P>
<br><a name="SEC5" href="#TOC1">ADVANTAGES OF THE ALTERNATIVE ALGORITHM</a><br>
@@ -223,7 +223,7 @@ because it has to search for all possible matches, but is also because it is
less susceptible to optimization.
</P>
<P>
-2. Capturing parentheses, backreferences, script runs, and matching within
+2. Capturing parentheses, backreferences, script runs, and matching within
invalid UTF string are not supported.
</P>
<P>
diff --git a/doc/html/pcre2partial.html b/doc/html/pcre2partial.html
index 1a88c1d..438c52c 100644
--- a/doc/html/pcre2partial.html
+++ b/doc/html/pcre2partial.html
@@ -275,9 +275,9 @@ Note the use of the <b>offset</b> modifier to start the new match where the
partial match was found. In this example, the next segment was added to the one
in which the partial match was found. This is the most straightforward
approach, typically using a memory buffer that is twice the size of each
-segment. After a partial match, the first half of the buffer is discarded, the
-second half is moved to the start of the buffer, and a new segment is added
-before repeating the match as in the example above. After a no match, the
+segment. After a partial match, the first half of the buffer is discarded, the
+second half is moved to the start of the buffer, and a new segment is added
+before repeating the match as in the example above. After a no match, the
entire buffer can be discarded.
</P>
<P>
diff --git a/doc/html/pcre2pattern.html b/doc/html/pcre2pattern.html
index 9df4db0..9f5068d 100644
--- a/doc/html/pcre2pattern.html
+++ b/doc/html/pcre2pattern.html
@@ -2021,8 +2021,8 @@ Earlier versions of Perl and PCRE1 used to give an error at compile time for
such patterns. However, because there are cases where this can be useful, such
patterns are now accepted, but whenever an iteration of such a group matches no
characters, matching moves on to the next item in the pattern instead of
-repeatedly matching an empty string. This does not prevent backtracking into
-any of the iterations if a subsequent item fails to match.
+repeatedly matching an empty string. This does not prevent backtracking into
+any of the iterations if a subsequent item fails to match.
</P>
<P>
By default, quantifiers are "greedy", that is, they match as much as possible
@@ -2374,7 +2374,7 @@ in the subject string reset to what it was before the assertion was processed.
<P>
The Perl-compatible lookaround assertions are atomic. If an assertion is true,
but there is a subsequent matching failure, there is no backtracking into the
-assertion. However, there are some cases where non-atomic assertions can be
+assertion. However, there are some cases where non-atomic assertions can be
useful. PCRE2 has some support for these, described in the section entitled
<a href="#nonatomicassertions">"Non-atomic assertions"</a>
below, but they are not Perl-compatible.
@@ -2621,11 +2621,11 @@ characters that are not "999".
The traditional Perl-compatible lookaround assertions are atomic. That is, if
an assertion is true, but there is a subsequent matching failure, there is no
backtracking into the assertion. However, there are some cases where non-atomic
-positive assertions can be useful. PCRE2 provides these using the following
+positive assertions can be useful. PCRE2 provides these using the following
syntax:
<pre>
(*non_atomic_positive_lookahead: or (*napla:
- (*non_atomic_positive_lookbehind: or (*naplb:
+ (*non_atomic_positive_lookbehind: or (*naplb:
</pre>
Consider the problem of finding the right-most word in a string that also
appears earlier in the string, that is, it must appear at least twice in total.
@@ -2633,8 +2633,8 @@ This pattern returns the required result as captured substring 1:
<pre>
^(?x)(*napla: .* \b(\w++)) (?&#62; .*? \b\1\b ){2}
</pre>
-For a subject such as "word1 word2 word3 word2 word3 word4" the result is
-"word3". How does it work? At the start, ^(?x) anchors the pattern and sets the
+For a subject such as "word1 word2 word3 word2 word3 word4" the result is
+"word3". How does it work? At the start, ^(?x) anchors the pattern and sets the
"x" option, which causes white space (introduced for readability) to be
ignored. Inside the assertion, the greedy .* at first consumes the entire
string, but then has to backtrack until the rest of the assertion can match a
@@ -2643,9 +2643,9 @@ succeeds, it captures the right-most word in the string.
</P>
<P>
The current matching point is then reset to the start of the subject, and the
-rest of the pattern match checks for two occurrences of the captured word,
-using an ungreedy .*? to scan from the left. If this succeeds, we are done, but
-if the last word in the string does not occur twice, this part of the pattern
+rest of the pattern match checks for two occurrences of the captured word,
+using an ungreedy .*? to scan from the left. If this succeeds, we are done, but
+if the last word in the string does not occur twice, this part of the pattern
fails. If a traditional atomic lookhead (?= or (*pla: had been used, the
assertion could not be re-entered, and the whole match would fail. The pattern
would succeed only if the very last word in the subject was found twice.
diff --git a/doc/html/pcre2syntax.html b/doc/html/pcre2syntax.html
index a6b6694..00f0513 100644
--- a/doc/html/pcre2syntax.html
+++ b/doc/html/pcre2syntax.html
@@ -553,7 +553,7 @@ Each top-level branch of a lookbehind must be of a fixed length.
<P>
These assertions are specific to PCRE2 and are not Perl-compatible.
<pre>
- (*napla:...)
+ (*napla:...)
(*non_atomic_positive_lookahead:...)
(*naplb:...)
diff --git a/doc/html/pcre2test.html b/doc/html/pcre2test.html
index 25af55c..e387315 100644
--- a/doc/html/pcre2test.html
+++ b/doc/html/pcre2test.html
@@ -245,7 +245,7 @@ compilation, each pattern is passed to the just-in-time compiler, if available.
<b>-jitfast</b>
Behave as if each pattern line has the <b>jitfast</b> modifier; after
successful compilation, each pattern is passed to the just-in-time compiler, if
-available, and each subject line is passed directly to the JIT matcher via its
+available, and each subject line is passed directly to the JIT matcher via its
"fast path".
</P>
<P>
@@ -620,7 +620,7 @@ for a description of the effects of these options.
firstline set PCRE2_FIRSTLINE
literal set PCRE2_LITERAL
match_line set PCRE2_EXTRA_MATCH_LINE
- match_invalid_utf set PCRE2_MATCH_INVALID_UTF
+ match_invalid_utf set PCRE2_MATCH_INVALID_UTF
match_unset_backref set PCRE2_MATCH_UNSET_BACKREF
match_word set PCRE2_EXTRA_MATCH_WORD
/m multiline set PCRE2_MULTILINE
@@ -746,8 +746,8 @@ options, the line is omitted. "First code unit" is where any match must start;
if there is more than one they are listed as "starting code units". "Last code
unit" is the last literal code unit that must be present in any match. This is
not necessarily the last character. These lines are omitted if no starting or
-ending code units are recorded. The subject length line is omitted when
-<b>no_start_optimize</b> is set because the minimum length is not calculated
+ending code units are recorded. The subject length line is omitted when
+<b>no_start_optimize</b> is set because the minimum length is not calculated
when it can never be used.
</P>
<P>
@@ -1278,7 +1278,7 @@ Here is an example:
</pre>
The first, complete match shows that the matched string is "abc", with the
preceding and following strings "pqr" and "xyz" having been consulted during
-the match (when processing the assertions). The partial match can indicate only
+the match (when processing the assertions). The partial match can indicate only
the preceding string.
</P>
<P>
diff --git a/doc/html/pcre2unicode.html b/doc/html/pcre2unicode.html
index f540b7c..3d4e6b4 100644
--- a/doc/html/pcre2unicode.html
+++ b/doc/html/pcre2unicode.html
@@ -24,13 +24,13 @@ width), but this is not the default. Unless specifically requested, PCRE2
treats each code unit in a string as one character.
</P>
<P>
-There are two ways of telling PCRE2 to switch to UTF mode, where characters may
-consist of more than one code unit and the range of values is constrained. The
+There are two ways of telling PCRE2 to switch to UTF mode, where characters may
+consist of more than one code unit and the range of values is constrained. The
program can call
<a href="pcre2_compile.html"><b>pcre2_compile()</b></a>
with the PCRE2_UTF option, or the pattern may start with the sequence (*UTF).
However, the latter facility can be locked out by the PCRE2_NEVER_UTF option.
-That is, the programmer can prevent the supplier of the pattern from switching
+That is, the programmer can prevent the supplier of the pattern from switching
to UTF mode.
</P>
<P>
@@ -425,7 +425,7 @@ You can run pattern matches on subject strings that may contain invalid UTF
sequences if you call <b>pcre2_compile()</b> with the PCRE2_MATCH_INVALID_UTF
option. This is supported by <b>pcre2_match()</b>, including JIT matching, but
not by <b>pcre2_dfa_match()</b>. When PCRE2_MATCH_INVALID_UTF is set, it forces
-PCRE2_UTF to be set as well. Note, however, that the pattern itself must be a
+PCRE2_UTF to be set as well. Note, however, that the pattern itself must be a
valid UTF string.
</P>
<P>
@@ -461,7 +461,7 @@ UTF character, or the end of the subject.
</P>
<P>
At internal fragment boundaries, \b and \B behave in the same way as at the
-beginning and end of the subject. For example, a sequence such as \bWORD\b
+beginning and end of the subject. For example, a sequence such as \bWORD\b
would match an instance of WORD that is surrounded by invalid UTF code units.
</P>
<P>