[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-users] [PATCH 3/3] spelling fix
|
From: |
ygrek |
|
Subject: |
[Mldonkey-users] [PATCH 3/3] spelling fix |
|
Date: |
Mon, 18 Jun 2012 00:57:12 +0300 |
official language name is "OCaml"
---
config/configure.in | 28 ++++++++++++++--------------
distrib/Install.txt | 4 ++--
src/daemon/common/commonInteractive.ml | 2 +-
src/daemon/driver/driverInteractive.ml | 2 +-
src/gtk/gui/gui_keys.ml | 2 +-
src/gtk/newgui/gui_keys.ml | 2 +-
src/networks/donkey/donkeyReliability.ml | 2 +-
src/networks/donkey/donkeyThieves.ml | 2 +-
src/utils/cdk/filename2.ml | 4 ++--
src/utils/cdk/gd.ml | 2 +-
src/utils/cdk/gdstubs.c | 2 +-
src/utils/lib/tiger.c | 2 +-
12 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/config/configure.in b/config/configure.in
index b8dedd8..0170f3f 100644
--- a/config/configure.in
+++ b/config/configure.in
@@ -274,7 +274,7 @@ if test -f ./CVS/Entries ; then
fi
# **********
**********
-# ********** build MLDonkey version, Required Ocaml and LablGTK
versions **********
+# ********** build MLDonkey version, Required OCaml and LablGTK
versions **********
# **********
**********
MLDONKEY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$SUB_VERSION
@@ -408,10 +408,10 @@ AC_ARG_ENABLE(batch,
AS_HELP_STRING([--enable-batch], [reply YES to all queries in this script]),
[BATCH="$enableval"])
AC_ARG_ENABLE(force-ocaml,
- AS_HELP_STRING([--enable-force-ocaml], [force usage of self-compiled Ocaml]),
+ AS_HELP_STRING([--enable-force-ocaml], [force usage of self-compiled OCaml]),
[FORCE_OCAML="$enableval"])
AC_ARG_ENABLE(ocamlver,
- AS_HELP_STRING([--enable-ocamlver=VER], [force usage of specific Ocaml
version (3.10.1|SVN), ]),
+ AS_HELP_STRING([--enable-ocamlver=VER], [force usage of specific OCaml
version (3.10.1|SVN), ]),
[REQUIRED_OCAML="$enableval"])
AC_ARG_ENABLE(mingw,
AS_HELP_STRING([--enable-mingw], [force compilation with MINGW on Cygwin]),
@@ -533,7 +533,7 @@ echo " Checking system tools finished."
echo "----------------------------------------"
echo ""
echo "--------------------------------"
-echo " Checking Ocaml compiler."
+echo " Checking OCaml compiler."
echo "--------------------------------"
CONFIG_DIR=$SOURCE_DIR/config
@@ -576,18 +576,18 @@ if [ test "$BUILD_OCAML" = "yes" ] || [ test
"$FORCE_OCAML" = "yes" ]; then
if [ test "$SYSTEM" = "mingw" ]; then
echo "******** Objective-Caml $REQUIRED_OCAML is required
*********" 1>&2;
- echo "******** no valid Ocaml compiler found on your system
*********" 1>&2;
+ echo "******** no valid OCaml compiler found on your system
*********" 1>&2;
echo "******** on MinGW there is no possibility to let configure
*********" 1>&2;
- echo "******** build the Ocaml compiler with the included script
*********" 1>&2;
+ echo "******** build the OCaml compiler with the included script
*********" 1>&2;
echo "******** check http://mldonkey.sourceforge.net/Windows
*********" 1>&2;
- echo "******** for instuctions how to compile Ocaml under MinGW
*********" 1>&2;
+ echo "******** for instuctions how to compile OCaml under MinGW
*********" 1>&2;
exit 1
else
echo "******** Objective-Caml $REQUIRED_OCAML is required *********" 1>&2;
if [ test "$WGET" = "" ] && [ test "$REQUIRED_OCAML" != "SVN" ]; then
echo "******** wget is missing *********" 1>&2;
- echo "******** cannot download Ocaml *********" 1>&2;
+ echo "******** cannot download OCaml *********" 1>&2;
exit 1
fi
echo "******* Check http://caml.inria.fr/ ********" 1>&2;
@@ -615,7 +615,7 @@ if [ test "$BUILD_OCAML" = "yes" ] || [ test "$FORCE_OCAML"
= "yes" ]; then
$WGET
http://caml.inria.fr/pub/distrib/ocaml-3.10/ocaml-"$REQUIRED_OCAML".tar.gz
fi
if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
- echo "******** download Ocaml $REQUIRED_OCAML not successful,
try do download it manually *********" 1>&2;
+ echo "******** download OCaml $REQUIRED_OCAML not successful,
try do download it manually *********" 1>&2;
echo "******** from http://caml.inria.fr/pub/distrib/
*********" 1>&2;
echo "******** and copy the tar.gz into $PATCH_DIR
*********" 1>&2;
exit 1
@@ -655,7 +655,7 @@ if [ test "$BUILD_OCAML" = "yes" ] || [ test "$FORCE_OCAML"
= "yes" ]; then
rm -rf ocaml-"$REQUIRED_OCAML"
fi
cd $CONFIG_DIR
- echo Ocaml locally installed for mldonkey
+ echo OCaml locally installed for mldonkey
if test -f "$LOCAL_OCAML"/ocamlc.opt; then
OCAMLC=$LOCAL_OCAML/ocamlc.opt
@@ -665,7 +665,7 @@ if [ test "$BUILD_OCAML" = "yes" ] || [ test "$FORCE_OCAML"
= "yes" ]; then
OCAMLC=$LOCAL_OCAML/ocamlc
ac_cv_prog_OCAMLC=$LOCAL_OCAML/ocamlc
else
- echo "Ocaml installation failed"; exit 1
+ echo "OCaml installation failed"; exit 1
fi
fi
;;
@@ -726,7 +726,7 @@ if test -f $OCAMLLIB/dynlink.cmxa; then
CAMLP4LIB_OPT="dynlink.cmxa $CAMLP4LIB_OPT"
fi
-# force usage of supported Ocaml versions
+# force usage of supported OCaml versions
case "$OCAMLVERSION" in
3.10.1*|3.10.2*|3.1*|4.*) ;;
*)
@@ -755,7 +755,7 @@ else
fi
echo "-------------------------------------------"
-echo " Checking Ocaml $OCAMLVERSION finished."
+echo " Checking OCaml $OCAMLVERSION finished."
echo "-------------------------------------------"
@@ -1743,7 +1743,7 @@ if test "$TARGET_TYPE" = "byte"; then
fi
echo ""
printf "Compilers:"
-echo " - Ocaml version $OCAMLVERSION $OCAML_TYPE"
+echo " - OCaml version $OCAMLVERSION $OCAML_TYPE"
echo " - $CC version $CC_VERSION"
if test "x$CXX" != "x"; then
echo " - $CXX version $CXX_VERSION"
diff --git a/distrib/Install.txt b/distrib/Install.txt
index 14b3b5c..29330f5 100644
--- a/distrib/Install.txt
+++ b/distrib/Install.txt
@@ -57,7 +57,7 @@ You have now two options to compile mldonkey:
The configure script will download ocaml and lablgtk, compile and install them
locally so that they can be used to compile mldonkey. Steps below can be
skipped
-now. Be patient. Ocaml and lablgtk tools take a while to compile and install.
+now. Be patient. OCaml and lablgtk tools take a while to compile and install.
Note: At least 70 M of free disk space is required on the partition where
mldonkey
is compiled.
@@ -100,7 +100,7 @@ is compiled.
To build GTK1 newgui: ./configure --enable-gui=newgui1
To build GTK1 oldgui: ./configure --enable-gui=oldgui
- - note: oldgui does not compile with Ocaml >= 3.10
+ - note: oldgui does not compile with OCaml >= 3.10
To build GTK2 GUI: ./configure --enable-gui[=newgui2]
lablgtk-1.2.7 and lablgtk-2.10.1 can both be installed at the same time.
diff --git a/src/daemon/common/commonInteractive.ml
b/src/daemon/common/commonInteractive.ml
index b407301..57ab02e 100644
--- a/src/daemon/common/commonInteractive.ml
+++ b/src/daemon/common/commonInteractive.ml
@@ -87,7 +87,7 @@ let canonize_basename name =
if not Autoconf.windows && not !!filenames_utf8 then
Charset.Locale.to_locale (Buffer.contents buf)
else
- Buffer.contents buf (* Windows uses patched Ocaml which always uses
Unicode chars *)
+ Buffer.contents buf (* Windows uses patched OCaml which always uses
Unicode chars *)
let last_sent_dir_warning = Hashtbl.create 10
diff --git a/src/daemon/driver/driverInteractive.ml
b/src/daemon/driver/driverInteractive.ml
index 0ba136a..9d1c4fb 100644
--- a/src/daemon/driver/driverInteractive.ml
+++ b/src/daemon/driver/driverInteractive.ml
@@ -1878,7 +1878,7 @@ let buildinfo html buf =
);
tack list
(
- "Ocaml version:\t",
+ "OCaml version:\t",
Sys.ocaml_version ^
" - C compiler version: " ^ Autoconf.cc_version ^
(if Autoconf.cxx_version <> "" then
diff --git a/src/gtk/gui/gui_keys.ml b/src/gtk/gui/gui_keys.ml
index 81aaa9f..7c4b00e 100644
--- a/src/gtk/gui/gui_keys.ml
+++ b/src/gtk/gui/gui_keys.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* xlib for Ocaml *)
+(* xlib for OCaml *)
(* *)
(* Fabrice Le Fessant, projet Para/SOR, INRIA Rocquencourt *)
(* *)
diff --git a/src/gtk/newgui/gui_keys.ml b/src/gtk/newgui/gui_keys.ml
index 81aaa9f..7c4b00e 100644
--- a/src/gtk/newgui/gui_keys.ml
+++ b/src/gtk/newgui/gui_keys.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* xlib for Ocaml *)
+(* xlib for OCaml *)
(* *)
(* Fabrice Le Fessant, projet Para/SOR, INRIA Rocquencourt *)
(* *)
diff --git a/src/networks/donkey/donkeyReliability.ml
b/src/networks/donkey/donkeyReliability.ml
index 2df247d..1902380 100644
--- a/src/networks/donkey/donkeyReliability.ml
+++ b/src/networks/donkey/donkeyReliability.ml
@@ -243,7 +243,7 @@ module Marshal = struct
let to_string v _ =
let v = Marshal.to_string v [] in
-(* The header depends on Ocaml version. Remove it. *)
+(* The header depends on OCaml version. Remove it. *)
let v = String.sub v (Marshal.header_size)
(String.length v - Marshal.header_size) in
v
diff --git a/src/networks/donkey/donkeyThieves.ml
b/src/networks/donkey/donkeyThieves.ml
index cd4d132..044d62c 100644
--- a/src/networks/donkey/donkeyThieves.ml
+++ b/src/networks/donkey/donkeyThieves.ml
@@ -130,7 +130,7 @@ module Marshal = struct
let to_string v _ =
let v = Marshal.to_string v [] in
-(* The header depends on Ocaml version. Remove it. *)
+(* The header depends on OCaml version. Remove it. *)
let v = String.sub v (Marshal.header_size)
(String.length v - Marshal.header_size) in
v
diff --git a/src/utils/cdk/filename2.ml b/src/utils/cdk/filename2.ml
index 7fde536..af72992 100644
--- a/src/utils/cdk/filename2.ml
+++ b/src/utils/cdk/filename2.ml
@@ -249,9 +249,9 @@ let temp_dir_name () =
| _ ->
(try Sys.getenv "TEMP" with Not_found -> ".")
-(* this code is copied from Ocaml stdlib/filename.ml but
+(* this code is copied from OCaml stdlib/filename.ml but
extended to respect runtime changes to $MLDONKEY_TEMP,
- Ocaml uses variable $TMPDIR/$TEMP instead *)
+ OCaml uses variable $TMPDIR/$TEMP instead *)
external open_desc: string -> open_flag list -> int -> int = "caml_sys_open"
external close_desc: int -> unit = "caml_sys_close"
diff --git a/src/utils/cdk/gd.ml b/src/utils/cdk/gd.ml
index aa3bf0e..28bbd50 100644
--- a/src/utils/cdk/gd.ml
+++ b/src/utils/cdk/gd.ml
@@ -1,5 +1,5 @@
(*
- * Ocaml-Gd. An interface to the Gd library for generating simple images
+ * OCaml-Gd. An interface to the Gd library for generating simple images
* Based on Shawn Wagner's OCamlGD 0.7.0. with some mods from GD4O
* Copyright (C) 2002 Shawn Wagner
* Copyright (C) 2003 Matthew C. Gushee
diff --git a/src/utils/cdk/gdstubs.c b/src/utils/cdk/gdstubs.c
index 4bec18b..deff52b 100644
--- a/src/utils/cdk/gdstubs.c
+++ b/src/utils/cdk/gdstubs.c
@@ -1,5 +1,5 @@
/*
- * Ocaml-Gd. An interface to the Gd library for generating simple images
+ * OCaml-Gd. An interface to the Gd library for generating simple images
* Based on Shawn Wagner's OCamlGD 0.7.0. with some mods from GD4O
* Copyright (C) 2002 Shawn Wagner
* Copyright (C) 2003 Matthew C. Gushee
diff --git a/src/utils/lib/tiger.c b/src/utils/lib/tiger.c
index 650722e..df4ed1b 100644
--- a/src/utils/lib/tiger.c
+++ b/src/utils/lib/tiger.c
@@ -811,7 +811,7 @@ void tiger_tree_string(char *s, size_t len, size_t pos,
size_t block_size, char
/**************************************************************************
- Ocaml stubs (copied from md4_c.c)
+ OCaml stubs (copied from md4_c.c)
***************************************************************************/
--
1.7.10