diff options
| -rw-r--r-- | INSTALL.adoc | 2 | ||||
| -rw-r--r-- | byterun/caml/major_gc.h | 2 | ||||
| -rw-r--r-- | byterun/caml/misc.h | 2 | ||||
| -rw-r--r-- | otherlibs/bigarray/bigarray.mli | 2 | ||||
| -rw-r--r-- | otherlibs/systhreads/condition.mli | 2 | ||||
| -rw-r--r-- | otherlibs/systhreads/st_posix.h | 2 | ||||
| -rw-r--r-- | otherlibs/systhreads/st_win32.h | 2 | ||||
| -rw-r--r-- | otherlibs/systhreads/thread.mli | 2 | ||||
| -rw-r--r-- | otherlibs/threads/condition.mli | 2 | ||||
| -rw-r--r-- | otherlibs/threads/thread.mli | 4 | ||||
| -rw-r--r-- | otherlibs/unix/unix.mli | 2 | ||||
| -rw-r--r-- | otherlibs/win32unix/winlist.h | 4 | ||||
| -rw-r--r-- | otherlibs/win32unix/winworker.h | 4 | ||||
| -rw-r--r-- | stdlib/bytes.mli | 2 | ||||
| -rw-r--r-- | stdlib/bytesLabels.mli | 2 | ||||
| -rw-r--r-- | stdlib/ephemeron.mli | 4 | ||||
| -rw-r--r-- | stdlib/map.mli | 2 | ||||
| -rw-r--r-- | stdlib/marshal.mli | 2 | ||||
| -rw-r--r-- | stdlib/nativeint.mli | 2 |
19 files changed, 23 insertions, 23 deletions
diff --git a/INSTALL.adoc b/INSTALL.adoc index 835d21b98b..05a165f80d 100644 --- a/INSTALL.adoc +++ b/INSTALL.adoc @@ -317,7 +317,7 @@ In the latter case, the destination directory defaults to the Read the "common problems" and "machine-specific hints" section at the end of this file. -Check the files `m.h` and `s.h` in `config/`. Wrong endian-ness or alignment +Check the files `m.h` and `s.h` in `config/`. Wrong endianness or alignment constraints in `m.h` will immediately crash the bytecode interpreter. If you get a "segmentation violation" signal, check the limits on the stack size diff --git a/byterun/caml/major_gc.h b/byterun/caml/major_gc.h index 906e6410c8..a6c42d9e38 100644 --- a/byterun/caml/major_gc.h +++ b/byterun/caml/major_gc.h @@ -55,7 +55,7 @@ extern uintnat caml_fl_wsz_at_phase_change; #define Subphase_mark_final 12 /* Subphase_mark_final: At the start of this subphase register which value with an ocaml finalizer are not marked, the associated - finalizer will be run later. So we mark now these value as alive, + finalizer will be run later. So we mark now these values as alive, since they must be available for their finalizer. */ diff --git a/byterun/caml/misc.h b/byterun/caml/misc.h index 0cf07aa460..d0b6927e47 100644 --- a/byterun/caml/misc.h +++ b/byterun/caml/misc.h @@ -48,7 +48,7 @@ typedef char * addr; which supports both GCC/Clang and MSVC. Note: CAMLnoreturn is a different macro defined in memory.h, - to be used in function bodies rather than aprototype attribute. + to be used in function bodies rather than as a prototype attribute. */ #ifdef __GNUC__ /* Works only in GCC 2.5 and later */ diff --git a/otherlibs/bigarray/bigarray.mli b/otherlibs/bigarray/bigarray.mli index db1c11a28b..0af832973e 100644 --- a/otherlibs/bigarray/bigarray.mli +++ b/otherlibs/bigarray/bigarray.mli @@ -49,7 +49,7 @@ ({!Bigarray.int16_signed_elt} or {!Bigarray.int16_unsigned_elt}), - OCaml integers (signed, 31 bits on 32-bit architectures, 63 bits on 64-bit architectures) ({!Bigarray.int_elt}), -- 32-bit signed integer ({!Bigarray.int32_elt}), +- 32-bit signed integers ({!Bigarray.int32_elt}), - 64-bit signed integers ({!Bigarray.int64_elt}), - platform-native signed integers (32 bits on 32-bit architectures, 64 bits on 64-bit architectures) ({!Bigarray.nativeint_elt}). diff --git a/otherlibs/systhreads/condition.mli b/otherlibs/systhreads/condition.mli index decf6dce92..36c71fc818 100644 --- a/otherlibs/systhreads/condition.mli +++ b/otherlibs/systhreads/condition.mli @@ -27,7 +27,7 @@ Condition.wait c m done; (* Modify D *) - if (* the predicate P over D is now satified *) then Condition.signal c; + if (* the predicate P over D is now satisfied *) then Condition.signal c; Mutex.unlock m ]} *) diff --git a/otherlibs/systhreads/st_posix.h b/otherlibs/systhreads/st_posix.h index 2ca937cdff..e42b50c407 100644 --- a/otherlibs/systhreads/st_posix.h +++ b/otherlibs/systhreads/st_posix.h @@ -116,7 +116,7 @@ static INLINE void st_tls_set(st_tlskey k, void * v) } /* The master lock. This is a mutex that is held most of the time, - so we implement it in a slightly consoluted way to avoid + so we implement it in a slightly convoluted way to avoid all risks of busy-waiting. Also, we count the number of waiting threads. */ diff --git a/otherlibs/systhreads/st_win32.h b/otherlibs/systhreads/st_win32.h index 0003a59e65..47bce9eac5 100644 --- a/otherlibs/systhreads/st_win32.h +++ b/otherlibs/systhreads/st_win32.h @@ -38,7 +38,7 @@ typedef DWORD st_retcode; #define SIGPREEMPTION SIGTERM -/* Thread-local storage assocaiting a Win32 event to every thread. */ +/* Thread-local storage associating a Win32 event to every thread. */ static DWORD st_thread_sem_key; /* OS-specific initialization */ diff --git a/otherlibs/systhreads/thread.mli b/otherlibs/systhreads/thread.mli index e5581a2f97..9b8a126796 100644 --- a/otherlibs/systhreads/thread.mli +++ b/otherlibs/systhreads/thread.mli @@ -83,7 +83,7 @@ val select : Unix.file_descr list -> Unix.file_descr list -> Unix.file_descr list -> float -> Unix.file_descr list * Unix.file_descr list * Unix.file_descr list -(** Suspend the execution of the calling thead until input/output +(** Suspend the execution of the calling thread until input/output becomes possible on the given Unix file descriptors. The arguments and results have the same meaning as for [Unix.select]. diff --git a/otherlibs/threads/condition.mli b/otherlibs/threads/condition.mli index 2e1ee77741..2557fe78dd 100644 --- a/otherlibs/threads/condition.mli +++ b/otherlibs/threads/condition.mli @@ -27,7 +27,7 @@ Condition.wait c m done; (* Modify D *) - if (* the predicate P over D is now satified *) then Condition.signal c; + if (* the predicate P over D is now satisfied *) then Condition.signal c; Mutex.unlock m ]} *) diff --git a/otherlibs/threads/thread.mli b/otherlibs/threads/thread.mli index 8369bbaee9..bf0c38047d 100644 --- a/otherlibs/threads/thread.mli +++ b/otherlibs/threads/thread.mli @@ -82,7 +82,7 @@ val select : Unix.file_descr list -> Unix.file_descr list -> Unix.file_descr list -> float -> Unix.file_descr list * Unix.file_descr list * Unix.file_descr list -(** Suspend the execution of the calling thead until input/output +(** Suspend the execution of the calling thread until input/output becomes possible on the given Unix file descriptors. The arguments and results have the same meaning as for {!Unix.select}. *) @@ -125,7 +125,7 @@ val critical_section : bool ref (the timer interrupt that transfers control from thread to thread), causing the current thread to run uninterrupted until [critical_section] is reset to [false] or the current thread - explicitely relinquishes control using [sleep], [delay], + explicitly relinquishes control using [sleep], [delay], [wait_inchan] or [wait_descr]. *) val sleep : unit -> unit diff --git a/otherlibs/unix/unix.mli b/otherlibs/unix/unix.mli index c62c2a0ef2..2c69433852 100644 --- a/otherlibs/unix/unix.mli +++ b/otherlibs/unix/unix.mli @@ -795,7 +795,7 @@ val symlink : ?to_dir:bool -> string -> string -> unit points to a directory or a file; if omitted, [symlink] examines [source] using [stat] and picks appropriately, if [source] does not exist then [false] is assumed (for this reason, it is recommended that the [~to_dir] parameter - be specified in new code). On Unix, [~to_dir] ignored. + be specified in new code). On Unix, [~to_dir] is ignored. Windows symbolic links are available in Windows Vista onwards. There are some important differences between Windows symlinks and their POSIX counterparts. diff --git a/otherlibs/win32unix/winlist.h b/otherlibs/win32unix/winlist.h index f504006006..285d507b7f 100644 --- a/otherlibs/win32unix/winlist.h +++ b/otherlibs/win32unix/winlist.h @@ -46,10 +46,10 @@ LPLIST list_next (LPLIST); #define LIST_NEXT(T, e) ((T)(list_next((LPLIST)(e)))) -/* Get number of element */ +/* Get the number of elements */ int list_length (LPLIST); -/* Concat two list. */ +/* Concatenate two lists */ LPLIST list_concat (LPLIST, LPLIST); #endif /* _WINLIST_H */ diff --git a/otherlibs/win32unix/winworker.h b/otherlibs/win32unix/winworker.h index c3a5dd0e38..a807f6b78c 100644 --- a/otherlibs/win32unix/winworker.h +++ b/otherlibs/win32unix/winworker.h @@ -23,7 +23,7 @@ /* Pool of worker threads. * - * These functions help to manage a pool of worker thread and submit task to + * These functions help to manage a pool of worker threads and submit task to * the pool. It helps to reduce the number of thread creation. * * Each worker are started in alertable wait state and jobs are submitted as @@ -40,7 +40,7 @@ typedef WORKER *LPWORKER; * This function will be called using the data following: * - hStop must be watched for change, since it represents an external command * to stop the call. This event is shared through the WORKER structure, which - * can be access throuhg worker_job_event_done. + * can be accessed through worker_job_event_done. * - data is user provided data for the function. */ typedef void (*WORKERFUNC) (HANDLE, void *); diff --git a/stdlib/bytes.mli b/stdlib/bytes.mli index 3032c1cf0a..dc53078768 100644 --- a/stdlib/bytes.mli +++ b/stdlib/bytes.mli @@ -48,7 +48,7 @@ external length : bytes -> int = "%bytes_length" external get : bytes -> int -> char = "%bytes_safe_get" (** [get s n] returns the byte at index [n] in argument [s]. - Raise [Invalid_argument] if [n] not a valid index in [s]. *) + Raise [Invalid_argument] if [n] is not a valid index in [s]. *) external set : bytes -> int -> char -> unit = "%bytes_safe_set" (** [set s n c] modifies [s] in place, replacing the byte at index [n] diff --git a/stdlib/bytesLabels.mli b/stdlib/bytesLabels.mli index 8c061fc699..9848f32d7e 100644 --- a/stdlib/bytesLabels.mli +++ b/stdlib/bytesLabels.mli @@ -23,7 +23,7 @@ external length : bytes -> int = "%bytes_length" external get : bytes -> int -> char = "%bytes_safe_get" (** [get s n] returns the byte at index [n] in argument [s]. - Raise [Invalid_argument] if [n] not a valid index in [s]. *) + Raise [Invalid_argument] if [n] is not a valid index in [s]. *) external set : bytes -> int -> char -> unit = "%bytes_safe_set" diff --git a/stdlib/ephemeron.mli b/stdlib/ephemeron.mli index 6757bdfa2a..091167b96a 100644 --- a/stdlib/ephemeron.mli +++ b/stdlib/ephemeron.mli @@ -358,10 +358,10 @@ module GenHashTable: sig (** [get_key cont] returns the keys if they are all alive *) val get_data: 'a container -> 'a option - (** [get_data cont] return the data if it is alive *) + (** [get_data cont] returns the data if it is alive *) val set_key_data: 'a container -> t -> 'a -> unit - (** [set_key_data cont] modify the key and data *) + (** [set_key_data cont] modifies the key and data *) val check_key: 'a container -> bool (** [check_key cont] checks if all the keys contained in the data diff --git a/stdlib/map.mli b/stdlib/map.mli index 63b65d17cb..7552c480a5 100644 --- a/stdlib/map.mli +++ b/stdlib/map.mli @@ -166,7 +166,7 @@ module type S = val exists: (key -> 'a -> bool) -> 'a t -> bool (** [exists p m] checks if at least one binding of the map - satisfy the predicate [p]. + satisfies the predicate [p]. @since 3.12.0 *) diff --git a/stdlib/marshal.mli b/stdlib/marshal.mli index 7790d21573..c287a2914e 100644 --- a/stdlib/marshal.mli +++ b/stdlib/marshal.mli @@ -90,7 +90,7 @@ val to_channel : out_channel -> 'a -> extern_flags list -> unit digest of the code transmitted along with the code position.) The exact definition of which free variables are captured in a - closure is not specified and can very between bytecode and native + closure is not specified and can vary between bytecode and native code (and according to optimization flags). In particular, a function value accessing a global reference may or may not include the reference in its closure. If it does, unmarshaling the diff --git a/stdlib/nativeint.mli b/stdlib/nativeint.mli index ebd550d48b..b733318db4 100644 --- a/stdlib/nativeint.mli +++ b/stdlib/nativeint.mli @@ -182,7 +182,7 @@ val compare: t -> t -> int {!Set.Make} and {!Map.Make}. *) val equal: t -> t -> bool -(** The equal function for natives ints. +(** The equal function for native ints. @since 4.03.0 *) (**/**) |