File tidies for 8.42-RC1 test release.

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

8 files changed, 35 insertions, 28 deletions

diff --git a/AUTHORS b/AUTHORS
index 291657c..eb9b1a4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,7 +8,7 @@ Email domain:     cam.ac.uk
 University of Cambridge Computing Service,
 Cambridge, England.
 
-Copyright (c) 1997-2017 University of Cambridge
+Copyright (c) 1997-2018 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-2017 Zoltan Herczeg
+Copyright(c) 2010-2018 Zoltan Herczeg
 All rights reserved.
 
 
@@ -30,7 +30,7 @@ Written by:       Zoltan Herczeg
 Email local part: hzmester
 Emain domain:     freemail.hu
 
-Copyright(c) 2009-2017 Zoltan Herczeg
+Copyright(c) 2009-2018 Zoltan Herczeg
 All rights reserved.
 
 
diff --git a/ChangeLog b/ChangeLog
index 7354bb1..5d1a4d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,8 @@ ChangeLog for PCRE
 Note that the PCRE 8.xx series (PCRE1) is now in a bugfix-only state. All
 development is happening in the PCRE2 10.xx series.
 
-Version 8.42 xx-xxx-2018
-------------------------
+Version 8.42 20-February-2018
+-----------------------------
 
 1.  Fixed a MIPS issue in the JIT compiler reported by Joshua Kinard.
 
@@ -39,9 +39,9 @@ as the first character of a match.
 8. Fix out-of-bounds read for partial matching of /./ against an empty string
 when the newline type is CRLF.
 
-9. When matching using the the REG_STARTEND feature of the POSIX API with a 
+9. When matching using the the REG_STARTEND feature of the POSIX API with a
 non-zero starting offset, unset capturing groups with lower numbers than a
-group that did capture something were not being correctly returned as "unset" 
+group that did capture something were not being correctly returned as "unset"
 (that is, with offset values of -1).
 
 10. Matching the pattern /(*UTF)\C[^\v]+\x80/ against an 8-bit string
diff --git a/LICENCE b/LICENCE
index dd9071a..f6ef7fd 100644
--- a/LICENCE
+++ b/LICENCE
@@ -25,7 +25,7 @@ Email domain:     cam.ac.uk
 University of Cambridge Computing Service,
 Cambridge, England.
 
-Copyright (c) 1997-2017 University of Cambridge
+Copyright (c) 1997-2018 University of Cambridge
 All rights reserved.
 
 
@@ -36,7 +36,7 @@ Written by:       Zoltan Herczeg
 Email local part: hzmester
 Emain domain:     freemail.hu
 
-Copyright(c) 2010-2017 Zoltan Herczeg
+Copyright(c) 2010-2018 Zoltan Herczeg
 All rights reserved.
 
 
@@ -47,7 +47,7 @@ Written by:       Zoltan Herczeg
 Email local part: hzmester
 Emain domain:     freemail.hu
 
-Copyright(c) 2009-2017 Zoltan Herczeg
+Copyright(c) 2009-2018 Zoltan Herczeg
 All rights reserved.
 
 
diff --git a/NEWS b/NEWS
index 36be07c..fb66619 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 News about PCRE releases
 ------------------------
 
+Release 8.42 20-February-2018
+-----------------------------
+
+This is a bug-fix release.
+
+
 Release 8.41 13-June-2017
 -------------------------
 
diff --git a/NON-AUTOTOOLS-BUILD b/NON-AUTOTOOLS-BUILD
index b6f6a58..37f6164 100644
--- a/NON-AUTOTOOLS-BUILD
+++ b/NON-AUTOTOOLS-BUILD
@@ -763,9 +763,9 @@ native z/OS (without UNIX System Services) and in z/VM, special ports are
 required. PCRE1 version 8.39 is available in file 882 on this site:
 
   http://www.cbttape.org
-   
-Everything, source and executable, is in EBCDIC and native z/OS file formats. 
-However, this software is not maintained and will not be upgraded. If you are 
+
+Everything, source and executable, is in EBCDIC and native z/OS file formats.
+However, this software is not maintained and will not be upgraded. If you are
 new to PCRE you should be looking at PCRE2 (version 10.30 or later).
 
 ===============================
diff --git a/configure.ac b/configure.ac
index 718a185..5838eb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,18 +9,18 @@ dnl The PCRE_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(pcre_major, [8])
-m4_define(pcre_minor, [41])
-m4_define(pcre_prerelease, [])
-m4_define(pcre_date, [2017-07-05])
+m4_define(pcre_minor, [42])
+m4_define(pcre_prerelease, [-RC1])
+m4_define(pcre_date, [2018-02-20])
 
 # 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:9:2])
-m4_define(libpcre16_version, [2:9:2])
-m4_define(libpcre32_version, [0:9:0])
-m4_define(libpcreposix_version, [0:5:0])
+m4_define(libpcre_version, [3:10:2])
+m4_define(libpcre16_version, [2:10:2])
+m4_define(libpcre32_version, [0:10:0])
+m4_define(libpcreposix_version, [0:6:0])
 m4_define(libpcrecpp_version, [0:1:0])
 
 AC_PREREQ(2.57)
diff --git a/doc/html/NON-AUTOTOOLS-BUILD.txt b/doc/html/NON-AUTOTOOLS-BUILD.txt
index 3910059..37f6164 100644
--- a/doc/html/NON-AUTOTOOLS-BUILD.txt
+++ b/doc/html/NON-AUTOTOOLS-BUILD.txt
@@ -760,13 +760,14 @@ The character code used is EBCDIC, not ASCII or Unicode. In z/OS, UNIX APIs and
 applications can be supported through UNIX System Services, and in such an
 environment PCRE can be built in the same way as in other systems. However, in
 native z/OS (without UNIX System Services) and in z/VM, special ports are
-required. For details, please see this web site:
+required. PCRE1 version 8.39 is available in file 882 on this site:
 
-  http://www.zaconsultants.net
+  http://www.cbttape.org
 
-You may download PCRE from WWW.CBTTAPE.ORG, file 882.  Everything, source and
-executable, is in EBCDIC and native z/OS file formats and this is the
-recommended download site.
+Everything, source and executable, is in EBCDIC and native z/OS file formats.
+However, this software is not maintained and will not be upgraded. If you are
+new to PCRE you should be looking at PCRE2 (version 10.30 or later).
 
-==========================
-Last Updated: 25 June 2015
+===============================
+Last Updated: 13 September 2017
+===============================
diff --git a/pcregrep.c b/pcregrep.c
index 628fac4..69ba85a 100644
--- a/pcregrep.c
+++ b/pcregrep.c
@@ -1387,7 +1387,7 @@ Returns:            nothing
 */
 
 static void
-do_after_lines(unsigned long int lastmatchnumber, char *lastmatchrestart, 
+do_after_lines(unsigned long int lastmatchnumber, char *lastmatchrestart,
   char *endptr, char *printname)
 {
 if (after_context > 0 && lastmatchnumber > 0)