From: Jean Privat <jean@pryen.org>
Date: Thu, 27 Apr 2017 20:07:37 +0000 (-0400)
Subject: Merge: Check binary files that might be wrongly commited
X-Git-Url: http://nitlanguage.org?ds=sidebyside;hp=-c

Merge: Check binary files that might be wrongly commited

Pull-Request: #2273
Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net>
---

75e2bbbac3603f35b5f2b15ac18c2c5a486e79d2
diff --combined lib/popcorn/README.md
index 4da9733,b5737a3..bbc9c95
--- a/lib/popcorn/README.md
+++ b/lib/popcorn/README.md
@@@ -364,7 -364,7 +364,7 @@@ The app declared in this example will t
  ### Route parameters
  
  **Route parameters** are variable parts of a route path. They can be used to path
- arguments within the URI.
+ arguments within the URI.
  Parameters in a route are prefixed with a colon `:` like in `:userId`, `:year`.
  
  The following example declares a handler `UserHome` that responds with the `user`
@@@ -718,7 -718,7 +718,7 @@@ app.listen("localhost", 3000
  
  ## Sessions
  
 -**Sessions** can be used thanks to the built-in `SessionMiddleware`.
 +**Sessions** can be used thanks to the built-in `SessionInit` middleware.
  
  Here a simple example of login button that define a value in the `req` session.
  
@@@ -747,7 -747,7 +747,7 @@@ class AppLogi
  end
  
  var app = new App
 -app.use("/*", new SessionInit)
 +app.use_before("/*", new SessionInit)
  app.use("/", new AppLogin)
  app.listen("localhost", 3000)
  ~~~