3.09.1 updategcaml3090

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

3 files changed, 14 insertions, 13 deletions

diff --git a/driver/errors.ml b/driver/errors.ml
index d5563582a8..5dcd488430 100644
--- a/driver/errors.ml
+++ b/driver/errors.ml
@@ -65,7 +65,7 @@ let report_error ppf exn =
   | Sys_error msg ->
       fprintf ppf "I/O error: %s" msg
   | Warnings.Errors (n) ->
-      fprintf ppf "@.Error: %d error-enabled warnings occurred." n
+      fprintf ppf "@.Error: error-enabled warnings (%d occurrences)" n
   | x -> fprintf ppf "@]"; raise x in
 
   fprintf ppf "@[%a@]@." report exn
diff --git a/driver/main_args.ml b/driver/main_args.ml
index f044742561..c5fd6b9a99 100644
--- a/driver/main_args.ml
+++ b/driver/main_args.ml
@@ -131,10 +131,10 @@ struct
     "-version", Arg.Unit F._version, " Print compiler version and exit";
     "-verbose", Arg.Unit F._verbose, " Print calls to external commands";
     "-vmthread", Arg.Unit F._vmthread,
-  " Generate code that supports the threads library with VM-level scheduling";
+           " Generate code that supports the threads library with VM-level\n\
+      \     scheduling";
     "-w", Arg.String F._w,
       "<flags>  Enable or disable warnings according to <flags>:\n\
-      \032    A/a enable/disable all warnings\n\
       \032    C/c enable/disable suspicious comment\n\
       \032    D/d enable/disable deprecated features\n\
       \032    E/e enable/disable fragile match\n\
@@ -149,11 +149,12 @@ struct
       \032    Y/y enable/disable suspicious unused variables\n\
       \032    Z/z enable/disable all other unused variables\n\
       \032    X/x enable/disable all other warnings\n\
+      \032    A/a enable/disable all warnings\n\
       \032    default setting is \"Aelz\"";
     "-warn-error" , Arg.String F._warn_error,
-      "<flags>  Treat the warnings of <flags> as errors, if they are enabled.\n\
-      \032    See option -w for the list of flags.\n\
-      \032    Default setting is \"a\" (warnings are not errors)";
+     "<flags>  Treat the warnings of <flags> as errors, if they are\n\
+      \     enabled.  See option -w for the list of flags.\n\
+      \     Default setting is \"a\" (warnings are not errors)";
     "-where", Arg.Unit F._where,
            " Print location of standard library and exit";
     "-nopervasives", Arg.Unit F._nopervasives, " (undocumented)";
diff --git a/driver/optmain.ml b/driver/optmain.ml
index c049a740a7..46ce13408c 100644
--- a/driver/optmain.ml
+++ b/driver/optmain.ml
@@ -112,8 +112,8 @@ let main () =
        "-dtypes", Arg.Set save_types,
              " Save type information in <filename>.annot";
        "-for-pack", Arg.String (fun s -> for_package := Some s),
-             "<ident>  Generate code that can later be `packed' with\n
-                       \t\t\tocamlopt -pack -o <ident>.cmx";
+             "<ident>  Generate code that can later be `packed' with\n\
+         \     ocamlopt -pack -o <ident>.cmx";
        "-i", Arg.Unit (fun () -> print_types := true; compile_only := true),
              " Print inferred interface";
        "-I", Arg.String(fun dir -> include_dirs := dir :: !include_dirs),
@@ -145,7 +145,7 @@ let main () =
              " Output a C object file instead of an executable";
        "-p", Arg.Set gprofile,
              " Compile and link with profiling support for \"gprof\"\n\
-               \t(not supported on all platforms)";
+         \     (not supported on all platforms)";
        "-pack", Arg.Set make_package,
               " Package the given .cmx files into one .cmx";
        "-pp", Arg.String(fun s -> preprocessor := Some s),
@@ -166,7 +166,6 @@ let main () =
        "-verbose", Arg.Set verbose, " Print calls to external commands";
        "-w", Arg.String (Warnings.parse_options false),
              "<flags>  Enable or disable warnings according to <flags>:\n\
-         \032    A/a enable/disable all warnings\n\
          \032    C/c enable/disable suspicious comment\n\
          \032    D/d enable/disable deprecated features\n\
          \032    E/e enable/disable fragile match\n\
@@ -181,11 +180,12 @@ let main () =
          \032    Y/y enable/disable suspicious unused variables\n\
          \032    Z/z enable/disable all other unused variables\n\
          \032    X/x enable/disable all other warnings\n\
+         \032    A/a enable/disable all warnings\n\
          \032    default setting is \"Aelz\"";
        "-warn-error" , Arg.String (Warnings.parse_options true),
-        "<flags>  Treat the warnings of <flags> as errors, if they are enabled.\n\
-         \032    See option -w for the list of flags.\n\
-         \032    Default setting is \"a\" (warnings are not errors)";
+        "<flags>  Treat the warnings of <flags> as errors, if they are\n\
+         \     enabled.  See option -w for the list of flags.\n\
+         \     Default setting is \"a\" (warnings are not errors)";
        "-where", Arg.Unit print_standard_library,
          " Print location of standard library and exit";