diff --git a/help/getting-your-organization-started-with-zulip.md b/help/getting-your-organization-started-with-zulip.md index 3317911424..75666ce6fb 100644 --- a/help/getting-your-organization-started-with-zulip.md +++ b/help/getting-your-organization-started-with-zulip.md @@ -19,16 +19,7 @@ us know! ## Choosing between Zulip Cloud and self-hosting -Whether [signing up for Zulip Cloud](/new/) or [self-hosting -Zulip](/self-hosting/) is the right choice for you depends on the -needs of your organization. - -If you aren’t sure what you need, our high quality export and import -tools ([cloud][export-cloud], [self-hosted][export-self-hosted]) -ensure you can always move from our hosting to yours (and back). - -[export-cloud]: /help/export-your-organization -[export-self-hosted]: https://zulip.readthedocs.io/en/stable/production/export-and-import.html +{!cloud-vs-self-hosting-intro.md!} ### Advantages of Zulip Cloud diff --git a/help/include/advantages-of-self-hosting-zulip.md b/help/include/advantages-of-self-hosting-zulip.md index ed052fd54d..c83e00cfb8 100644 --- a/help/include/advantages-of-self-hosting-zulip.md +++ b/help/include/advantages-of-self-hosting-zulip.md @@ -1,6 +1,7 @@ -* Zulip is [100% open-source software][zulip-github], with no "open core" catch. - When you self-host Zulip, you get the same software as [Zulip Cloud - Standard](https://zulip.com/plans/) customers. +* All [self-hosted plans](https://zulip.com/plans/#self-hosted) offer the same + [100% open-source software] [zulip-github]. Organizations that do not require + support with their installation can always use Zulip for free with no + limitations. * Retain full control over your data and simplify compliance by self-hosting Zulip behind your firewall. diff --git a/help/include/advantages-of-zulip-cloud.md b/help/include/advantages-of-zulip-cloud.md index c08af3cc00..4095c3af20 100644 --- a/help/include/advantages-of-zulip-cloud.md +++ b/help/include/advantages-of-zulip-cloud.md @@ -1,6 +1,4 @@ * Simple managed solution, with no setup or maintenance overhead. [Sign up](https://zulip.com/new/) with just a few clicks. * Always updated to the latest version of Zulip. -* Anyone can [start with Zulip Cloud Free](https://zulip.com/new/). [Free or heavily - discounted Zulip Cloud Standard](https://zulip.com/plans/) pricing is available for - most non-business uses. +* Anyone can [start with Zulip Cloud Free](https://zulip.com/new/). diff --git a/help/include/cloud-vs-self-hosting-intro.md b/help/include/cloud-vs-self-hosting-intro.md new file mode 100644 index 0000000000..9d241e0357 --- /dev/null +++ b/help/include/cloud-vs-self-hosting-intro.md @@ -0,0 +1,11 @@ +Whether [signing up for Zulip Cloud](https://zulip.com/new/) or [self-hosting +Zulip](https://zulip.com/self-hosting/) is the right choice for you depends on +the needs of your organization. + +If you aren’t sure what you need, our high quality export and import tools +([cloud][export-cloud], [self-hosted][export-self-hosted]) ensure you can always +move from our hosting to yours (and back). No matter which option you go with, +free or heavily discounted pricing is available for most non-business uses. + +[export-cloud]: /help/export-your-organization +[export-self-hosted]: https://zulip.readthedocs.io/en/stable/production/export-and-import.html diff --git a/help/zulip-cloud-or-self-hosting.md b/help/zulip-cloud-or-self-hosting.md index f5d1882ada..4868601774 100644 --- a/help/zulip-cloud-or-self-hosting.md +++ b/help/zulip-cloud-or-self-hosting.md @@ -1,12 +1,6 @@ # Choosing between Zulip Cloud and self-hosting -Whether [signing up for Zulip Cloud](https://zulip.com/new/) or [self-hosting -Zulip](https://zulip.com/self-hosting/) is the right choice for you depends on -the needs of your organization. - -If you aren’t sure what you need, our high quality export and import -tools ([cloud][export-cloud], [self-hosted][export-self-hosted]) -ensure you can always move from our hosting to yours (and back). +{!cloud-vs-self-hosting-intro.md!} ## Advantages of Zulip Cloud @@ -21,9 +15,6 @@ ensure you can always move from our hosting to yours (and back). * [Sign up for Zulip Cloud](https://zulip.com/new/) * [Self-hosting Zulip](https://zulip.com/self-hosting/) * [Trying out Zulip](/help/trying-out-zulip) -* [Setting up your organization](/help/getting-your-organization-started-with-zulip) -* [Migrating from other chat tools](/help/migrating-from-other-chat-tools) -* [Getting started with Zulip](/help/getting-started-with-zulip) - -[export-cloud]: /help/export-your-organization -[export-self-hosted]: https://zulip.readthedocs.io/en/stable/production/export-and-import.html +* [Plans and pricing](https://zulip.com/plans/) +* [Zulip Cloud billing](/help/zulip-cloud-billing) +* [Self-hosted billing](/help/self-hosted-billing)