From badfbcdd12291294fcf7097a2a5b51c9783ace4e Mon Sep 17 00:00:00 2001
From: "Philip.Hazel" <Philip.Hazel@gmail.com>
Date: Tue, 12 Sep 2017 11:41:31 +0000
Subject: [PATCH] Documentation update.

---
 configure.ac       |  6 +++---
 doc/pcre2pattern.3 | 16 +++++++++++-----
 src/pcre2.h        |  6 +++---
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index d332f6e..e811f9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,9 +9,9 @@ dnl The PCRE2_PRERELEASE feature is for identifying release candidates. It might
 dnl be defined as -RC2, for example. For real releases, it should be empty.
 
 m4_define(pcre2_major, [10])
-m4_define(pcre2_minor, [30])
-m4_define(pcre2_prerelease, [])
-m4_define(pcre2_date, [2017-08-14])
+m4_define(pcre2_minor, [31])
+m4_define(pcre2_prerelease, [-RC1])
+m4_define(pcre2_date, [2017-09-12])
 
 # 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/pcre2pattern.3 b/doc/pcre2pattern.3
index 2e5f7f0..dc37e5f 100644
--- a/doc/pcre2pattern.3
+++ b/doc/pcre2pattern.3
@@ -1,4 +1,4 @@
-.TH PCRE2PATTERN 3 "29 July 2017" "PCRE2 10.30"
+.TH PCRE2PATTERN 3 "12 September 2017" "PCRE2 10.31"
 .SH NAME
 PCRE2 - Perl-compatible regular expressions (revised API)
 .SH "PCRE2 REGULAR EXPRESSION DETAILS"
@@ -492,8 +492,10 @@ limited to certain values, as follows:
   32-bit non-UTF mode   no greater than 0xffffffff
   All UTF modes         no greater than 0x10ffff and a valid codepoint
 .sp
-Invalid Unicode codepoints are the range 0xd800 to 0xdfff (the so-called
-"surrogate" codepoints), and 0xffef.
+Invalid Unicode codepoints are all those in the range 0xd800 to 0xdfff (the
+so-called "surrogate" codepoints). The check for these can be disabled by the 
+caller of \fBpcre2_compile()\fP by setting the option 
+PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES.
 .
 .
 .SS "Escape sequences in character classes"
@@ -1404,7 +1406,11 @@ followed by two other characters. The octal or hexadecimal representation of
 Ranges normally include all code points between the start and end characters,
 inclusive. They can also be used for code points specified numerically, for
 example [\e000-\e037]. Ranges can include any characters that are valid for the
-current mode.
+current mode. In any UTF mode, the so-called "surrogate" characters (those
+whose code points lie between 0xd800 and 0xdfff inclusive) may not be specified 
+explicitly by default (the PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES option disables
+this check). However, ranges such as [\ex{d7ff}-\ex{e000}], which include the 
+surrogates, are always permitted.
 .P
 There is a special case in EBCDIC environments for ranges whose end points are
 both specified as literal letters in the same case. For compatibility with
@@ -3499,6 +3505,6 @@ Cambridge, England.
 .rs
 .sp
 .nf
-Last updated: 29 July 2017
+Last updated: 12 September 2017
 Copyright (c) 1997-2017 University of Cambridge.
 .fi
diff --git a/src/pcre2.h b/src/pcre2.h
index 5a45339..7028df3 100644
--- a/src/pcre2.h
+++ b/src/pcre2.h
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
 /* The current PCRE version information. */
 
 #define PCRE2_MAJOR          10
-#define PCRE2_MINOR          30
-#define PCRE2_PRERELEASE     
-#define PCRE2_DATE           2017-08-14
+#define PCRE2_MINOR          31
+#define PCRE2_PRERELEASE     -RC1
+#define PCRE2_DATE           2017-09-12
 
 /* 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