Skip to content

Commit

Permalink
Merge branch 'master' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
yogsototh committed Apr 15, 2012
2 parents 85d7ae9 + b395818 commit b029e2a
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
10 changes: 5 additions & 5 deletions content/html/en/blog/Yesod-tutorial-for-newbies.md
Expand Up @@ -242,7 +242,7 @@ Let's take a look at the file `config/routes`:
/favicon.ico FaviconR GET
/robots.txt RobotsR GET

/ RootR GET
/ HomeR GET
</pre>

We want to add a route of the form `/echo/[anything]` somehow and do some action with this.
Expand All @@ -262,7 +262,7 @@ Application.hs:31:1: Not in scope: `getEchoR'
</pre>

Why? Simply because we didn't written the code for the handler `EchoR`.
Edit the file `Handler/Root.hs` and append this:
Edit the file `Handler/Home.hs` and append this:

<code class="haskell">
getEchoR :: String -> Handler RepHtml
Expand Down Expand Up @@ -382,17 +382,17 @@ getEchoR theText = do
[whamlet|<h1>#{theText}|]
</code>

Do not forget to remove the getEchoR function inside `Handler/Root.hs`.
Do not forget to remove the getEchoR function inside `Handler/Home.hs`.

We must declare this new file into`yosog.cabal`.
Just after `Handler.Root`, add:
Just after `Handler.Home`, add:

<pre>
Handler.Echo
</pre>

We must also declare this new Handler module inside `Application.hs`.
Just after the "`import Handler.Root`", add:
Just after the "`import Handler.Home`", add:

<code class="haskell">
import Handler.Echo
Expand Down
10 changes: 5 additions & 5 deletions content/html/fr/blog/Yesod-tutorial-for-newbies.md
Expand Up @@ -243,7 +243,7 @@ Let's take a look at the file `config/routes`:
/favicon.ico FaviconR GET
/robots.txt RobotsR GET

/ RootR GET
/ HomeR GET
</pre>

We want to add a route of the form `/echo/[anything]` somehow and do some action with this.
Expand All @@ -263,7 +263,7 @@ Application.hs:31:1: Not in scope: `getEchoR'
</pre>

Why? Simply because we didn't written the code for the handler `EchoR`.
Edit the file `Handler/Root.hs` and append this:
Edit the file `Handler/Home.hs` and append this:

<code class="haskell">
getEchoR :: String -> Handler RepHtml
Expand Down Expand Up @@ -383,17 +383,17 @@ getEchoR theText = do
[whamlet|<h1>#{theText}|]
</code>

Do not forget to remove the getEchoR function inside `Handler/Root.hs`.
Do not forget to remove the getEchoR function inside `Handler/Home.hs`.

We must declare this new file into`yosog.cabal`.
Just after `Handler.Root`, add:
Just after `Handler.Home`, add:

<pre>
Handler.Echo
</pre>

We must also declare this new Handler module inside `Application.hs`.
Just after the "`import Handler.Root`", add:
Just after the "`import Handler.Home`", add:

<code class="haskell">
import Handler.Echo
Expand Down
10 changes: 5 additions & 5 deletions multi/blog/Yesod-tutorial-for-newbies.md
Expand Up @@ -249,7 +249,7 @@ Let's take a look at the file `config/routes`:
/favicon.ico FaviconR GET
/robots.txt RobotsR GET

/ RootR GET
/ HomeR GET
</pre>

We want to add a route of the form `/echo/[anything]` somehow and do some action with this.
Expand All @@ -269,7 +269,7 @@ Application.hs:31:1: Not in scope: `getEchoR'
</pre>

Why? Simply because we didn't written the code for the handler `EchoR`.
Edit the file `Handler/Root.hs` and append this:
Edit the file `Handler/Home.hs` and append this:

<code class="haskell">
getEchoR :: String -> Handler RepHtml
Expand Down Expand Up @@ -389,17 +389,17 @@ getEchoR theText = do
[whamlet|<h1>#{theText}|]
</code>

Do not forget to remove the getEchoR function inside `Handler/Root.hs`.
Do not forget to remove the getEchoR function inside `Handler/Home.hs`.

We must declare this new file into`yosog.cabal`.
Just after `Handler.Root`, add:
Just after `Handler.Home`, add:

<pre>
Handler.Echo
</pre>

We must also declare this new Handler module inside `Application.hs`.
Just after the "`import Handler.Root`", add:
Just after the "`import Handler.Home`", add:

<code class="haskell">
import Handler.Echo
Expand Down
10 changes: 5 additions & 5 deletions output/Scratch/en/blog/Yesod-tutorial-for-newbies/index.html
Expand Up @@ -326,7 +326,7 @@ <h2 id="echo">Echo</h2>
/favicon.ico FaviconR GET
/robots.txt RobotsR GET

/ RootR GET
/ HomeR GET
</pre>

<p>We want to add a route of the form <code>/echo/[anything]</code> somehow and do some action with this.
Expand All @@ -346,7 +346,7 @@ <h2 id="echo">Echo</h2>
</pre>

<p>Why? Simply because we didn&rsquo;t written the code for the handler <code>EchoR</code>.
Edit the file <code>Handler/Root.hs</code> and append this:</p>
Edit the file <code>Handler/Home.hs</code> and append this:</p>

<pre class="twilight">
<span class="Entity">getEchoR</span> :: <span class="Constant">String</span> -&gt; <span class="Constant">Handler</span> <span class="Constant">RepHtml</span>
Expand Down Expand Up @@ -468,17 +468,17 @@ <h4 id="separate-handlers">Separate Handlers</h4>
[whamlet|&lt;h1&gt;#{theText}|]
</pre>

<p>Do not forget to remove the getEchoR function inside <code>Handler/Root.hs</code>.</p>
<p>Do not forget to remove the getEchoR function inside <code>Handler/Home.hs</code>.</p>

<p>We must declare this new file into<code>yosog.cabal</code>.
Just after <code>Handler.Root</code>, add:</p>
Just after <code>Handler.Home</code>, add:</p>

<pre>
Handler.Echo
</pre>

<p>We must also declare this new Handler module inside <code>Application.hs</code>.
Just after the &ldquo;<code>import Handler.Root</code>&rdquo;, add:</p>
Just after the &ldquo;<code>import Handler.Home</code>&rdquo;, add:</p>

<pre class="twilight">
<span class="Keyword">import</span> <span class="Constant">Handler</span>.<span class="Constant">Echo</span>
Expand Down
10 changes: 5 additions & 5 deletions output/Scratch/fr/blog/Yesod-tutorial-for-newbies/index.html
Expand Up @@ -327,7 +327,7 @@ <h2 id="echo">Echo</h2>
/favicon.ico FaviconR GET
/robots.txt RobotsR GET

/ RootR GET
/ HomeR GET
</pre>

<p>We want to add a route of the form <code>/echo/[anything]</code> somehow and do some action with this.
Expand All @@ -347,7 +347,7 @@ <h2 id="echo">Echo</h2>
</pre>

<p>Why? Simply because we didn&rsquo;t written the code for the handler <code>EchoR</code>.
Edit the file <code>Handler/Root.hs</code> and append this:</p>
Edit the file <code>Handler/Home.hs</code> and append this:</p>

<pre class="twilight">
<span class="Entity">getEchoR</span> :: <span class="Constant">String</span> -&gt; <span class="Constant">Handler</span> <span class="Constant">RepHtml</span>
Expand Down Expand Up @@ -469,17 +469,17 @@ <h4 id="separate-handlers">Separate Handlers</h4>
[whamlet|&lt;h1&gt;#{theText}|]
</pre>

<p>Do not forget to remove the getEchoR function inside <code>Handler/Root.hs</code>.</p>
<p>Do not forget to remove the getEchoR function inside <code>Handler/Home.hs</code>.</p>

<p>We must declare this new file into<code>yosog.cabal</code>.
Just after <code>Handler.Root</code>, add:</p>
Just after <code>Handler.Home</code>, add:</p>

<pre>
Handler.Echo
</pre>

<p>We must also declare this new Handler module inside <code>Application.hs</code>.
Just after the &ldquo;<code>import Handler.Root</code>&rdquo;, add:</p>
Just after the &ldquo;<code>import Handler.Home</code>&rdquo;, add:</p>

<pre class="twilight">
<span class="Keyword">import</span> <span class="Constant">Handler</span>.<span class="Constant">Echo</span>
Expand Down

0 comments on commit b029e2a

Please sign in to comment.