Browse files

renaming "Objective Caml" to "OCaml" (first pass)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11015 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
  • Loading branch information...
1 parent 38843a6 commit 5f9d13b4422ca36b8a4a8b1ab137a8013993ecde doligez committed Apr 26, 2011
View
5 Changes
@@ -1,6 +1,7 @@
-Objective Caml 3.13.0:
-----------------------
+OCaml 3.13.0:
+-------------
+- The official name of the language is now OCaml.
- Warning 28 is now enabled by default.
View
24 INSTALL
@@ -1,5 +1,5 @@
- Installing Objective Caml on a Unix machine
- -------------------------------------------
+ Installing OCaml on a Unix machine
+ ----------------------------------
PREREQUISITES
@@ -170,15 +170,15 @@ for guidance on how to edit the generated files by hand.
make world
-This builds the Objective Caml bytecode compiler for the first time.
-This phase is fairly verbose; consider redirecting the output to a file:
+This builds the OCaml bytecode compiler for the first time. This
+phase is fairly verbose; consider redirecting the output to a file:
make world > log.world 2>&1 # in sh
make world >& log.world # in csh
3- (Optional) To be sure everything works well, you can try to
-bootstrap the system --- that is, to recompile all Objective Caml
-sources with the newly created compiler. From the top directory, do:
+bootstrap the system --- that is, to recompile all OCaml sources with
+the newly created compiler. From the top directory, do:
make bootstrap
@@ -205,9 +205,9 @@ or:
make opt > log.opt 2>&1 # in sh
make opt >& log.opt # in csh
-5- Compile fast versions of the Objective Caml compilers, by
-compiling them with the native-code compiler (you have only compiled
-them to bytecode so far). Just do:
+5- Compile fast versions of the OCaml compilers, by compiling them
+with the native-code compiler (you have only compiled them to bytecode
+so far). Just do:
make opt.opt
@@ -226,7 +226,7 @@ An alternative, and faster approach to steps 2 to 5 is
The result is equivalent to "make world opt opt.opt", but this may
fail if anything goes wrong in native-code generation.
-6- You can now install the Objective Caml system. This will create the
+6- You can now install the OCaml system. This will create the
following commands (in the binary directory selected during
autoconfiguration):
@@ -263,8 +263,8 @@ From the top directory, become superuser and do:
directory, do "make clean".
8- (Optional) The emacs/ subdirectory contains Emacs-Lisp files for an
-Objective Caml editing mode and an interface for the debugger. To
-install these files, change to the emacs/ subdirectory and do
+OCaml editing mode and an interface for the debugger. To install
+these files, change to the emacs/ subdirectory and do
make EMACSDIR=<directory where to install the files> install
or
View
38 README
@@ -1,17 +1,17 @@
OVERVIEW:
-Objective Caml is an implementation of the ML language, based on
-the Caml Light dialect extended with a complete class-based object system
-and a powerful module system in the style of Standard ML.
-
-Objective Caml comprises two compilers. One generates bytecode
-which is then interpreted by a C program. This compiler runs quickly,
-generates compact code with moderate memory requirements, and is
-portable to essentially any 32 or 64 bit Unix platform. Performance of
-generated programs is quite good for a bytecoded implementation.
-This compiler can be used either as a standalone, batch-oriented
-compiler that produces standalone programs, or as an interactive,
-toplevel-based system.
+OCaml is an implementation of the ML language, based on the Caml Light
+dialect extended with a complete class-based object system and a
+powerful module system in the style of Standard ML.
+
+OCaml comprises two compilers. One generates bytecode which is then
+interpreted by a C program. This compiler runs quickly, generates
+compact code with moderate memory requirements, and is portable to
+essentially any 32 or 64 bit Unix platform. Performance of generated
+programs is quite good for a bytecoded implementation. This compiler
+can be used either as a standalone, batch-oriented compiler that
+produces standalone programs, or as an interactive, toplevel-based
+system.
The other compiler generates high-performance native code for a number
of processors. Compilation takes longer and generates bigger code, but
@@ -40,10 +40,10 @@ Tier 2 (maintained when possible, with help from users):
Other operating systems for the processors above have not been tested,
but the compiler may work under other operating systems with little work.
-Before the introduction of objects, Objective Caml was known as Caml
-Special Light. Objective Caml is almost upwards compatible with Caml
-Special Light, except for a few additional reserved keywords that have
-forced some renaming of standard library functions.
+Before the introduction of objects, OCaml was known as Caml Special
+Light. OCaml is almost upwards compatible with Caml Special Light,
+except for a few additional reserved keywords that have forced some
+renaming of standard library functions.
CONTENTS:
@@ -89,14 +89,14 @@ MacOS X machines. For MS Windows, see README.win32.
DOCUMENTATION:
-The Objective Caml manual is distributed in HTML, PDF, Postscript,
-DVI, and Emacs Info files. It is available on the World Wide Web, at
+The OCaml manual is distributed in HTML, PDF, Postscript, DVI, and
+Emacs Info files. It is available on the World Wide Web, at
http://caml.inria.fr/
AVAILABILITY:
-The complete Objective Caml distribution can be accessed at
+The complete OCaml distribution can be accessed at
http://caml.inria.fr/
View
16 README.win32
@@ -1,7 +1,7 @@
- Release notes on the MS Windows ports of Objective Caml
- -------------------------------------------------------
+ Release notes on the MS Windows ports of OCaml
+ ----------------------------------------------
-There are no less than four ports of Objective Caml for MS Windows available:
+There are no less than four ports of OCaml for MS Windows available:
- a native Win32 port, built with the Microsoft development tools;
- a native Win32 port, built with the Cygwin/MinGW development tools;
- a port consisting of the Unix sources compiled under the Cygwin
@@ -171,9 +171,9 @@ Unix/GCC or Cygwin or Mingw on similar hardware.
CREDITS:
-The initial port of Caml Special Light (the ancestor of Objective Caml)
-to Windows NT was done by Kevin Gallo at Microsoft Research, who
-kindly contributed his changes to the Caml project.
+The initial port of Caml Special Light (the ancestor of OCaml) to
+Windows NT was done by Kevin Gallo at Microsoft Research, who kindly
+contributed his changes to the Caml project.
The graphical user interface for the toplevel was initially developed
by Jacob Navia, then significantly improved by Christopher A. Watford.
@@ -271,8 +271,8 @@ NOTES:
------------------------------------------------------------------------------
- The Cygwin port of Objective Caml
- ---------------------------------
+ The Cygwin port of OCaml
+ ------------------------
REQUIREMENTS:
View
2 asmrun/Makefile
@@ -180,10 +180,12 @@ clean::
.c.d.o:
ln -s -f $*.c $*.d.c
$(CC) -c $(DFLAGS) $*.d.c
+ rm -f $*.d.c
.c.p.o:
ln -s -f $*.c $*.p.c
$(CC) -c $(PFLAGS) $*.p.c
+ rm -f $*.p.c
.s.o:
$(ASPP) -DSYS_$(SYSTEM) -o $*.o $*.s
View
24 configure
@@ -209,14 +209,14 @@ case "$host,$cc" in
WARNING: you are using gcc version 2.7.2.1 on an Intel x86 processor.
This version of gcc is known to generate incorrect code for the
-Objective Caml runtime system on some Intel x86 machines. (The symptom
+OCaml runtime system on some Intel x86 machines. (The symptom
is a crash of boot/ocamlc when compiling stdlib/pervasives.mli.)
In particular, the version of gcc 2.7.2.1 that comes with
Linux RedHat 4.x / Intel is affected by this problem.
Other Linux distributions might also be affected.
If you are using one of these configurations, you are strongly advised
to use another version of gcc, such as 2.95, which are
-known to work well with Objective Caml.
+known to work well with OCaml.
Press <enter> to proceed or <interrupt> to stop.
EOF
@@ -225,7 +225,7 @@ EOF
WARNING: you are using gcc version 2.96 on an Intel x86 processor.
Certain patched versions of gcc 2.96 are known to generate incorrect
-code for the Objective Caml runtime system. (The symptom is a segmentation
+code for the OCaml runtime system. (The symptom is a segmentation
violation on boot/ocamlc.) Those incorrectly patched versions can be found
in RedHat 7.2 and Mandrake 8.0 and 8.1; other Linux distributions
might also be affected. (See bug #57760 on bugzilla.redhat.com)
@@ -343,7 +343,7 @@ sh ./runtest ansi.c
case $? in
0) echo "The C compiler is ANSI-compliant.";;
1) echo "The C compiler $cc is not ANSI-compliant."
- echo "You need an ANSI C compiler to build Objective Caml."
+ echo "You need an ANSI C compiler to build OCaml."
exit 2;;
*) echo "Unable to compile the test program."
echo "Make sure the C compiler $cc is properly installed."
@@ -362,7 +362,7 @@ case "$2,$3" in
echo "#define ARCH_SIXTYFOUR" >> m.h
arch64=true;;
*,*) echo "This architecture seems to be neither 32 bits nor 64 bits."
- echo "Objective Caml won't run on this architecture."
+ echo "OCaml won't run on this architecture."
exit 2;;
*) echo "Unable to compile the test program."
echo "Make sure the C compiler $cc is properly installed."
@@ -371,7 +371,7 @@ esac
if test $1 != 4 && test $2 != 4 && test $4 != 4; then
echo "Sorry, we can't find a 32-bit integer type"
echo "(sizeof(short) = $4, sizeof(int) = $1, sizeof(long) = $2)"
- echo "Objective Caml won't run on this architecture."
+ echo "OCaml won't run on this architecture."
exit 2
fi
@@ -413,7 +413,7 @@ fi
if test $3 = 8 && test $int64_native = false; then
echo "This architecture has 64-bit pointers but no 64-bit integer type."
- echo "Objective Caml won't run on this architecture."
+ echo "OCaml won't run on this architecture."
exit 2
fi
@@ -426,7 +426,7 @@ case $? in
1) echo "This is a little-endian architecture."
echo "#undef ARCH_BIG_ENDIAN" >> m.h;;
2) echo "This architecture seems to be neither big endian nor little endian."
- echo "Objective Caml won't run on this architecture."
+ echo "OCaml won't run on this architecture."
exit 2;;
*) echo "Something went wrong during endianness determination."
echo "You'll have to figure out endianness yourself"
@@ -460,7 +460,7 @@ case "$host" in
echo "#define ARCH_ALIGN_DOUBLE" >> m.h;;
*) echo "Something went wrong during alignment determination for doubles."
echo "I'm going to assume this architecture has alignment constraints over doubles."
- echo "That's a safe bet: Objective Caml will work even if"
+ echo "That's a safe bet: OCaml will work even if"
echo "this architecture has actually no alignment constraints."
echo "#define ARCH_ALIGN_DOUBLE" >> m.h;;
esac;;
@@ -486,7 +486,7 @@ if $int64_native; then
echo "#define ARCH_ALIGN_INT64" >> m.h;;
*) echo "Something went wrong during alignment determination for 64-bit integers."
echo "I'm going to assume this architecture has alignment constraints."
- echo "That's a safe bet: Objective Caml will work even if"
+ echo "That's a safe bet: OCaml will work even if"
echo "this architecture has actually no alignment constraints."
echo "#define ARCH_ALIGN_INT64" >> m.h;;
esac
@@ -1669,7 +1669,7 @@ mv m.h s.h Makefile ..
echo
echo "** Configuration summary **"
echo
-echo "Directories where Objective Caml will be installed:"
+echo "Directories where OCaml will be installed:"
echo " binaries.................. $bindir"
echo " standard library.......... $libdir"
echo " manual pages.............. $mandir (with extension .$manext)"
@@ -1743,5 +1743,5 @@ echo "The \"labltk\" library: not supported"
fi
echo
-echo "** Objective Caml configuration completed successfully **"
+echo "** OCaml configuration completed successfully **"
echo
View
4 debugger/main.ml
@@ -158,7 +158,7 @@ let set_checkpoints n =
let set_directory dir =
Sys.chdir dir
let print_version () =
- printf "The Objective Caml debugger, version %s@." Sys.ocaml_version;
+ printf "The OCaml debugger, version %s@." Sys.ocaml_version;
exit 0;
;;
let print_version_num () =
@@ -206,7 +206,7 @@ let main () =
arguments := !arguments ^ " " ^ (Filename.quote Sys.argv.(j))
done
end;
- printf "\tObjective Caml Debugger version %s@.@." Config.version;
+ printf "\tOCaml Debugger version %s@.@." Config.version;
Config.load_path := !default_load_path;
Clflags.recursive_types := true; (* Allow recursive types. *)
toplevel_loop (); (* Toplevel. *)
View
2 driver/main.ml
@@ -61,7 +61,7 @@ let process_file ppf name =
raise(Arg.Bad("don't know what to do with " ^ name))
let print_version_and_library () =
- print_string "The Objective Caml compiler, version ";
+ print_string "The OCaml compiler, version ";
print_string Config.version; print_newline();
print_string "Standard library directory: ";
print_string Config.standard_library; print_newline();
View
2 driver/optmain.ml
@@ -56,7 +56,7 @@ let process_file ppf name =
raise(Arg.Bad("don't know what to do with " ^ name))
let print_version_and_library () =
- print_string "The Objective Caml native-code compiler, version ";
+ print_string "The OCaml native-code compiler, version ";
print_string Config.version; print_newline();
print_string "Standard library directory: ";
print_string Config.standard_library; print_newline();
View
2 lex/main.ml
@@ -24,7 +24,7 @@ let output_name = ref None
let usage = "usage: ocamlex [options] sourcefile"
let print_version_string () =
- print_string "The Objective Caml lexer generator, version ";
+ print_string "The OCaml lexer generator, version ";
print_string Sys.ocaml_version ; print_newline();
exit 0
View
8 man/ocaml.m
@@ -3,7 +3,7 @@
.TH OCAML 1
.SH NAME
-ocaml \- The Objective Caml interactive toplevel
+ocaml \- The OCaml interactive toplevel
.SH SYNOPSIS
.B ocaml
@@ -20,8 +20,8 @@
The
.BR ocaml (1)
-command is the toplevel system for Objective Caml,
-that permits interactive use of the Objective Caml system through a
+command is the toplevel system for OCaml,
+that permits interactive use of the OCaml system through a
read-eval-print loop. In this mode, the system repeatedly reads Caml
phrases from the input, then typechecks, compiles and evaluates
them, then prints the inferred type and result value, if any. The
@@ -178,5 +178,5 @@ Note that a warning is not triggered (and not treated as error) if
.SH SEE ALSO
.BR ocamlc (1), \ ocamlopt (1), \ ocamlrun (1).
.br
-.IR The\ Objective\ Caml\ user's\ manual ,
+.IR The\ OCaml\ user's\ manual ,
chapter "The toplevel system".
View
14 man/ocamlc.m
@@ -3,7 +3,7 @@
.TH OCAMLC 1
.SH NAME
-ocamlc \- The Objective Caml bytecode compiler
+ocamlc \- The OCaml bytecode compiler
.SH SYNOPSIS
.B ocamlc
@@ -20,7 +20,7 @@
.SH DESCRIPTION
-The Objective Caml bytecode compiler
+The OCaml bytecode compiler
.BR ocamlc (1)
compiles Caml source files to bytecode object files and links
these object files to produce standalone bytecode executable files.
@@ -124,7 +124,7 @@ are assumed to be C shared libraries (DLLs). During linking, they are
then loads them dynamically at program start-up time.
The output of the linking phase is a file containing compiled bytecode
-that can be executed by the Objective Caml bytecode interpreter:
+that can be executed by the OCaml bytecode interpreter:
the command
.BR ocamlrun (1).
If
@@ -158,7 +158,7 @@ are assumed to be C shared libraries (DLLs). During linking, they are
.BR ocamlc ,
but compiles faster.
.B ocamlc.opt
-may not be available in all installations of Objective Caml.
+may not be available in all installations of O\Caml.
.SH OPTIONS
@@ -457,7 +457,7 @@ Build a bytecode object file (.cmo file) and its associated compiled
.B \-thread
Compile or link multithreaded programs, in combination with the
system "threads" library described in
-.IR The\ Objective\ Caml\ user's\ manual .
+.IR The\ OCaml\ user's\ manual .
.TP
.B \-unsafe
Turn bound checking off for array and string accesses (the
@@ -493,7 +493,7 @@ Print the version number of the compiler in short form (e.g. "3.11.0"),
.B \-vmthread
Compile or link multithreaded programs, in combination with the
VM-level threads library described in
-.IR The\ Objective\ Caml\ user's\ manual .
+.IR The\ OCaml\ user's\ manual .
.TP
.BI \-w \ warning\-list
Enable, disable, or mark as errors the warnings specified by the argument
@@ -751,5 +751,5 @@ compilation in any way (even if it is marked). If a warning is enabled,
.SH SEE ALSO
.BR ocamlopt (1), \ ocamlrun (1), \ ocaml (1).
.br
-.IR "The Objective Caml user's manual" ,
+.IR "The OCaml user's manual" ,
chapter "Batch compilation".
View
4 man/ocamlcp.m
@@ -3,7 +3,7 @@
.TH OCAMLCP 1
.SH NAME
-ocamlcp \- The Objective Caml profiling compiler
+ocamlcp \- The OCaml profiling compiler
.SH SYNOPSIS
.B ocamlcp
@@ -95,5 +95,5 @@
.BR ocamlc (1),
.BR ocamlprof (1).
.br
-.IR "The Objective Caml user's manual" ,
+.IR "The OCaml user's manual" ,
chapter "Profiling".
View
10 man/ocamldebug.m
@@ -3,13 +3,13 @@
.TH OCAMLDEBUG 1
.SH NAME
-ocamldebug \- the Objective Caml source-level replay debugger.
+ocamldebug \- the OCaml source-level replay debugger.
.SH SYNOPSIS
.B ocamldebug
.RI [\ options \ ]\ program \ [\ arguments \ ]
.SH DESCRIPTION
.B ocamldebug
-is the Objective Caml source-level replay debugger.
+is the OCaml source-level replay debugger.
Before the debugger can be used, the program must be compiled and
linked with the
@@ -46,7 +46,7 @@
.TP
.B \-emacs
Tell the debugger it is executed under Emacs. (See
-.I "The Objective Caml user's manual"
+.I "The OCaml user's manual"
for information on how to run the debugger under Emacs.)
.TP
.BI \-I \ directory
@@ -64,7 +64,7 @@
of the command
.B set\ socket
in
-.I "The Objective Caml user's manual"
+.I "The OCaml user's manual"
for the format of
.IR socket .
.TP
@@ -79,7 +79,7 @@
.SH SEE ALSO
.BR ocamlc (1)
.br
-.IR "The Objective Caml user's manual" ,
+.IR "The OCaml user's manual" ,
chapter "The debugger".
.SH AUTHOR
This manual page was written by Sven LUTHER <luther@debian.org>,
View
6 man/ocamldep.m
@@ -3,7 +3,7 @@
.TH OCAMLDEP 1
.SH NAME
-ocamldep \- Dependency generator for Objective Caml
+ocamldep \- Dependency generator for OCaml
.SH SYNOPSIS
.B ocamldep
@@ -16,7 +16,7 @@
The
.BR ocamldep (1)
-command scans a set of Objective Caml source files
+command scans a set of OCaml source files
(.ml and .mli files) for references to external compilation units,
and outputs dependency lines in a format suitable for the
.BR make (1)
@@ -111,5 +111,5 @@ causes dependencies on native compiled files (.cmx) to be generated instead
.BR ocamlc (1),
.BR ocamlopt (1).
.br
-.IR The\ Objective\ Caml\ user's\ manual ,
+.IR The\ OCaml\ user's\ manual ,
chapter "Dependency generator".
View
10 man/ocamldoc.m
@@ -12,7 +12,7 @@
\" ..
.SH NAME
-ocamldoc \- The Objective Caml documentation generator
+ocamldoc \- The OCaml documentation generator
.SH SYNOPSIS
@@ -24,13 +24,13 @@
.SH DESCRIPTION
-The Objective Caml documentation generator
+The OCaml documentation generator
.BR ocamldoc (1)
generates documentation from special comments embedded in source files. The
comments used by OCamldoc are of the form
.I (** ... *)
and follow the format described in the
-.IR "The Objective Caml user's manual" .
+.IR "The OCaml user's manual" .
OCamldoc can produce documentation in various formats: HTML, LaTeX, TeXinfo,
Unix man pages, and
@@ -258,7 +258,7 @@ as ocamldoc text to use as introduction (HTML, LaTeX and TeXinfo only).
Display a short usage summary and exit.
.SS "Type-checking options"
.BR ocamldoc (1)
-calls the Objective Caml type-checker to obtain type information. The
+calls the OCaml type-checker to obtain type information. The
following options impact the type-checking phase. They have the same meaning
as for the
.BR ocamlc (1)\ and \ ocamlopt (1)
@@ -430,5 +430,5 @@ is a list of color names separated by commas (,), as in
.BR ocamlc (1),
.BR ocamlopt (1).
.br
-.IR "The Objective Caml user's manual",
+.IR "The OCaml user's manual",
chapter "The documentation generator".
View
6 man/ocamllex.m
@@ -2,7 +2,7 @@
.TH OCAMLLEX 1
.SH NAME
-ocamllex \- The Objective Caml lexer generator
+ocamllex \- The OCaml lexer generator
.SH SYNOPSIS
.B ocamllex
@@ -18,7 +18,7 @@
The
.BR ocamllex (1)
-command generates Objective Caml lexers from a set of regular
+command generates OCaml lexers from a set of regular
expressions with associated semantic actions, in the style of
.BR lex (1).
@@ -83,5 +83,5 @@
.SH SEE ALSO
.BR ocamlyacc (1).
.br
-.IR "The Objective Caml user's manual" ,
+.IR "The OCaml user's manual" ,
chapter "Lexer and parser generators".
View
6 man/ocamlmktop.m
@@ -29,16 +29,16 @@
The
.BR ocamlmktop (1)
-command builds Objective Caml toplevels that
+command builds OCaml toplevels that
contain user code preloaded at start-up.
The
.BR ocamlmktop (1)
command takes as argument a set of
.IR x .cmo
and
.IR x .cma
-files, and links them with the object files that implement the Objective
-Caml toplevel. If the
+files, and links them with the object files that implement the
+OCaml toplevel. If the
.B \-custom
flag is given, C object files and libraries (.o and .a files) can also
be given on the command line and are linked in the resulting toplevel.
View
12 man/ocamlopt.m
@@ -4,7 +4,7 @@
.SH NAME
-ocamlopt \- The Objective Caml native-code compiler
+ocamlopt \- The OCaml native-code compiler
.SH SYNOPSIS
@@ -19,7 +19,7 @@
.SH DESCRIPTION
-The Objective Caml high-performance
+The OCaml high-performance
native-code compiler
.BR ocamlopt (1)
compiles Caml source files to native code object files and link these
@@ -120,7 +120,7 @@ a set of object files (.cmx/.o files). Libraries are build with
.BR ocamlopt ,
but compiles faster.
.B ocamlopt.opt
-is not available in all installations of Objective Caml.
+is not available in all installations of OCaml.
.SH OPTIONS
@@ -378,7 +378,7 @@ Build an object file (.cmx and .o files) and its associated compiled
with
.BR \-for\-pack .
See
-.IR "The Objective Caml user's manual" ,
+.IR "The OCaml user's manual" ,
chapter "Native-code compilation" for more details.
.TP
.BI \-pp \ command
@@ -441,7 +441,7 @@ apply to the way the extra native objects have been compiled (under
.B \-thread
Compile or link multithreaded programs, in combination with the
system threads library described in
-.IR "The Objective Caml user's manual" .
+.IR "The OCaml user's manual" .
.TP
.B \-unsafe
Turn bound checking off for array and string accesses (the
@@ -569,5 +569,5 @@ The AMD64 code generator (64-bit versions of Intel Pentium and AMD
.SH SEE ALSO
.BR ocamlc (1).
.br
-.IR "The Objective Caml user's manual" ,
+.IR "The OCaml user's manual" ,
chapter "Native-code compilation".
View
6 man/ocamlprof.m
@@ -2,7 +2,7 @@
.TH OCAMLPROF 1
.SH NAME
-ocamlprof \- The Objective Caml profiler
+ocamlprof \- The OCaml profiler
.SH SYNOPSIS
.B ocamlprof
@@ -15,7 +15,7 @@
The
.B ocamlprof
command prints execution counts gathered during the execution of a
-Objective Caml program instrumented with
+OCaml program instrumented with
.BR ocamlcp (1).
It produces a source listing of the program modules given as arguments
@@ -69,5 +69,5 @@
.SH SEE ALSO
.BR ocamlcp (1).
.br
-.IR "The Objective Caml user's manual" ,
+.IR "The OCaml user's manual" ,
chapter "Profiling".
View
12 man/ocamlrun.m
@@ -3,7 +3,7 @@
.TH OCAMLRUN 1
.SH NAME
-ocamlrun \- The Objective Caml bytecode interpreter
+ocamlrun \- The OCaml bytecode interpreter
.SH SYNOPSIS
.B ocamlrun
@@ -23,7 +23,7 @@
The first non-option argument is taken to be the name of the file
containing the executable bytecode. (That file is searched in the
executable path as well as in the current directory.) The remaining
-arguments are passed to the Objective Caml program, in the string array
+arguments are passed to the OCaml program, in the string array
.BR Sys.argv .
Element 0 of this array is the name of the
bytecode executable file; elements 1 to
@@ -85,14 +85,14 @@ in the OCAMLRUNPARAM environment variable (see below).
Additional directories to search for dynamically-loaded libraries.
.TP
.B OCAMLLIB
-The directory containing the Objective Caml standard
+The directory containing the OCaml standard
library. (If
.B OCAMLLIB
is not set,
.B CAMLLIB
will be used instead.) Used to locate the ld.conf configuration file for
dynamic loading. If not set,
-default to the library directory specified when compiling Objective Caml.
+default to the library directory specified when compiling OCaml.
.TP
.B OCAMLRUNPARAM
Set the runtime system options and garbage collection parameters.
@@ -105,7 +105,7 @@ in the OCAMLRUNPARAM environment variable (see below).
correspond to the fields of the
.B control
record documented in
-.IR "The Objective Caml user's manual",
+.IR "The OCaml user's manual",
chapter "Standard Library", section "Gc".
.TP
.B b
@@ -199,5 +199,5 @@ Startup messages (loading the bytecode executable file, resolving
.SH SEE ALSO
.BR ocamlc (1).
.br
-.IR "The Objective Caml user's manual" ,
+.IR "The OCaml user's manual" ,
chapter "Runtime system".
View
4 man/ocamlyacc.m
@@ -2,7 +2,7 @@
.TH OCAMLYACC 1
.SH NAME
-ocamlyacc \- The Objective Caml parser generator
+ocamlyacc \- The OCaml parser generator
.SH SYNOPSIS
.B ocamlyacc
@@ -91,5 +91,5 @@ starts with a dash (-) character. This option must be the last on the
.SH SEE ALSO
.BR ocamllex (1).
.br
-.IR "The Objective Caml user's manual" ,
+.IR "The OCaml user's manual" ,
chapter "Lexer and parser generators".
View
2 ocamldoc/odoc_texi.ml
@@ -22,7 +22,7 @@ open Module
let esc_8bits = ref false
-let info_section = ref "Objective Caml"
+let info_section = ref "OCaml"
let info_entry = ref []
View
2 tools/ocaml299to3.ml
@@ -124,7 +124,7 @@ let _ =
print_endline "Usage: ocaml299to3 <source file> ...";
print_endline "Description:";
print_endline
- "Convert Objective Caml 2.99 O'Labl-style labels in implementation files to";
+ "Convert OCaml 2.99 O'Labl-style labels in implementation files to";
print_endline
"a syntax compatible with version 3. Also `fun:' labels are replaced by `f:'.";
print_endline "Other syntactic changes are not handled.";
View
18 tools/ocamldep.ml
@@ -289,22 +289,22 @@ let _ =
add_to_load_path Filename.current_dir_name;
Arg.parse [
"-I", Arg.String add_to_load_path,
- "<dir> Add <dir> to the list of include directories";
+ "<dir> Add <dir> to the list of include directories";
"-impl", Arg.String (file_dependencies_as ML),
- "<f> Process <f> as a .ml file";
+ "<f> Process <f> as a .ml file";
"-intf", Arg.String (file_dependencies_as MLI),
- "<f> Process <f> as a .mli file";
+ "<f> Process <f> as a .mli file";
"-modules", Arg.Set raw_dependencies,
- " Print module dependencies in raw form (not suitable for make)";
+ " Print module dependencies in raw form (not suitable for make)";
"-native", Arg.Set native_only,
- " Generate dependencies for a pure native-code project (no .cmo files)";
+ " Generate dependencies for a pure native-code project (no .cmo files)";
"-pp", Arg.String(fun s -> preprocessor := Some s),
- "<cmd> Pipe sources through preprocessor <cmd>";
+ "<cmd> Pipe sources through preprocessor <cmd>";
"-slash", Arg.Set force_slash,
- " (Windows) Use forward slash / instead of backslash \\ in file paths";
+ " (Windows) Use forward slash / instead of backslash \\ in file paths";
"-version", Arg.Unit print_version,
- " Print version and exit";
+ " Print version and exit";
"-vnum", Arg.Unit print_version_num,
- " Print version number and exit";
+ " Print version number and exit";
] file_dependencies usage;
exit (if !error_occurred then 2 else 0)
View
2 toplevel/opttoploop.ml
@@ -409,7 +409,7 @@ let initialize_toplevel_env () =
exception PPerror
let loop ppf =
- fprintf ppf " Objective Caml version %s - native toplevel@.@." Config.version;
+ fprintf ppf " OCaml version %s - native toplevel@.@." Config.version;
initialize_toplevel_env ();
let lb = Lexing.from_function refill_lexbuf in
Location.input_name := "";
View
2 toplevel/opttopmain.ml
@@ -49,7 +49,7 @@ let file_argument name =
end
let print_version () =
- Printf.printf "The Objective Caml toplevel, version %s\n" Sys.ocaml_version;
+ Printf.printf "The OCaml toplevel, version %s\n" Sys.ocaml_version;
exit 0;
;;
View
2 toplevel/toploop.ml
@@ -400,7 +400,7 @@ let initialize_toplevel_env () =
exception PPerror
let loop ppf =
- fprintf ppf " Objective Caml version %s@.@." Config.version;
+ fprintf ppf " OCaml version %s@.@." Config.version;
initialize_toplevel_env ();
let lb = Lexing.from_function refill_lexbuf in
Location.input_name := "";
View
2 toplevel/topmain.ml
@@ -46,7 +46,7 @@ let file_argument name =
end
let print_version () =
- Printf.printf "The Objective Caml toplevel, version %s\n" Sys.ocaml_version;
+ Printf.printf "The OCaml toplevel, version %s\n" Sys.ocaml_version;
exit 0;
;;

0 comments on commit 5f9d13b

Please sign in to comment.