From 4d2b1673f8ce9925cf786fec16f4cff4ab036a4f Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 27 May 2020 17:00:13 -0700 Subject: [PATCH] docs: Replace support@zulipchat.com with support@zulip.com. The new address is cleaner and shorter. --- docs/production/mobile-push-notifications.md | 4 ++-- templates/corporate/billing.html | 4 ++-- templates/corporate/upgrade.html | 2 +- templates/zerver/atlassian.md | 2 +- templates/zerver/faq.html | 2 +- templates/zerver/for/mystery-hunt.md | 2 +- templates/zerver/for/open-source.md | 2 +- templates/zerver/for/research.md | 2 +- templates/zerver/help/configure-authentication-methods.md | 2 +- templates/zerver/help/contact-support.md | 4 ++-- templates/zerver/help/export-your-organization.md | 4 ++-- templates/zerver/help/gdpr-compliance.md | 4 ++-- templates/zerver/help/import-from-gitter.md | 2 +- templates/zerver/help/import-from-hipchat.md | 2 +- templates/zerver/help/import-from-mattermost.md | 2 +- templates/zerver/help/import-from-slack.md | 2 +- templates/zerver/help/message-retention-policy.md | 2 +- templates/zerver/help/saml-authentication.md | 4 ++-- zerver/forms.py | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/production/mobile-push-notifications.md b/docs/production/mobile-push-notifications.md index d2d1c1b443..12cb7fee8c 100644 --- a/docs/production/mobile-push-notifications.md +++ b/docs/production/mobile-push-notifications.md @@ -36,7 +36,7 @@ follows: This command will print the registration data it would send to the mobile push notifications service, ask you to accept the terms of service, and if you accept, register your server. If you have trouble, - email support@zulipchat.com with the output of this command. + email support@zulip.com with the output of this command. 1. If you or your users have already set up the Zulip mobile app, you'll each need to log out and log back in again in order to start @@ -146,7 +146,7 @@ and privacy in mind: by a small team of security expert engineers. If you have any questions about the security model, contact -support@zulipchat.com. +support@zulip.com. ## Submitting statistics diff --git a/templates/corporate/billing.html b/templates/corporate/billing.html index e5c8bb6842..ae5127afa4 100644 --- a/templates/corporate/billing.html +++ b/templates/corporate/billing.html @@ -135,7 +135,7 @@

- Contact support@zulipchat.com + Contact support@zulip.com for billing history or to make changes to your subscription.

@@ -155,7 +155,7 @@

- Contact support@zulipchat.com for billing history. + Contact support@zulip.com for billing history.

{% else %} diff --git a/templates/corporate/upgrade.html b/templates/corporate/upgrade.html index 225a3ebd9b..ccf9c0cc91 100644 --- a/templates/corporate/upgrade.html +++ b/templates/corporate/upgrade.html @@ -222,7 +222,7 @@

We're happy to help! - Contact support@zulipchat.com + Contact support@zulip.com for any billing-related questions.

diff --git a/templates/zerver/atlassian.md b/templates/zerver/atlassian.md index 2202b934c8..b8b9477d49 100644 --- a/templates/zerver/atlassian.md +++ b/templates/zerver/atlassian.md @@ -66,6 +66,6 @@ chat model. ## Decide on a payment plan. See [zulipchat.com/plans](https://zulipchat.com/plans) for Cloud -pricing, or email for on-premise support +pricing, or email for on-premise support options. We also offer affordable paid installation help that includes installing and configuring Zulip. diff --git a/templates/zerver/faq.html b/templates/zerver/faq.html index 4b5772bc78..386dc7abc1 100644 --- a/templates/zerver/faq.html +++ b/templates/zerver/faq.html @@ -64,7 +64,7 @@ on-premise) ensure you can always move from our hosting to yours (and back). If you’d like to do a migration, email - support@zulipchat.com and we’ll get you started! + support@zulip.com and we’ll get you started!

diff --git a/templates/zerver/for/mystery-hunt.md b/templates/zerver/for/mystery-hunt.md index 45ddf5db3e..1f19fa0f92 100644 --- a/templates/zerver/for/mystery-hunt.md +++ b/templates/zerver/for/mystery-hunt.md @@ -43,7 +43,7 @@ it’s easy to write bots that send things into or out of Zulip. [Click here](https://zulipchat.com/new) to create an organization; it only takes only about 30 seconds. If you decide to continue using it, just email -support@zulipchat.com to tell us you’re a mystery hunt team. +support@zulip.com to tell us you’re a mystery hunt team. **Where do I go for further information?** diff --git a/templates/zerver/for/open-source.md b/templates/zerver/for/open-source.md index 9704406dc6..ef20d1eab5 100644 --- a/templates/zerver/for/open-source.md +++ b/templates/zerver/for/open-source.md @@ -97,7 +97,7 @@ commercial offerings. This offer extends to any community involved in supporting free and open source software: development projects, foundations, meetups, hackathons, conference committees, and more. If you’re not sure whether your organization qualifies, send us an email at -support@zulipchat.com. +support@zulip.com. ### Moderation suite. diff --git a/templates/zerver/for/research.md b/templates/zerver/for/research.md index 4bea36bf0b..29dc605e71 100644 --- a/templates/zerver/for/research.md +++ b/templates/zerver/for/research.md @@ -88,7 +88,7 @@ like Category Theory). This free hosting is supported by (and is identical to) zulipchat.com’s commercial offerings. If you’re not sure whether your -organization qualifies, send us an email at support@zulipchat.com. +organization qualifies, send us an email at support@zulip.com. ### Native LaTeX support powered by KaTeX diff --git a/templates/zerver/help/configure-authentication-methods.md b/templates/zerver/help/configure-authentication-methods.md index 2e1476a4e7..56a3a218bd 100644 --- a/templates/zerver/help/configure-authentication-methods.md +++ b/templates/zerver/help/configure-authentication-methods.md @@ -9,7 +9,7 @@ these methods. LDAP and various custom SSO login methods are currently restricted to self-hosted Zulips only. SAML authentication is supported by Zulip -Cloud but requires contacting support@zulipchat.com to configure it. +Cloud but requires contacting support@zulip.com to configure it. **Note:** If you are running your own server, [read this](https://zulip.readthedocs.io/en/latest/production/authentication-methods.html) diff --git a/templates/zerver/help/contact-support.md b/templates/zerver/help/contact-support.md index 39adcffc16..6d1a405ea1 100644 --- a/templates/zerver/help/contact-support.md +++ b/templates/zerver/help/contact-support.md @@ -9,7 +9,7 @@ channels: to a couple days later, but Zulip's threading makes it easy for us to reply to every thread. Please read the community conventions (linked above) and choose a topic when starting a conversation. -* We aim to reply to [email support](mailto:support@zulipchat.com) +* We aim to reply to [email support](mailto:support@zulip.com) questions within a business day. Simple queries or requests for data imports generally receive faster replies. * GitHub [server](https://github.com/zulip/zulip/issues/new), web @@ -29,5 +29,5 @@ organization. ## Billing and commercial questions -We provide exclusively [email support](mailto:support@zulipchat.com) +We provide exclusively [email support](mailto:support@zulip.com) for sales, billing, partnerships, and other commercial questions. diff --git a/templates/zerver/help/export-your-organization.md b/templates/zerver/help/export-your-organization.md index 5cbb7fb474..5b1a5f8da4 100644 --- a/templates/zerver/help/export-your-organization.md +++ b/templates/zerver/help/export-your-organization.md @@ -43,7 +43,7 @@ with lots of messages or uploaded files. {start_tabs} -1. Email support@zulipchat.com with your zulipchat.com subdomain, asking for +1. Email support@zulip.com with your zulipchat.com subdomain, asking for a full export with member consent. Email us from the same address that you use to sign in to Zulip. @@ -72,7 +72,7 @@ import. This export is limited to paid Zulip Standard customers, though in rare cases may be available to other organizations in case of due legal process. -To start this export, email support@zulipchat.com with your zulipchat.com +To start this export, email support@zulip.com with your zulipchat.com subdomain, asking for a full export without member consent. You'll also need to email us evidence that you have authority to read diff --git a/templates/zerver/help/gdpr-compliance.md b/templates/zerver/help/gdpr-compliance.md index a76eb591a3..4b50a98b1c 100644 --- a/templates/zerver/help/gdpr-compliance.md +++ b/templates/zerver/help/gdpr-compliance.md @@ -115,7 +115,7 @@ GDPR: * The [Zulip REST API](https://zulipchat.com/api/rest) lets you automate your processes for handling GDPR requests. -Contact [support@zulipchat.com](mailto:support@zulipchat.com) for +Contact [support@zulip.com](mailto:support@zulip.com) for any assistance related to this topic. ## GDPR compliance on-premises @@ -141,5 +141,5 @@ may be useful: There's a lot more that goes into GDPR compliance, including securing your server infrastructure responsibly, internal policies around access, logging, and backups, etc. If you need detailed guidance, we -recommend contacting support@zulipchat.com; our paid support contracts +recommend contacting support@zulip.com; our paid support contracts include assistance with understanding GDPR compliance with Zulip. diff --git a/templates/zerver/help/import-from-gitter.md b/templates/zerver/help/import-from-gitter.md index 477838825f..920404e5cf 100644 --- a/templates/zerver/help/import-from-gitter.md +++ b/templates/zerver/help/import-from-gitter.md @@ -29,7 +29,7 @@ First, export your data from Gitter. ### Import into zulipchat.com -Email support@zulipchat.com with `gitter_data.zip` and your desired +Email support@zulip.com with `gitter_data.zip` and your desired subdomain. Your imported organization will be hosted at `.zulipchat.com`. diff --git a/templates/zerver/help/import-from-hipchat.md b/templates/zerver/help/import-from-hipchat.md index 5aa5304324..3d99581b91 100644 --- a/templates/zerver/help/import-from-hipchat.md +++ b/templates/zerver/help/import-from-hipchat.md @@ -78,7 +78,7 @@ download the file. ### Import into zulipchat.com -Email support@zulipchat.com with your exported archive and your desired Zulip +Email support@zulip.com with your exported archive and your desired Zulip subdomain. Your imported organization will be hosted at `.zulipchat.com`. diff --git a/templates/zerver/help/import-from-mattermost.md b/templates/zerver/help/import-from-mattermost.md index 6fa443c874..597cf5166a 100644 --- a/templates/zerver/help/import-from-mattermost.md +++ b/templates/zerver/help/import-from-mattermost.md @@ -122,7 +122,7 @@ Replace `` and `` with the appropriate values below. ### Import into zulipchat.com -Email support@zulipchat.com with your exported archive, +Email support@zulip.com with your exported archive, the name of the Mattermost team you want to import, and your desired Zulip subdomain. Your imported organization will be hosted at `.zulipchat.com`. diff --git a/templates/zerver/help/import-from-slack.md b/templates/zerver/help/import-from-slack.md index 397f2be267..710c6917ca 100644 --- a/templates/zerver/help/import-from-slack.md +++ b/templates/zerver/help/import-from-slack.md @@ -58,7 +58,7 @@ This step will also generate a different token starting with ### Import into zulipchat.com -Email support@zulipchat.com with `slack_data.zip`, the Slack API token +Email support@zulip.com with `slack_data.zip`, the Slack API token generated above, and your desired subdomain. Your imported organization will be hosted at `.zulipchat.com`. diff --git a/templates/zerver/help/message-retention-policy.md b/templates/zerver/help/message-retention-policy.md index e75ae9215a..3a48f35126 100644 --- a/templates/zerver/help/message-retention-policy.md +++ b/templates/zerver/help/message-retention-policy.md @@ -19,7 +19,7 @@ Zulip's system supports: In Zulip Cloud, message retention policies are available on the Zulip Cloud Standard and Zulip Cloud Plus [plans](https://zulip.com/plans), as well as for the hundreds of communities with sponsored Cloud -Standard hosting. Contact support@zulipchat.com if you're on one of +Standard hosting. Contact support@zulip.com if you're on one of these plans and would like to enable it. ## Important details diff --git a/templates/zerver/help/saml-authentication.md b/templates/zerver/help/saml-authentication.md index e8b740ca8f..93a1a777fa 100644 --- a/templates/zerver/help/saml-authentication.md +++ b/templates/zerver/help/saml-authentication.md @@ -22,7 +22,7 @@ Zulip with various common SAML Identity Providers. `first_name` to `user.firstName`, and `last_name` to `user.lastName`. 1. Assign the appropriate accounts in the "Assignments" tab. These are the users that will be able to log in to your Zulip organization. -1. Send the following information to us at support@zulipchat.com: +1. Send the following information to us at support@zulip.com: * The URL of your zulipchat-hosted organization. * The "Identity Provider metadata" provided by Okta for the application. * The name "X" that will be displayed on the "Log in with X" button in Zulip. @@ -48,7 +48,7 @@ Zulip with various common SAML Identity Providers. Make sure to set the "Include in SAML assertion" flag on these parameters. 1. The OneLogin side of configuration should be ready! - Send the following information to us at support@zulipchat.com: + Send the following information to us at support@zulip.com: * The URL of your zulipchat-hosted organization. * The issuer URL from the "SSO" section. It contains Identity Provider metadata that we will need. * The name "X" that will be displayed on the "Log in with X" button in Zulip. diff --git a/zerver/forms.py b/zerver/forms.py index 13a5325dfb..dddb9e33d1 100644 --- a/zerver/forms.py +++ b/zerver/forms.py @@ -40,7 +40,7 @@ from two_factor.utils import totp_digits MIT_VALIDATION_ERROR = 'That user does not exist at MIT or is a ' + \ 'mailing list. ' + \ 'If you want to sign up an alias for Zulip, ' + \ - 'contact us.' + 'contact us.' WRONG_SUBDOMAIN_ERROR = "Your Zulip account is not a member of the " + \ "organization associated with this subdomain. " + \ "Please contact your organization administrator with any questions."