Final file tidies for 10.22.

git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@551 6239d852-aaf2-0410-a92c-79f79f948069

10 files changed, 56 insertions, 45 deletions

diff --git a/NEWS b/NEWS
index 1ff11a2..602e324 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 News about PCRE2 releases
 -------------------------
 
-Version 10.22 29-June-2016
+Version 10.22 29-July-2016
 --------------------------
 
 1. ChangeLog has the details of a number of bug fixes.
diff --git a/configure.ac b/configure.ac
index d119f82..d7c57aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
 
 m4_define(pcre2_major, [10])
 m4_define(pcre2_minor, [22])
-m4_define(pcre2_prerelease, [-RC1])
-m4_define(pcre2_date, [2016-06-29])
+m4_define(pcre2_prerelease, [])
+m4_define(pcre2_date, [2016-07-29])
 
 # NOTE: The CMakeLists.txt file searches for the above variables in the first
 # 50 lines of this file. Please update that if the variables above are moved.
diff --git a/doc/html/pcre2test.html b/doc/html/pcre2test.html
index 148c4b3..17b308e 100644
--- a/doc/html/pcre2test.html
+++ b/doc/html/pcre2test.html
@@ -1090,7 +1090,8 @@ The <b>allcaptures</b> modifier requests that the values of all potential
 captured parentheses be output after a match. By default, only those up to the
 highest one actually used in the match are output (corresponding to the return
 code from <b>pcre2_match()</b>). Groups that did not take part in the match
-are output as "&#60;unset&#62;".
+are output as "&#60;unset&#62;". This modifier is not relevant for DFA matching (which
+does no capturing); it is ignored, with a warning message, if present.
 </P>
 <br><b>
 Testing callouts
@@ -1705,7 +1706,7 @@ Cambridge, England.
 </P>
 <br><a name="SEC21" href="#TOC1">REVISION</a><br>
 <P>
-Last updated: 17 June 2016
+Last updated: 06 July 2016
 <br>
 Copyright &copy; 1997-2016 University of Cambridge.
 <br>
diff --git a/doc/html/pcre2unicode.html b/doc/html/pcre2unicode.html
index 7af55c3..6ca367f 100644
--- a/doc/html/pcre2unicode.html
+++ b/doc/html/pcre2unicode.html
@@ -67,16 +67,20 @@ In UTF modes, the dot metacharacter matches one UTF character instead of a
 single code unit.
 </P>
 <P>
-The escape sequence \C can be used to match a single code unit, in a UTF mode,
+The escape sequence \C can be used to match a single code unit in a UTF mode,
 but its use can lead to some strange effects because it breaks up multi-unit
 characters (see the description of \C in the
 <a href="pcre2pattern.html"><b>pcre2pattern</b></a>
-documentation). The use of \C is not supported by the alternative matching
-function <b>pcre2_dfa_match()</b> when in UTF mode. Its use provokes a
-match-time error. The JIT optimization also does not support \C in UTF mode.
-If JIT optimization is requested for a UTF pattern that contains \C, it will
-not succeed, and so the matching will be carried out by the normal interpretive
-function.
+documentation).
+</P>
+<P>
+The use of \C is not supported by the alternative matching function
+<b>pcre2_dfa_match()</b> when in UTF-8 or UTF-16 mode, that is, when a character
+may consist of more than one code unit. The use of \C in these modes provokes
+a match-time error. Also, the JIT optimization does not support \C in these
+modes. If JIT optimization is requested for a UTF-8 or UTF-16 pattern that
+contains \C, it will not succeed, and so when <b>pcre2_match()</b> is called,
+the matching will be carried out by the normal interpretive function.
 </P>
 <P>
 The character escapes \b, \B, \d, \D, \s, \S, \w, and \W correctly test
@@ -244,9 +248,9 @@ Errors in UTF-16 strings
 <P>
 The following negative error codes are given for invalid UTF-16 strings:
 <pre>
-  PCRE_UTF16_ERR1  Missing low surrogate at end of string
-  PCRE_UTF16_ERR2  Invalid low surrogate follows high surrogate
-  PCRE_UTF16_ERR3  Isolated low surrogate
+  PCRE2_ERROR_UTF16_ERR1  Missing low surrogate at end of string
+  PCRE2_ERROR_UTF16_ERR2  Invalid low surrogate follows high surrogate
+  PCRE2_ERROR_UTF16_ERR3  Isolated low surrogate
 
 <a name="utf32strings"></a></PRE>
 </P>
@@ -256,8 +260,8 @@ Errors in UTF-32 strings
 <P>
 The following negative error codes are given for invalid UTF-32 strings:
 <pre>
-  PCRE_UTF32_ERR1  Surrogate character (range from 0xd800 to 0xdfff)
-  PCRE_UTF32_ERR2  Code point is greater than 0x10ffff
+  PCRE2_ERROR_UTF32_ERR1  Surrogate character (0xd800 to 0xdfff)
+  PCRE2_ERROR_UTF32_ERR2  Code point is greater than 0x10ffff
 
 </PRE>
 </P>
@@ -276,9 +280,9 @@ Cambridge, England.
 REVISION
 </b><br>
 <P>
-Last updated: 16 October 2015
+Last updated: 03 July 2016
 <br>
-Copyright &copy; 1997-2015 University of Cambridge.
+Copyright &copy; 1997-2016 University of Cambridge.
 <br>
 <p>
 Return to the <a href="index.html">PCRE2 index page</a>.
diff --git a/doc/pcre2.txt b/doc/pcre2.txt
index fe66fb4..8f4e8a1 100644
--- a/doc/pcre2.txt
+++ b/doc/pcre2.txt
@@ -9740,15 +9740,19 @@ WIDE CHARACTERS AND UTF MODES
        In UTF modes, the dot metacharacter matches one UTF  character  instead
        of a single code unit.
 
-       The  escape  sequence  \C can be used to match a single code unit, in a
-       UTF mode, but its use can lead  to  some  strange  effects  because  it
-       breaks  up  multi-unit  characters  (see  the  description of \C in the
-       pcre2pattern documentation). The use of \C  is  not  supported  by  the
-       alternative  matching  function pcre2_dfa_match() when in UTF mode. Its
-       use provokes a match-time error. The JIT  optimization  also  does  not
-       support  \C  in  UTF  mode.  If JIT optimization is requested for a UTF
-       pattern that contains \C, it will not succeed, and so the matching will
-       be carried out by the normal interpretive function.
+       The escape sequence \C can be used to match a single code unit in a UTF
+       mode, but its use can lead to some strange effects because it breaks up
+       multi-unit  characters  (see  the description of \C in the pcre2pattern
+       documentation).
+
+       The use of \C is not supported by  the  alternative  matching  function
+       pcre2_dfa_match() when in UTF-8 or UTF-16 mode, that is, when a charac-
+       ter may consist of more than one code unit. The  use  of  \C  in  these
+       modes  provokes a match-time error. Also, the JIT optimization does not
+       support \C in these modes. If JIT optimization is requested for a UTF-8
+       or  UTF-16  pattern  that contains \C, it will not succeed, and so when
+       pcre2_match() is called, the matching will be carried out by the normal
+       interpretive function.
 
        The character escapes \b, \B, \d, \D, \s, \S, \w, and \W correctly test
        characters of any code value, but,  by  default,  the  characters  that
@@ -9900,9 +9904,9 @@ VALIDITY OF UTF STRINGS
        The following  negative  error  codes  are  given  for  invalid  UTF-16
        strings:
 
-         PCRE_UTF16_ERR1  Missing low surrogate at end of string
-         PCRE_UTF16_ERR2  Invalid low surrogate follows high surrogate
-         PCRE_UTF16_ERR3  Isolated low surrogate
+         PCRE2_ERROR_UTF16_ERR1  Missing low surrogate at end of string
+         PCRE2_ERROR_UTF16_ERR2  Invalid low surrogate follows high surrogate
+         PCRE2_ERROR_UTF16_ERR3  Isolated low surrogate
 
 
    Errors in UTF-32 strings
@@ -9910,8 +9914,8 @@ VALIDITY OF UTF STRINGS
        The  following  negative  error  codes  are  given  for  invalid UTF-32
        strings:
 
-         PCRE_UTF32_ERR1  Surrogate character (range from 0xd800 to 0xdfff)
-         PCRE_UTF32_ERR2  Code point is greater than 0x10ffff
+         PCRE2_ERROR_UTF32_ERR1  Surrogate character (0xd800 to 0xdfff)
+         PCRE2_ERROR_UTF32_ERR2  Code point is greater than 0x10ffff
 
 
 AUTHOR
@@ -9923,8 +9927,8 @@ AUTHOR
 
 REVISION
 
-       Last updated: 16 October 2015
-       Copyright (c) 1997-2015 University of Cambridge.
+       Last updated: 03 July 2016
+       Copyright (c) 1997-2016 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
diff --git a/doc/pcre2test.1 b/doc/pcre2test.1
index f639ec2..2fbf794 100644
--- a/doc/pcre2test.1
+++ b/doc/pcre2test.1
@@ -1055,7 +1055,7 @@ The \fBallcaptures\fP modifier requests that the values of all potential
 captured parentheses be output after a match. By default, only those up to the
 highest one actually used in the match are output (corresponding to the return
 code from \fBpcre2_match()\fP). Groups that did not take part in the match
-are output as "<unset>". This modifier is not relevant for DFA matching (which 
+are output as "<unset>". This modifier is not relevant for DFA matching (which
 does no capturing); it is ignored, with a warning message, if present.
 .
 .
diff --git a/doc/pcre2test.txt b/doc/pcre2test.txt
index d285a3a..cfa0baa 100644
--- a/doc/pcre2test.txt
+++ b/doc/pcre2test.txt
@@ -981,7 +981,9 @@ SUBJECT MODIFIERS
        tured parentheses be output after a match. By default, only those up to
        the highest one actually used in the match are output (corresponding to
        the return code from pcre2_match()). Groups that did not take  part  in
-       the match are output as "<unset>".
+       the  match  are  output as "<unset>". This modifier is not relevant for
+       DFA matching (which does no capturing); it is ignored, with  a  warning
+       message, if present.
 
    Testing callouts
 
@@ -1546,5 +1548,5 @@ AUTHOR
 
 REVISION
 
-       Last updated: 17 June 2016
+       Last updated: 06 July 2016
        Copyright (c) 1997-2016 University of Cambridge.
diff --git a/src/config.h.generic b/src/config.h.generic
index 5595998..8a71be0 100644
--- a/src/config.h.generic
+++ b/src/config.h.generic
@@ -206,7 +206,7 @@ sure both macros are undefined; an emulation function will then be used. */
 #define PACKAGE_NAME "PCRE2"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE2 10.22-RC1"
+#define PACKAGE_STRING "PCRE2 10.22"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "pcre2"
@@ -215,7 +215,7 @@ sure both macros are undefined; an emulation function will then be used. */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "10.22-RC1"
+#define PACKAGE_VERSION "10.22"
 
 /* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
    parentheses (of any kind) in a pattern. This limits the amount of system
@@ -299,7 +299,7 @@ sure both macros are undefined; an emulation function will then be used. */
 /* #undef SUPPORT_VALGRIND */
 
 /* Version number of package */
-#define VERSION "10.22-RC1"
+#define VERSION "10.22"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
diff --git a/src/pcre2.h b/src/pcre2.h
index ab7d803..20d221b 100644
--- a/src/pcre2.h
+++ b/src/pcre2.h
@@ -43,8 +43,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define PCRE2_MAJOR          10
 #define PCRE2_MINOR          22
-#define PCRE2_PRERELEASE     -RC1
-#define PCRE2_DATE           2016-06-29
+#define PCRE2_PRERELEASE     
+#define PCRE2_DATE           2016-07-29
 
 /* When an application links to a PCRE DLL in Windows, the symbols that are
 imported have to be identified as such. When building PCRE2, the appropriate
diff --git a/src/pcre2.h.generic b/src/pcre2.h.generic
index ab7d803..20d221b 100644
--- a/src/pcre2.h.generic
+++ b/src/pcre2.h.generic
@@ -43,8 +43,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define PCRE2_MAJOR          10
 #define PCRE2_MINOR          22
-#define PCRE2_PRERELEASE     -RC1
-#define PCRE2_DATE           2016-06-29
+#define PCRE2_PRERELEASE     
+#define PCRE2_DATE           2016-07-29
 
 /* When an application links to a PCRE DLL in Windows, the symbols that are
 imported have to be identified as such. When building PCRE2, the appropriate