Merge pull request #236 from fasterthanlime/master

Typos in docs

docs/actions.md

@@ -157,7 +157,7 @@ end)
 By default all cookies are given the additional attributes `Path=/; HttpOnly`
 (which creates a [*session
 cookie*](http://en.wikipedia.org/wiki/HTTP_cookie#Terminology)). You can
-configure a cookie's settings by overidding the the `cookie_attributes`
+configure a cookie's settings by overriding the the `cookie_attributes`
 function on your application. Here's an example that adds an expiration date to
 cookies to make them persist:
 

docs/etlua_templates.md

@@ -8,7 +8,7 @@ code inline in a template file to produce a dynamic output. In Lapis we use
 `etlua` to render dynamic content inside of HTML templates.
 
 `etlua` files use the `.etlua` extension. Lapis knows how to load those types
-of files automatically using Lua's `require` function after you've enable
+of files automatically using Lua's `require` function after you've enabled
 `etlua`
 
 For example, here's a simple template that renders a random number:
@@ -192,7 +192,7 @@ you can also include them using the `render` function.
 Any values and helpers available in the parent template are also available in
 the sub-template.
 
-Somtimes you need to pass data to a sub-template that's generated during the
+Sometimes you need to pass data to a sub-template that's generated during the
 execution of the parent template. `render` takes a second argument of values
 to pass into the sub-template.
 

docs/exception_handling.md

@@ -5,7 +5,7 @@ title: Exception Handling
 ## The Kinds of Errors
 
 Lapis makes a distinction between two kinds of errors: Recoverable and
-non-recoverable errors. Errors thrown by Lua's runtime during executuion or
+non-recoverable errors. Errors thrown by Lua's runtime during execution or
 calls to  `error` are considered non-recoverable. (This also includes the Lua
 built-in function `assert`)
 
@@ -63,7 +63,7 @@ class App extends lapis.Application
 
 What happens when there is an error? The action will stop executing at the
 first error, and then the error handler is run. The default error handler will
-set an array like table of errors in <span
+set an array-like table of errors in <span
 class="for_moon">`@errors`</span><span class="for_lua">`self.errors`</span> and
 return <span class="for_moon">`render: true`</span><span class="for_lua">`{
 render = true }`</span>. In your view you can then display the errors. This

docs/html_generation.md

@@ -276,7 +276,7 @@ class MyView extends Widget
 
 You can use either strings or builder functions as the content.
 
-To access the content from the layout call `@content_for` without the content
+To access the content from the layout, call `@content_for` without the content
 argument:
 
 ```moon

docs/models.md

@@ -80,7 +80,7 @@ class Followings extends Model
   @primary_key: { "user_id", "followed_user_id" }
 ```
 
-## Class Mehods
+## Class Methods
 
 Model class methods are used for fetching existing rows or creating new ones.
 

docs/moon_getting_started.md

@@ -157,7 +157,7 @@ class App extends lapis.Application
 You are free to add as many as you like by calling `@before_filter` multiple
 times. They will be run in the order they are registered.
 
-If a before filter calls the `@write` method then the action will be canceled.
+If a before filter calls the `@write` method then the action will be cancelled.
 For example we can cancel the action and redirect to another page if some
 condition is not met:
 

docs/utilities.md

@@ -36,7 +36,7 @@ Converts a key,value table into a query string
 
 ### `underscore(str)`
 
-Converst CamelCase to camel_case.
+Convert CamelCase to camel_case.
 
 ### `slugify(str)`
 
@@ -531,7 +531,7 @@ cache.delete { "/hello", { thing: "world" } }
 
 ### `delete_all([dict_name="page_cache"])`
 
-Deletes all entires from the cache.
+Deletes all entries from the cache.
 
 ### `delete_path(path, [dict_name="page_cache"])`