summaryrefslogtreecommitdiff
path: root/doc/html
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2018-08-13 11:57:09 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2018-08-13 11:57:09 +0000
commitcda75c98a6c0c1ea2efdc2861134fff4d71cf85e (patch)
tree66e18f00d3775d4858c295e31d8c2d33a84a2a80 /doc/html
parent969454248f0219bdf200f602bdc17bccbceea906 (diff)
downloadpcre2-cda75c98a6c0c1ea2efdc2861134fff4d71cf85e.tar.gz
File tidies and documentation update for 10.32-RC1 Release Candidate.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@983 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'doc/html')
-rw-r--r--doc/html/NON-AUTOTOOLS-BUILD.txt2
-rw-r--r--doc/html/pcre2.html10
-rw-r--r--doc/html/pcre2_convert_context_free.html2
-rw-r--r--doc/html/pcre2_converted_pattern_free.html2
-rw-r--r--doc/html/pcre2_jit_stack_assign.html4
-rw-r--r--doc/html/pcre2_jit_stack_free.html2
-rw-r--r--doc/html/pcre2_serialize_encode.html2
-rw-r--r--doc/html/pcre2_serialize_free.html2
-rw-r--r--doc/html/pcre2_substring_list_free.html2
-rw-r--r--doc/html/pcre2api.html28
-rw-r--r--doc/html/pcre2build.html8
-rw-r--r--doc/html/pcre2compat.html2
-rw-r--r--doc/html/pcre2convert.html2
-rw-r--r--doc/html/pcre2grep.html4
-rw-r--r--doc/html/pcre2jit.html2
-rw-r--r--doc/html/pcre2perform.html2
-rw-r--r--doc/html/pcre2serialize.html10
-rw-r--r--doc/html/pcre2syntax.html12
-rw-r--r--doc/html/pcre2test.html22
19 files changed, 60 insertions, 60 deletions
diff --git a/doc/html/NON-AUTOTOOLS-BUILD.txt b/doc/html/NON-AUTOTOOLS-BUILD.txt
index 21c69de..b742ed3 100644
--- a/doc/html/NON-AUTOTOOLS-BUILD.txt
+++ b/doc/html/NON-AUTOTOOLS-BUILD.txt
@@ -329,7 +329,7 @@ cache can be deleted by selecting "File > Delete Cache".
most recent build configuration is targeted by the tests. A summary of
test results is presented. Complete test output is subsequently
available for review in Testing\Temporary under your build dir.
-
+
BUILDING PCRE2 ON WINDOWS WITH VISUAL STUDIO
diff --git a/doc/html/pcre2.html b/doc/html/pcre2.html
index 81555f9..bc588c4 100644
--- a/doc/html/pcre2.html
+++ b/doc/html/pcre2.html
@@ -23,11 +23,11 @@ please consult the man page, in case the conversion went wrong.
<P>
PCRE2 is the name used for a revised API for the PCRE library, which is a set
of functions, written in C, that implement regular expression pattern matching
-using the same syntax and semantics as Perl, with just a few differences. After
-nearly two decades, the limitations of the original API were making development
+using the same syntax and semantics as Perl, with just a few differences. After
+nearly two decades, the limitations of the original API were making development
increasingly difficult. The new API is more extensible, and it was simplified
by abolishing the separate "study" optimizing function; in PCRE2, patterns are
-automatically optimized where possible. Since forking from PCRE1, the code has
+automatically optimized where possible. Since forking from PCRE1, the code has
been extensively refactored and new features introduced.
</P>
<P>
@@ -164,7 +164,7 @@ listing), and the short pages for individual functions, are concatenated in
pcre2build building PCRE2
pcre2callout details of the callout feature
pcre2compat discussion of Perl compatibility
- pcre2convert details of pattern conversion functions
+ pcre2convert details of pattern conversion functions
pcre2demo a demonstration C program that uses PCRE2
pcre2grep description of the <b>pcre2grep</b> command (8-bit only)
pcre2jit discussion of just-in-time optimization support
@@ -175,7 +175,7 @@ listing), and the short pages for individual functions, are concatenated in
pcre2perform discussion of performance issues
pcre2posix the POSIX-compatible C API for the 8-bit library
pcre2sample discussion of the pcre2demo program
- pcre2serialize details of pattern serialization
+ pcre2serialize details of pattern serialization
pcre2syntax quick syntax reference
pcre2test description of the <b>pcre2test</b> command
pcre2unicode discussion of Unicode and UTF support
diff --git a/doc/html/pcre2_convert_context_free.html b/doc/html/pcre2_convert_context_free.html
index 6ad9794..e9b142b 100644
--- a/doc/html/pcre2_convert_context_free.html
+++ b/doc/html/pcre2_convert_context_free.html
@@ -28,7 +28,7 @@ DESCRIPTION
This function is part of an experimental set of pattern conversion functions.
It frees the memory occupied by a convert context, using the memory
freeing function from the general context with which it was created, or
-<b>free()</b> if that was not set. If the argument is NULL, the function returns
+<b>free()</b> if that was not set. If the argument is NULL, the function returns
immediately without doing anything.
</P>
<P>
diff --git a/doc/html/pcre2_converted_pattern_free.html b/doc/html/pcre2_converted_pattern_free.html
index 2133341..01d28d7 100644
--- a/doc/html/pcre2_converted_pattern_free.html
+++ b/doc/html/pcre2_converted_pattern_free.html
@@ -28,7 +28,7 @@ DESCRIPTION
This function is part of an experimental set of pattern conversion functions.
It frees the memory occupied by a converted pattern that was obtained by
calling <b>pcre2_pattern_convert()</b> with arguments that caused it to place
-the converted pattern into newly obtained heap memory. If the argument is NULL,
+the converted pattern into newly obtained heap memory. If the argument is NULL,
the function returns immediately without doing anything.
</P>
<P>
diff --git a/doc/html/pcre2_jit_stack_assign.html b/doc/html/pcre2_jit_stack_assign.html
index 6730ba5..4b3abb9 100644
--- a/doc/html/pcre2_jit_stack_assign.html
+++ b/doc/html/pcre2_jit_stack_assign.html
@@ -38,8 +38,8 @@ passed to a matching function. The arguments of this function are:
</PRE>
</P>
<P>
-If <i>mcontext</i> is NULL, the function returns immediately, without doing
-anything.
+If <i>mcontext</i> is NULL, the function returns immediately, without doing
+anything.
</P>
<P>
If <i>callback</i> is NULL and <i>callback_data</i> is NULL, an internal 32KiB
diff --git a/doc/html/pcre2_jit_stack_free.html b/doc/html/pcre2_jit_stack_free.html
index 3ec5338..1d078d7 100644
--- a/doc/html/pcre2_jit_stack_free.html
+++ b/doc/html/pcre2_jit_stack_free.html
@@ -26,7 +26,7 @@ DESCRIPTION
</b><br>
<P>
This function is used to free a JIT stack that was created by
-<b>pcre2_jit_stack_create()</b> when it is no longer needed. If the argument is
+<b>pcre2_jit_stack_create()</b> when it is no longer needed. If the argument is
NULL, the function returns immediately without doing anything. For more
details, see the
<a href="pcre2jit.html"><b>pcre2jit</b></a>
diff --git a/doc/html/pcre2_serialize_encode.html b/doc/html/pcre2_serialize_encode.html
index 4b8bfd4..f153270 100644
--- a/doc/html/pcre2_serialize_encode.html
+++ b/doc/html/pcre2_serialize_encode.html
@@ -28,7 +28,7 @@ DESCRIPTION
</b><br>
<P>
This function encodes a list of compiled patterns into a byte stream that can
-be saved on disc or elsewhere. Note that this is not an abstract format like
+be saved on disc or elsewhere. Note that this is not an abstract format like
Java or .NET. Conversion of the byte stream back into usable compiled patterns
can only happen on a host that is running the same version of PCRE2, with the
same code unit width, and the host must also have the same endianness, pointer
diff --git a/doc/html/pcre2_serialize_free.html b/doc/html/pcre2_serialize_free.html
index b6e41c9..26b435b 100644
--- a/doc/html/pcre2_serialize_free.html
+++ b/doc/html/pcre2_serialize_free.html
@@ -27,7 +27,7 @@ DESCRIPTION
<P>
This function frees the memory that was obtained by
<b>pcre2_serialize_encode()</b> to hold a serialized byte stream. The argument
-must point to such a byte stream or be NULL, in which case the function returns
+must point to such a byte stream or be NULL, in which case the function returns
without doing anything.
</P>
<P>
diff --git a/doc/html/pcre2_substring_list_free.html b/doc/html/pcre2_substring_list_free.html
index 922a139..0919d1e 100644
--- a/doc/html/pcre2_substring_list_free.html
+++ b/doc/html/pcre2_substring_list_free.html
@@ -27,7 +27,7 @@ DESCRIPTION
<P>
This is a convenience function for freeing the store obtained by a previous
call to <b>pcre2substring_list_get()</b>. Its only argument is a pointer to
-the list of string pointers. If the argument is NULL, the function returns
+the list of string pointers. If the argument is NULL, the function returns
immediately, without doing anything.
</P>
<P>
diff --git a/doc/html/pcre2api.html b/doc/html/pcre2api.html
index 5586c6a..25b9465 100644
--- a/doc/html/pcre2api.html
+++ b/doc/html/pcre2api.html
@@ -518,8 +518,8 @@ been matched by <b>pcre2_match()</b>. They are:
<b>pcre2_substring_number_from_name()</b>
</pre>
<b>pcre2_substring_free()</b> and <b>pcre2_substring_list_free()</b> are also
-provided, to free memory used for extracted strings. If either of these
-functions is called with a NULL argument, the function returns immediately
+provided, to free memory used for extracted strings. If either of these
+functions is called with a NULL argument, the function returns immediately
without doing anything.
</P>
<P>
@@ -1255,7 +1255,7 @@ If the compile context argument <i>ccontext</i> is NULL, memory for the compiled
pattern is obtained by calling <b>malloc()</b>. Otherwise, it is obtained from
the same memory function that was used for the compile context. The caller must
free the memory by calling <b>pcre2_code_free()</b> when it is no longer needed.
-If <b>pcre2_code_free()</b> is called with a NULL argument, it returns
+If <b>pcre2_code_free()</b> is called with a NULL argument, it returns
immediately, without doing anything.
</P>
<P>
@@ -1265,7 +1265,7 @@ if the code has been processed by the JIT compiler (see
<a href="#jitcompiling">below),</a>
the JIT information cannot be copied (because it is position-dependent).
The new copy can initially be used only for non-JIT matching, though it can be
-passed to <b>pcre2_jit_compile()</b> if required. If <b>pcre2_code_copy()</b> is
+passed to <b>pcre2_jit_compile()</b> if required. If <b>pcre2_code_copy()</b> is
called with a NULL argument, it returns NULL.
</P>
<P>
@@ -1514,15 +1514,15 @@ PCRE2_EXTENDED is equivalent to Perl's /x option, and it can be changed within
a pattern by a (?x) option setting.
</P>
<P>
-When PCRE2 is compiled without Unicode support, PCRE2_EXTENDED recognizes as
-white space only those characters with code points less than 256 that are
-flagged as white space in its low-character table. The table is normally
-created by
+When PCRE2 is compiled without Unicode support, PCRE2_EXTENDED recognizes as
+white space only those characters with code points less than 256 that are
+flagged as white space in its low-character table. The table is normally
+created by
<a href="pcre2_maketables.html"><b>pcre2_maketables()</b>,</a>
which uses the <b>isspace()</b> function to identify space characters. In most
ASCII environments, the relevant characters are those with code points 0x0009
(tab), 0x000A (linefeed), 0x000B (vertical tab), 0x000C (formfeed), 0x000D
-(carriage return), and 0x0020 (space).
+(carriage return), and 0x0020 (space).
</P>
<P>
When PCRE2 is compiled with Unicode support, in addition to these characters,
@@ -1552,8 +1552,8 @@ built.
PCRE2_EXTENDED_MORE
</pre>
This option has the effect of PCRE2_EXTENDED, but, in addition, unescaped space
-and horizontal tab characters are ignored inside a character class. Note: only
-these two characters are ignored, not the full set of pattern white space
+and horizontal tab characters are ignored inside a character class. Note: only
+these two characters are ignored, not the full set of pattern white space
characters that are ignored outside a character class. PCRE2_EXTENDED_MORE is
equivalent to Perl's /xx option, and it can be changed within a pattern by a
(?xx) option setting.
@@ -2323,7 +2323,7 @@ reloaded must be running the same version of PCRE2, with the same code unit
width, and must also have the same endianness, pointer width, and PCRE2_SIZE
type. Before compiled patterns can be saved, they must be converted to a
"serialized" form, which in the case of PCRE2 is really just a bytecode dump.
-The functions whose names begin with <b>pcre2_serialize_</b> are used for
+The functions whose names begin with <b>pcre2_serialize_</b> are used for
converting to and from the serialized form. They are described in the
<a href="pcre2serialize.html"><b>pcre2serialize</b></a>
documentation. Note that PCRE2 serialization does not convert compiled patterns
@@ -2398,7 +2398,7 @@ match data block (for that match) have taken place.
</P>
<P>
When a match data block itself is no longer needed, it should be freed by
-calling <b>pcre2_match_data_free()</b>. If this function is called with a NULL
+calling <b>pcre2_match_data_free()</b>. If this function is called with a NULL
argument, it returns immediately, without doing anything.
</P>
<br><a name="SEC27" href="#TOC1">MATCHING A PATTERN: THE TRADITIONAL FUNCTION</a><br>
@@ -3383,7 +3383,7 @@ replacement string, with more particular errors being PCRE2_ERROR_BADREPESCAPE
(invalid escape sequence), PCRE2_ERROR_REPMISSINGBRACE (closing curly bracket
not found), PCRE2_ERROR_BADSUBSTITUTION (syntax error in extended group
substitution), and PCRE2_ERROR_BADSUBSPATTERN (the pattern match ended before
-it started or the match started earlier than the current position in the
+it started or the match started earlier than the current position in the
subject, which can happen if \K is used in an assertion).
</P>
<P>
diff --git a/doc/html/pcre2build.html b/doc/html/pcre2build.html
index fc56808..e31b604 100644
--- a/doc/html/pcre2build.html
+++ b/doc/html/pcre2build.html
@@ -82,7 +82,7 @@ The following sections include descriptions of "on/off" options whose names
begin with --enable or --disable. Because of the way that <b>configure</b>
works, --enable and --disable always come in pairs, so the complementary option
always exists as well, but as it specifies the default, it is not described.
-Options that specify values have names that start with --with. At the end of a
+Options that specify values have names that start with --with. At the end of a
<b>configure</b> run, a summary of the configuration is output.
</P>
<br><a name="SEC3" href="#TOC1">BUILDING 8-BIT, 16-BIT AND 32-BIT LIBRARIES</a><br>
@@ -171,12 +171,12 @@ Just-in-time (JIT) compiler support is included in the build by specifying
--enable-jit
</pre>
This support is available only for certain hardware architectures. If this
-option is set for an unsupported architecture, a building error occurs.
-If in doubt, use
+option is set for an unsupported architecture, a building error occurs.
+If in doubt, use
<pre>
--enable-jit=auto
</pre>
-which enables JIT only if the current hardware is supported. You can check
+which enables JIT only if the current hardware is supported. You can check
if JIT is enabled in the configuration summary that is output at the end of a
<b>configure</b> run. If you are enabling JIT under SELinux you may also want to
add
diff --git a/doc/html/pcre2compat.html b/doc/html/pcre2compat.html
index 3123111..f593204 100644
--- a/doc/html/pcre2compat.html
+++ b/doc/html/pcre2compat.html
@@ -42,7 +42,7 @@ assertion is a condition that has a matching branch (that is, the condition is
false).
</P>
<P>
-4. The following Perl escape sequences are not supported: \F, \l, \L, \u,
+4. The following Perl escape sequences are not supported: \F, \l, \L, \u,
\U, and \N when followed by a character name. \N on its own, matching a
non-newline character, and \N{U+dd..}, matching a Unicode code point, are
supported. The escapes that modify the case of following letters are
diff --git a/doc/html/pcre2convert.html b/doc/html/pcre2convert.html
index 7372e08..871e563 100644
--- a/doc/html/pcre2convert.html
+++ b/doc/html/pcre2convert.html
@@ -105,7 +105,7 @@ If <b>buffer</b> points to a NULL pointer, an output buffer is obtained using
the allocator in the context or <b>malloc()</b> if no context is supplied. A
pointer to this buffer is placed in the variable to which <b>buffer</b> points.
When no longer needed the output buffer must be freed by calling
-<b>pcre2_converted_pattern_free()</b>. If this function is called with a NULL
+<b>pcre2_converted_pattern_free()</b>. If this function is called with a NULL
argument, it returns immediately without doing anything.
</P>
<P>
diff --git a/doc/html/pcre2grep.html b/doc/html/pcre2grep.html
index 653cbf2..272b87d 100644
--- a/doc/html/pcre2grep.html
+++ b/doc/html/pcre2grep.html
@@ -155,7 +155,7 @@ of changing the way binary files are handled.
<br><a name="SEC5" href="#TOC1">BINARY ZEROS IN PATTERNS</a><br>
<P>
Patterns passed from the command line are strings that are terminated by a
-binary zero, so cannot contain internal zeros. However, patterns that are read
+binary zero, so cannot contain internal zeros. However, patterns that are read
from a file via the <b>-f</b> option may contain binary zeros.
</P>
<br><a name="SEC6" href="#TOC1">OPTIONS</a><br>
@@ -542,7 +542,7 @@ counter that is incremented each time around its main processing loop. If the
value set by <b>--match-limit</b> is reached, an error occurs.
<br>
<br>
-The <b>--heap-limit</b> option specifies, as a number of kibibytes (units of
+The <b>--heap-limit</b> option specifies, as a number of kibibytes (units of
1024 bytes), the amount of heap memory that may be used for matching. Heap
memory is needed only if matching the pattern requires a significant number of
nested backtracking points to be remembered. This parameter can be set to zero
diff --git a/doc/html/pcre2jit.html b/doc/html/pcre2jit.html
index 330e993..fa007e0 100644
--- a/doc/html/pcre2jit.html
+++ b/doc/html/pcre2jit.html
@@ -193,7 +193,7 @@ are a starting size, a maximum size, and a general context (for memory
allocation functions, or NULL for standard memory allocation). It returns a
pointer to an opaque structure of type <b>pcre2_jit_stack</b>, or NULL if there
is an error. The <b>pcre2_jit_stack_free()</b> function is used to free a stack
-that is no longer needed. If its argument is NULL, this function returns
+that is no longer needed. If its argument is NULL, this function returns
immediately, without doing anything. (For the technically minded: the address
space is allocated by mmap or VirtualAlloc.) A maximum stack size of 512KiB to
1MiB should be more than enough for any pattern.
diff --git a/doc/html/pcre2perform.html b/doc/html/pcre2perform.html
index edd5050..f823c12 100644
--- a/doc/html/pcre2perform.html
+++ b/doc/html/pcre2perform.html
@@ -94,7 +94,7 @@ may also reduce the memory requirements.
In contrast to <b>pcre2_match()</b>, <b>pcre2_dfa_match()</b> does use recursive
function calls, but only for processing atomic groups, lookaround assertions,
and recursion within the pattern. The original version of the code used to
-allocate quite large internal workspace vectors on the stack, which caused some
+allocate quite large internal workspace vectors on the stack, which caused some
problems for some patterns in environments with small stacks. From release
10.32 the code for <b>pcre2_dfa_match()</b> has been re-factored to use heap
memory when necessary for internal workspace when recursing, though recursive
diff --git a/doc/html/pcre2serialize.html b/doc/html/pcre2serialize.html
index 0a7669e..18a8d7f 100644
--- a/doc/html/pcre2serialize.html
+++ b/doc/html/pcre2serialize.html
@@ -50,13 +50,13 @@ PCRE2's 16-bit library cannot be reloaded on a 64-bit system, nor can they be
reloaded using the 8-bit library.
</P>
<P>
-Note that "serialization" in PCRE2 does not convert compiled patterns to an
-abstract format like Java or .NET serialization. The serialized output is
-really just a bytecode dump, which is why it can only be reloaded in the same
+Note that "serialization" in PCRE2 does not convert compiled patterns to an
+abstract format like Java or .NET serialization. The serialized output is
+really just a bytecode dump, which is why it can only be reloaded in the same
environment as the one that created it. Hence the restrictions mentioned above.
Applications that are not statically linked with a fixed version of PCRE2 must
-be prepared to recompile patterns from their sources, in order to be immune to
-PCRE2 upgrades.
+be prepared to recompile patterns from their sources, in order to be immune to
+PCRE2 upgrades.
</P>
<br><a name="SEC2" href="#TOC1">SECURITY CONCERNS</a><br>
<P>
diff --git a/doc/html/pcre2syntax.html b/doc/html/pcre2syntax.html
index 4a69c74..c60e5a4 100644
--- a/doc/html/pcre2syntax.html
+++ b/doc/html/pcre2syntax.html
@@ -70,7 +70,7 @@ This table applies to ASCII and Unicode environments.
\ddd character with octal code ddd, or backreference
\o{ddd..} character with octal code ddd..
\U "U" if PCRE2_ALT_BSUX is set (otherwise is an error)
- \N{U+hh..} character with Unicode code point hh..
+ \N{U+hh..} character with Unicode code point hh..
\uhhhh character with hex code hhhh (if PCRE2_ALT_BSUX is set)
\xhh character with hex code hh
\x{hh..} character with hex code hh..
@@ -446,7 +446,7 @@ but some of them use Unicode properties if PCRE2_UCP is set. You can use
</P>
<br><a name="SEC16" href="#TOC1">OPTION SETTING</a><br>
<P>
-Changes of these options within a group are automatically cancelled at the end
+Changes of these options within a group are automatically cancelled at the end
of the group.
<pre>
(?i) caseless
@@ -458,12 +458,12 @@ of the group.
(?x) extended: ignore white space except in classes
(?xx) as (?x) but also ignore space and tab in classes
(?-...) unset option(s)
- (?^) unset imnsx options
+ (?^) unset imnsx options
</pre>
Unsetting x or xx unsets both. Several options may be set at once, and a
mixture of setting and unsetting such as (?i-x) is allowed, but there may be
only one hyphen. Setting (but no unsetting) is allowed after (?^ for example
-(?^in). An option setting may appear at the start of a non-capturing group, for
+(?^in). An option setting may appear at the start of a non-capturing group, for
example (?i:...).
</P>
<P>
@@ -604,8 +604,8 @@ pattern is not anchored.
(*MARK:NAME); if not found, the (*SKIP) is ignored
(*THEN) local failure, backtrack to next alternation
</pre>
-The effect of one of these verbs in a group called as a subroutine is confined
-to the subroutine call.
+The effect of one of these verbs in a group called as a subroutine is confined
+to the subroutine call.
</P>
<br><a name="SEC24" href="#TOC1">CALLOUTS</a><br>
<P>
diff --git a/doc/html/pcre2test.html b/doc/html/pcre2test.html
index a28db98..af2b18c 100644
--- a/doc/html/pcre2test.html
+++ b/doc/html/pcre2test.html
@@ -315,8 +315,8 @@ number of subject lines to be matched against that pattern. In between sets of
test data, command lines that begin with # may appear. This file format, with
some restrictions, can also be processed by the <b>perltest.sh</b> script that
is distributed with PCRE2 as a means of checking that the behaviour of PCRE2
-and Perl is the same. For a specification of <b>perltest.sh</b>, see the
-comments near its beginning.
+and Perl is the same. For a specification of <b>perltest.sh</b>, see the
+comments near its beginning.
</P>
<P>
When the input is a terminal, <b>pcre2test</b> prompts for each line of input,
@@ -1446,10 +1446,10 @@ the minimum values for each parameter that allows the match to complete without
error. If JIT is being used, only the match limit is relevant.
</P>
<P>
-When using this modifier, the pattern should not contain any limit settings
-such as (*LIMIT_MATCH=...) within it. If such a setting is present and is
-lower than the minimum matching value, the minimum value cannot be found
-because <b>pcre2_set_match_limit()</b> etc. are only able to reduce the value of
+When using this modifier, the pattern should not contain any limit settings
+such as (*LIMIT_MATCH=...) within it. If such a setting is present and is
+lower than the minimum matching value, the minimum value cannot be found
+because <b>pcre2_set_match_limit()</b> etc. are only able to reduce the value of
an in-pattern limit; they cannot increase it.
</P>
<P>
@@ -1464,13 +1464,13 @@ For non-DFA matching, the <i>match_limit</i> number is a measure of the amount
of backtracking that takes place, and learning the minimum value can be
instructive. For most simple matches, the number is quite small, but for
patterns with very large numbers of matching possibilities, it can become large
-very quickly with increasing length of subject string. In the case of DFA
-matching, <i>match_limit</i> controls the total number of calls, both recursive
-and non-recursive, to the internal matching function, thus controlling the
+very quickly with increasing length of subject string. In the case of DFA
+matching, <i>match_limit</i> controls the total number of calls, both recursive
+and non-recursive, to the internal matching function, thus controlling the
overall amount of computing resource that is used.
</P>
<P>
-For both kinds of matching, the <i>heap_limit</i> number, which is in kibibytes
+For both kinds of matching, the <i>heap_limit</i> number, which is in kibibytes
(units of 1024 bytes), limits the amount of heap memory used for matching. A
value of zero disables the use of any heap memory; many simple pattern matches
can be done without using the heap, so zero is not an unreasonable setting.
@@ -1929,7 +1929,7 @@ documentation. In this section we describe the features of <b>pcre2test</b> that
can be used to test these functions.
</P>
<P>
-Note that "serialization" in PCRE2 does not convert compiled patterns to an
+Note that "serialization" in PCRE2 does not convert compiled patterns to an
abstract format like Java or .NET. It just makes a reloadable byte code stream.
Hence the restrictions on reloading mentioned above.
</P>