Kian-Meng, Ang 3 лет назад
Родитель
Сommit
b12b4300ba

+ 1 - 1
doc/src/guide/migrating_from_2.5.asciidoc

@@ -64,7 +64,7 @@ experimental.
 * Add automatic handling of range requests to REST handlers
 * Add automatic handling of range requests to REST handlers
   that return the callback `auto` from `ranges_accepted/2`.
   that return the callback `auto` from `ranges_accepted/2`.
   Cowboy will call the configured `ProvideCallback` and
   Cowboy will call the configured `ProvideCallback` and
-  then split the ouput automatically for the ranged response.
+  then split the output automatically for the ranged response.
 
 
 * Enable range requests support in `cowboy_static`.
 * Enable range requests support in `cowboy_static`.
 
 

+ 3 - 3
doc/src/manual/cowboy_stream.asciidoc

@@ -52,11 +52,11 @@ HTTP/1.1 will initialize a stream only when the request-line
 and all headers have been received. When errors occur before
 and all headers have been received. When errors occur before
 that point Cowboy will call the callback `early_error/5`
 that point Cowboy will call the callback `early_error/5`
 with a partial request, the error reason and the response
 with a partial request, the error reason and the response
-Cowboy intends to send. All other events go throuh the
+Cowboy intends to send. All other events go through the
 stream handler using the normal callbacks.
 stream handler using the normal callbacks.
 
 
 HTTP/2 will initialize the stream when the `HEADERS` block has
 HTTP/2 will initialize the stream when the `HEADERS` block has
-been fully received and decoded. Any protocol error occuring
+been fully received and decoded. Any protocol error occurring
 before that will not result in a response being sent and
 before that will not result in a response being sent and
 will therefore not go through the stream handler. In addition
 will therefore not go through the stream handler. In addition
 Cowboy may terminate streams without sending an HTTP response
 Cowboy may terminate streams without sending an HTTP response
@@ -278,7 +278,7 @@ This can also be used to override stream handler
 options. For example this is supported by
 options. For example this is supported by
 link:man:cowboy_compress_h(3)[cowboy_compress_h(3)].
 link:man:cowboy_compress_h(3)[cowboy_compress_h(3)].
 
 
-Not all options can be overriden. Please consult the
+Not all options can be overridden. Please consult the
 relevant option's documentation for details.
 relevant option's documentation for details.
 
 
 == Predefined events
 == Predefined events

+ 1 - 1
doc/src/manual/cowboy_websocket.asciidoc

@@ -126,7 +126,7 @@ timeout::
     received first.
     received first.
 
 
 {error, Reason}::
 {error, Reason}::
-    A socket error ocurred.
+    A socket error occurred.
 
 
 == Types
 == Types
 
 

+ 1 - 1
test/rest_handler_SUITE.erl

@@ -127,7 +127,7 @@ do_accept_callback_true(Config, Fun) ->
 	ok.
 	ok.
 
 
 charset_in_content_types_provided(Config) ->
 charset_in_content_types_provided(Config) ->
-	doc("When a charset is matched explictly in content_types_provided, "
+	doc("When a charset is matched explicitly in content_types_provided, "
 		"that charset is used and the charsets_provided callback is ignored."),
 		"that charset is used and the charsets_provided callback is ignored."),
 	ConnPid = gun_open(Config),
 	ConnPid = gun_open(Config),
 	Ref = gun:get(ConnPid, "/charset_in_content_types_provided", [
 	Ref = gun:get(ConnPid, "/charset_in_content_types_provided", [