Doc updates getting ready for 8.33-RC1.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1319 2f5784b3-3f2a-0410-8824-cb99058d5e15

7 files changed, 100 insertions, 63 deletions

diff --git a/AUTHORS b/AUTHORS
index ba4753d..97d8c71 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,7 +8,7 @@ Email domain:     cam.ac.uk
 University of Cambridge Computing Service,
 Cambridge, England.
 
-Copyright (c) 1997-2012 University of Cambridge
+Copyright (c) 1997-2013 University of Cambridge
 All rights reserved
 
 
@@ -19,7 +19,7 @@ Written by:       Zoltan Herczeg
 Email local part: hzmester
 Emain domain:     freemail.hu
 
-Copyright(c) 2010-2012 Zoltan Herczeg
+Copyright(c) 2010-2013 Zoltan Herczeg
 All rights reserved.
 
 
@@ -30,7 +30,7 @@ Written by:       Zoltan Herczeg
 Email local part: hzmester
 Emain domain:     freemail.hu
 
-Copyright(c) 2009-2012 Zoltan Herczeg
+Copyright(c) 2009-2013 Zoltan Herczeg
 All rights reserved.
 
 
diff --git a/ChangeLog b/ChangeLog
index 0528b40..4f2030f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 ChangeLog for PCRE
 ------------------
 
-Version 8.33 xx-xxxx-201x
--------------------------
+Version 8.33 28-April-2013
+--------------------------
 
 1.  Added 'U' to some constants that are compared to unsigned integers, to
     avoid compiler signed/unsigned warnings. Added (int) casts to unsigned
diff --git a/LICENCE b/LICENCE
index 5ce31a8..3aff6a6 100644
--- a/LICENCE
+++ b/LICENCE
@@ -24,7 +24,7 @@ Email domain:     cam.ac.uk
 University of Cambridge Computing Service,
 Cambridge, England.
 
-Copyright (c) 1997-2012 University of Cambridge
+Copyright (c) 1997-2013 University of Cambridge
 All rights reserved.
 
 
@@ -35,7 +35,7 @@ Written by:       Zoltan Herczeg
 Email local part: hzmester
 Emain domain:     freemail.hu
 
-Copyright(c) 2010-2012 Zoltan Herczeg
+Copyright(c) 2010-2013 Zoltan Herczeg
 All rights reserved.
 
 
@@ -46,7 +46,7 @@ Written by:       Zoltan Herczeg
 Email local part: hzmester
 Emain domain:     freemail.hu
 
-Copyright(c) 2009-2012 Zoltan Herczeg
+Copyright(c) 2009-2013 Zoltan Herczeg
 All rights reserved.
 
 
diff --git a/NEWS b/NEWS
index ebd9c5e..4c41d18 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,30 @@
 News about PCRE releases
 ------------------------
 
+Release 8.33 28-April-2013
+--------------------------
+
+A number of bugs are fixed, and some performance improvements have been made. 
+There are also some new features, of which these are the most important:
+
+.  The behaviour of the backtracking verbs has been rationalized and 
+   documented in more detail.
+
+.  JIT now supports callouts and all of the backtracking verbs.
+
+.  Unicode validation has been updated in the light of Unicode Corrigendum #9,
+   which points out that "non characters" are not "characters that may not 
+   appear in Unicode strings" but rather "characters that are reserved for 
+   internal use and have only local meaning".
+   
+.  (*LIMIT_MATCH=d) and (*LIMIT_RECURSION=d) have been added so that the 
+   creator of a pattern can specify lower (but not higher) limits for the 
+   matching process.
+   
+.  The PCRE_NEVER_UTF option is available to prevent pattern-writers from using
+   the (*UTF) feature, as this could be a security issue. 
+
+
 Release 8.32 30-November-2012
 -----------------------------
 
diff --git a/NON-AUTOTOOLS-BUILD b/NON-AUTOTOOLS-BUILD
index d1045df..01a4512 100644
--- a/NON-AUTOTOOLS-BUILD
+++ b/NON-AUTOTOOLS-BUILD
@@ -168,7 +168,7 @@ can skip ahead to the CMake section.
        pcre16_version.c
        pcre16_xclass.c
 
- (7') If you want to build a 16-bit library (as well as, or instead of the 8-bit
+ (8) If you want to build a 16-bit library (as well as, or instead of the 8-bit
      or 32-bit libraries) repeat steps 5-6 with the following files:
 
        pcre32_byte_order.c
@@ -194,30 +194,31 @@ can skip ahead to the CMake section.
        pcre32_version.c
        pcre32_xclass.c
 
- (8) If you want to build the POSIX wrapper functions (which apply only to the
+ (9) If you want to build the POSIX wrapper functions (which apply only to the
      8-bit library), ensure that you have the pcreposix.h file and then compile
      pcreposix.c (remembering -DHAVE_CONFIG_H if necessary). Link the result
      (on its own) as the pcreposix library.
 
- (9) The pcretest program can be linked with any combination of the 8-bit, 16-bit
-     and 32-bit libraries (depending on what you selected in config.h). Compile
-     pcretest.c and pcre_printint.c (again, don't forget -DHAVE_CONFIG_H) and
-     link them together with the appropriate library/ies. If you compiled an
-     8-bit library, pcretest also needs the pcreposix wrapper library unless
-     you compiled it with -DNOPOSIX.
+(10) The pcretest program can be linked with any combination of the 8-bit,
+     16-bit and 32-bit libraries (depending on what you selected in config.h).
+     Compile pcretest.c and pcre_printint.c (again, don't forget
+     -DHAVE_CONFIG_H) and link them together with the appropriate library/ies.
+     If you compiled an 8-bit library, pcretest also needs the pcreposix
+     wrapper library unless you compiled it with -DNOPOSIX.
 
-(10) Run pcretest on the testinput files in the testdata directory, and check
+(11) Run pcretest on the testinput files in the testdata directory, and check
      that the output matches the corresponding testoutput files. There are
      comments about what each test does in the section entitled "Testing PCRE"
      in the README file. If you compiled more than one of the 8-bit, 16-bit and
-     32-bit libraries, you need to run pcretest with the -16 option to do 16-bit
-     tests and with the -32 option to do 32-bit tests.
+     32-bit libraries, you need to run pcretest with the -16 option to do
+     16-bit tests and with the -32 option to do 32-bit tests.
 
      Some tests are relevant only when certain build-time options are selected.
-     For example, test 4 is for UTF-8/UTF-16/UTF-32 support, and will not run if
-     you have built PCRE without it. See the comments at the start of each
+     For example, test 4 is for UTF-8/UTF-16/UTF-32 support, and will not run
+     if you have built PCRE without it. See the comments at the start of each
      testinput file. If you have a suitable Unix-like shell, the RunTest script
-     will run the appropriate tests for you.
+     will run the appropriate tests for you. The command "RunTest list" will 
+     output a list of all the tests.
 
      Note that the supplied files are in Unix format, with just LF characters
      as line terminators. You may need to edit them to change this if your
@@ -227,11 +228,11 @@ can skip ahead to the CMake section.
      locale to "french" rather than "fr_FR", and there some minor output
      differences.
 
-(11) If you have built PCRE with SUPPORT_JIT, the JIT features will be tested
+(12) If you have built PCRE with SUPPORT_JIT, the JIT features will be tested
      by the testdata files. However, you might also like to build and run
-     the JIT test program, pcre_jit_test.c.
+     the freestanding JIT test program, pcre_jit_test.c.
 
-(12) If you want to use the pcregrep command, compile and link pcregrep.c; it
+(13) If you want to use the pcregrep command, compile and link pcregrep.c; it
      uses only the basic 8-bit PCRE library (it does not need the pcreposix
      library).
 
@@ -435,9 +436,9 @@ CMAKE_USE_RELATIVE_PATHS support on Windows.
 
 Here it is:
 -- AdditionalIncludeDirectories is only partially modified (only the
-first path - see below)
+   first path - see below)
 -- Only some of the contained file paths are modified - shown below for
-pcre.vcproj
+   pcre.vcproj
 -- It properly modifies
 
 I am sure CMake people can fix that if they want to. Until then one will
@@ -449,9 +450,9 @@ deal.
 AdditionalIncludeDirectories="E:\builds\pcre\build;E:\builds\pcre\pcre-7.5;"
 AdditionalIncludeDirectories=".;E:\builds\pcre\pcre-7.5;"
 
-RelativePath="pcre.h">
-RelativePath="pcre_chartables.c">
-RelativePath="pcre_chartables.c.rule">
+RelativePath="pcre.h"
+RelativePath="pcre_chartables.c"
+RelativePath="pcre_chartables.c.rule"
 
 
 TESTING WITH RUNTEST.BAT
@@ -646,4 +647,4 @@ There is also a mirror here:
   http://www.vsoft-software.com/downloads.html
 
 ==========================
-Last Updated: 22 February 2013
+Last Updated: 28 April 2013
diff --git a/README b/README
index 2a49fd6..b091a25 100644
--- a/README
+++ b/README
@@ -37,10 +37,10 @@ The contents of this README file are:
 The PCRE APIs
 -------------
 
-PCRE is written in C, and it has its own API. There are three sets of functions,
-one for the 8-bit library, which processes strings of bytes, one for the
-16-bit library, which processes strings of 16-bit values, and one for the 32-bit
-library, which processes strings of 32-bit values. The distribution also
+PCRE is written in C, and it has its own API. There are three sets of
+functions, one for the 8-bit library, which processes strings of bytes, one for
+the 16-bit library, which processes strings of 16-bit values, and one for the
+32-bit library, which processes strings of 32-bit values. The distribution also
 includes a set of C++ wrapper functions (see the pcrecpp man page for details),
 courtesy of Google Inc., which can be used to call the 8-bit PCRE library from
 C++.
@@ -647,9 +647,13 @@ NON-AUTOTOOLS-BUILD.
 The RunTest script runs the pcretest test program (which is documented in its
 own man page) on each of the relevant testinput files in the testdata
 directory, and compares the output with the contents of the corresponding
-testoutput files. Some tests are relevant only when certain build-time options
-were selected. For example, the tests for UTF-8/16/32 support are run only if
---enable-utf was used. RunTest outputs a comment when it skips a test.
+testoutput files. RunTest uses a file called testtry to hold the main output
+from pcretest. Other files whose names begin with "test" are used as working
+files in some tests.
+
+Some tests are relevant only when certain build-time options were selected. For
+example, the tests for UTF-8/16/32 support are run only if --enable-utf was
+used. RunTest outputs a comment when it skips a test.
 
 Many of the tests that are not skipped are run up to three times. The second
 run forces pcre_study() to be called for all patterns except for a few in some
@@ -662,15 +666,20 @@ The entire set of tests is run once for each of the 8-bit, 16-bit and 32-bit
 libraries that are enabled. If you want to run just one set of tests, call
 RunTest with either the -8, -16 or -32 option.
 
-If valgrind is installed, you can run the tests under it by putting "valgrind" 
-on the RunTest command line.
-
-RunTest uses a file called testtry to hold the main output from pcretest.
-Other files whose names begin with "test" are used as working files in some
-tests. To run pcretest on just one or more specific test files, give their
-numbers as arguments to RunTest, for example:
+If valgrind is installed, you can run the tests under it by putting "valgrind"
+on the RunTest command line. To run pcretest on just one or more specific test
+files, give their numbers as arguments to RunTest, for example:
 
   RunTest 2 7 11
+  
+You can also specify ranges of tests such as 3-6 or 3- (meaning 3 to the
+end), or a number preceded by ~ to exclude a test. For example:
+
+  Runtest 3-15 ~10
+
+This runs tests 3 to 15, excluding test 10, and just ~13 runs all the tests
+except test 13. Whatever order the arguments are in, the tests are always run
+in numerical order.
 
 You can also call RunTest with the single argument "list" to cause it to output
 a list of tests.
@@ -731,21 +740,24 @@ test is run only when JIT support is not available. They test some JIT-specific
 features such as information output from pcretest about JIT compilation.
 
 The fourteenth, fifteenth, and sixteenth tests are run only in 8-bit mode, and
-the seventeenth, eighteenth, and nineteenth tests are run only in 16/32-bit mode.
-These are tests that generate different output in the two modes. They are for
-general cases, UTF-8/16/32 support, and Unicode property support, respectively.
+the seventeenth, eighteenth, and nineteenth tests are run only in 16/32-bit
+mode. These are tests that generate different output in the two modes. They are
+for general cases, UTF-8/16/32 support, and Unicode property support,
+respectively.
 
 The twentieth test is run only in 16/32-bit mode. It tests some specific
 16/32-bit features of the DFA matching engine.
 
-The twenty-first and twenty-second tests are run only in 16/32-bit mode, when the
-link size is set to 2 for the 16-bit library. They test reloading pre-compiled patterns.
+The twenty-first and twenty-second tests are run only in 16/32-bit mode, when
+the link size is set to 2 for the 16-bit library. They test reloading
+pre-compiled patterns.
+
+The twenty-third and twenty-fourth tests are run only in 16-bit mode. They are
+for general cases, and UTF-16 support, respectively.
 
-The twenty-third and twenty-fourth tests are run only in 16-bit mode. They are for
-general cases, and UTF-16 support, respectively.
+The twenty-fifth and twenty-sixth tests are run only in 32-bit mode. They are
+for general cases, and UTF-32 support, respectively.
 
-The twenty-fifth and twenty-sixth tests are run only in 32-bit mode. They are for
-general cases, and UTF-32 support, respectively.
 
 Character tables
 ----------------
@@ -811,11 +823,11 @@ pcre_xxx, one with the name pcre16_xx, and a third with the name pcre32_xxx.
 (A) Source files of the PCRE library functions and their headers:
 
   dftables.c              auxiliary program for building pcre_chartables.c
-                            when --enable-rebuild-chartables is specified
+                          when --enable-rebuild-chartables is specified
 
   pcre_chartables.c.dist  a default set of character tables that assume ASCII
-                            coding; used, unless --enable-rebuild-chartables is
-                            specified, by copying to pcre[16]_chartables.c
+                          coding; used, unless --enable-rebuild-chartables is
+                          specified, by copying to pcre[16]_chartables.c
 
   pcreposix.c                )
   pcre[16|32]_byte_order.c   )
@@ -959,4 +971,4 @@ pcre_xxx, one with the name pcre16_xx, and a third with the name pcre32_xxx.
 Philip Hazel
 Email local part: ph10
 Email domain: cam.ac.uk
-Last updated: 16 March 2013
+Last updated: 28 April 2013
diff --git a/configure.ac b/configure.ac
index 99f07f0..a39d819 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,16 +11,16 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
 m4_define(pcre_major, [8])
 m4_define(pcre_minor, [33])
 m4_define(pcre_prerelease, [-RC1])
-m4_define(pcre_date, [2012-12-07])
+m4_define(pcre_date, [2013-04-28])
 
 # 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.
 
 # Libtool shared library interface versions (current:revision:age)
-m4_define(libpcre_version, [3:0:2])
-m4_define(libpcre16_version, [2:0:2])
-m4_define(libpcre32_version, [0:0:0])
-m4_define(libpcreposix_version, [0:1:0])
+m4_define(libpcre_version, [3:1:2])
+m4_define(libpcre16_version, [2:1:2])
+m4_define(libpcre32_version, [0:1:0])
+m4_define(libpcreposix_version, [0:2:0])
 m4_define(libpcrecpp_version, [0:0:0])
 
 AC_PREREQ(2.57)