merge branch 4.02 from 4.02.1 (rev 15540) to a few fixes after 4.02.2 (rev 16205)

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

3 files changed, 7 insertions, 2 deletions

diff --git a/man/ocamlc.m b/man/ocamlc.m
index 3cd4e7447d..adb280927f 100644
--- a/man/ocamlc.m
+++ b/man/ocamlc.m
@@ -929,7 +929,8 @@ compiling your program with later versions of OCaml when they add new
 warnings or modify existing warnings.
 
 The default setting is
-.B \-warn\-error\ -a (all warnings are non-fatal).
+.B \-warn\-error \-a
+(all warnings are non-fatal).
 .TP
 .B \-warn\-help
 Show the description of all available warning numbers.
diff --git a/man/ocamlopt.m b/man/ocamlopt.m
index 9a3a9b3bd3..a541e598d4 100644
--- a/man/ocamlopt.m
+++ b/man/ocamlopt.m
@@ -603,7 +603,8 @@ compiling your program with later versions of OCaml when they add new
 warnings or modify existing warnings.
 
 The default setting is
-.B \-warn\-error\ -a (all warnings are non-fatal).
+.B \-warn\-error \-a
+(all warnings are non-fatal).
 .TP
 .B \-warn\-help
 Show the description of all available warning numbers.
diff --git a/man/ocamlrun.m b/man/ocamlrun.m
index 166e71ed62..2882395e5a 100644
--- a/man/ocamlrun.m
+++ b/man/ocamlrun.m
@@ -197,6 +197,9 @@ Calling of finalisation functions.
 Startup messages (loading the bytecode executable file, resolving
 shared libraries).
 
+.BR 0x200
+Computation of compaction-triggering condition.
+
 The multiplier is
 .BR k ,
 .BR M ,\ or