Documentation tidies and clarifications.

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

7 files changed, 46 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 16713b3..1edbf26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 ChangeLog for PCRE
 ------------------
 
-Version 7.4 10-Sep-07
+Version 7.4 21-Sep-07
 ---------------------
 
 1.  Change 7.3/28 was implemented for classes by looking at the bitmap. This
diff --git a/NEWS b/NEWS
index f174753..ec470cc 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ News about PCRE releases
 ------------------------
 
 
-Release 7.4 13-Sep-07
+Release 7.4 21-Sep-07
 ---------------------
 
 The only change of specification is the addition of options to control whether
diff --git a/NON-UNIX-USE b/NON-UNIX-USE
index b31546e..1a3ca85 100644
--- a/NON-UNIX-USE
+++ b/NON-UNIX-USE
@@ -9,7 +9,7 @@ This document contains the following sections:
   Building for virtual Pascal
   Stack size in Windows environments
   Comments about Win32 builds
-  Building PCRE with Cmake
+  Building PCRE with CMake
   Building under Windows with BCC5.5
   Building PCRE on OpenVMS
 
@@ -31,10 +31,10 @@ library consists entirely of code written in Standard C, and so should compile
 successfully on any system that has a Standard C compiler and library. The C++
 wrapper functions are a separate issue (see below).
 
-The PCRE distribution contains some experimental support for "cmake", but this
-is incomplete and not fully documented. However if you are a "cmake" user you
-might like to try building with "cmake". There are some instructions in the
-section entitled "Building PCRE with Cmake" below.
+The PCRE distribution includes support for CMake. This support is relatively
+new, but has already been used successfully to build PCRE in multiple build
+environments on Windows. There are some instructions in the section entitled
+"Building PCRE with CMake" below.
 
 
 GENERIC INSTRUCTIONS FOR THE PCRE C LIBRARY
@@ -169,11 +169,15 @@ fail because of this. Normally, running out of stack causes a crash, but there
 have been cases where the test program has just died silently. See your linker
 documentation for how to increase stack size if you experience problems. The
 Linux default of 8Mb is a reasonable choice for the stack, though even that can
-be too small for some pattern/subject combinations. There is more about stack
-usage in the "pcrestack" documentation.
+be too small for some pattern/subject combinations. 
 
+PCRE has a compile configuration option to disable the use of stack for
+recursion so that heap is used instead. However, pattern matching is
+significantly slower when this is done. There is more about stack usage in the
+"pcrestack" documentation.
 
-COMMENTS ABOUT WIN32 BUILDS
+
+COMMENTS ABOUT WIN32 BUILDS (see also "BUILDING PCRE WITH CMAKE" below)
 
 There are two ways of building PCRE using the "configure, make, make install"
 paradigm on Windows systems: using MinGW or using Cygwin. These are not at all
@@ -250,7 +254,11 @@ things in this area in future.
 
 BUILDING PCRE WITH CMAKE
 
-These instructions were contributed by a PCRE user.
+CMake is an alternative build facility that can be used instead of the
+traditional Unix "configure". CMake version 2.4.7 supports Borland makefiles,
+MinGW makefiles, MSYS makefiles, NMake makefiles, UNIX makefiles, Visual Studio
+6, Visual Studio 7, Visual Studio 8, and Watcom W8. The following instructions
+were contributed by a PCRE user.
 
 1. Download CMake 2.4.7 or above from http://www.cmake.org/, install and ensure
    that cmake\bin is on your path.
@@ -376,5 +384,5 @@ $!   Locale could not be set to fr
 $!
 =========================
 
-Last Updated: 17 September 2007
+Last Updated: 21 September 2007
 ****
diff --git a/README b/README
index ce6b68b..dabf243 100644
--- a/README
+++ b/README
@@ -103,7 +103,9 @@ Building PCRE on non-Unix systems
 
 For a non-Unix system, please read the comments in the file NON-UNIX-USE,
 though if your system supports the use of "configure" and "make" you may be
-able to build PCRE in the same way as for Unix-like systems.
+able to build PCRE in the same way as for Unix-like systems. PCRE can also be
+configured in many platform environments using the GUI facility of CMake's
+CMakeSetup. It creates Makefiles, solution files, etc.
 
 PCRE has been compiled on many different operating systems. It should be
 straightforward to build PCRE on any system that has a Standard C compiler and
@@ -506,7 +508,10 @@ in the comparison output, it means that locale is not available on your system,
 despite being listed by "locale". This does not mean that PCRE is broken.
 
 [If you are trying to run this test on Windows, you may be able to get it to
-work by changing "fr_FR" to "french" everywhere it occurs.]
+work by changing "fr_FR" to "french" everywhere it occurs. Alternatively, use
+RunTest.bat. The version of RunTest.bat included with PCRE 7.4 and above uses
+Windows versions of test 2. More info on using RunTest.bat is included in the
+document entitled NON-UNIX-USE.]
 
 The fourth test checks the UTF-8 support. It is not run automatically unless
 PCRE is built with UTF-8 support. To do this you must set --enable-utf8 when
@@ -720,4 +725,4 @@ The distribution should contain the following files:
 Philip Hazel
 Email local part: ph10
 Email domain: cam.ac.uk
-Last updated: 17 September 2007
+Last updated: 21 September 2007
diff --git a/configure.ac b/configure.ac
index 24ec216..cd2dc8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,8 @@ dnl empty.
 
 m4_define(pcre_major, [7])
 m4_define(pcre_minor, [4])
-m4_define(pcre_prerelease, [-RC4])
-m4_define(pcre_date, [2007-09-19])
+m4_define(pcre_prerelease, [])
+m4_define(pcre_date, [2007-09-21])
 
 # Libtool shared library interface versions (current:revision:age)
 m4_define(libpcre_version, [0:1:0])
diff --git a/doc/pcrebuild.3 b/doc/pcrebuild.3
index fd08758..6654aaa 100644
--- a/doc/pcrebuild.3
+++ b/doc/pcrebuild.3
@@ -5,11 +5,16 @@ PCRE - Perl-compatible regular expressions
 .rs
 .sp
 This document describes the optional features of PCRE that can be selected when
-the library is compiled. They are all selected, or deselected, by providing
-options to the \fBconfigure\fP script that is run before the \fBmake\fP
-command. The complete list of options for \fBconfigure\fP (which includes the
-standard ones such as the selection of the installation directory) can be
-obtained by running
+the library is compiled. It assumes use of the \fBconfigure\fP script, where
+the optional features are selected or deselected by providing options to
+\fBconfigure\fP before running the \fBmake\fP command. However, the same
+options can be selected in both Unix-like and non-Unix-like environments using
+the GUI facility of \fBCMakeSetup\fP if you are using \fBCMake\fP instead of
+\fBconfigure\fP to build PCRE.
+.P
+The complete list of options for \fBconfigure\fP (which includes the standard
+ones such as the selection of the installation directory) can be obtained by
+running
 .sp
   ./configure --help
 .sp
@@ -272,6 +277,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 11 September 2007
+Last updated: 21 September 2007
 Copyright (c) 1997-2007 University of Cambridge.
 .fi
diff --git a/doc/pcresyntax.3 b/doc/pcresyntax.3
index af68a63..53e51ac 100644
--- a/doc/pcresyntax.3
+++ b/doc/pcresyntax.3
@@ -370,7 +370,8 @@ pattern is not anchored.
 .SH "NEWLINE CONVENTIONS"
 .rs
 .sp
-These are recognized only at the very start of a pattern.
+These are recognized only at the very start of the pattern or after a 
+(*BSR_...) option.
 .sp
   (*CR)
   (*LF)
@@ -382,7 +383,8 @@ These are recognized only at the very start of a pattern.
 .SH "WHAT \eR MATCHES"
 .rs
 .sp
-These are recognized only at the very start of a pattern.
+These are recognized only at the very start of the pattern or after a 
+(*...) option that sets the newline convention.
 .sp
   (*BSR_ANYCRLF)
   (*BSR_UNICODE)
@@ -416,6 +418,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 11 September 2007
+Last updated: 21 September 2007
 Copyright (c) 1997-2007 University of Cambridge.
 .fi