Merge branch '10.0' into 10.1

1 files changed, 4 insertions, 5 deletions

diff --git a/pcre/doc/html/pcreapi.html b/pcre/doc/html/pcreapi.html
index b401ecc76df..2d7adf185a6 100644
--- a/pcre/doc/html/pcreapi.html
+++ b/pcre/doc/html/pcreapi.html
@@ -315,9 +315,8 @@ documentation for details of how to do this. It is a non-standard way of
 building PCRE, for use in environments that have limited stacks. Because of the
 greater use of memory management, it runs more slowly. Separate functions are
 provided so that special-purpose external code can be used for this case. When
-used, these functions are always called in a stack-like manner (last obtained,
-first freed), and always for memory blocks of the same size. There is a
-discussion about PCRE's stack usage in the
+used, these functions always allocate memory blocks of the same size. There is
+a discussion about PCRE's stack usage in the
 <a href="pcrestack.html"><b>pcrestack</b></a>
 documentation.
 </P>
@@ -2913,9 +2912,9 @@ Cambridge CB2 3QH, England.
 </P>
 <br><a name="SEC26" href="#TOC1">REVISION</a><br>
 <P>
-Last updated: 09 February 2014
+Last updated: 18 December 2015
 <br>
-Copyright &copy; 1997-2014 University of Cambridge.
+Copyright &copy; 1997-2015 University of Cambridge.
 <br>
 <p>
 Return to the <a href="index.html">PCRE index page</a>.