The new address is cleaner and shorter.
This commit is contained in:
Tim Abbott
2020-05-27 17:00:13 -07:00
committed by Mateusz Mandera
parent 501e7c44dc
commit 4d2b1673f8
19 changed files with 25 additions and 25 deletions

View File

@@ -36,7 +36,7 @@ follows:
This command will print the registration data it would send to the This command will print the registration data it would send to the
mobile push notifications service, ask you to accept the terms of mobile push notifications service, ask you to accept the terms of
service, and if you accept, register your server. If you have trouble, 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, 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 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. by a small team of security expert engineers.
If you have any questions about the security model, contact If you have any questions about the security model, contact
support@zulipchat.com. support@zulip.com.
## Submitting statistics ## Submitting statistics

View File

@@ -135,7 +135,7 @@
<hr> <hr>
<div class="support-link"> <div class="support-link">
<p> <p>
Contact <a href="mailto:support@zulipchat.com">support@zulipchat.com</a> Contact <a href="mailto:support@zulip.com">support@zulip.com</a>
for billing history or to make changes to your subscription. for billing history or to make changes to your subscription.
</p> </p>
</div> </div>
@@ -155,7 +155,7 @@
</div> </div>
<div class="support-link"> <div class="support-link">
<p> <p>
Contact <a href="mailto:support@zulipchat.com">support@zulipchat.com</a> for billing history. Contact <a href="mailto:support@zulip.com">support@zulip.com</a> for billing history.
</p> </p>
</div> </div>
{% else %} {% else %}

View File

@@ -222,7 +222,7 @@
<div class="support-link"> <div class="support-link">
<p> <p>
We're happy to help! We're happy to help!
Contact <a href="mailto:support@zulipchat.com">support@zulipchat.com</a> Contact <a href="mailto:support@zulip.com">support@zulip.com</a>
for any billing-related questions. for any billing-related questions.
</p> </p>
</div> </div>

View File

@@ -66,6 +66,6 @@ chat model.
## Decide on a payment plan. ## Decide on a payment plan.
See [zulipchat.com/plans](https://zulipchat.com/plans) for Cloud See [zulipchat.com/plans](https://zulipchat.com/plans) for Cloud
pricing, or email <support@zulipchat.com> for on-premise support pricing, or email <support@zulip.com> for on-premise support
options. We also offer affordable paid installation help that includes options. We also offer affordable paid installation help that includes
installing and configuring Zulip. installing and configuring Zulip.

View File

@@ -64,7 +64,7 @@
<a href="https://zulip.readthedocs.io/en/latest/production/export-and-import.html">on-premise</a>) ensure you can always move <a href="https://zulip.readthedocs.io/en/latest/production/export-and-import.html">on-premise</a>) ensure you can always move
from our hosting to yours (and back). If from our hosting to yours (and back). If
you&rsquo;d like to do a migration, email you&rsquo;d like to do a migration, email
support@zulipchat.com and well get you started! support@zulip.com and well get you started!
</p> </p>
</div> </div>
<div class="faq"> <div class="faq">

View File

@@ -43,7 +43,7 @@ its easy to write bots that send things into or out of Zulip.
[Click here](https://zulipchat.com/new) to create an organization; it [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 only takes only about 30 seconds. If you decide to continue using it, just email
support@zulipchat.com to tell us youre a mystery hunt team. support@zulip.com to tell us youre a mystery hunt team.
**Where do I go for further information?** **Where do I go for further information?**

View File

@@ -97,7 +97,7 @@ commercial offerings. This offer extends to any community involved in
supporting free and open source software: development projects, foundations, supporting free and open source software: development projects, foundations,
meetups, hackathons, conference committees, and more. If youre not sure meetups, hackathons, conference committees, and more. If youre not sure
whether your organization qualifies, send us an email at whether your organization qualifies, send us an email at
support@zulipchat.com. support@zulip.com.
### Moderation suite. ### Moderation suite.

View File

@@ -88,7 +88,7 @@ like Category Theory).
This free hosting is supported by (and is identical to) This free hosting is supported by (and is identical to)
zulipchat.coms commercial offerings. If youre not sure whether your zulipchat.coms commercial offerings. If youre 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 ### Native LaTeX support powered by KaTeX

View File

@@ -9,7 +9,7 @@ these methods.
LDAP and various custom SSO login methods are currently restricted to LDAP and various custom SSO login methods are currently restricted to
self-hosted Zulips only. SAML authentication is supported by Zulip 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, **Note:** If you are running your own server,
[read this](https://zulip.readthedocs.io/en/latest/production/authentication-methods.html) [read this](https://zulip.readthedocs.io/en/latest/production/authentication-methods.html)

View File

@@ -9,7 +9,7 @@ channels:
to a couple days later, but Zulip's threading makes it easy for us to a couple days later, but Zulip's threading makes it easy for us
to reply to every thread. Please read the community conventions to reply to every thread. Please read the community conventions
(linked above) and choose a topic when starting a conversation. (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 questions within a business day. Simple queries or requests for
data imports generally receive faster replies. data imports generally receive faster replies.
* GitHub [server](https://github.com/zulip/zulip/issues/new), web * GitHub [server](https://github.com/zulip/zulip/issues/new), web
@@ -29,5 +29,5 @@ organization.
## Billing and commercial questions ## 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. for sales, billing, partnerships, and other commercial questions.

View File

@@ -43,7 +43,7 @@ with lots of messages or uploaded files.
{start_tabs} {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 a full export with member consent. Email us from the same address that
you use to sign in to Zulip. you use to sign in to Zulip.
@@ -72,7 +72,7 @@ import.
This export is limited to paid Zulip Standard customers, though in rare 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. 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. subdomain, asking for a full export without member consent.
You'll also need to email us evidence that you have authority to read You'll also need to email us evidence that you have authority to read

View File

@@ -115,7 +115,7 @@ GDPR:
* The [Zulip REST API](https://zulipchat.com/api/rest) lets you * The [Zulip REST API](https://zulipchat.com/api/rest) lets you
automate your processes for handling GDPR requests. 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. any assistance related to this topic.
## GDPR compliance on-premises ## GDPR compliance on-premises
@@ -141,5 +141,5 @@ may be useful:
There's a lot more that goes into GDPR compliance, including securing There's a lot more that goes into GDPR compliance, including securing
your server infrastructure responsibly, internal policies around your server infrastructure responsibly, internal policies around
access, logging, and backups, etc. If you need detailed guidance, we 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. include assistance with understanding GDPR compliance with Zulip.

View File

@@ -29,7 +29,7 @@ First, export your data from Gitter.
### Import into zulipchat.com ### 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 subdomain. Your imported organization will be hosted at
`<subdomain>.zulipchat.com`. `<subdomain>.zulipchat.com`.

View File

@@ -78,7 +78,7 @@ download the file.
### Import into zulipchat.com ### 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 subdomain. Your imported organization will be hosted at
`<subdomain>.zulipchat.com`. `<subdomain>.zulipchat.com`.

View File

@@ -122,7 +122,7 @@ Replace `<username>` and `<server_ip>` with the appropriate values below.
### Import into zulipchat.com ### 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 the name of the Mattermost team you want to import, and your desired Zulip
subdomain. Your imported organization will be hosted at subdomain. Your imported organization will be hosted at
`<subdomain>.zulipchat.com`. `<subdomain>.zulipchat.com`.

View File

@@ -58,7 +58,7 @@ This step will also generate a different token starting with
### Import into zulipchat.com ### 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 generated above, and your desired subdomain. Your imported organization will
be hosted at `<subdomain>.zulipchat.com`. be hosted at `<subdomain>.zulipchat.com`.

View File

@@ -19,7 +19,7 @@ Zulip's system supports:
In Zulip Cloud, message retention policies are available on the Zulip In Zulip Cloud, message retention policies are available on the Zulip
Cloud Standard and Zulip Cloud Plus [plans](https://zulip.com/plans), Cloud Standard and Zulip Cloud Plus [plans](https://zulip.com/plans),
as well as for the hundreds of communities with sponsored Cloud 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. these plans and would like to enable it.
## Important details ## Important details

View File

@@ -22,7 +22,7 @@ Zulip with various common SAML Identity Providers.
`first_name` to `user.firstName`, and `last_name` to `user.lastName`. `first_name` to `user.firstName`, and `last_name` to `user.lastName`.
1. Assign the appropriate accounts in the "Assignments" tab. These are the users 1. Assign the appropriate accounts in the "Assignments" tab. These are the users
that will be able to log in to your Zulip organization. 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 URL of your zulipchat-hosted organization.
* The "Identity Provider metadata" provided by Okta for the application. * 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. * 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. Make sure to set the "Include in SAML assertion" flag on these parameters.
1. The OneLogin side of configuration should be ready! 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 URL of your zulipchat-hosted organization.
* The issuer URL from the "SSO" section. It contains Identity Provider metadata that we will need. * 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. * The name "X" that will be displayed on the "Log in with X" button in Zulip.

View File

@@ -40,7 +40,7 @@ from two_factor.utils import totp_digits
MIT_VALIDATION_ERROR = 'That user does not exist at MIT or is a ' + \ MIT_VALIDATION_ERROR = 'That user does not exist at MIT or is a ' + \
'<a href="https://ist.mit.edu/email-lists">mailing list</a>. ' + \ '<a href="https://ist.mit.edu/email-lists">mailing list</a>. ' + \
'If you want to sign up an alias for Zulip, ' + \ 'If you want to sign up an alias for Zulip, ' + \
'<a href="mailto:support@zulipchat.com">contact us</a>.' '<a href="mailto:support@zulip.com">contact us</a>.'
WRONG_SUBDOMAIN_ERROR = "Your Zulip account is not a member of the " + \ WRONG_SUBDOMAIN_ERROR = "Your Zulip account is not a member of the " + \
"organization associated with this subdomain. " + \ "organization associated with this subdomain. " + \
"Please contact your organization administrator with any questions." "Please contact your organization administrator with any questions."