update CONTRIBUTING.md to newer version

CONTRIBUTING.md

@@ -22,27 +22,37 @@ ask contributors to follow so that we can merge your changes quickly.
 
 ## Submitting Changes
 
-* <a href="https://docs.google.com/forms/d/1g7EF6PERciwn7zfmfke5Sir2n10yddGGSXyZsq98tVY/viewform?usp=send_form">Sign the Contributor License Agreement</a>
+* <a href="https://docs.google.com/forms/d/1g7EF6PERciwn7zfmfke5Sir2n10yddGGSXyZsq98tVY/viewform?usp=send_form">Sign the Contributor License Agreement</a>.
+* All content, comments, and pull requests must follow the [Stellar Community Guidelines](https://www.stellar.org/community-guidelines/).
 * Push your changes to a topic branch in your fork of the repository.
-* Submit a pull request to the corresponding repository in the Stellar organization.
+* Submit a pull request to the [solar repository](https://github.com/stellar/solar) in the Stellar organization.
  * Include a descriptive [commit message](https://github.com/erlang/otp/wiki/Writing-good-commit-messages).
  * Changes contributed via pull request should focus on a single issue at a time.
  * Rebase your local changes against the master branch. Resolve any conflicts that arise.
-
-At this point you're waiting on us. We like to at least comment on pull requests within three 
-business days. We may suggest some changes or improvements or alternatives.
+
+At this point you're waiting on us. We like to at least comment on pull requests within three
+business days (and, typically, one business day). We may suggest some changes or improvements or alternatives.
+
+## Making Trivial Changes
+
+### Documentation
+For changes of a trivial nature to comments and documentation, it is not
+always necessary to create a new GitHub issue. In this case, it is
+appropriate to start the first line of a commit with 'doc' instead of
+an issue number.
 
 # Additional Resources
 
-* [Bug tracker (Github)](https://github.com/stellar/solar/issues)
 * <a href="https://docs.google.com/forms/d/1g7EF6PERciwn7zfmfke5Sir2n10yddGGSXyZsq98tVY/viewform?usp=send_form">Contributor License Agreement</a>
-* #stellar-dev IRC channel on freenode.org and Slack chat on stellar-public.slack.com
+* [Readme for solar](https://github.com/stellar/solar/blob/master/README.md)
+* #stellar-dev IRC channel on freenode.org
+* #dev channel on [Slack](http://slack.stellar.org)
 
 
 This document is inspired by:
 
-https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md 
+https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md
 
-https://github.com/thoughtbot/factory_girl_rails/blob/master/CONTRIBUTING.md 
+https://github.com/thoughtbot/factory_girl_rails/blob/master/CONTRIBUTING.md
 
 https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md