From 19ca7d812e1c84194b38a9b6c1f5a0d17c2c8cfe Mon Sep 17 00:00:00 2001 From: jungle-boogie Date: Tue, 24 Nov 2015 11:04:15 -0800 Subject: [PATCH 1/2] more copy edits add links to inspired by projects and updated language with golang. --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dd865d86..383a2c41 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ You may also be interested in the [developer guide] ## 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` 2. `cd` into your website's directory @@ -160,9 +160,11 @@ for hosting the Caddy project. 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 -inspiration from [spark](https://github.com/rif/spark), nginx, lighttpd, -Websocketd, and Vagrant, and provides a pleasant mixture of features from each -of them. +inspiration from [spark](https://github.com/rif/spark), +[nginx](https://github.com/nginx/nginx), lighttpd, +[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)* From 6478eee3381e3581e0cc816ec066550a1c693552 Mon Sep 17 00:00:00 2001 From: jungle-boogie Date: Tue, 24 Nov 2015 11:16:05 -0800 Subject: [PATCH 2/2] removed stray ) and spaces. --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 383a2c41..6698dccf 100644 --- a/README.md +++ b/README.md @@ -130,8 +130,8 @@ Caddy is available as a Docker container from any of these sources: #### 3rd-party dependencies -Although Caddy's binaries are completely static, Caddy relies on some excellent -libraries. [Godoc.org](https://godoc.org/github.com/mholt/caddy) shows the +Although Caddy's binaries are completely static, Caddy relies on some excellent +libraries. [Godoc.org](https://godoc.org/github.com/mholt/caddy) shows the packages that each Caddy package imports. @@ -139,18 +139,18 @@ packages that each Caddy package imports. ## Contributing -**[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), +**[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), then join the #caddy channel.) -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) +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) if you haven't already. Thanks for making Caddy -- and the Web -- better! -Special thanks to -[![DigitalOcean](http://i.imgur.com/sfGr0eY.png)](https://www.digitalocean.com) +Special thanks to +[![DigitalOcean](http://i.imgur.com/sfGr0eY.png)](https://www.digitalocean.com) for hosting the Caddy project. @@ -158,12 +158,12 @@ for hosting the Caddy project. ## About the project -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 -inspiration from [spark](https://github.com/rif/spark), -[nginx](https://github.com/nginx/nginx), lighttpd, -[Websocketd]()https://github.com/joewalnes/websocketd) -and [Vagrant](https://www.vagrantup.com/), +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 +inspiration from [spark](https://github.com/rif/spark), +[nginx](https://github.com/nginx/nginx), lighttpd, +[Websocketd](https://github.com/joewalnes/websocketd) +and [Vagrant](https://www.vagrantup.com/), which provides a pleasant mixture of features from each of them.