diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 73a4e10f..5dd414e0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,18 +4,13 @@ Welcome! Our community focuses on helping others and making Caddy the best it can be. We gladly accept contributions and encourage you to get involved! -### Join us in chat +### Join us in the forum -Please direct your discussion to the correct room: +The [Caddy forum](https://forum.caddyserver.com) is the place for all discussion +that doesn't belong in issues or pull requests. Feel free to participate with us! -- **Dev Chat:** [gitter.im/mholt/caddy](https://gitter.im/mholt/caddy) - to chat -with other Caddy developers -- **Support:** -[gitter.im/caddyserver/support](https://gitter.im/caddyserver/support) - to give -and get help -- **General:** -[gitter.im/caddyserver/general](https://gitter.im/caddyserver/general) - for -anything about Web development +If you want to file a bug report or make an improvement to Caddy, however, you +should submit an issue or pull request. ### Bug reports diff --git a/README.md b/README.md index e1fe9ef9..b1631642 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Caddy](https://caddyserver.com/resources/images/caddy-boxed.png)](https://caddyserver.com) -[![Dev Chat](https://img.shields.io/badge/dev%20chat-gitter-ff69b4.svg?style=flat-square&label=dev+chat&color=ff69b4)](https://gitter.im/mholt/caddy) +[![community](https://img.shields.io/badge/community-forum-ff69b4.svg?style=flat-square)](https://forum.caddyserver.com) [![Documentation](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square)](https://godoc.org/github.com/mholt/caddy) [![Linux Build Status](https://img.shields.io/travis/mholt/caddy.svg?style=flat-square&label=linux+build)](https://travis-ci.org/mholt/caddy) [![Windows Build Status](https://img.shields.io/appveyor/ci/mholt/caddy.svg?style=flat-square&label=windows+build)](https://ci.appveyor.com/project/mholt/caddy) @@ -143,14 +143,11 @@ packages that each Caddy package imports. ## Contributing -**[Join our dev chat on Gitter](https://gitter.im/mholt/caddy)** to chat with -other Caddy developers! (Dev chat only; try our -[support room](https://gitter.im/caddyserver/support) for help or -[general](https://gitter.im/caddyserver/general) for anything else.) +**[Join our community](https://forum.caddyserver.com) where you can chat with other Caddy users and developers!** -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. +Please see our [contributing guidelines](https://github.com/mholt/caddy/blob/master/CONTRIBUTING.md). + +We use GitHub issues and pull requests *only* for bug reports and discussing specific changes to Caddy. We welcome all other topics on the [forum](https://forum.caddyserver.com)! Thanks for making Caddy -- and the Web -- better! diff --git a/dist/README.txt b/dist/README.txt index aeba8e85..298f35f7 100644 --- a/dist/README.txt +++ b/dist/README.txt @@ -3,6 +3,9 @@ CADDY 0.8.3 Website https://caddyserver.com +Community + https://forum.caddyserver.com + Twitter @caddyserver