merge version 3.12 from 3.12.1 to r12205

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12210 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 6 insertions, 0 deletions

diff --git a/stdlib/string.mli b/stdlib/string.mli
index d1ae9356b..2405ac6ad 100644
--- a/stdlib/string.mli
+++ b/stdlib/string.mli
@@ -132,6 +132,12 @@ val map : (char -> char) -> string -> string
    the characters of [s] and stores the results in a new string that
    is returned. *)
 
+val trim : string -> string
+(** Return a copy of the argument, without leading and trailing whitespace.
+   The characters regarded as whitespace are: [' '], ['\012'], ['\n'],
+   ['\r'], and ['\t'].  If there is no whitespace character in the argument,
+   return the original string itself, not a copy. *)
+
 val escaped : string -> string
 (** Return a copy of the argument, with special characters
    represented by escape sequences, following the lexical