diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8d89556b51..82577129e9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,8 +32,8 @@ needs doing: [desktop app](https://github.com/zulip/zulip-desktop). * Building out our [Python API and bots](https://github.com/zulip/python-zulip-api) framework. -* [Writing an integration](https://zulipchat.com/api/integrations-overview). -* Improving our [user](https://zulipchat.com/help/) or +* [Writing an integration](https://zulip.com/api/integrations-overview). +* Improving our [user](https://zulip.com/help/) or [developer](https://zulip.readthedocs.io/en/latest/) documentation. * [Reviewing code](https://zulip.readthedocs.io/en/latest/contributing/code-reviewing.html) and manually testing pull requests. diff --git a/README.md b/README.md index b744c12675..78e57b5094 100644 --- a/README.md +++ b/README.md @@ -51,17 +51,17 @@ You might be interested in: the [Zulip community server](https://zulip.readthedocs.io/en/latest/contributing/chat-zulip-org.html). We also recommend reading Zulip for - [open source](https://zulipchat.com/for/open-source/), Zulip for - [companies](https://zulipchat.com/for/companies/), or Zulip for - [working groups and part time communities](https://zulipchat.com/for/working-groups-and-communities/). + [open source](https://zulip.com/for/open-source/), Zulip for + [companies](https://zulip.com/for/companies/), or Zulip for + [working groups and part time communities](https://zulip.com/for/working-groups-and-communities/). * **Running a Zulip server**. Use a preconfigured [Digital Ocean droplet](https://marketplace.digitalocean.com/apps/zulip), [install Zulip](https://zulip.readthedocs.io/en/stable/production/install.html) directly, or use Zulip's experimental [Docker image](https://zulip.readthedocs.io/en/latest/production/deployment.html#zulip-in-docker). - Commercial support is available; see for details. + Commercial support is available; see for details. -* **Using Zulip without setting up a server**. +* **Using Zulip without setting up a server**. offers free and commercial hosting, including providing our paid plan for free to fellow open source projects. diff --git a/docs/THIRDPARTY b/docs/THIRDPARTY index 8179422d86..63883af717 100644 --- a/docs/THIRDPARTY +++ b/docs/THIRDPARTY @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Zulip Upstream-Contact: Tim Abbott -Source: https://zulipchat.com/ +Source: https://zulip.com/ Comment: Unless otherwise noted, the Zulip software is distributed under the Apache License, Version 2.0. The software includes some works released by third diff --git a/docs/contributing/chat-zulip-org.md b/docs/contributing/chat-zulip-org.md index c060fb7d8e..af6a2f5855 100644 --- a/docs/contributing/chat-zulip-org.md +++ b/docs/contributing/chat-zulip-org.md @@ -117,4 +117,4 @@ will search the full history of public streams in the organization for `keyword` (including messages sent before you joined and on public streams you're not subscribed to). -[searching]: https://zulipchat.com/help/search-for-messages +[searching]: https://zulip.com/help/search-for-messages diff --git a/docs/contributing/gsod-ideas.md b/docs/contributing/gsod-ideas.md index f48d8ba40c..1084d24904 100644 --- a/docs/contributing/gsod-ideas.md +++ b/docs/contributing/gsod-ideas.md @@ -6,14 +6,14 @@ ## About us -[Zulip](https://zulipchat.com) is a powerful, open source team chat +[Zulip](https://zulip.com) is a powerful, open source team chat application. Zulip has a web app, a cross-platform mobile app for iOS and Android, a cross-platform desktop app, and over 100 native integrations, all open source. Zulip has gained a considerable amount of traction since it was [released as open source software][oss-release] in late 2015, with -code contributions from [over 500 people](https://zulipchat.com/team) +code contributions from [over 500 people](https://zulip.com/team) from all around the world. Thousands of people use Zulip every single day, and your work on Zulip will have impact on the daily experiences of a large and rapidly growing number of people. @@ -210,7 +210,7 @@ are clearly correct and that explain why they are correct. **Project name**: REST API Documentation Fill in the gaps in Zulip's -[REST API documentation](https://zulipchat.com/api). Zulip has a +[REST API documentation](https://zulip.com/api). Zulip has a [nice framework](../documentation/api.md) for writing API documentation built by a student last summer based on the OpenAPI standard with built-in automated tests, but there are dozens of @@ -264,9 +264,9 @@ blog posts they've written in the past. **Project name**: User documentation for non-web apps We have a lot of nice -[user-facing documentation](https://zulipchat.com/help/) for how Zulip +[user-facing documentation](https://zulip.com/help/) for how Zulip works and how to accomplish useful tasks. An example article is how -to [star a message](https://zulipchat.com/help/star-a-message). In +to [star a message](https://zulip.com/help/star-a-message). In most cases, our documentation explains how to accomplish a task in the Zulip webapp, but doesn't cover how to do those tasks in Zulip's mobile and beta terminal apps. @@ -274,7 +274,7 @@ mobile and beta terminal apps. We have recently built a nice markdown-based system to make it easy to show information for multiple platforms in a single tabbed widget. An example article using this widget is -[logging in](https://zulipchat.com/help/logging-in). This project will +[logging in](https://zulip.com/help/logging-in). This project will likely take advantage of that system to build out documentation for our other apps. diff --git a/docs/development/using.md b/docs/development/using.md index 41871ddfb2..95be144bf7 100644 --- a/docs/development/using.md +++ b/docs/development/using.md @@ -92,7 +92,7 @@ the development environment][authentication-dev-server]. See the mobile project's documentation on [using a development server for mobile development][mobile-dev-server]. -[rest-api]: https://zulipchat.com/api/rest +[rest-api]: https://zulip.com/api/rest [authentication-dev-server]: ./authentication.md [django-runserver]: https://docs.djangoproject.com/en/1.8/ref/django-admin/#runserver-port-or-address-port [new-feature-tutorial]: ../tutorials/new-feature-tutorial.md diff --git a/docs/documentation/api.md b/docs/documentation/api.md index 667aa76fa1..e1c8152f7c 100644 --- a/docs/documentation/api.md +++ b/docs/documentation/api.md @@ -1,7 +1,7 @@ # Documenting REST API endpoints This document explains the system for documenting [Zulip's REST -API](https://zulipchat.com/api/rest). This documentation is an +API](https://zulip.com/api/rest). This documentation is an essential resource both for users and the developers of Zulip's mobile and terminal apps. We carefully designed a system for both displaying it and helping ensure it stays up to date as Zulip's API changes. @@ -35,7 +35,7 @@ want to also read the [Step by step guide](#step-by-step-guide). To understand how this documentation system works, start by reading an existing doc file (`templates/zerver/api/render-message.md` is a good example; accessible live -[here](https://zulipchat.com/api/render-message) or in the development +[here](https://zulip.com/api/render-message) or in the development environment at `http://localhost:9991/api/render-message`). We highly recommend looking at those resources while reading this page. diff --git a/docs/documentation/integrations.md b/docs/documentation/integrations.md index 3af4b6a4fd..7dfca60031 100644 --- a/docs/documentation/integrations.md +++ b/docs/documentation/integrations.md @@ -101,7 +101,7 @@ Here are a few common macros used to document Zulip's integrations: [the docs for Zulip's GitHub integration][GitHub]. * `{!download-python-bindings.md!}` macro - Links to Zulip's - [API page](https://zulipchat.com/api/) to download and install Zulip's + [API page](https://zulip.com/api/) to download and install Zulip's API bindings. This macro is usually used in non-webhook integration docs under `templates/zerver/integrations/.md`. For an example rendering, see **Step 2** of @@ -134,11 +134,11 @@ Here are a few common macros used to document Zulip's integrations: ``` For an example rendering, see - [Zulip's Beanstalk integration](https://zulipchat.com/integrations/doc/beanstalk). + [Zulip's Beanstalk integration](https://zulip.com/integrations/doc/beanstalk). -[GitHub]: https://zulipchat.com/integrations/doc/github -[codebase]: https://zulipchat.com/integrations/doc/codebase -[beanstalk]: https://zulipchat.com/integrations/doc/beanstalk +[GitHub]: https://zulip.com/integrations/doc/github +[codebase]: https://zulip.com/integrations/doc/codebase +[beanstalk]: https://zulip.com/integrations/doc/beanstalk [1]: https://github.com/zulip/zulip/blob/708f3a4bb19c8e823c9ea1e577d360ac4229b199/zerver/lib/integrations.py#L78 ## Writing guidelines @@ -146,7 +146,7 @@ Here are a few common macros used to document Zulip's integrations: For the vast majority of integrations, you should just copy the docs for a similar integration and edit it. [Basecamp][basecamp] is a good one to copy. -[basecamp]: https://zulipchat.com/integrations/doc/basecamp +[basecamp]: https://zulip.com/integrations/doc/basecamp ### General writing guidelines diff --git a/docs/documentation/openapi.md b/docs/documentation/openapi.md index f5b7e344fa..a6ba60a946 100644 --- a/docs/documentation/openapi.md +++ b/docs/documentation/openapi.md @@ -44,7 +44,7 @@ info: title: Zulip REST API description: Powerful open source group chat. contact: - url: https://zulipchat.com + url: https://zulip.com license: name: Apache 2.0 url: https://www.apache.org/licenses/LICENSE-2.0.html diff --git a/docs/documentation/overview.md b/docs/documentation/overview.md index f4c49f5895..2eab8d8bb9 100644 --- a/docs/documentation/overview.md +++ b/docs/documentation/overview.md @@ -91,19 +91,19 @@ to do the things one does a lot in each type of documentation. ### General user documentation To learn more about Zulip's general user documentation, -[visit it on zulipchat.com](https://zulipchat.com/help/) or +[visit it on zulip.com](https://zulip.com/help/) or [read our guide on writing user documentation](user.md). ### Integrations documentation To learn more about Zulip's integrations documentation, -[visit it on zulipchat.com](https://zulipchat.com/integrations/) or +[visit it on zulip.com](https://zulip.com/integrations/) or [read our guide on writing user documentation](integrations.md). ### API documentation To learn more about Zulip's API documentation, -[visit it on zulipchat.com](https://zulipchat.com/api/) or +[visit it on zulip.com](https://zulip.com/api/) or [read our tutorial on writing user documentation](../documentation/api.md). ## Automated testing diff --git a/docs/documentation/user.md b/docs/documentation/user.md index 319deab31a..e89247d398 100644 --- a/docs/documentation/user.md +++ b/docs/documentation/user.md @@ -234,7 +234,7 @@ should be formatted as a continuation of a numbered step. Our markdown processor supports easily creating a tab switcher widget design to easily show the instructions for different -[platforms](https://zulipchat.com/help/logging-out) in user docs, +[platforms](https://zulip.com/help/logging-out) in user docs, languages in API docs, etc. To create a tab switcher, write: {start_tabs} @@ -254,5 +254,5 @@ the tabs' labels are declared in This widget can also be used just to create a nice box around a set of instructions -([example](https://zulipchat.com/help/deactivate-your-account)) by +([example](https://zulip.com/help/deactivate-your-account)) by only declaring a single tab. diff --git a/docs/index.rst b/docs/index.rst index 6eb00b5182..baf3741109 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -8,11 +8,11 @@ Welcome to the Zulip documentation! Welcome! Zulip's documentation is split into four parts: -- `User documentation `__, for users and +- `User documentation `__, for users and administrators of Zulip organizations. - `Installation documentation `__, for installing and maintaining a production self-hosted Zulip installation. -- `API documentation `__, for writing +- `API documentation `__, for writing integrations or bots using the Zulip API. - `Contributor documentation `__, for developing the Zulip software, translating, submitting bug reports, diff --git a/docs/overview/architecture-overview.md b/docs/overview/architecture-overview.md index 4d596b508b..c90accb15c 100644 --- a/docs/overview/architecture-overview.md +++ b/docs/overview/architecture-overview.md @@ -7,7 +7,7 @@ Key Codebases The main Zulip codebase is at . It contains the Zulip backend (written in Python 3.x and Django), the webapp (written in JavaScript and TypeScript) and our library of -incoming webhook [integrations](https://zulipchat.com/integrations) +incoming webhook [integrations](https://zulip.com/integrations) with other services and applications (see [the directory structure guide](../overview/directory-structure.md)). @@ -44,10 +44,10 @@ Zulip is a real-time team chat application meant to provide a great experience for a wide range of organizations, from companies to volunteer projects to groups of friends, ranging in size from a small team to 10,000s of users. It has [hundreds of -features](https://zulipchat.com/features) both larger and small, and +features](https://zulip.com/features) both larger and small, and supports dedicated apps for iOS, Android, Linux, Windows, and macOS, all modern web browsers, several cross-protocol chat clients, and -numerous dedicated [Zulip API](https://zulipchat.com/api) clients +numerous dedicated [Zulip API](https://zulip.com/api) clients (e.g. bots). A server can host multiple Zulip *realms* (organizations), each on its @@ -59,7 +59,7 @@ administrators of an organization have a great deal of control over who can register an account, what permissions new users have, etc. For more on security considerations and options, see [the security model section](../production/security-model.md) and the [Zulip Help -Center](https://zulipchat.com/help). +Center](https://zulip.com/help). Components ---------- diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md index fe7bd91cec..c2fe729907 100644 --- a/docs/overview/changelog.md +++ b/docs/overview/changelog.md @@ -192,7 +192,7 @@ server-level setting is enabled by default, and the organization-level setting is disabled. As a result, organization administrators can configure this feature entirely in the UI. However, servers that had previously [enabled previews of linked -websites](https://zulipchat.com/help/allow-image-link-previews) will +websites](https://zulip.com/help/allow-image-link-previews) will lose the setting and need to re-enable it. - We rewrote the Google Authentication backend to use the `python-social-auth` system we use for other third-party @@ -593,7 +593,7 @@ Zulip installations; it has minimal changes for existing servers. - Users can now configure email and mobile push notifications for all messages in a stream (useful for low-traffic streams/organizations), not just for messages mentioning them. -- New [stream settings](https://zulipchat.com/help/stream-permissions) +- New [stream settings](https://zulip.com/help/stream-permissions) control whether private stream subscribers can access history from before they joined, and allow configuring streams to only allow administrators to post. diff --git a/docs/overview/directory-structure.md b/docs/overview/directory-structure.md index 4541c4b372..7cf870004a 100644 --- a/docs/overview/directory-structure.md +++ b/docs/overview/directory-structure.md @@ -31,7 +31,7 @@ paths will be familiar to Django developers. * `zerver/views/*.py` Most [Django views](https://docs.djangoproject.com/en/1.8/topics/http/views/). * `zerver/webhooks/` Webhook views and tests for [Zulip's incoming webhook integrations]( - https://zulipchat.com/api/incoming-webhooks-overview). + https://zulip.com/api/incoming-webhooks-overview). * `zerver/tornado/views.py` Tornado views. diff --git a/docs/overview/gsoc-ideas.md b/docs/overview/gsoc-ideas.md index d26a50cf04..0cf9f6ed62 100644 --- a/docs/overview/gsoc-ideas.md +++ b/docs/overview/gsoc-ideas.md @@ -6,14 +6,14 @@ ## About us -[Zulip](https://zulipchat.com) is a powerful, open source team chat +[Zulip](https://zulip.com) is a powerful, open source team chat application. Zulip has a web app, a cross-platform mobile app for iOS and Android, a cross-platform desktop app, and over 100 native integrations, all open source. Zulip has gained a considerable amount of traction since it was [released as open source software][oss-release] in late 2015, with -code contributions from [over 500 people](https://zulipchat.com/team) +code contributions from [over 500 people](https://zulip.com/team) from all around the world. Thousands of people use Zulip every single day, and your work on Zulip will have impact on the daily experiences of a large and rapidly growing number of people. @@ -264,7 +264,7 @@ CSS](https://github.com/zulip/zulip/). Expert: Eeshan Garg. - Fill in the gaps in Zulip's [REST API - documentation](https://zulipchat.com/api), which is an important + documentation](https://zulip.com/api), which is an important resource for any organization integrating with Zulip. Zulip has a [nice framework](../documentation/api.md) for writing API documentation built by past GSoC students based on the OpenAPI diff --git a/docs/production/authentication-methods.md b/docs/production/authentication-methods.md index 343a6d35fc..834b8bc7e1 100644 --- a/docs/production/authentication-methods.md +++ b/docs/production/authentication-methods.md @@ -269,7 +269,7 @@ Zulip by entering your email address and LDAP password on the Zulip login form. You may also want to configure Zulip's settings for [inviting new -users](https://zulipchat.com/help/invite-new-users). If LDAP is the +users](https://zulip.com/help/invite-new-users). If LDAP is the only enabled authentication method, the main use case for Zulip's invitation feature is selecting the initial streams for invited users (invited users will still need to use their LDAP password to create an @@ -307,7 +307,7 @@ When using this feature, you may also want to since any such changes would be automatically overwritten on the sync run of `manage.py sync_ldap_user_data`. -[restrict-name-changes]: https://zulipchat.com/help/restrict-name-and-email-changes +[restrict-name-changes]: https://zulip.com/help/restrict-name-and-email-changes #### Synchronizing avatars @@ -329,7 +329,7 @@ corresponding LDAP attribute is `linkedinProfile` then you just need to add `'custom_profile_field__linkedin_profile': 'linkedinProfile'` to the `AUTH_LDAP_USER_ATTR_MAP`. -[custom-profile-fields]: https://zulipchat.com/help/add-custom-profile-fields +[custom-profile-fields]: https://zulip.com/help/add-custom-profile-fields #### Automatically deactivating users with Active Directory @@ -380,7 +380,7 @@ Other fields you may want to sync from LDAP include: * String fields like `default_language` (e.g. `en`) or `timezone`, if you have that data in the right format in your LDAP database. * [Coming soon][custom-profile-fields-ldap]: Support for syncing - [custom profile fields](https://zulipchat.com/help/add-custom-profile-fields) + [custom profile fields](https://zulip.com/help/add-custom-profile-fields) from your LDAP database. You can look at the [full list of fields][models-py] in the Zulip user diff --git a/docs/production/email-gateway.md b/docs/production/email-gateway.md index 7e7dd604ec..d40dba4e2c 100644 --- a/docs/production/email-gateway.md +++ b/docs/production/email-gateway.md @@ -9,7 +9,7 @@ because it enables: into Zulip. * Integrating third-party services that can send email notifications into Zulip. See the [integration - documentation](https://zulipchat.com/integrations/doc/email) for + documentation](https://zulip.com/integrations/doc/email) for details. Once this integration is configured, each stream will have a special diff --git a/docs/production/export-and-import.md b/docs/production/export-and-import.md index ffc9d0d9a1..1cd16fa810 100644 --- a/docs/production/export-and-import.md +++ b/docs/production/export-and-import.md @@ -31,7 +31,7 @@ service (or back): JSON files–a format shared by our [data import](#import-into-a-new-zulip-server) tools for third-party services like - [Slack](https://zulipchat.com/help/import-from-slack). + [Slack](https://zulip.com/help/import-from-slack). Like the backup tool, logical data exports must be imported on a Zulip server running the same version. However, logical data diff --git a/docs/production/install-existing-server.md b/docs/production/install-existing-server.md index 515b5c991d..b9230103ff 100644 --- a/docs/production/install-existing-server.md +++ b/docs/production/install-existing-server.md @@ -18,7 +18,8 @@ existing services if (when) your server goes down. These instructions are only for experts. If you're not an experienced Linux sysadmin, you will have a much better experience if you get a -dedicated VM to install Zulip on instead (or [use zulipchat.com](https://zulipchat.com). +dedicated VM to install Zulip on instead (or [use +zulip.com](https://zulip.com). ### Nginx diff --git a/docs/production/install.md b/docs/production/install.md index 6ff8d46dc1..bd0dd0b367 100644 --- a/docs/production/install.md +++ b/docs/production/install.md @@ -10,7 +10,7 @@ Zulip's Note that if you're developing for Zulip, you should install Zulip's [development environment](../development/overview.md) instead. If you're just looking to play around with Zulip and see what it looks like, -you can create a test organization at . +you can create a test organization at . ## Step 1: Download the latest release @@ -78,8 +78,8 @@ backup][zulip-backups] or importing your data from [HipChat][hipchat-import], [Slack][slack-import], or another Zulip server, you should stop here and return to the import instructions. -[hipchat-import]: https://zulipchat.com/help/import-from-hipchat -[slack-import]: https://zulipchat.com/help/import-from-slack +[hipchat-import]: https://zulip.com/help/import-from-hipchat +[slack-import]: https://zulip.com/help/import-from-slack [zulip-backups]: ../production/export-and-import.html#backups Otherwise, open the link in a browser. Follow the prompts to set up @@ -114,7 +114,7 @@ important announcements, including new releases and security issues. You can als and [upgrading](../production/upgrade-or-modify.md) a production Zulip server. -[realm-admin-docs]: https://zulipchat.com/help/getting-your-organization-started-with-zulip +[realm-admin-docs]: https://zulip.com/help/getting-your-organization-started-with-zulip ```eval_rst .. _installer-details: diff --git a/docs/production/management-commands.md b/docs/production/management-commands.md index dc545386c8..bc5288ace8 100644 --- a/docs/production/management-commands.md +++ b/docs/production/management-commands.md @@ -119,7 +119,7 @@ There are dozens of useful management commands under * `./manage.py change_user_email`: Change a user's email address. * `./manage.py knight`: Can toggle whether a user is an administrator (easier done [via the - UI](https://zulipchat.com/help/change-a-users-role)) or create an + UI](https://zulip.com/help/change-a-users-role)) or create an API super user bot (with `--permission=api_super_user`), which are needed for some content mirroring integrations. * `./manage.py export_single_user` does a limited version of the [main diff --git a/docs/production/mobile-push-notifications.md b/docs/production/mobile-push-notifications.md index 12cb7fee8c..dd5a475191 100644 --- a/docs/production/mobile-push-notifications.md +++ b/docs/production/mobile-push-notifications.md @@ -61,7 +61,7 @@ Zulip only sends push notifications for private messages sent by other users and messages mentioning you). A push notification should appear in the Android notification area. -[mobile-notifications-always]: https://zulipchat.com/help/test-mobile-notifications +[mobile-notifications-always]: https://zulip.com/help/test-mobile-notifications ## Updating your server's registration @@ -96,7 +96,7 @@ forwarding service). ## Security and privacy Use of the push notification bouncer is subject to the -[Zulipchat Terms of Service](https://zulipchat.com/terms/). By using +[Zulipchat Terms of Service](https://zulip.com/terms/). By using push notifications, you agree to those terms. We've designed this push notification bouncer service with security diff --git a/docs/production/multiple-organizations.md b/docs/production/multiple-organizations.md index b319b96973..c510af9e85 100644 --- a/docs/production/multiple-organizations.md +++ b/docs/production/multiple-organizations.md @@ -46,9 +46,9 @@ things: [the notes on `SOCIAL_AUTH_SUBDOMAIN` below](#authentication). For servers hosting a large number of organizations, like -[zulipchat.com](https://zulipchat.com), one can set -`ROOT_DOMAIN_LANDING_PAGE = True` in `/etc/zulip/settings.py` so that -the homepage for the server is a copy of the Zulip homepage. +[zulip.com](https://zulip.com), one can set `ROOT_DOMAIN_LANDING_PAGE += True` in `/etc/zulip/settings.py` so that the homepage for the +server is a copy of the Zulip homepage. ### SSL Certificates diff --git a/docs/production/requirements.md b/docs/production/requirements.md index 7a04b92404..8a5869bb96 100644 --- a/docs/production/requirements.md +++ b/docs/production/requirements.md @@ -81,7 +81,7 @@ on hardware requirements for larger organizations. * Outgoing HTTP(S) access (ports 80 and 443) to the public Internet so that Zulip can properly manage image previews and embeds. Outgoing Internet access is not required if you [disable those - features](https://zulipchat.com/help/allow-image-link-previews). + features](https://zulip.com/help/allow-image-link-previews). * Outgoing SMTP access (usually port 587) to your [SMTP server](../production/email.md) so that Zulip can send emails. * A domain name (e.g. `zulip.example.com`) that your users will use to diff --git a/docs/production/security-model.md b/docs/production/security-model.md index 3cc938353b..bfe42d639b 100644 --- a/docs/production/security-model.md +++ b/docs/production/security-model.md @@ -113,7 +113,7 @@ strength allowed is controlled by two settings in figure out whether a stream with that name exists, but cannot see any other details about the stream. - * See [Stream permissions](https://zulipchat.com/help/stream-permissions) for more details. + * See [Stream permissions](https://zulip.com/help/stream-permissions) for more details. * Zulip supports editing the content and topics of messages that have already been sent. As a general philosophy, our policies provide @@ -128,7 +128,7 @@ strength allowed is controlled by two settings in any time by that administrator. * See - [Configuring message editing and deletion](https://zulipchat.com/help/configure-message-editing-and-deletion) + [Configuring message editing and deletion](https://zulip.com/help/configure-message-editing-and-deletion) for more details. ## Users and Bots @@ -146,7 +146,7 @@ strength allowed is controlled by two settings in exceptions: * Administrators may get access to private messages via some types of - [data export](https://zulipchat.com/help/export-your-organization). + [data export](https://zulip.com/help/export-your-organization). * Administrators can change the ownership of a bot. If a bot is subscribed to a private stream, then an administrator can indirectly get access to @@ -164,7 +164,7 @@ strength allowed is controlled by two settings in SSO system, since neither of those prevents authenticating with the user's API key or those of bots the user has created. Instead, you should - [deactivate the user's account](https://zulipchat.com/help/deactivate-or-reactivate-a-user) + [deactivate the user's account](https://zulip.com/help/deactivate-or-reactivate-a-user) via Zulip's "Organization settings" interface. * The Zulip mobile apps authenticate to the server by sending the diff --git a/docs/production/settings.md b/docs/production/settings.md index b671b88f22..9b04ba821f 100644 --- a/docs/production/settings.md +++ b/docs/production/settings.md @@ -9,7 +9,7 @@ Most configuration can be done by a realm administrator, on the web. For those settings, see [the documentation for realm administrators][realm-admin-docs]. -[realm-admin-docs]: https://zulipchat.com/help/getting-your-organization-started-with-zulip +[realm-admin-docs]: https://zulip.com/help/getting-your-organization-started-with-zulip This page discusses additional configuration that a system administrator can do. To change any of the following settings, edit diff --git a/docs/production/ssl-certificates.md b/docs/production/ssl-certificates.md index fad7ef9784..222327e408 100644 --- a/docs/production/ssl-certificates.md +++ b/docs/production/ssl-certificates.md @@ -138,7 +138,7 @@ running the following as `root`: service nginx reload ``` -[desktop-certs]: https://zulipchat.com/help/custom-certificates +[desktop-certs]: https://zulip.com/help/custom-certificates ## Troubleshooting diff --git a/docs/production/upgrade-or-modify.md b/docs/production/upgrade-or-modify.md index 9e43455ff2..7727fbc5fa 100644 --- a/docs/production/upgrade-or-modify.md +++ b/docs/production/upgrade-or-modify.md @@ -129,7 +129,7 @@ help](https://chat.zulip.org/#narrow/stream/31-production-help) in the server](../contributing/chat-zulip-org.md) for best-effort help. Please include the relevant error output from the above logs in a [markdown code -block](https://zulipchat.com/help/format-your-message-using-markdown#code) +block](https://zulip.com/help/format-your-message-using-markdown#code) in any reports. ### Rolling back to a prior version @@ -327,7 +327,7 @@ that fact: * Ideally, you'd reproduce the issue in an unmodified version (e.g. on [chat.zulip.org](../contributing/chat-zulip-org.md) or -[zulipchat.com](https://zulipchat.com)). +[zulip.com](https://zulip.com)). * Where that is difficult or you think it's very unlikely your changes are related to the issue, just mention your changes in the issue report. diff --git a/docs/production/zoom-configuration.md b/docs/production/zoom-configuration.md index 1dd7d483f3..413f989485 100644 --- a/docs/production/zoom-configuration.md +++ b/docs/production/zoom-configuration.md @@ -32,5 +32,5 @@ to be your app's "Client Secret". This enables Zoom support in your Zulip server. Finally, [configure Zoom as the video call -provider](https://zulipchat.com/help/start-a-call) in the Zulip +provider](https://zulip.com/help/start-a-call) in the Zulip organization(s) where you want to use it. diff --git a/docs/subsystems/client.md b/docs/subsystems/client.md index a91b569be2..1092dc7573 100644 --- a/docs/subsystems/client.md +++ b/docs/subsystems/client.md @@ -35,4 +35,4 @@ object as `request.client`. In most integrations, `request.client` is then passed to `check_send_stream_message`, where it is used to keep track of which client sent the message (which in turn is used by analytics). For more -information, see [the incoming webhook walkthrough](https://zulipchat.com/api/incoming-webhooks-walkthrough). +information, see [the incoming webhook walkthrough](https://zulip.com/api/incoming-webhooks-walkthrough). diff --git a/docs/subsystems/custom-apps.md b/docs/subsystems/custom-apps.md index ee7e7d7cf8..b7e60f0f95 100644 --- a/docs/subsystems/custom-apps.md +++ b/docs/subsystems/custom-apps.md @@ -177,7 +177,7 @@ you basically have to solve these problems: Zulip actually supports a bunch of integrations out-of-the-box that perform as **World Readers**. -The [three different integration models](https://zulipchat.com/api/integrations-overview#sending-content-into-zulip) +The [three different integration models](https://zulip.com/api/integrations-overview#sending-content-into-zulip) basically differ in where they perform the main functions of a **World Reader**. diff --git a/docs/subsystems/email.md b/docs/subsystems/email.md index b3d6bee282..00d7ca76aa 100644 --- a/docs/subsystems/email.md +++ b/docs/subsystems/email.md @@ -6,7 +6,7 @@ guide to [sending outgoing email](../production/email.md). If you're trying to configure an email integration to receive incoming email (e.g. so that users can reply to missed message emails via email), you might be interested in our instructions for -[setting up an email integration](https://zulipchat.com/integrations/doc/email). +[setting up an email integration](https://zulip.com/integrations/doc/email). On to the documentation. Zulip's email system is fairly straightforward, with only a few things you need to know to get started. diff --git a/docs/subsystems/markdown.md b/docs/subsystems/markdown.md index 8f1e8ca7a5..08d92c3321 100644 --- a/docs/subsystems/markdown.md +++ b/docs/subsystems/markdown.md @@ -131,8 +131,8 @@ Important considerations for any changes are: Zulip's markdown processor's rendering supports a number of features that depend on realm-specific or user-specific data. For example, the realm could have -[Linkifiers](https://zulipchat.com/help/add-a-custom-linkification-filter) -or [Custom emoji](https://zulipchat.com/help/add-custom-emoji) +[Linkifiers](https://zulip.com/help/add-a-custom-linkification-filter) +or [Custom emoji](https://zulip.com/help/add-custom-emoji) configured, and Zulip supports mentions for streams, users, and user groups (which depend on data like users' names, IDs, etc.). diff --git a/docs/subsystems/sending-messages.md b/docs/subsystems/sending-messages.md index 21d3014864..f09909eba0 100644 --- a/docs/subsystems/sending-messages.md +++ b/docs/subsystems/sending-messages.md @@ -67,7 +67,7 @@ number of purposes: messages. E.g. determining whether to send the plaintext/markdown raw content or the rendered HTML (e.g. the `apply_markdown` and `client_gravatar` features in our - [events API docs](https://zulipchat.com/api/register-queue)). + [events API docs](https://zulip.com/api/register-queue)). * Following our standard naming convention, input validation is done inside the `check_message` function, which is responsible for validating the user can send to the recipient, @@ -92,7 +92,7 @@ number of purposes: step adds a lot of complexity, because the events system cannot make queries to the database directly. * Trigger any other deferred work caused by the current message, - e.g. [outgoing webhooks](https://zulipchat.com/api/outgoing-webhooks) + e.g. [outgoing webhooks](https://zulip.com/api/outgoing-webhooks) or embedded bots. * Every query is designed to be a bulk query; we carefully unit-test this system for how many database and memcached queries diff --git a/docs/translating/translating.md b/docs/translating/translating.md index 5731688780..21906602a4 100644 --- a/docs/translating/translating.md +++ b/docs/translating/translating.md @@ -87,7 +87,7 @@ There are a few ways to see your translations in the Zulip UI: `http://localhost:9991/de/login/`. This works for any part of the Zulip UI, including portico (logged-out) pages. * For Zulip's logged-in UI (i.e. the actual webapp), you can [pick the - language](https://zulipchat.com/help/change-your-language) in the + language](https://zulip.com/help/change-your-language) in the Zulip UI. * If your system has languages configured in your OS/browser, Zulip's portico (logged-out) pages will automatically use your configured diff --git a/docs/tutorials/life-of-a-request.md b/docs/tutorials/life-of-a-request.md index e9d3fb8666..d2e08a569f 100644 --- a/docs/tutorials/life-of-a-request.md +++ b/docs/tutorials/life-of-a-request.md @@ -78,9 +78,9 @@ we can see something called `i18n_urls`. These urls show up in the address bar of the browser, and serve HTML. For example, the `/features` page (preview -[here](https://zulipchat.com/features/)) gets translated in Chinese at +[here](https://zulip.com/features/)) gets translated in Chinese at `zh-hans/features/` (preview -[here](https://zulipchat.com/zh-hans/features/)). +[here](https://zulip.com/zh-hans/features/)). Note the `zh-hans` prefix--that url pattern gets added by `i18n_patterns`. diff --git a/docs/tutorials/writing-views.md b/docs/tutorials/writing-views.md index 0beb46e023..a864a2eece 100644 --- a/docs/tutorials/writing-views.md +++ b/docs/tutorials/writing-views.md @@ -20,7 +20,7 @@ A view in Zulip is everything that helps implement a server endpoint. Every path that the Zulip server supports (doesn't show a 404 page for) is a view. The obvious ones are those you can visit in your browser, for example -[/integrations](https://zulipchat.com/integrations/), which shows the +[/integrations](https://zulip.com/integrations/), which shows the integration documentation. These paths show up in the address bar of the browser. There are other views that are only seen by software, namely the API views. They are used to build the various clients that diff --git a/puppet/zulip/files/nginx/sites-available/zulip-org b/puppet/zulip/files/nginx/sites-available/zulip-org index 65ea7579bd..9d1c54fd9d 100644 --- a/puppet/zulip/files/nginx/sites-available/zulip-org +++ b/puppet/zulip/files/nginx/sites-available/zulip-org @@ -17,7 +17,7 @@ server { } location / { - rewrite ^/ https://zulipchat.com permanent; + rewrite ^/ https://zulip.com permanent; } } diff --git a/static/html/5xx.html b/static/html/5xx.html index 910f87bac7..759a7ba5a3 100644 --- a/static/html/5xx.html +++ b/static/html/5xx.html @@ -17,7 +17,7 @@
-
+ Download the latest version. {% endtrans %} diff --git a/templates/zerver/atlassian.md b/templates/zerver/atlassian.md index b8b9477d49..82c2340159 100644 --- a/templates/zerver/atlassian.md +++ b/templates/zerver/atlassian.md @@ -4,10 +4,11 @@ migrating from Atlassian’s HipChat or Stride to Zulip. ## Do a trial of Zulip. -* [Install Zulip on-premise](https://zulip.readthedocs.io/en/stable/production/install.html) -or [create a Zulip Cloud organization](https://zulipchat.com/new) on -zulipchat.com. Installing a Zulip server takes just a couple of -minutes. +* [Install Zulip +on-premise](https://zulip.readthedocs.io/en/stable/production/install.html) +or [create a Zulip Cloud +organization](https://zulip.com/new). Installing a Zulip server takes +just a couple of minutes. * Stop by the [Zulip community server](https://chat.zulip.org) to see what an active Zulip organization looks like. The Zulip community @@ -65,7 +66,7 @@ chat model. ## Decide on a payment plan. -See [zulipchat.com/plans](https://zulipchat.com/plans) for Cloud +See [zulip.com/plans](https://zulip.com/plans) for Cloud 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/emails/followup_day1.source.html b/templates/zerver/emails/followup_day1.source.html index d9baee891b..cf2834bba3 100644 --- a/templates/zerver/emails/followup_day1.source.html +++ b/templates/zerver/emails/followup_day1.source.html @@ -27,7 +27,7 @@ {% else %}
  • {{ _('Email:') }} {{ email }}
    • {% endif %} - {% trans %}(you'll need these to sign in to the mobile and desktop apps){% endtrans %} + {% trans %}(you'll need these to sign in to the mobile and desktop apps){% endtrans %}

    diff --git a/templates/zerver/emails/followup_day1.txt b/templates/zerver/emails/followup_day1.txt index 626a9dfdf2..44588e104f 100644 --- a/templates/zerver/emails/followup_day1.txt +++ b/templates/zerver/emails/followup_day1.txt @@ -18,7 +18,7 @@ {% else %} * {{ _('Email:') }} {{ email }} {% endif %} -{% trans %}(you'll need these to sign in to the mobile and desktop apps (https://zulipchat.com/apps)){% endtrans %} +{% trans %}(you'll need these to sign in to the mobile and desktop apps (https://zulip.com/apps)){% endtrans %} {% if is_realm_admin %} diff --git a/templates/zerver/for/mystery-hunt.md b/templates/zerver/for/mystery-hunt.md index 7af70d889a..1580972e51 100644 --- a/templates/zerver/for/mystery-hunt.md +++ b/templates/zerver/for/mystery-hunt.md @@ -30,9 +30,9 @@ Yes! We provide free hosting for all MIT mystery hunt teams, student groups, and research groups. Besides being easy on the wallet, Zulip is also free (open source) -software. We make it easy to export your data from a -[zulipchat.com](https://zulipchat.com) hosted Zulip and import it into a -self-hosted installation. +software. We make it easy to export your data from [Zulip +Cloud](https://zulip.com) and import it into a self-hosted +installation. **Can I integrate Zulip with my current puzzlehunting software?** @@ -41,7 +41,7 @@ it’s easy to write bots that send things into or out of Zulip. **Where can I test it out?** -[Click here](https://zulipchat.com/new) to create an organization; it +[Click here](https://zulip.com/new) to create an organization; it only takes only about 30 seconds. If you decide to continue using it, just email support@zulip.com to tell us you’re a mystery hunt team. diff --git a/templates/zerver/for/open-source.md b/templates/zerver/for/open-source.md index ef20d1eab5..2f3574b332 100644 --- a/templates/zerver/for/open-source.md +++ b/templates/zerver/for/open-source.md @@ -90,14 +90,14 @@ community succeed too! Below, we’ve collected a list of [Zulip features](/features) that are particularly useful to open source communities. -### Free hosting at zulipchat.com. +### Free hosting at zulip.com. -The hosting is supported by (and is identical to) zulipchat.com’s +The hosting is supported by (and is identical to) zulip.com’s 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@zulip.com. +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@zulip.com. ### Moderation suite. @@ -196,8 +196,8 @@ first creating an account. Our high quality [export](/help/export-your-organization) and [import](https://zulip.readthedocs.io/en/latest/production/export-and-import.html) -tools ensure you can always move from -[zulipchat.com](https://zulipchat.com) hosting to your own servers. +tools ensure you can always move from [Zulip Cloud](https://zulip.com) +hosting to your own servers. ### Free and open source. diff --git a/templates/zerver/for/research.md b/templates/zerver/for/research.md index 29dc605e71..1e095ae12e 100644 --- a/templates/zerver/for/research.md +++ b/templates/zerver/for/research.md @@ -84,11 +84,11 @@ particularly useful to academic research organizations (both formal organizations and online communities focused around research topics like Category Theory). -### Free hosting at zulipchat.com. +### Free hosting at zulip.com. -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@zulip.com. +This free hosting is supported by (and is identical to) zulip.com’s +commercial offerings. If you’re not sure whether your organization +qualifies, send us an email at support@zulip.com. ### Native LaTeX support powered by KaTeX @@ -157,8 +157,8 @@ easily find relevant past discussions. Our high quality [export](/help/export-your-organization) and [import](https://zulip.readthedocs.io/en/latest/production/export-and-import.html) -tools ensure you can always move from -[zulipchat.com](https://zulipchat.com) hosting to your own servers. +tools ensure you can always move from [Zulip Cloud](https://zulip.com) +hosting to your own servers. ### Free and open source. diff --git a/templates/zerver/help/about-streams-and-topics.md b/templates/zerver/help/about-streams-and-topics.md index e9cf3bf886..16ba1f0ff0 100644 --- a/templates/zerver/help/about-streams-and-topics.md +++ b/templates/zerver/help/about-streams-and-topics.md @@ -30,7 +30,7 @@ complicated? The short answer is that most users spend many hours a day on chat. A little investment up front pays huge dividends in access to a more powerful communication paradigm. -A longer answer is [here](https://zulipchat.com/why-zulip). +A longer answer is [here](https://zulip.com/why-zulip). ## Replying to a topic diff --git a/templates/zerver/help/desktop-app-install-guide.md b/templates/zerver/help/desktop-app-install-guide.md index f44435d6b5..85c8bbb856 100644 --- a/templates/zerver/help/desktop-app-install-guide.md +++ b/templates/zerver/help/desktop-app-install-guide.md @@ -16,7 +16,7 @@ look at the newest features, consider the [beta releases](#install-a-beta-releas #### Disk image (recommended) -1. Download [Zulip for macOS](https://zulipchat.com/apps/mac). +1. Download [Zulip for macOS](https://zulip.com/apps/mac). 1. Open the file, and drag the app into the `Applications` folder. The app will update automatically to future versions. @@ -33,7 +33,7 @@ also work, if you prefer. #### Web installer (recommended) -1. Download and run [Zulip for Windows](https://zulipchat.com/apps/windows). +1. Download and run [Zulip for Windows](https://zulip.com/apps/windows). 1. Run Zulip from the Start menu. The app will update automatically to future versions. @@ -72,7 +72,7 @@ regular software update on your system, e.g. with #### AppImage (recommended for all other distros) -1. Download [Zulip for Linux](https://zulipchat.com/apps/linux). +1. Download [Zulip for Linux](https://zulip.com/apps/linux). 2. Make the file executable, with `chmod a+x Zulip-x.x.x-x86_64.AppImage` from a terminal (replace `x.x.x` with the actual name of the downloaded file). diff --git a/templates/zerver/help/gdpr-compliance.md b/templates/zerver/help/gdpr-compliance.md index c0b1654bc2..0d601e1876 100644 --- a/templates/zerver/help/gdpr-compliance.md +++ b/templates/zerver/help/gdpr-compliance.md @@ -2,7 +2,7 @@ This page covers how Zulip interacts with the EU's landmark GDPR legislation; you can read the -[Zulip Cloud privacy policy](https://zulipchat.com/privacy) for our +[Zulip Cloud privacy policy](https://zulip.com/privacy) for our general privacy policies. ## What is GDPR? diff --git a/templates/zerver/help/index.md b/templates/zerver/help/index.md index 95220ea627..409d84a61c 100644 --- a/templates/zerver/help/index.md +++ b/templates/zerver/help/index.md @@ -8,7 +8,7 @@ chat tools. Most people use Zulip on the Web. There are also mobile apps for Android/iOS, and desktop apps for Mac/Linux/Windows, which can be -downloaded [here](https://zulipchat.com/apps/). +downloaded [here](https://zulip.com/apps/). One Zulip account, associated with a particular company, project, or team, is known as an **organization**. diff --git a/templates/zerver/help/keyboard-shortcuts.md b/templates/zerver/help/keyboard-shortcuts.md index 24d1d4a98f..70e527b5d7 100644 --- a/templates/zerver/help/keyboard-shortcuts.md +++ b/templates/zerver/help/keyboard-shortcuts.md @@ -99,11 +99,11 @@ below, and add more to your repertoire as needed. * **Send message**: `Enter`, `Tab` then `Enter`, and/or `Ctrl` + `Enter`, depending on your settings. See - [enable enter to send](https://zulipchat.com/help/enable-enter-to-send). + [enable enter to send](https://zulip.com/help/enable-enter-to-send). * **Insert new line**: `Enter`, or `Shift` + `Enter`, depending on your settings. See - [enable enter to send](https://zulipchat.com/help/enable-enter-to-send). + [enable enter to send](https://zulip.com/help/enable-enter-to-send). * **Insert italic text**: `*italic*` or `Ctrl + I` * **Insert bold text**: `**bold**` or `Ctrl + B` diff --git a/templates/zerver/help/logging-in.md b/templates/zerver/help/logging-in.md index 7153142b2d..0e6c1125e8 100644 --- a/templates/zerver/help/logging-in.md +++ b/templates/zerver/help/logging-in.md @@ -60,8 +60,8 @@ For subsequent logins, see [switching between organizations](/help/switching-bet Some ideas: * If you know your organization is hosted on - [zulipchat.com](https://zulipchat.com), go to - [find my account](https://zulipchat.com/accounts/find/) and enter the email + [zulip.com](https://zulip.com), go to [find my + account](https://zulip.com/accounts/find/) and enter the email address that you signed up with. * Try guessing the URL. Zulip URLs often look like `.zulipchat.com`, diff --git a/templates/zerver/help/saml-authentication.md b/templates/zerver/help/saml-authentication.md index 7779dcc9ee..c2551266b0 100644 --- a/templates/zerver/help/saml-authentication.md +++ b/templates/zerver/help/saml-authentication.md @@ -14,7 +14,7 @@ Zulip with various common SAML Identity Providers. [Okta's documentation](https://developer.okta.com/docs/guides/saml-application-setup/overview/). Specify: * `https://.zulipchat.com/complete/saml/` for the "Single sign on URL"`. - * `https://zulipchat.com` for the "Audience URI (SP Entity ID)". + * `https://zulip.com` for the "Audience URI (SP Entity ID)". * Skip "Default RelayState". * Skip "Name ID format". * Set 'Email` for "Application username format". @@ -39,7 +39,7 @@ Zulip with various common SAML Identity Providers. but will be shown on your OneLogin Applications page. 1. Go to the "Configuration" section: * Leave the `RelayState` field empty. - * Set `https://zulipchat.com` as the Audience. + * Set `https://zulip.com` as the Audience. * Set `https://.zulipchat.com/complete/saml/` as the Recipient, ACS URL and ACS URL Validator. 1. Go to the "Parameters" section. Ignore the pre-configured parameters that are already there diff --git a/templates/zerver/history.html b/templates/zerver/history.html index 3b94b39e93..d4b27366a0 100644 --- a/templates/zerver/history.html +++ b/templates/zerver/history.html @@ -133,10 +133,10 @@ additional sources of funding.

    - In mid-2017, Kandra Labs launched two products: a hosted - Zulip service - at zulipchat.com, - and an enterprise support product for on-premise + In mid-2017, Kandra Labs launched two products: a + hosted Zulip service + at zulip.com, and + an enterprise support product for on-premise deployments.

    diff --git a/templates/zerver/insecure_desktop_app.html b/templates/zerver/insecure_desktop_app.html index b29a9ffe80..99e94e8b2c 100644 --- a/templates/zerver/insecure_desktop_app.html +++ b/templates/zerver/insecure_desktop_app.html @@ -26,7 +26,7 @@ {% endif %}

    - + {{ _("Download the latest release.") }}

    diff --git a/templates/zerver/realm_creation_failed.html b/templates/zerver/realm_creation_failed.html index 9ee5e0ca62..46071cc95f 100644 --- a/templates/zerver/realm_creation_failed.html +++ b/templates/zerver/realm_creation_failed.html @@ -23,7 +23,7 @@ can install your own Zulip server or create a new organization on - Zulip Cloud + Zulip Cloud {% endtrans %}

    diff --git a/templates/zerver/team.html b/templates/zerver/team.html index d9d58f1799..37418a8263 100644 --- a/templates/zerver/team.html +++ b/templates/zerver/team.html @@ -60,7 +60,7 @@

    Kandra Labs provides commercial Zulip hosting and on-premises support - at https://zulipchat.com, + at https://zulip.com, and employs the core developers of the project. It was started in June 2016 to help sustain the growth of the Zulip project. Kandra Labs is funded by diff --git a/templates/zerver/unsupported_browser.html b/templates/zerver/unsupported_browser.html index e93080688e..50eeb2369f 100644 --- a/templates/zerver/unsupported_browser.html +++ b/templates/zerver/unsupported_browser.html @@ -23,7 +23,7 @@

    {% trans %} You can also use - the Zulip + the Zulip desktop app. {% endtrans %}

    diff --git a/zerver/context_processors.py b/zerver/context_processors.py index 637a3ad578..1be1f62116 100644 --- a/zerver/context_processors.py +++ b/zerver/context_processors.py @@ -82,7 +82,7 @@ def zulip_default_context(request: HttpRequest) -> Dict[str, Any]: find_team_link_disabled = False allow_search_engine_indexing = True - apps_page_url = 'https://zulipchat.com/apps/' + apps_page_url = 'https://zulip.com/apps/' if settings.ZILENCER_ENABLED: apps_page_url = '/apps/' diff --git a/zerver/data_import/slack.py b/zerver/data_import/slack.py index f6a643b892..98e89ed3b7 100755 --- a/zerver/data_import/slack.py +++ b/zerver/data_import/slack.py @@ -75,7 +75,7 @@ def slack_workspace_to_realm(domain_name: str, realm_id: int, user_list: List[Ze zerver_realmemoji, emoji_url_map = build_realmemoji(custom_emoji_list, realm_id) realm['zerver_realmemoji'] = zerver_realmemoji - # See https://zulipchat.com/help/set-default-streams-for-new-users + # See https://zulip.com/help/set-default-streams-for-new-users # for documentation on zerver_defaultstream realm['zerver_userprofile'] = zerver_userprofile diff --git a/zerver/lib/email_notifications.py b/zerver/lib/email_notifications.py index a83297191b..a95ce07453 100644 --- a/zerver/lib/email_notifications.py +++ b/zerver/lib/email_notifications.py @@ -564,7 +564,7 @@ def enqueue_welcome_emails(user: UserProfile, realm_creation: bool=False) -> Non context['getting_started_link'] = (user.realm.uri + '/help/getting-your-organization-started-with-zulip') else: - context['getting_started_link'] = "https://zulipchat.com" + context['getting_started_link'] = "https://zulip.com" # Imported here to avoid import cycles. from zproject.backends import email_belongs_to_ldap, ZulipLDAPAuthBackend diff --git a/zerver/management/commands/register_server.py b/zerver/management/commands/register_server.py index cca99a55bb..9fd68e4e43 100644 --- a/zerver/management/commands/register_server.py +++ b/zerver/management/commands/register_server.py @@ -23,7 +23,7 @@ class Command(ZulipBaseCommand): dest='agree_to_terms_of_service', action='store_true', default=False, - help="Agree to the Zulipchat Terms of Service: https://zulipchat.com/terms/.") + help="Agree to the Zulipchat Terms of Service: https://zulip.com/terms/.") parser.add_argument('--rotate-key', dest="rotate_key", action='store_true', @@ -61,7 +61,7 @@ class Command(ZulipBaseCommand): if not options['agree_to_terms_of_service'] and not options["rotate_key"]: print("To register, you must agree to the Zulipchat Terms of Service: " - "https://zulipchat.com/terms/") + "https://zulip.com/terms/") tos_prompt = input("Do you agree to the Terms of Service? [Y/n] ") print("") if not (tos_prompt.lower() == 'y' or diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index bf4cda09a8..f3102dbc5f 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -14,7 +14,7 @@ info: description: | Powerful open source group chat contact: - url: https://zulipchat.com + url: https://zulip.com license: name: Apache 2.0 url: https://www.apache.org/licenses/LICENSE-2.0.html @@ -1669,7 +1669,7 @@ paths: tags: ["users"] description: | [Deactivates a - user](https://zulipchat.com/help/deactivate-or-reactivate-a-user) + user](https://zulip.com/help/deactivate-or-reactivate-a-user) given their user ID. `DELETE {{ api_url }}/v1/users/{user_id}` @@ -1707,7 +1707,7 @@ paths: tags: ["users"] description: | [Reactivates a - user](https://zulipchat.com/help/deactivate-or-reactivate-a-user) + user](https://zulip.com/help/deactivate-or-reactivate-a-user) given their user ID. `POST {{ api_url }}/v1/users/{user_id}/reactivate` @@ -2681,7 +2681,7 @@ paths: description: | This endpoint is used to upload a custom emoji for use in the user's organization. Access to this endpoint depends on the - [organization's configuration](https://zulipchat.com/help/only-allow-admins-to-add-emoji). + [organization's configuration](https://zulip.com/help/only-allow-admins-to-add-emoji). `POST {{ api_url }}/v1/realm/emoji/{emoji_name}` parameters: diff --git a/zerver/tests/fixtures/markdown_test_cases.json b/zerver/tests/fixtures/markdown_test_cases.json index 0dd9090a3d..7e63952c7f 100644 --- a/zerver/tests/fixtures/markdown_test_cases.json +++ b/zerver/tests/fixtures/markdown_test_cases.json @@ -381,7 +381,7 @@ }, { "name": "two_inline_images", - "input": "Google logo today: https://www.google.com/images/srpr/logo4w.png\nKinda boring\nZulip logo: https://zulipchat.com/static/images/landing-page/zulip-octopus.png", + "input": "Google logo today: https://www.google.com/images/srpr/logo4w.png\nKinda boring\nZulip logo: https://zulip.com/static/images/landing-page/zulip-octopus.png", "expected_output": "

    Google logo today: https:\/\/www.google.com\/images\/srpr\/logo4w.png<\/a>
    \nKinda boring
    \nZulip logo:     https:\/\/zulipchat.com\/static\/images\/landing-page\/zulip-octopus.png<\/a><\/p>\n

    <\/a><\/div>
    <\/a><\/div>", "backend_only_rendering": true, "text_content": "Google logo today: https:\/\/www.google.com\/images\/srpr\/logo4w.png\nKinda boring\nZulip logo: https:\/\/zulipchat.com\/static\/images\/landing-page\/zulip-octopus.png\n" diff --git a/zerver/tests/test_custom_profile_data.py b/zerver/tests/test_custom_profile_data.py index 5fb3da7079..f33760db4a 100644 --- a/zerver/tests/test_custom_profile_data.py +++ b/zerver/tests/test_custom_profile_data.py @@ -502,7 +502,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase): ('Favorite food', 'long short text data'), ('Favorite editor', 'vim'), ('Birthday', '1909-3-5'), - ('Favorite website', 'https://zulipchat.com'), + ('Favorite website', 'https://zulip.com'), ('Mentor', [self.example_user("cordelia").id]), ('GitHub', 'zulip-mobile') ] diff --git a/zerver/tests/test_docs.py b/zerver/tests/test_docs.py index 48846eae7b..0c20edb8ba 100644 --- a/zerver/tests/test_docs.py +++ b/zerver/tests/test_docs.py @@ -345,7 +345,7 @@ class AboutPageTest(ZulipTestCase): with self.settings(ZILENCER_ENABLED=False): result = self.client_get('/team/') self.assertEqual(result.status_code, 301) - self.assertEqual(result["Location"], "https://zulipchat.com/team/") + self.assertEqual(result["Location"], "https://zulip.com/team/") def test_split_by(self) -> None: """Utility function primarily used in authors page""" @@ -402,14 +402,14 @@ class PlansPageTest(ZulipTestCase): with self.settings(PRODUCTION=True): result = self.client_get("/plans/", subdomain="zulip") self.assertEqual(result.status_code, 302) - self.assertEqual(result["Location"], "https://zulipchat.com/plans") + self.assertEqual(result["Location"], "https://zulip.com/plans") self.login('iago') # SELF_HOSTED should hide the local plans page, even if logged in result = self.client_get("/plans/", subdomain="zulip") self.assertEqual(result.status_code, 302) - self.assertEqual(result["Location"], "https://zulipchat.com/plans") + self.assertEqual(result["Location"], "https://zulip.com/plans") # But in the development environment, it renders a page result = self.client_get("/plans/", subdomain="zulip") @@ -443,7 +443,7 @@ class AppsPageTest(ZulipTestCase): with self.settings(ZILENCER_ENABLED=False): result = self.client_get('/apps/') self.assertEqual(result.status_code, 301) - self.assertTrue(result['Location'] == 'https://zulipchat.com/apps/') + self.assertTrue(result['Location'] == 'https://zulip.com/apps/') with self.settings(ZILENCER_ENABLED=True): result = self.client_get('/apps/') diff --git a/zerver/tests/test_email_notifications.py b/zerver/tests/test_email_notifications.py index ec9c83a58f..8e3dfef2e3 100644 --- a/zerver/tests/test_email_notifications.py +++ b/zerver/tests/test_email_notifications.py @@ -112,7 +112,7 @@ class TestFollowupEmails(ZulipTestCase): email_data = ujson.loads(scheduled_emails[0].data) self.assertEqual(email_data["context"]["email"], self.example_email("hamlet")) self.assertEqual(email_data["context"]["is_realm_admin"], False) - self.assertEqual(email_data["context"]["getting_started_link"], "https://zulipchat.com") + self.assertEqual(email_data["context"]["getting_started_link"], "https://zulip.com") self.assertNotIn("ldap_username", email_data["context"]) ScheduledEmail.objects.all().delete() diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py index 7518f82ced..84908abbba 100644 --- a/zerver/tests/test_subs.py +++ b/zerver/tests/test_subs.py @@ -785,12 +785,12 @@ class StreamAdminTest(ZulipTestCase): # Verify that we don't render inline URL previews in this code path. with self.settings(INLINE_URL_EMBED_PREVIEW=True): result = self.client_patch('/json/streams/%d' % (stream_id,), - {'description': ujson.dumps('See https://zulipchat.com/team')}) + {'description': ujson.dumps('See https://zulip.com/team')}) self.assert_json_success(result) stream = get_stream('stream_name1', realm) self.assertEqual( stream.rendered_description, - '

    See https://zulipchat.com/team

    ', + '

    See https://zulip.com/team

    ', ) def test_change_stream_description_requires_realm_admin(self) -> None: diff --git a/zerver/tests/test_users.py b/zerver/tests/test_users.py index 3702b42f67..c591e260ea 100644 --- a/zerver/tests/test_users.py +++ b/zerver/tests/test_users.py @@ -445,7 +445,7 @@ class PermissionTest(ZulipTestCase): 'Favorite food': 'short text data', 'Favorite editor': 'vim', 'Birthday': '1909-3-5', - 'Favorite website': 'https://zulipchat.com', + 'Favorite website': 'https://zulip.com', 'Mentor': [cordelia.id], 'GitHub': 'timabbott', } diff --git a/zerver/views/portico.py b/zerver/views/portico.py index 98a30b018c..47ebce214f 100644 --- a/zerver/views/portico.py +++ b/zerver/views/portico.py @@ -20,7 +20,7 @@ def apps_view(request: HttpRequest, _: str) -> HttpResponse: } } ) - return HttpResponseRedirect('https://zulipchat.com/apps/', status=301) + return HttpResponseRedirect('https://zulip.com/apps/', status=301) @add_google_analytics def plans_view(request: HttpRequest) -> HttpResponse: @@ -30,7 +30,7 @@ def plans_view(request: HttpRequest) -> HttpResponse: if realm is not None: realm_plan_type = realm.plan_type if realm.plan_type == Realm.SELF_HOSTED and settings.PRODUCTION: - return HttpResponseRedirect('https://zulipchat.com/plans') + return HttpResponseRedirect('https://zulip.com/plans') if not request.user.is_authenticated: return redirect_to_login(next="plans") return TemplateResponse( @@ -42,7 +42,7 @@ def plans_view(request: HttpRequest) -> HttpResponse: @add_google_analytics def team_view(request: HttpRequest) -> HttpResponse: if not settings.ZILENCER_ENABLED: - return HttpResponseRedirect('https://zulipchat.com/team/', status=301) + return HttpResponseRedirect('https://zulip.com/team/', status=301) try: with open(settings.CONTRIBUTOR_DATA_FILE_PATH) as f: diff --git a/zproject/urls.py b/zproject/urls.py index b0a9aff3c4..88add09b72 100644 --- a/zproject/urls.py +++ b/zproject/urls.py @@ -654,7 +654,7 @@ urls += [ # Mobile-specific authentication URLs urls += [ # Used as a global check by all mobile clients, which currently send - # requests to https://zulipchat.com/compatibility almost immediately after + # requests to https://zulip.com/compatibility almost immediately after # starting up. url(r'^compatibility$', zerver.views.compatibility.check_global_compatibility), ]