summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/ocaml.m11
-rw-r--r--toplevel/topmain.ml2
2 files changed, 12 insertions, 1 deletions
diff --git a/man/ocaml.m b/man/ocaml.m
index fa589e0a7..7f7e5a644 100644
--- a/man/ocaml.m
+++ b/man/ocaml.m
@@ -13,6 +13,9 @@ ocaml \- The Objective Caml interactive toplevel
.BI \-I \ lib-dir
]
[
+.I object-files
+]
+[
.I script-file
]
.SH DESCRIPTION
@@ -36,6 +39,14 @@ output, errors on standard error. End-of-file on standard input
terminates
.BR ocaml (1).
+If one or more
+.I object-files
+(ending in
+.B .cmo
+or
+.B .cma
+ ) are given, they are loaded silently before starting the toplevel.
+
If a
.I script-file
is given, phrases are read silently from the file, errors printed on
diff --git a/toplevel/topmain.ml b/toplevel/topmain.ml
index 1f815da69..4875f253c 100644
--- a/toplevel/topmain.ml
+++ b/toplevel/topmain.ml
@@ -14,7 +14,7 @@
open Clflags
-let usage = "Usage: ocaml <options> [script-file]\noptions are:"
+let usage = "Usage: ocaml <options> <object-files> [script-file]\noptions are:"
let preload_objects = ref []