Skip to content

Commit 6e225d2

Browse files
authored
Merge pull request #169 from Fourchaux/typos
Fixing typos
2 parents e6c2509 + 0be411b commit 6e225d2

24 files changed

+48
-48
lines changed

CHANGES

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
* Split the ocsigen package in three : tyxml, ocsigenserver and eliom
135135
* Rename into ocsigenserver
136136
* Revproxy, Accesscontrol: Handling {{{X-Forwarded-For}}} and {{{X-Forwarded-Proto}}} headers
137-
* HTTP parser rewrited
137+
* HTTP parser rewritten
138138

139139
===== 1.90 =====
140140

@@ -465,7 +465,7 @@
465465
browsers).
466466
** Eliom: More secure cookies.
467467
** Eliom: new version of the tutorial.
468-
** Eliom splitted in several modules.
468+
** Eliom split in several modules.
469469
** Eliom: Nurpawiki example now called Miniwiki.
470470
** Eliom: {{{any_...}}} form widgets now called {{{raw_...}}}
471471
** Eliom: {{{~url}}} parameter (for {{{new_service}}}, etc.) now
@@ -565,11 +565,11 @@
565565
of type body content.
566566
* Eliom: Module {{{Text}}} replaced by {{{HtmlText}}}, and adding
567567
{{{CssText}}} and {{{Text}}} (for any content type).
568-
* Eliom: Bugfix - Typing errors of parameters are now catched only
568+
* Eliom: Bugfix - Typing errors of parameters are now caught only
569569
if the names of parameters fit exactly.
570570
* Eliom: {{{register_service}}} now called {{{register}}}.
571571
* Eliom: EXPERIMENTAL Fallbacks can now get a "Session expired" from
572-
previous pages and actions may send informations to the page
572+
previous pages and actions may send information to the page
573573
generated (using exception).
574574
* Eliom: Now possible to pre-apply services (to make links or to be
575575
used as fallbacks for coservices)
@@ -588,7 +588,7 @@
588588
* Ocsigen: Simplifying parsing of configuration file (could be
589589
improved).
590590
* Ocsigen: EXPERIMENTAL It is now possible to reload the modules
591-
without stoping the server.
591+
without stopping the server.
592592
* Staticmod: Rewriting of URLs using regular expressions.
593593

594594
===== 0.6.0 (2007-03-14) =====
@@ -679,7 +679,7 @@
679679
parameters. Note that {{{**}}} is used to create **pairs** and not
680680
tuples.
681681
* The {{{a}}} and {{{post_form}}} functions now take a fix number of
682-
parameters, correponding to GET parameters.
682+
parameters, corresponding to GET parameters.
683683
* //URLs// are now called //services//,
684684
* //state URLs// are now called //auxiliary services//,
685685
* {{{register_post_url}}} does not exist anymore. use

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ CHMOD := chmod
545545
INSTALL := install
546546
CC := gcc
547547
548-
# optionnal
548+
# optional
549549
RLWRAP := $rlwrap
550550
551551

src/baselib/ocsigen_lib_base.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ module String_base = struct
298298
with Invalid_argument _ -> raise Not_found
299299

300300
(* Cut a string to the next separator, removing spaces.
301-
Raises Not_found if the separator connot be found.
301+
Raises Not_found if the separator cannot be found.
302302
*)
303303
let sep char s =
304304
let len = String.length s in

src/baselib/ocsigen_messages.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,15 @@ reviewed the proposed library, it is next step.
172172
The four methods tested are: lazy, fun, ifprint, and fun moving the "if"
173173
to the caller (see full listing and results at the end of the post). Two
174174
test has been done for each one: when parameter is an integer constant
175-
and when parameter is the result of a funcion call who mades an addition.
175+
and when parameter is the result of a function call who mades an addition.
176176
177177
The conclusion seems: defining that "lazy" method needs 1 unit of time,
178178
proposal using "fun" instead of lazy needs 0.8, and the version
179179
"ifprintf" needs 16. Proposal moving the "if" needs 0.7.
180180
181181
Thus, if no error has been done, fun is the fastest option, lazy is near.
182182
183-
Another point is the posibility of, using a camlp4 syntax extension, to
183+
Another point is the possibility of, using a camlp4 syntax extension, to
184184
introduce a few of sugar. Something like expand:
185185
186186
from: log "some=%d\n" 14;

src/baselib/ocsigen_stream.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ val cont : 'a -> (unit -> 'a step Lwt.t) -> 'a step Lwt.t
6262
finalizers must be called manually. *)
6363
val add_finalizer : 'a t -> (outcome -> unit Lwt.t) -> unit
6464

65-
(** Finalize the stream. This function must be called explicitely after reading
65+
(** Finalize the stream. This function must be called explicitly after reading
6666
the stream, otherwise finalizers won't be called. *)
6767
val finalize : 'a t -> outcome -> unit Lwt.t
6868

src/extensions/cgimod.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ type reg = {
5858
path: string; (** path of the script *)
5959
path_info: string; (** path_info environment variable *)
6060

61-
exec:string option; (** binary to execute the script with (optionnal) *)
61+
exec:string option; (** binary to execute the script with (optional) *)
6262
env:(string * string) list (** environment variables *) }
6363

6464
(*****************************************************************************)
@@ -121,7 +121,7 @@ let string_conform2 s =
121121
(* split a string in two parts, according to a regexp *)
122122
let split_regexp r s =
123123
match Regexp.string_match r s 0 with
124-
| None -> None (* the begining of the string doesn't match the regexp *)
124+
| None -> None (* the beginning of the string doesn't match the regexp *)
125125
| Some result ->
126126
let (split,l) = Regexp.match_end result, String.length s in
127127
let s' = Regexp.first_chars s split in

src/extensions/deflatemod.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ let convert = function
238238
|(None,v) -> Some (Star, qvalue v)
239239
|_ -> None
240240

241-
(* Follow http's RFC to select the transfert encoding *)
241+
(* Follow http's RFC to select the transfer encoding *)
242242
let select_encoding accept_header =
243243
let h = List.sort enc_compare (filtermap convert accept_header) in
244244
let (exclude,accept) =

src/extensions/ocsigen_comet.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ let map_rev_accu_split func lst accu1 accu2 =
4646
(*** EXTENSION OPTIONS ***)
4747

4848

49-
(* timeout for comet connections : if no value has been written in the ellapsed
49+
(* timeout for comet connections : if no value has been written in the elapsed
5050
* time, connection will be closed. Should be equal to client timeout. *)
5151
let timeout_ref = ref 20.
5252
let get_timeout () = !timeout_ref
@@ -128,7 +128,7 @@ end = struct
128128
let new_id = Ocsigen_lib.make_cryptographic_safe_string
129129

130130
(* because Hashtables allow search for elements with a corresponding hash, we
131-
* have to create a dummy channel in order to retreive the original channel.
131+
* have to create a dummy channel in order to retrieve the original channel.
132132
* Is there a KISSer way to do that ? *)
133133
let (dummy1, dummy2) = Lwt.task ()
134134
let dummy_chan i =
@@ -212,7 +212,7 @@ sig
212212

213213
val decode_upcomming :
214214
Ocsigen_extensions.request -> (Channels.t list * Channels.chan_id list) Lwt.t
215-
(* decode incomming message : the result is the list of channels to listen
215+
(* decode incoming message : the result is the list of channels to listen
216216
to (on the left) or to signal non existence (on the right). *)
217217

218218
val encode_downgoing :

src/extensions/ocsipersist-dbm/ocsipersist.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ let rec get_indescr i =
130130
end
131131
else (Lwt_unix.sleep 2.1) >>= (fun () -> get_indescr (i-1))))
132132

133-
let inch = ref (Lwt.fail (Failure "Ocsipersist not initalised"))
134-
let outch = ref (Lwt.fail (Failure "Ocsipersist not initalised"))
133+
let inch = ref (Lwt.fail (Failure "Ocsipersist not initialised"))
134+
let outch = ref (Lwt.fail (Failure "Ocsipersist not initialised"))
135135

136136
let init_fun config =
137137
let (store, ocsidbmconf, delay_loading) =
@@ -354,7 +354,7 @@ let iter_block a b = failwith "iter_block not implemented for DBM. Please use Oc
354354

355355
let length table =
356356
db_length table
357-
(* Because of Dbm implementation, the result may be less thann the expected
357+
(* Because of Dbm implementation, the result may be less than the expected
358358
result in some case (with a version of ocsipersist based on Dbm) *)
359359

360360
let _ = Ocsigen_extensions.register_extension ~name:"ocsipersist" ~init_fun ()

src/extensions/staticmod.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ exception Not_concerned
3333
(*****************************************************************************)
3434
(* Structures describing the static pages a each virtual server *)
3535

36-
(* A static site is either an entire directory served unconditionnaly,
36+
(* A static site is either an entire directory served unconditionally,
3737
or a more elaborate redirection based on regexpes and http error
3838
codes. See the web documentation of staticmod for detail *)
3939
type static_site_kind =

0 commit comments

Comments
 (0)