Commit 0a40970d authored by Matt Holt's avatar Matt Holt

Merge pull request #361 from jungle-boogie/patch-2

more copy edits
parents bc37cf0d 6478eee3
...@@ -95,7 +95,7 @@ You may also be interested in the [developer guide] ...@@ -95,7 +95,7 @@ You may also be interested in the [developer guide]
## Running from Source ## Running from Source
Note: You will need **[Go 1.4](https://golang.org/dl)** or newer Note: You will need **[Go 1.4](https://golang.org/dl)** or a later version.
1. `$ go get github.com/mholt/caddy` 1. `$ go get github.com/mholt/caddy`
2. `cd` into your website's directory 2. `cd` into your website's directory
...@@ -130,8 +130,8 @@ Caddy is available as a Docker container from any of these sources: ...@@ -130,8 +130,8 @@ Caddy is available as a Docker container from any of these sources:
#### 3rd-party dependencies #### 3rd-party dependencies
Although Caddy's binaries are completely static, Caddy relies on some excellent Although Caddy's binaries are completely static, Caddy relies on some excellent
libraries. [Godoc.org](https://godoc.org/github.com/mholt/caddy) shows the libraries. [Godoc.org](https://godoc.org/github.com/mholt/caddy) shows the
packages that each Caddy package imports. packages that each Caddy package imports.
...@@ -139,18 +139,18 @@ packages that each Caddy package imports. ...@@ -139,18 +139,18 @@ packages that each Caddy package imports.
## Contributing ## Contributing
**[Join us on Slack](https://gophers.slack.com/messages/caddy/)** to chat with **[Join us on Slack](https://gophers.slack.com/messages/caddy/)** to chat with
other Caddy developers! ([Request an invite](http://bit.ly/go-slack-signup), other Caddy developers! ([Request an invite](http://bit.ly/go-slack-signup),
then join the #caddy channel.) then join the #caddy channel.)
This project would not be what it is without your help. Please see the This project would not be what it is without your help. Please see the
[contributing guidelines](https://github.com/mholt/caddy/blob/master/CONTRIBUTING.md) [contributing guidelines](https://github.com/mholt/caddy/blob/master/CONTRIBUTING.md)
if you haven't already. if you haven't already.
Thanks for making Caddy -- and the Web -- better! Thanks for making Caddy -- and the Web -- better!
Special thanks to Special thanks to
[![DigitalOcean](http://i.imgur.com/sfGr0eY.png)](https://www.digitalocean.com) [![DigitalOcean](http://i.imgur.com/sfGr0eY.png)](https://www.digitalocean.com)
for hosting the Caddy project. for hosting the Caddy project.
...@@ -158,11 +158,13 @@ for hosting the Caddy project. ...@@ -158,11 +158,13 @@ for hosting the Caddy project.
## About the project ## About the project
Caddy was born out of the need for a "batteries-included" web server that runs Caddy was born out of the need for a "batteries-included" web server that runs
anywhere and doesn't have to take its configuration with it. Caddy took anywhere and doesn't have to take its configuration with it. Caddy took
inspiration from [spark](https://github.com/rif/spark), nginx, lighttpd, inspiration from [spark](https://github.com/rif/spark),
Websocketd, and Vagrant, and provides a pleasant mixture of features from each [nginx](https://github.com/nginx/nginx), lighttpd,
of them. [Websocketd](https://github.com/joewalnes/websocketd)
and [Vagrant](https://www.vagrantup.com/),
which provides a pleasant mixture of features from each of them.
*Twitter: [@mholt6](https://twitter.com/mholt6)* *Twitter: [@mholt6](https://twitter.com/mholt6)*
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment