diff options
| author | Loïc Hoguin <[email protected]> | 2013-06-29 19:52:52 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2013-06-29 19:52:52 +0200 |
| commit | cc4c046ec051c8ddd7b78bc9f13bc7357d1d106e (patch) | |
| tree | b182df1716755ef35003f8b767396517a4301f21 | |
| parent | 116acaead7c988bf292bdae68e9016ef962553da (diff) | |
| parent | f664329b0b11bdaa74f694260b3e3b3678f83d81 (diff) | |
| download | cowboy-cc4c046ec051c8ddd7b78bc9f13bc7357d1d106e.tar.gz cowboy-cc4c046ec051c8ddd7b78bc9f13bc7357d1d106e.tar.bz2 cowboy-cc4c046ec051c8ddd7b78bc9f13bc7357d1d106e.zip | |
Merge branch 'fix_docs' of git://github.com/pannonia-technologies/cowboy
| -rw-r--r-- | guide/erlang_web.md | 4 | ||||
| -rw-r--r-- | guide/getting_started.md | 2 | ||||
| -rw-r--r-- | guide/modern_web.md | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/guide/erlang_web.md b/guide/erlang_web.md index d665ffe..fa3d922 100644 --- a/guide/erlang_web.md +++ b/guide/erlang_web.md @@ -43,7 +43,7 @@ designed to work in a distributed setting, so it is a perfect match. Or is it? Surely you can find solutions to handle that many -concurrent connections with my favorite language... But all +concurrent connections with your favorite language... But all these solutions will break down in the next few years. Why? Firstly because servers don't get any more powerful, they instead get a lot more cores and memory. This is only useful @@ -90,7 +90,7 @@ The Web is asynchronous Long ago, the Web was synchronous because HTTP was synchronous. You fired a request, and then waited for a response. Not anymore. -It all started when XmlHttpRequest started being used. It allowed +It all began when XmlHttpRequest started being used. It allowed the client to perform asynchronous calls to the server. Then Websocket appeared and allowed both the server and the client diff --git a/guide/getting_started.md b/guide/getting_started.md index 812b1e0..abd807a 100644 --- a/guide/getting_started.md +++ b/guide/getting_started.md @@ -50,7 +50,7 @@ we will just use the plain HTTP handler, which has three callback functions: init/3, handle/2 and terminate/3. You can find more information about the arguments and possible return values of these callbacks in the [cowboy_http_handler function reference](http://ninenines.eu/docs/en/cowboy/HEAD/manual/cowboy_http_handler). -Following is an example of a simple HTTP handler module. +Here is an example of a simple HTTP handler module. ``` erlang -module(my_handler). diff --git a/guide/modern_web.md b/guide/modern_web.md index 6c668b3..65e1c1c 100644 --- a/guide/modern_web.md +++ b/guide/modern_web.md @@ -66,7 +66,7 @@ of concerns between the client and the server. They communicate by referencing resources. Resources can be identified, but also manipulated. A resource representation has a media type and information about whether it can be cached and how. Hypermedia -determines how resources are related and they can be used. +determines how resources are related and how they can be used. REST is also stateless. All requests contain the complete information necessary to perform the action. |