Skip to content

Commit

Permalink
Fix some typos
Browse files Browse the repository at this point in the history
  • Loading branch information
trexnix committed Aug 16, 2015
1 parent f56e213 commit 9153712
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion source/guides/actions/overview.md
Expand Up @@ -56,7 +56,7 @@ The whole action name is `Web::Controllers::Dashboard::Index`.

### Action Module

Lotus philosophy emphatizes _composition over inheritance_ and avoids the [framework superclass antipattern](http://michaelfeathers.typepad.com/michael_feathers_blog/2013/01/the-framework-superclass-anti-pattern.html).
Lotus philosophy emphasizes _composition over inheritance_ and avoids the [framework superclass antipattern](http://michaelfeathers.typepad.com/michael_feathers_blog/2013/01/the-framework-superclass-anti-pattern.html).
For this reason, all the components are provided as **modules to include** instead of base classes to inherit from.

Like we said before, Lotus can run multiple apps within the same Ruby process.
Expand Down
4 changes: 2 additions & 2 deletions source/guides/getting-started.md
Expand Up @@ -139,7 +139,7 @@ The first thing we need to add is a route:
get '/', to: 'home#index'
```

The root we added pointed our application's root URL to the `index` action of the `home` controller (see the [routing guide](/guides/routing/overview) for more information).
The root we pointed our application's root URL to the `index` action of the `home` controller (see the [routing guide](/guides/routing/overview) for more information).
Now we can create the index action.

```ruby
Expand Down Expand Up @@ -196,7 +196,7 @@ Lotus uses a _"Container"_ architecture by default, whereby a single project can
Such applications might include a JSON API, an admin panel, a marketing website, and so forth.

All these applications live under `apps/`, with the default application named `web`.
Lotus' core frameworks are duplicated when the container boots, so configurations for different containers don't interfere with others.
Lotus' core frameworks are duplicated when the container boots, so configurations for different applications don't interfere with others.

Let's recap what we've seen so far: to get our own page on the screen, we followed the execution path of a request in Lotus through the router into a controller action, through a view, to a template file.

Expand Down

0 comments on commit 9153712

Please sign in to comment.