summaryrefslogtreecommitdiffstats
path: root/docs/en/cowboy
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2016-12-28 17:58:28 +0100
committerLoïc Hoguin <[email protected]>2016-12-28 17:58:28 +0100
commit1780abb415b1a9c27c3a1f53267e9689da6b0005 (patch)
treec24aace1c86174d44f9e9a4ff8d6504bb51d0b6e /docs/en/cowboy
parent67d8600081356707f2f2e8ecd56958bb38bc9eb1 (diff)
downloadninenines.eu-1780abb415b1a9c27c3a1f53267e9689da6b0005.tar.gz
ninenines.eu-1780abb415b1a9c27c3a1f53267e9689da6b0005.tar.bz2
ninenines.eu-1780abb415b1a9c27c3a1f53267e9689da6b0005.zip
Update docs
Diffstat (limited to 'docs/en/cowboy')
-rw-r--r--docs/en/cowboy/2.0/guide/getting_started.asciidoc11
-rw-r--r--docs/en/cowboy/2.0/guide/getting_started/index.html10
2 files changed, 15 insertions, 6 deletions
diff --git a/docs/en/cowboy/2.0/guide/getting_started.asciidoc b/docs/en/cowboy/2.0/guide/getting_started.asciidoc
index 74164be5..7fb787d1 100644
--- a/docs/en/cowboy/2.0/guide/getting_started.asciidoc
+++ b/docs/en/cowboy/2.0/guide/getting_started.asciidoc
@@ -71,10 +71,15 @@ PROJECT = hello_erlang
DEPS = cowboy
dep_cowboy_commit = master
+DEP_PLUGINS = cowboy
+
include erlang.mk
----
-If you run `make run` now, Cowboy will be included in the release
+We also tell the build system to load the plugins Cowboy provides.
+These include predefined templates that we will use soon.
+
+If you do `make run` now, Cowboy will be included in the release
and started automatically. This is not enough however, as Cowboy
doesn't do anything by default. We still need to tell Cowboy to
listen for connections.
@@ -119,7 +124,7 @@ HTTP handler.
Generate a handler from a template:
[source,bash]
-$ make new t=cowboy_http n=hello_handler
+$ make new t=cowboy.http n=hello_handler
Then, open the 'src/hello_handler.erl' file and modify
the `init/2` function like this to send a reply.
@@ -134,7 +139,7 @@ init(Req0, State) ->
{ok, Req, State}.
----
-What the above code does is send a `200 OK` reply, with the
+What the above code does is send a 200 OK reply, with the
Content-type header set to `text/plain` and the response
body set to `Hello Erlang!`.
diff --git a/docs/en/cowboy/2.0/guide/getting_started/index.html b/docs/en/cowboy/2.0/guide/getting_started/index.html
index cbfd7b58..3cac27bb 100644
--- a/docs/en/cowboy/2.0/guide/getting_started/index.html
+++ b/docs/en/cowboy/2.0/guide/getting_started/index.html
@@ -149,8 +149,12 @@ http://www.gnu.org/software/src-highlite -->
<span style="color: #009900">DEPS =</span> cowboy
<span style="color: #009900">dep_cowboy_commit =</span> master
+<span style="color: #009900">DEP_PLUGINS =</span> cowboy
+
include erlang.mk</tt></pre></div></div>
-<div class="paragraph"><p>If you run <code>make run</code> now, Cowboy will be included in the release
+<div class="paragraph"><p>We also tell the build system to load the plugins Cowboy provides.
+These include predefined templates that we will use soon.</p></div>
+<div class="paragraph"><p>If you do <code>make run</code> now, Cowboy will be included in the release
and started automatically. This is not enough however, as Cowboy
doesn&#8217;t do anything by default. We still need to tell Cowboy to
listen for connections.</p></div>
@@ -199,7 +203,7 @@ HTTP handler.</p></div>
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ make new <span style="color: #009900">t</span><span style="color: #990000">=</span>cowboy_http <span style="color: #009900">n</span><span style="color: #990000">=</span>hello_handler</tt></pre></div></div>
+<pre><tt>$ make new <span style="color: #009900">t</span><span style="color: #990000">=</span>cowboy<span style="color: #990000">.</span>http <span style="color: #009900">n</span><span style="color: #990000">=</span>hello_handler</tt></pre></div></div>
<div class="paragraph"><p>Then, open the <em>src/hello_handler.erl</em> file and modify
the <code>init/2</code> function like this to send a reply.</p></div>
<div class="listingblock">
@@ -213,7 +217,7 @@ http://www.gnu.org/software/src-highlite -->
<span style="color: #990000">&lt;&lt;</span><span style="color: #FF0000">"Hello Erlang!"</span><span style="color: #990000">&gt;&gt;</span>,
<span style="color: #009900">Req0</span>),
{<span style="color: #FF6600">ok</span>, <span style="color: #009900">Req</span>, <span style="color: #009900">State</span>}<span style="color: #990000">.</span></tt></pre></div></div>
-<div class="paragraph"><p>What the above code does is send a <code>200 OK</code> reply, with the
+<div class="paragraph"><p>What the above code does is send a 200 OK reply, with the
Content-type header set to <code>text/plain</code> and the response
body set to <code>Hello Erlang!</code>.</p></div>
<div class="paragraph"><p>If you run the release and open <a href="http://localhost:8080">http://localhost:8080</a>