merge changes from 3.12.0 to 3.12.1

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

1 files changed, 2 insertions, 0 deletions

diff --git a/stdlib/filename.mli b/stdlib/filename.mli
index e43f19ccf2..efbdcd98d5 100644
--- a/stdlib/filename.mli
+++ b/stdlib/filename.mli
@@ -82,6 +82,7 @@ val temp_file : ?temp_dir: string -> string -> string -> string
    (readable and writable only by the file owner).  The file is
    guaranteed to be different from any other file that existed when
    [temp_file] was called.
+   Raise [Sys_error] if the file could not be created.
    @before 3.11.2 no ?temp_dir optional argument
 *)
 
@@ -95,6 +96,7 @@ val open_temp_file :
    [mode] is a list of additional flags to control the opening of the file.
    It can contain one or several of [Open_append], [Open_binary],
    and [Open_text].  The default is [[Open_text]] (open in text mode).
+   Raise [Sys_error] if the file could not be opened.
    @before 3.11.2 no ?temp_dir optional argument
 *)