Bug 1622956 - Update contact URL and Address

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ffe627d303252c532c9899eb268824afc45df724..ea7187a34c41d649c33c9a4c1d6196b34a9100c7 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -45,11 +45,12 @@ For specific git instructions, see [GitHub workflow 101](https://github.com/serv
 
 In all Bugzilla-related forums, we follow the
 [Mozilla Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/).
- For escalation or moderation issues, please contact inclusion@bugzilla.org instead of inclusion@mozilla.com.
+ For escalation or moderation issues, please contact us on Matrix or email bmo-mods@mozilla.com.
+ To report incidents use [our online reporting tool](https://app.convercent.com/en-us/Anonymous/IssueIntake/Survey?organizationId=11885ec6-e5a6-e811-80e6-000d3ab6ebad&intakeChannelId=2d885ec6-e5a6-e811-80e6-000d3ab6ebad).
  We will respond within 24 hours.
 
 ## Communication
 
-Bugzilla contributors frequent the `#bugzilla` channel on [`irc.mozilla.org`](https://wiki.mozilla.org/IRC).
+Bugzilla contributors frequent the `#bugzilla.mozilla.org` channel on [`chat.mozilla.org`](https://chat.mozilla.org/#/room/#bmo:mozilla.org).
 
 You can also join the [`bugzilla-dev` mailing list](developers@bugzilla.org).

diff --git a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
index ccd1e96f697e19786c9db168dcf7ae2b6be209c8..a8ce04be676aad70f5e99a927a46753a21dc6ae6 100644 (file)
--- a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
@@ -152,19 +152,14 @@
   or if you need to contact a [% terms.Bugzilla %] community administrator urgently:
 </p>
 
-<ul>
-  <li>
-    Send email to <a href="mailto:bmo-mods@mozilla.com">bmo-mods@mozilla.com</a> with
-    the [% terms.bug %] number and a short description of the situation.
-  </li>
-</ul>
-
 <p>
-  If the content of a user's name field contains abusive or offensive content,
-  contact a moderator at
-  <a href="mailto:bmo-mods@mozilla.com">bmo-mods@mozilla.com</a>.
+  To report incidents use [our online reporting tool](https://app.convercent.com/en-us/Anonymous/IssueIntake/Survey?organizationId=11885ec6-e5a6-e811-80e6-000d3ab6ebad&intakeChannelId=2d885ec6-e5a6-e811-80e6-000d3ab6ebad).
 </p>
 
+<p>
+  Using Matrix, you can contact a on-duty staff member in the [bugzilla.mozilla.org channel on chat.mozilla.org](https://chat.mozilla.org/#/room/#bmo:mozilla.org).
+</p>
+  
 <h2>See Also</h2>
 
 <p>