From 7b8ba5ebd91e957b64ac4b8e6c3f78355dea6ca6 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Mon, 8 Jun 2020 15:58:42 -0700 Subject: [PATCH] docs: Update most remaining references to zulipchat.com. In some cases, the cleanest tweak is to replace references to the domain with Zulip Cloud, the product. --- CONTRIBUTING.md | 2 +- docs/THIRDPARTY | 2 +- docs/contributing/gsod-ideas.md | 2 +- docs/overview/architecture-overview.md | 4 ++-- docs/overview/changelog.md | 2 +- docs/production/deployment.md | 2 +- docs/production/export-and-import.md | 8 ++++---- docs/production/security-model.md | 7 +++---- docs/production/troubleshooting.md | 2 +- docs/production/upgrade-or-modify.md | 2 +- docs/subsystems/logging.md | 2 +- docs/testing/testing.md | 2 +- static/js/portico/landing-page.js | 4 ++-- templates/corporate/jobs.html | 2 +- templates/zerver/api/server-settings.md | 2 +- templates/zerver/faq.html | 4 ++-- .../zerver/help/export-your-organization.md | 16 ++++++++-------- .../help/format-your-message-using-markdown.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/plans.html | 2 +- templates/zerver/zulipchat_migration_tos.html | 2 +- .../spiders/common/spiders.py | 2 +- zerver/lib/cache_helpers.py | 2 +- .../migrations/0273_migrate_old_bot_messages.py | 2 +- zerver/models.py | 6 +++--- zproject/default_settings.py | 4 ++-- 29 files changed, 48 insertions(+), 49 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 82577129e9..ed7628d82a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -214,7 +214,7 @@ if appropriate. **Reporting security issues**. Please do not report security issues publicly, including on public streams on chat.zulip.org. You can - email security@zulipchat.com. We create a CVE for every security + email security@zulip.com. We create a CVE for every security issue in our released software. ## User feedback diff --git a/docs/THIRDPARTY b/docs/THIRDPARTY index 63883af717..99c095f6d0 100644 --- a/docs/THIRDPARTY +++ b/docs/THIRDPARTY @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Zulip -Upstream-Contact: Tim Abbott +Upstream-Contact: Tim Abbott Source: https://zulip.com/ Comment: Unless otherwise noted, the Zulip software is distributed under the Apache diff --git a/docs/contributing/gsod-ideas.md b/docs/contributing/gsod-ideas.md index 1084d24904..2e4132e807 100644 --- a/docs/contributing/gsod-ideas.md +++ b/docs/contributing/gsod-ideas.md @@ -288,7 +288,7 @@ they would really appreciate having a few 1-3 minute videos explaining the Zulip model and how to use Zulip efficiently to help train the rest of their organization on the benefits of Zulip. We would hope to link to these videos prominently in the Zulip tutorial experience -(both in-app and on zulipchat.com). The core Zulip team has a pretty +(both in-app and on the landing pages). The core Zulip team has a pretty good idea of how to explain Zulip, but does not have significant experience creating videos, and we would love to work with someone skilled at doing screencast tutorials of software to create something diff --git a/docs/overview/architecture-overview.md b/docs/overview/architecture-overview.md index c90accb15c..84f214fbd1 100644 --- a/docs/overview/architecture-overview.md +++ b/docs/overview/architecture-overview.md @@ -51,8 +51,8 @@ numerous dedicated [Zulip API](https://zulip.com/api) clients (e.g. bots). A server can host multiple Zulip *realms* (organizations), each on its -own (sub)domain. While most deployments host only one organization, some -such as zulipchat.com host thousands. Each organization is a private +own (sub)domain. While most installations host only one organization, some +such as zulip.com host thousands. Each organization is a private chamber with its own users, streams, customizations, and so on. This means that one person might be a user of multiple Zulip realms. The administrators of an organization have a great deal of control over diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md index c2fe729907..fc62f656b3 100644 --- a/docs/overview/changelog.md +++ b/docs/overview/changelog.md @@ -110,7 +110,7 @@ in bursts. - Fixed a couple missing translation tags. - Fixed "User groups" settings UI bug for administrators. - Fixed data import tool to reset resource limits after importing - data from a free plan organization on zulipchat.com. + data from a free plan organization on zulip.com. - Changed the SAML default signature algorithm to SHA-256, overriding the SHA-1 default used by python3-saml. diff --git a/docs/production/deployment.md b/docs/production/deployment.md index 00c2d709a5..e413a67294 100644 --- a/docs/production/deployment.md +++ b/docs/production/deployment.md @@ -60,7 +60,7 @@ though it's also possible to subclass some of the lower-level manifests defined in that directory if you want to customize. A good example of doing this is in the [zulip_ops puppet configuration][zulipchat-puppet] that we use as part -of managing chat.zulip.org and zulipchat.com. +of managing chat.zulip.org and zulip.com. ### Using Zulip with Amazon RDS as the database diff --git a/docs/production/export-and-import.md b/docs/production/export-and-import.md index 1cd16fa810..81de21623c 100644 --- a/docs/production/export-and-import.md +++ b/docs/production/export-and-import.md @@ -235,7 +235,7 @@ replication. You can see the configuration in these files: * `puppet/zulip_ops/manifests/postgres_master.pp` * `puppet/zulip_ops/files/postgresql/*` -We use this configuration for zulipchat.com, and it works well in +We use this configuration for Zulip Cloud, and it works well in production, but it's not fully generic. Contributions to make it a supported and documented option for other installations are appreciated. @@ -302,16 +302,16 @@ archive of all the organization's uploaded files. * Ensure that the Zulip server you're importing into is running the same version of Zulip as the server you're exporting from. - * For exports from zulipchat.com, you need to [upgrade to + * For exports from Zulip Cloud (zulip.com), you need to [upgrade to master][upgrade-zulip-from-git], since we run run master on - zulipchat.com: + Zulip Cloud: ``` /home/zulip/deployments/current/scripts/upgrade-zulip-from-git master ``` It is not sufficient to be on the latest stable release, as - zulipchat.com runs pre-release versions of Zulip that are often + zulip.com runs pre-release versions of Zulip that are often several months of development ahead of the latest release. * Note that if your server has limited free RAM, you'll want to diff --git a/docs/production/security-model.md b/docs/production/security-model.md index bfe42d639b..f8c76cc7b7 100644 --- a/docs/production/security-model.md +++ b/docs/production/security-model.md @@ -6,7 +6,7 @@ please feel free to ask questions in [#production help](https://chat.zulip.org/#narrow/stream/31-production-help) on the [Zulip community server](../contributing/chat-zulip-org.md) (or if you think you've found a security bug, please report it to -security@zulipchat.com so we can do a responsible security +security@zulip.com so we can do a responsible security announcement). ## Secure your Zulip server like your email server @@ -243,9 +243,8 @@ strength allowed is controlled by two settings in ## Final notes and security response If you find some aspect of Zulip that seems inconsistent with this -security model, please report it to security@zulipchat.com so that we -can investigate and coordinate an appropriate security release if -needed. +security model, please report it to security@zulip.com so that we can +investigate and coordinate an appropriate security release if needed. Zulip security announcements will be sent to zulip-announce@googlegroups.com, so you should subscribe if you are diff --git a/docs/production/troubleshooting.md b/docs/production/troubleshooting.md index 670a8345e8..a0e1cbd9c2 100644 --- a/docs/production/troubleshooting.md +++ b/docs/production/troubleshooting.md @@ -203,7 +203,7 @@ the next section for details. ### Nagios configuration The complete Nagios configuration (sans secret keys) used to -monitor zulipchat.com is available under `puppet/zulip_ops` in the +monitor zulip.com is available under `puppet/zulip_ops` in the Zulip Git repository (those files are not installed in the release tarballs). diff --git a/docs/production/upgrade-or-modify.md b/docs/production/upgrade-or-modify.md index 7727fbc5fa..9a375d01d0 100644 --- a/docs/production/upgrade-or-modify.md +++ b/docs/production/upgrade-or-modify.md @@ -500,7 +500,7 @@ upgrading to master, make sure you understand: thousands of changes not present in the latest release (all of which will be included in our next release). There are probably some bugs. -* We deploy master to chat.zulip.org and zulipchat.com on a regular +* We deploy master to chat.zulip.org and zulip.com on a regular basis (often daily), so it's very important to the project that it be stable. Most regressions will be minor UX issues or be fixed quickly, because we need them to be fixed. diff --git a/docs/subsystems/logging.md b/docs/subsystems/logging.md index f4ec8ad21d..f9ad82dba0 100644 --- a/docs/subsystems/logging.md +++ b/docs/subsystems/logging.md @@ -11,7 +11,7 @@ will always be new bugs being introduced, that goal is impossible without an efficient and effective error reporting framework. We expect to in the future integrate a service like [Sentry][sentry] -to make it easier for very large installations like zulipchat.com to +to make it easier for very large installations like zulip.com to manage their exceptions and ensure they are all tracked down, but our default email-based system is great for small installations. diff --git a/docs/testing/testing.md b/docs/testing/testing.md index 6836ca91e6..38d751b457 100644 --- a/docs/testing/testing.md +++ b/docs/testing/testing.md @@ -155,5 +155,5 @@ aren't broken. Those tests end up failing nondeterministically fairly often, which is unfortunate, but there's simply no other correct way to verify links other than attempting to access them. The compromise we've implemented is that in CI, these tests only verify links to -websites controlled by the Zulip project (zulipchat.com, our GitHub, +websites controlled by the Zulip project (zulip.com, our GitHub, our ReadTheDocs), and not links to third-party websites. diff --git a/static/js/portico/landing-page.js b/static/js/portico/landing-page.js index c693624f2f..a189acb566 100644 --- a/static/js/portico/landing-page.js +++ b/static/js/portico/landing-page.js @@ -151,8 +151,8 @@ const apps_events = function () { }; const events = function () { - // get the location url like `zulipchat.com/features/`, cut off the trailing - // `/` and then split by `/` to get ["zulipchat.com", "features"], then + // get the location url like `zulip.com/features/`, cut off the trailing + // `/` and then split by `/` to get ["zulip.com", "features"], then // pop the last element to get the current section (eg. `features`). const location = window.location.pathname.replace(/\/#*$/, "").split(/\//).pop(); diff --git a/templates/corporate/jobs.html b/templates/corporate/jobs.html index a3865bdd3b..4b1433778d 100644 --- a/templates/corporate/jobs.html +++ b/templates/corporate/jobs.html @@ -250,7 +250,7 @@

How to apply for a job

- You can email us at jobs@zulipchat.com with your resume. + You can email us at jobs@zulip.com with your resume.

diff --git a/templates/zerver/api/server-settings.md b/templates/zerver/api/server-settings.md index 37c7e12601..17a3800c8a 100644 --- a/templates/zerver/api/server-settings.md +++ b/templates/zerver/api/server-settings.md @@ -34,7 +34,7 @@ response, for two reasons: might be missing some keys (in which case a client should assume the appropriate default). * If a `/server_settings` request is made to the root domain of a - multi-subdomain server, like the root domain of zulipchat.com, the settings + multi-subdomain server, like the root domain of zulip.com, the settings that are realm-specific are not known and thus not provided. #### Example response diff --git a/templates/zerver/faq.html b/templates/zerver/faq.html index 386dc7abc1..da46d06c6d 100644 --- a/templates/zerver/faq.html +++ b/templates/zerver/faq.html @@ -19,7 +19,7 @@ employees of the customer. Generally, only closed organizations that also pay their members’ salaries pay full price. Just contact - sales@zulipchat.com and we’d be happy to + sales@zulip.com and we’d be happy to discuss your situation!

@@ -103,7 +103,7 @@ community server to see Zulip in action and chat with the developers, tweet @zulip, or - shoot us an email at sales@zulipchat.com! + shoot us an email at sales@zulip.com!

diff --git a/templates/zerver/help/export-your-organization.md b/templates/zerver/help/export-your-organization.md index 5b1a5f8da4..b5d5621474 100644 --- a/templates/zerver/help/export-your-organization.md +++ b/templates/zerver/help/export-your-organization.md @@ -3,14 +3,14 @@ {!admin-only.md!} !!! warn "" - These instructions are specific to the hosted zulipchat.com service. + These instructions are specific to the hosted Zulip Cloud service. If you're running your own server, you may be looking for our documentation on [server export and import][export-and-import] or [server backups][production-backups]. Zulip has high quality export tools that can be used to migrate from the -hosted Zulip Cloud service (zulipchat.com) to your own servers. There are -three types of zulipchat.com exports. +hosted Zulip Cloud service (zulip.com) to your own servers. There are +three types of Zulip Cloud exports. * **Public export**: An export of all users, settings, and all the data that appears in public streams. @@ -43,7 +43,7 @@ with lots of messages or uploaded files. {start_tabs} -1. Email support@zulip.com with your zulipchat.com subdomain, asking for +1. Email support@zulip.com with your organization's zulip.com URL, asking for a full export with member consent. Email us from the same address that you use to sign in to Zulip. @@ -72,12 +72,12 @@ 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@zulip.com with your zulipchat.com -subdomain, asking for a full export without member consent. +To start this export, email support@zulip.com with your zulip.com +URL, asking for a full export without member consent. You'll also need to email us evidence that you have authority to read -members' private messages. Typically, this will be because the zulipchat.com -subdomain is administered by a corporation, and you are an official +members' private messages. Typically, this will be because the zulip.com +URL is administered by a corporation, and you are an official representative of that corporation. By requesting and approving this export, you will also assume full legal responsibility that the appropriate employment agreements and corporate policy for this type of export are in place. Note diff --git a/templates/zerver/help/format-your-message-using-markdown.md b/templates/zerver/help/format-your-message-using-markdown.md index ea98b4387c..150ba82928 100644 --- a/templates/zerver/help/format-your-message-using-markdown.md +++ b/templates/zerver/help/format-your-message-using-markdown.md @@ -64,8 +64,8 @@ Zulip auto-linkifies URLs and valid stream names. You can also add a patterns like `#1234` to your ticketing system. ``` -Auto-detected URL: zulipchat.com -Named link: [Zulip homepage](zulipchat.com) +Auto-detected URL: zulip.com +Named link: [Zulip homepage](zulip.com) Stream: #**stream name** Topic: #**stream name>topic name** Custom linkifier: #1234 (links to ticket 1234 in your ticketing system) diff --git a/templates/zerver/help/import-from-gitter.md b/templates/zerver/help/import-from-gitter.md index 920404e5cf..3c22038195 100644 --- a/templates/zerver/help/import-from-gitter.md +++ b/templates/zerver/help/import-from-gitter.md @@ -27,7 +27,7 @@ First, export your data from Gitter. {end_tabs} -### Import into zulipchat.com +### Import into Zulip Cloud Email support@zulip.com with `gitter_data.zip` and your desired subdomain. Your imported organization will be hosted at diff --git a/templates/zerver/help/import-from-hipchat.md b/templates/zerver/help/import-from-hipchat.md index 3d99581b91..b0a1259b58 100644 --- a/templates/zerver/help/import-from-hipchat.md +++ b/templates/zerver/help/import-from-hipchat.md @@ -76,7 +76,7 @@ download the file. [cli-export]: https://confluence.atlassian.com/hipchatdc3/export-data-from-hipchat-data-center-913476832.html -### Import into zulipchat.com +### Import into Zulip Cloud Email support@zulip.com with your exported archive and your desired Zulip subdomain. Your imported organization will be hosted at diff --git a/templates/zerver/help/import-from-mattermost.md b/templates/zerver/help/import-from-mattermost.md index 597cf5166a..7eba2834ea 100644 --- a/templates/zerver/help/import-from-mattermost.md +++ b/templates/zerver/help/import-from-mattermost.md @@ -120,7 +120,7 @@ Replace `` and `` with the appropriate values below. ``` {end_tabs} -### Import into zulipchat.com +### Import into Zulip Cloud Email support@zulip.com with your exported archive, the name of the Mattermost team you want to import, and your desired Zulip diff --git a/templates/zerver/help/import-from-slack.md b/templates/zerver/help/import-from-slack.md index 1881c1694e..c261959ea6 100644 --- a/templates/zerver/help/import-from-slack.md +++ b/templates/zerver/help/import-from-slack.md @@ -56,7 +56,7 @@ receive a zip file `slack_data.zip`. This step will also generate a different token starting with `xoxe-`; you don't need it. -### Import into zulipchat.com +### Import into Zulip Cloud Email support@zulip.com with `slack_data.zip`, the Slack API token generated above, and your desired subdomain. Your imported organization will diff --git a/templates/zerver/plans.html b/templates/zerver/plans.html index d6a5e104be..120956da76 100644 --- a/templates/zerver/plans.html +++ b/templates/zerver/plans.html @@ -158,7 +158,7 @@
Pricing varies with support required
- + Contact sales diff --git a/templates/zerver/zulipchat_migration_tos.html b/templates/zerver/zulipchat_migration_tos.html index fbc79470b2..fbadd62cc2 100644 --- a/templates/zerver/zulipchat_migration_tos.html +++ b/templates/zerver/zulipchat_migration_tos.html @@ -1,6 +1,6 @@
{% trans %} -

This organization has been migrated to new hosting on zulipchat.com. We just need you to do one last thing.

+

This organization has been migrated to new hosting on zulip.com. We just need you to do one last thing.

Accept the Zulip Cloud terms of service

{% endtrans %}
diff --git a/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py b/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py index 4108dbeeb0..b75cdf8570 100644 --- a/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py +++ b/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py @@ -63,7 +63,7 @@ class BaseDocumentationSpider(scrapy.Spider): self.log(response) def _is_external_link(self, url: str) -> bool: - if "zulip.readthedocs" in url or "zulipchat.com" in url or "zulip.org" in url: + if "zulip.readthedocs" in url or "zulip.com" in url or "zulip.org" in url: # We want CI to check any links to Zulip sites. return False if (len(url) > 4 and url[:4] == "file") or ("localhost" in url): diff --git a/zerver/lib/cache_helpers.py b/zerver/lib/cache_helpers.py index a064329a22..944b5c4c27 100644 --- a/zerver/lib/cache_helpers.py +++ b/zerver/lib/cache_helpers.py @@ -77,7 +77,7 @@ def session_cache_items(items_for_remote_cache: Dict[str, str], items_for_remote_cache[store.cache_key] = store.decode(session.session_data) def get_active_realm_ids() -> List[int]: - """For servers like zulipchat.com with a lot of realms, it only makes + """For installations like Zulip Cloud hosting a lot of realms, it only makes sense to do cache-filling work for realms that have any currently active users/clients. Otherwise, we end up with every single-user trial organization that has ever been created costing us N streams diff --git a/zerver/migrations/0273_migrate_old_bot_messages.py b/zerver/migrations/0273_migrate_old_bot_messages.py index ef44361190..7cd7a0e864 100644 --- a/zerver/migrations/0273_migrate_old_bot_messages.py +++ b/zerver/migrations/0273_migrate_old_bot_messages.py @@ -13,7 +13,7 @@ def fix_messages(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None: * Changing their sent messages to have been sent by NOTIFICATION_BOT. * Changing their 1:1 PMs to be PMs with NOTIFICATION_BOT and deleting their PM recipient object. - * Deleting any Huddles that involve them (zulipchat.com data suggests there are none, + * Deleting any Huddles that involve them (zulip.com data suggests there are none, so this is mainly out of caution) and Recipient objects (which will cascade to associated Subscription, Message, and UserMessage objects if they exist). * Deleting their UserProfile objects. diff --git a/zerver/models.py b/zerver/models.py index 468f143c20..c1451f43f9 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -284,8 +284,8 @@ class Realm(models.Model): UPGRADE_TEXT_STANDARD = _("Available on Zulip Standard. Upgrade to access.") # plan_type controls various features around resource/feature - # limitations for a Zulip organization on multi-tenant servers - # like zulipchat.com. + # limitations for a Zulip organization on multi-tenant installations + # like Zulip Cloud. SELF_HOSTED = 1 LIMITED = 2 STANDARD = 3 @@ -2632,7 +2632,7 @@ class AbstractRealmAuditLog(models.Model): event_type: int = models.PositiveSmallIntegerField() - # event_types synced from on-prem installations to zulipchat.com when + # event_types synced from on-prem installations to Zulip Cloud when # billing for mobile push notifications is enabled. Every billing # event_type should have ROLE_COUNT populated in extra_data. SYNCED_BILLING_EVENTS = [ diff --git a/zproject/default_settings.py b/zproject/default_settings.py index 3c4a661c7b..ede89c14db 100644 --- a/zproject/default_settings.py +++ b/zproject/default_settings.py @@ -170,7 +170,7 @@ DEVELOPMENT_LOG_EMAILS = DEVELOPMENT # for dev and test environments; or # * don't make sense to change on a typical production server with # one or a handful of realms, though they might on an installation -# like zulipchat.com or to work around a problem on another server. +# like Zulip Cloud or to work around a problem on another server. # The following bots are optional system bots not enabled by # default. The default ones are defined in INTERNAL_BOTS, in settings.py. @@ -183,7 +183,7 @@ ERROR_BOT: Optional[str] = None NAGIOS_STAGING_SEND_BOT: Optional[str] = None NAGIOS_STAGING_RECEIVE_BOT: Optional[str] = None # SYSTEM_BOT_REALM would be a constant always set to 'zulip', -# except that it isn't that on zulipchat.com. We will likely do a +# except that it isn't that on Zulip Cloud. We will likely do a # migration and eliminate this parameter in the future. SYSTEM_BOT_REALM = 'zulipinternal'