aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/SUPPORT.md40
-rw-r--r--CODE_OF_CONDUCT.md2
-rw-r--r--CONTRIBUTING.md17
-rw-r--r--README.md20
4 files changed, 40 insertions, 39 deletions
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
index b6f2e942e9..978f011f23 100644
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -1,28 +1,22 @@
-# Support #
+[![Zulip][zulip-badge]][zulip-link]
+[![Discourse][discourse-badge]][discourse-link]
+
+[discourse-badge]: https://img.shields.io/badge/Discourse-forum-informational.svg
+[discourse-link]: https://coq.discourse.group/
-Get in touch with the user community and ask questions about Coq on
-our [Discourse forum][]. Posts in other languages than English are
-explicitly welcome there. There is also a historic mailing list called
-the [Coq-Club][] which has lots of subscribers, and an IRC channel
-(`irc://irc.freenode.net/#coq`).
+[zulip-badge]: https://img.shields.io/badge/Zulip-chat-informational.svg
+[zulip-link]: https://coq.zulipchat.com/
+
+# Support #
-In addition, you may also ask questions about Coq on [Stack
-Overflow][] (use the tag [coq][Stack Overflow tag]) or on the
-meta-theory of Coq on the [TCS Stack Exchange][] (which also has a
-[coq][TCS SE tag] tag).
+<!-- content copied verbatim from "Questions and discussion" in README.md -->
-You can reach the Coq development team through the [development
-category][] of the above mentioned Discourse forum, the [Gitter
-channel][], and of course the bug tracker.
+We have a number of channels to reach the user community and the
+development team:
-See also [coq.inria.fr/community](https://coq.inria.fr/community.html).
+- Our [Zulip chat][zulip-link], for casual and high traffic discussions.
+- Our [Discourse forum][discourse-link], for more structured and easily browsable discussions and Q&A.
+- Our historical mailing list, the [Coq-Club](https://sympa.inria.fr/sympa/info/coq-club).
-[Discourse forum]: https://coq.discourse.group
-[Coq-Club]: https://sympa.inria.fr/sympa/arc/coq-club
-[Stack Overflow]: https://stackoverflow.com
-[Stack Overflow tag]: https://stackoverflow.com/questions/tagged/coq
-[TCS Stack Exchange]: https://cstheory.stackexchange.com/
-[TCS SE tag]: https://cstheory.stackexchange.com/questions/tagged/coq
-[development category]: https://coq.discourse.group/c/coq-development
-[Gitter channel]: https://gitter.im/coq/coq
-[bug tracker]: https://github.com/coq/coq/issues
+See also [coq.inria.fr/community](https://coq.inria.fr/community.html), which
+lists several other active platforms.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 0720cf6210..0d8751de7e 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -11,7 +11,7 @@ Their goal is that everyone feels safe and welcome when contributing to Coq or
interacting with others in Coq related forums.
These rules apply to all spaces managed by the Coq development team.
-This includes the GitHub repository, the mailing lists, the Gitter channel,
+This includes the GitHub repository, the Discourse forum, the Zulip chat, the mailing lists,
physical events like Coq working groups and workshops, and any other forums
created or managed by the development team which the community uses for
communication. In addition, violations of these rules outside these spaces may
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 525ced7fee..8a09e43c94 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -179,7 +179,8 @@ Learn how to write a Coq plugin, and about best practices, in the Coq
progress, so do not hesitate to expand it, or ask questions.
If you want quick feedback on best practices, or how to talk to the
-Coq API, a good place to hang out is the Coq [Gitter channel][Gitter].
+Coq API, a good place to hang out is the [Coq devs & plugin devs
+stream][Zulip-dev] of our Zulip chat.
Finally, we strongly encourage authors of plugins to submit their
plugins to join Coq's continuous integration (CI) early on. Indeed,
@@ -285,7 +286,7 @@ GitHub account). You can file a bug for any of the following:
It would help if you search the existing issues before reporting a
bug. This can be difficult, so consider it extra credit. We don't
mind duplicate bug reports. If unsure, you are always very welcome to
-ask on our [Discourse forum][Discourse] or [Gitter chat][Gitter]
+ask on our [Discourse forum][Discourse] or [Zulip chat][Zulip]
before, after, or while writing a bug report.
It is better if you can test that your bug is still present in the
@@ -364,7 +365,7 @@ Being in this team will grant you the following access:
idea for a new feature).
- **Creating new labels:** if you feel a `part:` label is missing, do
not hesitate to create it. If you are not sure, you may discuss it
- with other contributors and developers on [Gitter][] first.
+ with other contributors and developers on [Zulip][Zulip-dev] first.
- **Closing issues:** if a bug cannot be reproduced anymore, is a
duplicate, or should not be considered a bug report in the first
place, you should close it. When doing so, try putting an
@@ -1133,7 +1134,7 @@ before a change is ready on your side.
When opening a draft PR, make sure to give it a descriptive enough
title so that interested developers still notice it in their
notification feed. You may also advertise it by talking about it in
-our [developer chat][Gitter]. If you know which developer would be
+our [developer chat][Zulip-dev]. If you know which developer would be
able to provide useful feedback to you, you may also ping them.
###### Turning a PR into draft mode ######
@@ -1182,8 +1183,9 @@ documentation is still a work-in-progress.
### Online forum and chat to talk to developers ###
We have a [Discourse forum][Discourse] (see in particular the [Coq
-development category][Discourse-development-category]) and a [Gitter
-chat][Gitter]. Feel free to join any of them and ask questions.
+development][Discourse-development-category] category) and a [Zulip
+chat][Zulip] (see in particular the [Coq devs & plugin devs][Zulip-dev]
+stream). Feel free to join any of them and ask questions.
People are generally happy to help and very reactive.
Obviously, the issue tracker is also a good place to ask questions,
@@ -1267,7 +1269,6 @@ can be found [on the wiki][wiki-CUDW].
[GitHub-wiki-extensions]: https://help.github.com/en/articles/editing-wiki-content
[GitLab-coq]: https://gitlab.com/coq
[GitLab-doc]: https://docs.gitlab.com/
-[Gitter]: https://gitter.im/coq/coq
[JasonGross-coq-tools]: https://github.com/JasonGross/coq-tools
[jenkins-doc]: https://github.com/coq/coq/wiki/Jenkins-(automated-benchmarking)
[kind-documentation]: https://github.com/coq/coq/issues?q=is%3Aopen+is%3Aissue+label%3A%22kind%3A+documentation%22
@@ -1311,3 +1312,5 @@ can be found [on the wiki][wiki-CUDW].
[wiki-CUDW]: https://github.com/coq/coq/wiki/CoqImplementorsWorkshop
[wiki-WG]: https://github.com/coq/coq/wiki/Coq-Working-Groups
[YouTube]: https://www.youtube.com/channel/UCbJo6gYYr0OF18x01M4THdQ
+[Zulip]: https://coq.zulipchat.com
+[Zulip-dev]: https://coq.zulipchat.com/#narrow/stream/237656-Coq-devs.20.26.20plugin.20devs
diff --git a/README.md b/README.md
index ccb026fd58..62004c0036 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
[![GitLab][gitlab-badge]][gitlab-link]
[![Azure Pipelines][azure-badge]][azure-link]
-[![Gitter][gitter-badge]][gitter-link]
+[![Zulip][zulip-badge]][zulip-link]
+[![Discourse][discourse-badge]][discourse-link]
[![DOI][doi-badge]][doi-link]
[gitlab-badge]: https://gitlab.com/coq/coq/badges/master/pipeline.svg
@@ -11,8 +12,11 @@
[azure-badge]: https://dev.azure.com/coq/coq/_apis/build/status/coq.coq?branchName=master
[azure-link]: https://dev.azure.com/coq/coq/_build/latest?definitionId=1?branchName=master
-[gitter-badge]: https://badges.gitter.im/coq/coq.svg
-[gitter-link]: https://gitter.im/coq/coq
+[discourse-badge]: https://img.shields.io/badge/Discourse-forum-informational.svg
+[discourse-link]: https://coq.discourse.group/
+
+[zulip-badge]: https://img.shields.io/badge/Zulip-chat-informational.svg
+[zulip-link]: https://coq.zulipchat.com/
[doi-badge]: https://zenodo.org/badge/DOI/10.5281/zenodo.1003420.svg
[doi-link]: https://doi.org/10.5281/zenodo.1003420
@@ -102,12 +106,12 @@ approach some problems you may encounter.
We have a number of channels to reach the user community and the
development team:
-- Our [Discourse forum](https://coq.discourse.group).
-- Our mailing list, the [Coq-Club](https://sympa.inria.fr/sympa/info/coq-club).
-- Our [Gitter channel][gitter-link], which is a good way to reach
- developers for quick chat and development questions.
+- Our [Zulip chat][zulip-link], for casual and high traffic discussions.
+- Our [Discourse forum][discourse-link], for more structured and easily browsable discussions and Q&A.
+- Our historical mailing list, the [Coq-Club](https://sympa.inria.fr/sympa/info/coq-club).
-See also [coq.inria.fr/community](https://coq.inria.fr/community.html).
+See also [coq.inria.fr/community](https://coq.inria.fr/community.html), which
+lists several other active platforms.
## Bug reports