Tidies and final updates for 7.1.

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

29 files changed, 109 insertions, 71 deletions

diff --git a/ChangeLog b/ChangeLog
index fc8e24c..e0c29e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 ChangeLog for PCRE
 ------------------
 
-Version 7.1 12-Mar-07
+Version 7.1 24-Apr-07
 ---------------------
 
  1. Applied Bob Rossi and Daniel G's patches to convert the build system to one
diff --git a/NEWS b/NEWS
index a046f70..dd93daf 100644
--- a/NEWS
+++ b/NEWS
@@ -2,13 +2,17 @@ News about PCRE releases
 ------------------------
 
 
-Release 7.1 20-Mar-07
+Release 7.1 24-Apr-07
 ---------------------
 
-There are no new features in this release. A few bugs are fixed (see ChangeLog
-for details), but the major change is a complete re-implementation of the build
-system. This now has full Autotools support and so is now "standard" in some
-sense. It should help with compiling PCRE in a wide variety of environments.
+There is only one new feature in this release: a linebreak setting of
+PCRE_NEWLINE_ANYCRLF. It is a cut-down version of PCRE_NEWLINE_ANY, which
+recognizes only CRLF, CR, and LF as linebreaks.
+
+A few bugs are fixed (see ChangeLog for details), but the major change is a
+complete re-implementation of the build system. This now has full Autotools
+support and so is now "standard" in some sense. It should help with compiling
+PCRE in a wide variety of environments.
 
 NOTE: when building shared libraries for Windows, three dlls are now built,
 called libpcre, libpcreposix, and libpcrecpp. Previously, everything was
diff --git a/NON-UNIX-USE b/NON-UNIX-USE
index fa1f895..1d44725 100644
--- a/NON-UNIX-USE
+++ b/NON-UNIX-USE
@@ -192,7 +192,7 @@ gcc and MinGW's gcc). So, a user can:
 
 The test files that are supplied with PCRE are in Unix format, with LF
 characters as line terminators. It may be necessary to change the line
-terminators in order to get some of the tests to work. We hope to improves
+terminators in order to get some of the tests to work. We hope to improve
 things in this area in future.
 
 
@@ -274,5 +274,5 @@ $!   Locale could not be set to fr
 $!
 =========================
 
-Last Updated: 26 March 2007
+Last Updated: 24 April 2007
 ****
diff --git a/README b/README
index da2e3e0..2f4d3c5 100644
--- a/README
+++ b/README
@@ -436,9 +436,12 @@ Making new tarballs
 -------------------
 
 The command "make dist" creates three PCRE tarballs, in tar.gz, tar.bz2, and
-zip formats. However, if you have modified any of the man page sources in the
-doc directory, you should first run the PrepareRelease script. This re-creates
-the .txt and HTML forms of the documentation from the man pages.
+zip formats. The command "make distcheck" does the same, but then does a trial
+build of the new distribution to ensure that it works.
+
+If you have modified any of the man page sources in the doc directory, you
+should first run the PrepareRelease script before making a distribution. This
+script creates the .txt and HTML forms of the documentation from the man pages.
 
 
 Testing PCRE
@@ -711,4 +714,4 @@ The distribution should contain the following files:
 Philip Hazel
 Email local part: ph10
 Email domain: cam.ac.uk
-Last updated: 16 April 2007
+Last updated: 24 April 2007
diff --git a/configure.ac b/configure.ac
index 5578a35..291fc28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,8 @@ dnl empty.
 
 m4_define(pcre_major, [7])
 m4_define(pcre_minor, [1])
-m4_define(pcre_prerelease, [-RC5])
-m4_define(pcre_date, [2007-04-16])
+m4_define(pcre_prerelease, [])
+m4_define(pcre_date, [2007-04-24])
 
 # Libtool shared library interface versions (current:revision:age)
 m4_define(libpcre_version, [0:1:0])
diff --git a/doc/html/pcre-config.html b/doc/html/pcre-config.html
index b227c6f..0987745 100644
--- a/doc/html/pcre-config.html
+++ b/doc/html/pcre-config.html
@@ -22,7 +22,7 @@ man page, in case the conversion went wrong.
 </ul>
 <br><a name="SEC1" href="#TOC1">SYNOPSIS</a><br>
 <P>
-<b>pcre-config  [--prefix] [--exec-prefix] [--version] [--libs] </b>
+<b>pcre-config  [--prefix] [--exec-prefix] [--version] [--libs]</b>
 <b>[--libs-posix] [--cflags] [--cflags-posix]</b>
 </P>
 <br><a name="SEC2" href="#TOC1">DESCRIPTION</a><br>
diff --git a/doc/html/pcre_compile.html b/doc/html/pcre_compile.html
index e43f9fe..3fd9a77 100644
--- a/doc/html/pcre_compile.html
+++ b/doc/html/pcre_compile.html
@@ -70,7 +70,9 @@ PCRE_NO_UTF8_CHECK.
 </P>
 <P>
 The yield of the function is a pointer to a private data structure that
-contains the compiled pattern, or NULL if an error was detected.
+contains the compiled pattern, or NULL if an error was detected. Note that
+compiling regular expressions with one version of PCRE for use with a different
+version is not guaranteed to work and may cause crashes.
 </P>
 <P>
 There is a complete description of the PCRE native API in the
diff --git a/doc/html/pcre_compile2.html b/doc/html/pcre_compile2.html
index a71c4d7..8d743c1 100644
--- a/doc/html/pcre_compile2.html
+++ b/doc/html/pcre_compile2.html
@@ -74,7 +74,9 @@ PCRE_NO_UTF8_CHECK.
 </P>
 <P>
 The yield of the function is a pointer to a private data structure that
-contains the compiled pattern, or NULL if an error was detected.
+contains the compiled pattern, or NULL if an error was detected. Note that
+compiling regular expressions with one version of PCRE for use with a different
+version is not guaranteed to work and may cause crashes.
 </P>
 <P>
 There is a complete description of the PCRE native API in the
diff --git a/doc/html/pcreapi.html b/doc/html/pcreapi.html
index 34011a8..263d26b 100644
--- a/doc/html/pcreapi.html
+++ b/doc/html/pcreapi.html
@@ -287,7 +287,9 @@ The compiled form of a regular expression can be saved and re-used at a later
 time, possibly by a different program, and even on a host other than the one on
 which it was compiled. Details are given in the
 <a href="pcreprecompile.html"><b>pcreprecompile</b></a>
-documentation.
+documentation. However, compiling a regular expression with one version of PCRE
+for use with a different version is not guaranteed to work and may cause
+crashes.
 </P>
 <br><a name="SEC6" href="#TOC1">CHECKING BUILD-TIME OPTIONS</a><br>
 <P>
@@ -1857,7 +1859,7 @@ Cambridge CB2 3QH, England.
 </P>
 <br><a name="SEC22" href="#TOC1">REVISION</a><br>
 <P>
-Last updated: 16 April 2007
+Last updated: 24 April 2007
 <br>
 Copyright &copy; 1997-2007 University of Cambridge.
 <br>
diff --git a/doc/html/pcrecallout.html b/doc/html/pcrecallout.html
index 19e457a..c87acf2 100644
--- a/doc/html/pcrecallout.html
+++ b/doc/html/pcrecallout.html
@@ -37,7 +37,7 @@ function is to be called. Different callout points can be identified by putting
 a number less than 256 after the letter C. The default value is zero.
 For example, this pattern has two callout points:
 <pre>
-  (?C1)\deabc(?C2)def
+  (?C1)abc(?C2)def
 </pre>
 If the PCRE_AUTO_CALLOUT option bit is set when <b>pcre_compile()</b> is called,
 PCRE automatically inserts callouts, all with number 255, before each item in
diff --git a/doc/html/pcrepattern.html b/doc/html/pcrepattern.html
index 6cde7ad..9e0b4cd 100644
--- a/doc/html/pcrepattern.html
+++ b/doc/html/pcrepattern.html
@@ -1805,7 +1805,7 @@ function is to be called. If you want to identify different callout points, you
 can put a number less than 256 after the letter C. The default value is zero.
 For example, this pattern has two callout points:
 <pre>
-  (?C1)\dabc(?C2)def
+  (?C1)abc(?C2)def
 </pre>
 If the PCRE_AUTO_CALLOUT flag is passed to <b>pcre_compile()</b>, callouts are
 automatically installed before each item in the pattern. They are all numbered
diff --git a/doc/html/pcreprecompile.html b/doc/html/pcreprecompile.html
index 97619b0..0e4cb74 100644
--- a/doc/html/pcreprecompile.html
+++ b/doc/html/pcreprecompile.html
@@ -34,7 +34,9 @@ tables, it is a little bit more complicated.
 If you save compiled patterns to a file, you can copy them to a different host
 and run them there. This works even if the new host has the opposite endianness
 to the one on which the patterns were compiled. There may be a small
-performance penalty, but it should be insignificant.
+performance penalty, but it should be insignificant. However, compiling regular
+expressions with one version of PCRE for use with a different version is not
+guaranteed to work and may cause crashes.
 </P>
 <br><a name="SEC2" href="#TOC1">SAVING A COMPILED PATTERN</a><br>
 <P>
@@ -147,7 +149,7 @@ Cambridge CB2 3QH, England.
 </P>
 <br><a name="SEC6" href="#TOC1">REVISION</a><br>
 <P>
-Last updated: 06 March 2007
+Last updated: 24 April 2007
 <br>
 Copyright &copy; 1997-2007 University of Cambridge.
 <br>
diff --git a/doc/html/pcretest.html b/doc/html/pcretest.html
index c041a9c..cc4269b 100644
--- a/doc/html/pcretest.html
+++ b/doc/html/pcretest.html
@@ -668,7 +668,7 @@ Cambridge CB2 3QH, England.
 </P>
 <br><a name="SEC15" href="#TOC1">REVISION</a><br>
 <P>
-Last updated: 16 April 2007
+Last updated: 24 April 2007
 <br>
 Copyright &copy; 1997-2007 University of Cambridge.
 <br>
diff --git a/doc/pcre.txt b/doc/pcre.txt
index c15bef6..f50b1d3 100644
--- a/doc/pcre.txt
+++ b/doc/pcre.txt
@@ -887,7 +887,9 @@ SAVING PRECOMPILED PATTERNS FOR LATER USE
        The compiled form of a regular expression can be saved and re-used at a
        later time, possibly by a different program, and even on a  host  other
        than  the  one  on  which  it  was  compiled.  Details are given in the
-       pcreprecompile documentation.
+       pcreprecompile documentation. However, compiling a  regular  expression
+       with  one version of PCRE for use with a different version is not guar-
+       anteed to work and may cause crashes.
 
 
 CHECKING BUILD-TIME OPTIONS
@@ -2386,7 +2388,7 @@ AUTHOR
 
 REVISION
 
-       Last updated: 16 April 2007
+       Last updated: 24 April 2007
        Copyright (c) 1997-2007 University of Cambridge.
 ------------------------------------------------------------------------------
 
@@ -2414,7 +2416,7 @@ PCRE CALLOUTS
        default value is zero.  For  example,  this  pattern  has  two  callout
        points:
 
-         (?C1)eabc(?C2)def
+         (?C1)abc(?C2)def
 
        If  the  PCRE_AUTO_CALLOUT  option  bit  is  set when pcre_compile() is
        called, PCRE automatically  inserts  callouts,  all  with  number  255,
@@ -4478,7 +4480,7 @@ EXAMPLE OF PARTIAL MATCHING USING PCRETEST
        using  pcre_dfa_exec()  matching  (by means of the \D escape sequence),
        produces the following output:
 
-           re> /^?(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)$/
+           re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
          data> 25jun04\P\D
           0: 25jun04
          data> 23dec3\P\D
@@ -4505,7 +4507,7 @@ MULTI-SEGMENT MATCHING WITH pcre_dfa_exec()
        using the \R escape sequence to set the PCRE_DFA_RESTART option (\P and
        \D are as above):
 
-           re> /^?(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)$/
+           re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
          data> 23ja\P\D
          Partial match: 23ja
          data> n05\R\D
@@ -4614,7 +4616,9 @@ SAVING AND RE-USING PRECOMPILED PCRE PATTERNS
        ent  host  and  run them there. This works even if the new host has the
        opposite endianness to the one on which  the  patterns  were  compiled.
        There  may  be a small performance penalty, but it should be insignifi-
-       cant.
+       cant. However, compiling regular expressions with one version  of  PCRE
+       for  use  with  a  different  version is not guaranteed to work and may
+       cause crashes.
 
 
 SAVING A COMPILED PATTERN
@@ -4721,7 +4725,7 @@ AUTHOR
 
 REVISION
 
-       Last updated: 06 March 2007
+       Last updated: 24 April 2007
        Copyright (c) 1997-2007 University of Cambridge.
 ------------------------------------------------------------------------------
 
@@ -5189,7 +5193,7 @@ MATCHING INTERFACE
        return false (because the empty string is not a valid number):
 
           int number;
-          pcrecpp::RE::FullMatch("abc", "[a-z]+(\d+)?", &number);
+          pcrecpp::RE::FullMatch("abc", "[a-z]+(\\d+)?", &number);
 
        The matching interface supports at most 16 arguments per call.  If  you
        need    more,    consider    using    the    more   general   interface
diff --git a/doc/pcre_compile.3 b/doc/pcre_compile.3
index 03e7e62..17f884e 100644
--- a/doc/pcre_compile.3
+++ b/doc/pcre_compile.3
@@ -58,7 +58,9 @@ PCRE must be built with UTF-8 support in order to use PCRE_UTF8 and
 PCRE_NO_UTF8_CHECK.
 .P
 The yield of the function is a pointer to a private data structure that
-contains the compiled pattern, or NULL if an error was detected.
+contains the compiled pattern, or NULL if an error was detected. Note that
+compiling regular expressions with one version of PCRE for use with a different
+version is not guaranteed to work and may cause crashes.
 .P
 There is a complete description of the PCRE native API in the
 .\" HREF
diff --git a/doc/pcre_compile2.3 b/doc/pcre_compile2.3
index eeffdb9..1e71aff 100644
--- a/doc/pcre_compile2.3
+++ b/doc/pcre_compile2.3
@@ -62,7 +62,9 @@ PCRE must be built with UTF-8 support in order to use PCRE_UTF8 and
 PCRE_NO_UTF8_CHECK.
 .P
 The yield of the function is a pointer to a private data structure that
-contains the compiled pattern, or NULL if an error was detected.
+contains the compiled pattern, or NULL if an error was detected. Note that
+compiling regular expressions with one version of PCRE for use with a different
+version is not guaranteed to work and may cause crashes.
 .P
 There is a complete description of the PCRE native API in the
 .\" HREF
diff --git a/doc/pcreapi.3 b/doc/pcreapi.3
index 035da07..0e33761 100644
--- a/doc/pcreapi.3
+++ b/doc/pcreapi.3
@@ -265,7 +265,9 @@ which it was compiled. Details are given in the
 .\" HREF
 \fBpcreprecompile\fP
 .\"
-documentation.
+documentation. However, compiling a regular expression with one version of PCRE
+for use with a different version is not guaranteed to work and may cause
+crashes.
 .
 .
 .SH "CHECKING BUILD-TIME OPTIONS"
@@ -1849,6 +1851,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 16 April 2007
+Last updated: 24 April 2007
 Copyright (c) 1997-2007 University of Cambridge.
 .fi
diff --git a/doc/pcrecallout.3 b/doc/pcrecallout.3
index 2566c47..01cbe0e 100644
--- a/doc/pcrecallout.3
+++ b/doc/pcrecallout.3
@@ -17,7 +17,7 @@ function is to be called. Different callout points can be identified by putting
 a number less than 256 after the letter C. The default value is zero.
 For example, this pattern has two callout points:
 .sp
-  (?C1)\deabc(?C2)def
+  (?C1)abc(?C2)def
 .sp
 If the PCRE_AUTO_CALLOUT option bit is set when \fBpcre_compile()\fP is called,
 PCRE automatically inserts callouts, all with number 255, before each item in
diff --git a/doc/pcrecpp.3 b/doc/pcrecpp.3
index 7745de5..ee7bb78 100644
--- a/doc/pcrecpp.3
+++ b/doc/pcrecpp.3
@@ -88,7 +88,7 @@ string is assigned the empty string. Therefore, the following will
 return false (because the empty string is not a valid number):
 .sp
    int number;
-   pcrecpp::RE::FullMatch("abc", "[a-z]+(\\d+)?", &number);
+   pcrecpp::RE::FullMatch("abc", "[a-z]+(\e\ed+)?", &number);
 .sp
 The matching interface supports at most 16 arguments per call.
 If you need more, consider using the more general interface
diff --git a/doc/pcrepartial.3 b/doc/pcrepartial.3
index 19bb4ea..21008c1 100644
--- a/doc/pcrepartial.3
+++ b/doc/pcrepartial.3
@@ -99,7 +99,7 @@ pattern, but the first two are partial matches. The same test, using
 \fBpcre_dfa_exec()\fP matching (by means of the \eD escape sequence), produces
 the following output:
 .sp
-    re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
+    re> /^\ed?\ed(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\ed\ed$/
   data> 25jun04\eP\eD
    0: 25jun04
   data> 23dec3\eP\eD
@@ -126,7 +126,7 @@ space as before, because this is where details of the previous partial match
 are stored. Here is an example using \fBpcretest\fP, using the \eR escape
 sequence to set the PCRE_DFA_RESTART option (\eP and \eD are as above):
 .sp
-    re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
+    re> /^\ed?\ed(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\ed\ed$/
   data> 23ja\eP\eD
   Partial match: 23ja
   data> n05\eR\eD
diff --git a/doc/pcrepattern.3 b/doc/pcrepattern.3
index 60d1f1f..b53426b 100644
--- a/doc/pcrepattern.3
+++ b/doc/pcrepattern.3
@@ -1783,7 +1783,7 @@ function is to be called. If you want to identify different callout points, you
 can put a number less than 256 after the letter C. The default value is zero.
 For example, this pattern has two callout points:
 .sp
-  (?C1)\dabc(?C2)def
+  (?C1)abc(?C2)def
 .sp
 If the PCRE_AUTO_CALLOUT flag is passed to \fBpcre_compile()\fP, callouts are
 automatically installed before each item in the pattern. They are all numbered
diff --git a/doc/pcreprecompile.3 b/doc/pcreprecompile.3
index 9330e50..fcc45cb 100644
--- a/doc/pcreprecompile.3
+++ b/doc/pcreprecompile.3
@@ -17,7 +17,9 @@ tables, it is a little bit more complicated.
 If you save compiled patterns to a file, you can copy them to a different host
 and run them there. This works even if the new host has the opposite endianness
 to the one on which the patterns were compiled. There may be a small
-performance penalty, but it should be insignificant.
+performance penalty, but it should be insignificant. However, compiling regular
+expressions with one version of PCRE for use with a different version is not
+guaranteed to work and may cause crashes.
 .
 .
 .SH "SAVING A COMPILED PATTERN"
@@ -143,6 +145,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 06 March 2007
+Last updated: 24 April 2007
 Copyright (c) 1997-2007 University of Cambridge.
 .fi
diff --git a/doc/pcretest.1 b/doc/pcretest.1
index c2d2b04..5824278 100644
--- a/doc/pcretest.1
+++ b/doc/pcretest.1
@@ -537,7 +537,7 @@ indicating that the subject partially matched the pattern, you can restart the
 match with additional subject data by means of the \eR escape sequence. For
 example:
 .sp
-    re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
+    re> /^\ed?\ed(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\ed\ed$/
   data> 23ja\eP\eD
   Partial match: 23ja
   data> n05\eR\eD
@@ -690,6 +690,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 16 April 2007
+Last updated: 24 April 2007
 Copyright (c) 1997-2007 University of Cambridge.
 .fi
diff --git a/doc/pcretest.txt b/doc/pcretest.txt
index 06bee98..0ba2996 100644
--- a/doc/pcretest.txt
+++ b/doc/pcretest.txt
@@ -488,7 +488,7 @@ RESTARTING AFTER A PARTIAL MATCH
        can restart the match with additional subject data by means of  the  \R
        escape sequence. For example:
 
-           re> /^?(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)$/
+           re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
          data> 23ja\P\D
          Partial match: 23ja
          data> n05\R\D
@@ -621,5 +621,5 @@ AUTHOR
 
 REVISION
 
-       Last updated: 16 April 2007
+       Last updated: 24 April 2007
        Copyright (c) 1997-2007 University of Cambridge.
diff --git a/maint/README b/maint/README
index 9bf0562..8515c3d 100644
--- a/maint/README
+++ b/maint/README
@@ -61,7 +61,8 @@ Preparing for a PCRE release
 This section contains a checklist of things that I consult before building a
 distribution for a new release.
 
-. Ensure that the version number and version date are correct in configure.ac.
+. Ensure that the version number and version date are correct in configure.ac,
+  ChangeLog, and NEWS.
 
 . Run ./autogen.sh to ensure everything is up-to-date.
 
@@ -72,16 +73,10 @@ distribution for a new release.
   the PCRE test output, apart from the version identification at the top. The 
   other tests are not Perl-compatible (they use various special PCRE options).
 
-. Test on a number of different operating systems. In particular, at the moment 
-  I can test on Solaris, using Sun's cc compiler (as a change from gcc). Adding 
-  -xarch=v9 to the cc options does a 64-bit test, but it also needs -S 64 for 
-  pcretest to increase the stack size for test 2. I also test on FreeBSD and 
-  Linux (where I develop). 
-
 . Test with valgrind by running "RunTest valgrind". There is also "RunGrepTest
   valgrind", though that takes quite a long time.
   
-. It can also useful to test with Electric Fence, though the fact that it 
+. It may also useful to test with Electric Fence, though the fact that it 
   grumbles for missing free() calls can be a nuisance. (A missing free() in 
   pcretest is hardly a big problem.) To build with EF, use:
     
@@ -95,7 +90,9 @@ distribution for a new release.
   because there have been problems with lookbehinds that looked too far. 
   
 . Test with the emulated memmove() function by undefining HAVE_MEMMOVE and 
-  HAVE_BCOPY in config.h.
+  HAVE_BCOPY in config.h. You may see a number of "pcre_memmove defined but not 
+  used" warnings for the modules in which there is no call to memmove(). These
+  can be ignored.
 
 . Documentation: check AUTHORS, COPYING, ChangeLog (check date), INSTALL, 
   LICENCE, NEWS (check date), NON-UNIX-USE, and README. Many of these won't 
@@ -104,12 +101,18 @@ distribution for a new release.
 . Man pages: Check all man pages for \ not followed by e or f or " because
   that indicates a markup error.
 
+. When the release is built, test it on a number of different operating 
+  systems if possible, and using different compilers as well. For example,
+  on Solaris it is helpful to test using Sun's cc compiler as a change from
+  gcc. Adding -xarch=v9 to the cc options does a 64-bit test, but it also
+  needs -S 64 for pcretest to increase the stack size for test 2.
+
 
 Making a PCRE release
 ---------------------
 
 Run PrepareRelease and commit the files that it changes (by removing trailing
-spaces). Then run "make dist" to create the tarballs and the zipball.
+spaces). Then run "make distcheck" to create the tarballs and the zipball.
 
 Don't forget to update Freshmeat when the new release is out, and to tell
 webmaster@pcre.org and the mailing list.
@@ -251,8 +254,16 @@ others are relatively new.
 
 . Someone suggested --disable-callout to save code space when callouts are 
   never wanted. This seems rather marginal.  
+  
+. Work needs doing so that the pcregrep tests work better with different 
+  linebreak settings. Currently, some tests don't work when the input files
+  do not have \n line endings.
+  
+. If the fr_FR locale isn't available for testing, try "french" instead, 
+  because this may be available on Windows. It means modifying the test data, 
+  however.  
 
 Philip Hazel
 Email local part: ph10
 Email domain: cam.ac.uk
-Last updated: 20 March 2007
+Last updated: 24 April 2007
diff --git a/testdata/testinput1 b/testdata/testinput1
index 9e256ef..d8ef12b 100644
--- a/testdata/testinput1
+++ b/testdata/testinput1
@@ -4018,9 +4018,4 @@
   abc
   abc\n  
 
-/^X/m
-    XABC
-    ** Failers 
-    XABC\B
-
 / End of testinput1 /
diff --git a/testdata/testinput2 b/testdata/testinput2
index 32d9586..20e6d93 100644
--- a/testdata/testinput2
+++ b/testdata/testinput2
@@ -2151,4 +2151,9 @@ a random value. /Ix
 /abc.$/mgx<anycrlf>
     abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc7\x{2028} abc8\x{2029} abc9
 
+/^X/m
+    XABC
+    ** Failers 
+    XABC\B
+
 / End of testinput2 /
diff --git a/testdata/testoutput1 b/testdata/testoutput1
index d401404..b513dca 100644
--- a/testdata/testoutput1
+++ b/testdata/testoutput1
@@ -6571,12 +6571,4 @@ No match
   abc\n  
 No match
 
-/^X/m
-    XABC
- 0: X
-    ** Failers 
-No match
-    XABC\B
-No match
-
 / End of testinput1 /
diff --git a/testdata/testoutput2 b/testdata/testoutput2
index d3b620b..a636c7e 100644
--- a/testdata/testoutput2
+++ b/testdata/testoutput2
@@ -8169,4 +8169,12 @@ No match
  0: abc5
  0: abc9
 
+/^X/m
+    XABC
+ 0: X
+    ** Failers 
+No match
+    XABC\B
+No match
+
 / End of testinput2 /