Skip to content

Commit

Permalink
misc text changes
Browse files Browse the repository at this point in the history
  • Loading branch information
lancehalvorsen committed Dec 9, 2014
1 parent 9b2a0da commit 3707fc3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions 0_overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ Links to more in-depth information on Plug can be found in the Resources Guide.

### Cowboy

Cowboy is an HTTP server written in Erlang by Loïc Hoguin of [99s](http://ninenines.eu/). Cowboy is built in a modular way on top of Ranch, Bullet, and Sheriff. This is how 99s describes them all.
Cowboy is an HTTP server written in Erlang by Loïc Hoguin of [99s](http://ninenines.eu/). Cowboy is built in a modular way on top of Ranch, Bullet, and Sheriff. This is how 99s describes them.

- Cowboy is a small, fast, modular HTTP server supporting Websockets, SPDY and more.

- Ranch is a socket acceptor pool for TCP protocols. It is also a standalone library for building networked applications.

- Bullet is simple, reliable, efficient streaming library.
- Bullet is a simple, reliable, efficient streaming library.

- Sheriff uses parse transforms for type based validation. Sheriff also validates data dynamically using Erlang's type system with no extra code required.

Expand Down
2 changes: 1 addition & 1 deletion A_up_and_running.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Once the application compiles successfully, we can start it.
$ mix phoenix.start
```

If we point our favorite web browser at [http://localhost:4000](http://localhost:4000), we should see the Phoenix Framework welcome page.
By default Phoenix accepts requests on port 4000. If we point our favorite web browser at [http://localhost:4000](http://localhost:4000), we should see the Phoenix Framework welcome page.

![Phoenix Welcome Page](/images/welcome-to-phoenix.png)

Expand Down
2 changes: 1 addition & 1 deletion B_adding_pages.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Enough prep, let's get on with our first new Phoenix page!

###A New Route

Routes map unique http verb/path pairs to controller/action pairs which will handle them. Phoenix generates a router file for us in new applications at `web/router.ex`. This is where we will be working for this section.
Routes map unique HTTP verb/path pairs to controller/action pairs which will handle them. Phoenix generates a router file for us in new applications at `web/router.ex`. This is where we will be working for this section.

The route for our "Welcome to Phoenix!" page from the previous Up And Running Guide looks like this.
```elixir
Expand Down

0 comments on commit 3707fc3

Please sign in to comment.