Skip to content

Commit 8f3e11a

Browse files
committed
Doc file tidies for 10.38-RC1
1 parent e2fde18 commit 8f3e11a

24 files changed

+97
-95
lines changed

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repository:
1212
https://github.com/PhilipHazel/pcre2/releases
1313

1414
There is a mailing list for discussion about the development of PCRE2 at
15-
[email protected]. You can subscribe by sending an email to
15+
[email protected]. You can subscribe by sending an email to
1616
1717

1818
You can access the archives and also subscribe or manage your subscription

doc/html/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repository:
1212
https://github.com/PhilipHazel/pcre2/releases
1313

1414
There is a mailing list for discussion about the development of PCRE2 at
15-
[email protected]. You can subscribe by sending an email to
15+
[email protected]. You can subscribe by sending an email to
1616
1717

1818
You can access the archives and also subscribe or manage your subscription

doc/html/pcre2.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1>pcre2 man page</h1>
2828
increasingly difficult. The new API is more extensible, and it was simplified
2929
by abolishing the separate "study" optimizing function; in PCRE2, patterns are
3030
automatically optimized where possible. Since forking from PCRE1, the code has
31-
been extensively refactored and new features introduced. The old library is now
31+
been extensively refactored and new features introduced. The old library is now
3232
obsolete and is no longer maintained.
3333
</P>
3434
<P>

doc/html/pcre2_dfa_match.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ <h1>pcre2_dfa_match man page</h1>
4545
<i>workspace</i> Points to a vector of ints used as working space
4646
<i>wscount</i> Number of elements in the vector
4747
</pre>
48-
The size of output vector needed to contain all the results depends on the
49-
number of simultaneous matches, not on the number of parentheses in the
50-
pattern. Using <b>pcre2_match_data_create_from_pattern()</b> to create the match
51-
data block is therefore not advisable when using this function.
48+
The size of output vector needed to contain all the results depends on the
49+
number of simultaneous matches, not on the number of parentheses in the
50+
pattern. Using <b>pcre2_match_data_create_from_pattern()</b> to create the match
51+
data block is therefore not advisable when using this function.
5252
</P>
5353
<P>
5454
A match context is needed only if you want to set up a callout function or

doc/html/pcre2api.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1917,10 +1917,10 @@ <h1>pcre2api man page</h1>
19171917
<pre>
19181918
PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK
19191919
</pre>
1920-
Since release 10.38 PCRE2 has forbidden the use of \K within lookaround
1921-
assertions, following Perl's lead. This option is provided to re-enable the
1922-
previous behaviour (act in positive lookarounds, ignore in negative ones) in
1923-
case anybody is relying on it.
1920+
Since release 10.38 PCRE2 has forbidden the use of \K within lookaround
1921+
assertions, following Perl's lead. This option is provided to re-enable the
1922+
previous behaviour (act in positive lookarounds, ignore in negative ones) in
1923+
case anybody is relying on it.
19241924
<pre>
19251925
PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES
19261926
</pre>
@@ -2526,7 +2526,7 @@ <h1>pcre2api man page</h1>
25262526
Before calling <b>pcre2_match()</b>, <b>pcre2_dfa_match()</b>, or
25272527
<b>pcre2_jit_match()</b> you must create a match data block by calling one of
25282528
the creation functions above. For <b>pcre2_match_data_create()</b>, the first
2529-
argument is the number of pairs of offsets in the <i>ovector</i>.
2529+
argument is the number of pairs of offsets in the <i>ovector</i>.
25302530
</P>
25312531
<P>
25322532
When using <b>pcre2_match()</b>, one pair of offsets is required to identify the
@@ -2535,14 +2535,14 @@ <h1>pcre2api man page</h1>
25352535
the matched portion of the subject plus three captured substrings.
25362536
</P>
25372537
<P>
2538-
When using <b>pcre2_dfa_match()</b> there may be multiple matched substrings of
2538+
When using <b>pcre2_dfa_match()</b> there may be multiple matched substrings of
25392539
different lengths at the same point in the subject. The ovector should be made
25402540
large enough to hold as many as are expected.
25412541
</P>
25422542
<P>
25432543
A minimum of at least 1 pair is imposed by <b>pcre2_match_data_create()</b>, so
2544-
it is always possible to return the overall matched string in the case of
2545-
<b>pcre2_match()</b> or the longest match in the case of
2544+
it is always possible to return the overall matched string in the case of
2545+
<b>pcre2_match()</b> or the longest match in the case of
25462546
<b>pcre2_dfa_match()</b>.
25472547
</P>
25482548
<P>

doc/html/pcre2demo.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,11 @@ <h1>pcre2demo man page</h1>
234234
if (rc == 0)
235235
printf("ovector was not big enough for all the captured substrings\n");
236236

237-
/* Since release 10.38 PCRE2 has locked out the use of \K in lookaround
238-
assertions. However, there is an option to re-enable the old behaviour. If that
237+
/* Since release 10.38 PCRE2 has locked out the use of \K in lookaround
238+
assertions. However, there is an option to re-enable the old behaviour. If that
239239
is set, it is possible to run patterns such as /(?=.\K)/ that use \K in an
240240
assertion to set the start of a match later than its end. In this demonstration
241-
program, we show how to detect this case, but it shouldn't arise because the
241+
program, we show how to detect this case, but it shouldn't arise because the
242242
option is never set. */
243243

244244
if (ovector[0] &gt; ovector[1])

doc/html/pcre2pattern.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,10 +1175,10 @@ <h1>pcre2pattern man page</h1>
11751175
matches "foobar", the first substring is still set to "foo".
11761176
</P>
11771177
<P>
1178-
From version 5.32.0 Perl forbids the use of \K in lookaround assertions. From
1179-
release 10.38 PCRE2 also forbids this by default. However, the
1180-
PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK option can be used when calling
1181-
<b>pcre2_compile()</b> to re-enable the previous behaviour. When this option is
1178+
From version 5.32.0 Perl forbids the use of \K in lookaround assertions. From
1179+
release 10.38 PCRE2 also forbids this by default. However, the
1180+
PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK option can be used when calling
1181+
<b>pcre2_compile()</b> to re-enable the previous behaviour. When this option is
11821182
set, \K is acted upon when it occurs inside positive assertions, but is
11831183
ignored in negative assertions. Note that when a pattern such as (?=ab\K)
11841184
matches, the reported start of the match can be greater than the end of the

doc/html/pcre2syntax.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ <h1>pcre2syntax man page</h1>
429429
<pre>
430430
\K set reported start of match
431431
</pre>
432-
From release 10.38 \K is not permitted by default in lookaround assertions,
432+
From release 10.38 \K is not permitted by default in lookaround assertions,
433433
for compatibility with Perl. However, if the PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK
434434
option is set, the previous behaviour is re-enabled. When this option is set,
435435
\K is honoured in positive assertions, but ignored in negative ones.

doc/html/pcre2test.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ <h1>pcre2test man page</h1>
8484
<br><a name="SEC3" href="#TOC1">INPUT ENCODING</a><br>
8585
<P>
8686
Input to <b>pcre2test</b> is processed line by line, either by calling the C
87-
library's <b>fgets()</b> function, or via the <b>libreadline</b> or <b>libedit</b>
87+
library's <b>fgets()</b> function, or via the <b>libreadline</b> or <b>libedit</b>
8888
library. In some Windows environments character 26 (hex 1A) causes an immediate
8989
end of file, and no further data is read, so this character should be avoided
9090
unless you really want that action.
@@ -610,7 +610,7 @@ <h1>pcre2test man page</h1>
610610
for a description of the effects of these options.
611611
<pre>
612612
allow_empty_class set PCRE2_ALLOW_EMPTY_CLASS
613-
allow_lookaround_bsk set PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK
613+
allow_lookaround_bsk set PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK
614614
allow_surrogate_escapes set PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES
615615
alt_bsux set PCRE2_ALT_BSUX
616616
alt_circumflex set PCRE2_ALT_CIRCUMFLEX

doc/pcre2.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ nearly two decades, the limitations of the original API were making development
1111
increasingly difficult. The new API is more extensible, and it was simplified
1212
by abolishing the separate "study" optimizing function; in PCRE2, patterns are
1313
automatically optimized where possible. Since forking from PCRE1, the code has
14-
been extensively refactored and new features introduced. The old library is now
14+
been extensively refactored and new features introduced. The old library is now
1515
obsolete and is no longer maintained.
1616
.P
1717
As well as Perl-style regular expression patterns, some features that appeared

0 commit comments

Comments
 (0)