diff --git a/README.md b/README.md index 6d1bd8e58c..397eed4765 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ possible bugs. Zulip also has a [blog](https://blog.zulip.org/). Last but not least, we use [GitHub](https://github.com/zulip/zulip) to track Zulip-related issues (and store our code, of course). -Anybody with a Github account should be able to create Issues there +Anybody with a GitHub account should be able to create Issues there pertaining to bugs or enhancement requests. We also use Pull Requests as our primary mechanism to receive code contributions. diff --git a/templates/zerver/features.html b/templates/zerver/features.html index 4c9ddd93b0..937c9e8410 100644 --- a/templates/zerver/features.html +++ b/templates/zerver/features.html @@ -125,7 +125,7 @@
{% trans %}Get alerts and updates from your favorite services with off-the-shelf integrations for - Trac, Nagios, Github, Jenkins, and more.{% endtrans %}
+ Trac, Nagios, GitHub, Jenkins, and more.{% endtrans %}Further configuration is possible. By default, commits traffic (pushes, commit comments), - Github issues traffic, and pull requests are enabled. You can exclude certain types of traffic + GitHub issues traffic, and pull requests are enabled. You can exclude certain types of traffic via the checkboxes. If you want commit traffic, issue traffic, and pull requests to go to different places, you can use the Commit Stream and Issue Stream overrides; otherwise, it is safe to leave these fields blank and just have it default to the Stream