help: Update billing articles for current billing management features.

Updates the self-hosted and Zulip Cloud billing articles for features
that have been added to billing management such as paying by invoice,
adding billing contact information, viewing past invoices, etc.

Revises text to be cleaner and clearer in some places.

More consistently uses bold (when not linked) for plan names.

Fixes a few errors or omissions in existing instructions.

Co-authored-by: Alya Abbott <alya@zulip.com>

help/include/automatic-billing.md

@@ -1,20 +1,26 @@
 !!! tip ""
 
-    Automatic billing is recommended unless you have a specific reason to
+    Automatic license management is recommended unless you have a
-    choose manual billing.
+    specific reason to choose manual license management.
 
-With automatic billing, you automatically purchase a Zulip license for each user
+With automatic license management, you automatically purchase a Zulip
-in your organization at the start of each billing period (month or year), and
+license for each user in your organization at the start of each billing
-whenever you need additional licenses.
+period (month or year), and whenever you need additional licenses.
 
-- [Deactivating a user](/help/deactivate-or-reactivate-a-user) frees up their
+- [Deactivating a user](/help/deactivate-or-reactivate-a-user) frees up
-  license for reuse. No refunds are given for unused licenses you have
+  their license for reuse. No refunds are given for unused licenses you
-  purchased. For example, if you start a billing period with 10 users,
+  have purchased for the current billing period. For example if you start
-  deactivate 5 users, and then add 2 new users, you will be billed for 10
+  an annual billing period with 10 users, and deactivate 4 users halfway
-  licenses for the entire billing period.
+  through the year, then you will receive no refund, even if those licenses
+  are not used in the remaining 6 months of the year.
 
-- If you have no free licenses when you **add a user**, you will be automatically
+- If you have no free licenses when a new user joins or an existing user
-  billed for an additional license. You will be charged only for the remaining
+  is reactivated, you will be automatically billed for an additional
-  part of the billing period. For example, if you are on a $8/user/month monthly
+  license. You will be charged only for the remaining part of the
-  plan, you will be billed $4 for a user added half way through the month. Each
+  billing period. For example, if you are on a $8/user/month monthly
-  month, you will see a single charge for all licenses added that month.
+  plan, you will be billed $4 for a user added halfway through the month.
+
+- If you have an annual billing period, each month, you will see a
+  single charge for all licenses added the previous month. If you have
+  a monthly billing period, the charge for licenses added during the
+  previous month will be combined with your monthly renewal charge.

help/include/manage-billing-intro.md

@@ -0,0 +1,16 @@
+On the billing page for an active paid plan you can:
+
+- View your past invoices.
+
+- View and update the billing details displayed on invoices and receipts
+  for future payments.
+
+- If you pay for your plan by credit card, update your card's payment
+  details.
+
+- Change your billing frequency to be monthly or annual.
+
+- If you opted for [manual license
+  management](#how-does-manual-license-management-work), you can [update
+  the number of licenses](#manually-update-number-of-licenses)
+  for the current billing period or the next billing period.

help/include/manual-add-license-instructions.md

@@ -0,0 +1,8 @@
+1. Modify **Number of licenses for current billing period** or **Number of
+   licenses for next billing period**, and click **Update**.
+
+!!! tip ""
+
+    Modifying the number of licenses for the current billing period also
+    automatically updates the number of licenses for the next
+    billing period.

help/include/manual-billing-intro.md

@@ -1,3 +1,16 @@
-With manual billing, you choose and pay for a preset user limit. If
+With manual license management, you choose and pay for a fixed number of
-the limit is reached, no more users can join until licenses are manually
+licenses, which limits the number of users in your organization.
-added.
+
+- If the limit is reached, unlike [automatic license
+  management](#how-does-automatic-license-management-work), new users
+  cannot join and existing users cannot be reactivated until licenses
+  are manually added (or freed up by [deactivating existing
+  users](/help/deactivate-or-reactivate-a-user)).
+
+- When you add a license for the current billing period, you will be
+  charged only for the remaining part of the billing period.
+
+- If you have an annual billing period, each month, you will see a
+  single charge for all licenses added the previous month. If you have
+  a monthly billing period, the charge for licenses added during the
+  previous month will be combined with your monthly renewal charge.

help/include/pay-by-invoice-steps.md

@@ -0,0 +1,22 @@
+1. Select **pay by invoice**.
+
+1. Select your preferred option from the **Payment schedule** dropdown.
+
+1. Select the **Number of licenses** you would like to purchase for your
+   organization; see details about [manual license
+   management](#how-does-manual-license-management-work).
+
+1. Click **Update billing information** to enter your billing details,
+   which will be included on invoices and receipts.
+
+1. Click the **Send invoice** button, and an email with an initial
+   invoice will be sent to the email address you used to sign in.
+
+1. Your plan will be upgraded when the initial invoice is paid.
+
+!!! tip ""
+
+    Until the initial invoice is paid, logging in to manage your billing
+    will show a page with a link to the outstanding invoice. You'll be able
+    to manage your plan once your first invoice is paid.
+

help/include/payment-options.md

@@ -0,0 +1,6 @@
+You can pay by credit card or by invoice. If you choose to pay by
+invoice, your organization will be upgraded to the plan you selected
+once the initial invoice is paid.
+
+Note that automatic license management is only available if you pay by
+credit card. Paying by invoice requires manual license management.

help/include/plan-upgrade-steps.md

@@ -2,4 +2,9 @@
 
 1. Click **Add card** to enter your payment details.
 
+1. *(optional)* **View and update** billing information included on
+   receipts so that they are different from the information entered for
+   the payment method, e.g. in case you would prefer that the company's
+   name be on receipts instead of the card holder's name.
+
 1. Click the **Purchase** button to complete your purchase.

help/include/self-hosted-billing-log-in-step.md

@@ -0,0 +1 @@
+1. [Log in to billing management](#log-in-to-billing-management).

help/include/self-hosted-billing-multiple-organizations.md

@@ -1,6 +1,6 @@
 !!! warn ""
 
-    If your server has more than one organization, upgrade to Zulip Server 8.0+
+    If your server hosts more than one organization, upgrade to Zulip Server 8.0+
     to manage billing and plan upgrades separately for each organization. You must
     purchase the same plan for all users in your organization. Older servers
     only support server-wide plan management.

help/self-hosted-billing.md

@@ -3,85 +3,48 @@
 This page describes how to manage your self-hosted plan, and answers some common
 questions about plans and billing for self-hosted organizations. Please refer to
 [Self-hosted Zulip plans and pricing](https://zulip.com/plans/#self-hosted) for plan
-details.  If you have any questions not answered here, please don't hesitate to
+details.
+
+The topics covered include:
+
+* [Logging in to manage billing](#log-in-to-billing-management)
+* [Upgrading to a paid plan](#upgrade-to-a-paid-plan)
+* [Managing billing](#manage-billing)
+* [Canceling a paid plan](#cancel-paid-plan)
+* [Applying for a free Community plan](#apply-for-community-plan)
+* [Applying for a paid plan discount](#apply-for-a-paid-plan-discount)
+* [Manual license management](#manually-update-number-of-licenses)
+
+If you have any questions not answered here, please don't hesitate to
 reach out at [sales@zulip.com](mailto:sales@zulip.com).
 
 ## Paid plan details and upgrades
 
-For businesses with up to 10 Zulip users, the Free plan is a good option, and
+For businesses with up to 10 Zulip users, the **Free** plan is a good option, and
-includes free access to the Mobile Push Notification Service.
+includes free access to Zulip's [Mobile Push Notification Service][push-notifications].
 
-For businesses with more than 10 Zulip users, both the Basic and Business plans
+For businesses with more than 10 Zulip users, both the **Basic** and **Business**
-include unlimited access to the Mobile Push Notification Service.
+plans include unlimited access to Zulip's Mobile Push Notification Service.
 
-The Business plan also includes commercial support for dozens of features and
+The **Business** plan also includes commercial support for dozens of features and
-[integrations](/help/integrations-overview) that help businesses take full advantage of their Zulip
+[integrations](/help/integrations-overview) that help businesses take full advantage
-implementation. The minimum purchase is 25 licenses.
+of their Zulip implementation. The minimum purchase is 25 licenses.
 
-If your organization requires hands-on support, such as real-time support during
+If your organization requires hands-on support, such as real-time assistance during
-installation and upgrades, support for advanced deployment options, custom
+installation and upgrades, help with advanced deployment options, development of
-feature development or integrations, etc., should contact
+custom features or integrations, etc., please contact
 [sales@zulip.com](mailto:sales@zulip.com) to discuss pricing.
 
+!!! warn ""
+
+    **Note**: For 8.0+ servers hosting more than one organization, commercial support
+    for any server-wide configurations requires upgrading the organization with the
+    largest number of users.
+
 Paid plan discounts are available in a variety of situations; see
 [below](#paid-plan-discounts) for details.
 
-## Upgrade to a paid plan
+## Log in to billing management
-
-### Start a free trial
-
-**New customers** are eligible for a free 30-day trial of Zulip Basic. An
-organization is considered to be a new customer if:
-
-- It was not registered for Zulip's [Mobile Push Notification
-  Service](https://zulip.readthedocs.io/en/stable/production/mobile-push-notifications.html)
-  prior to December 12, 2023, and
-- It has never previously signed up for a self-hosted Zulip plan (Basic, Business,
-  Community or Enterprise).
-
-{start_tabs}
-
-{tab|v8}
-
-{!register-server.md!}
-
-{!self-hosted-log-in.md!}
-
-1. On the page listing Zulip's self-hosted plans, click the **Start 30-day
-   trial** button at the bottom of the **Basic** plan.
-
-1. Click **Add card** to enter your payment details.
-
-1. Click **Start 30-day trial** to start your free trial.
-
-!!! tip ""
-
-    Once you start the trial, you can switch between monthly and annual billing
-    on your organization's billing page.
-
-{tab|all-versions}
-
-{!legacy-log-in-intro.md!}
-
-{!register-server-legacy.md!}
-
-{!legacy-log-in.md!}
-
-1. On the page listing Zulip's self-hosted plans, click the **Start 30-day
-   trial** button at the bottom of the **Basic** plan.
-
-1. Click **Add card** to enter your payment details.
-
-1. Click **Start 30-day trial** to start your free trial.
-
-!!! tip ""
-
-    Once you start the trial, you can switch between monthly and annual billing
-    on your organization's billing page.
-
-{end_tabs}
-
-### Upgrade directly to a paid plan
 
 {!self-hosted-billing-multiple-organizations.md!}
 
@@ -91,29 +54,28 @@ organization is considered to be a new customer if:
 
 {!self-hosted-billing-admin-only.md!}
 
+{!register-server.md!}
+
 {!self-hosted-log-in.md!}
 
-1. On the page listing Zulip's self-hosted plans, click the button at the bottom
-   of the plan you would like to purchase.
-
-{!plan-upgrade-steps.md!}
-
-!!! warn ""
-
-    If your server hosts more than one organization, commercial
-    support for server-wide configurations requires upgrading the
-    organization with the largest number of users.
-
 {tab|all-versions}
 
 {!legacy-log-in-intro.md!}
 
+{!register-server-legacy.md!}
+
 {!legacy-log-in.md!}
 
-{!plan-upgrade-steps.md!}
-
 {end_tabs}
 
+Once you are logged in, you can [upgrade to a paid
+plan](#upgrade-to-a-paid-plan), [manage billing](#manage-billing), [cancel a
+paid plan](#cancel-paid-plan), or [apply for a free Community
+plan](#apply-for-community-plan) or a [paid plan
+discount](#apply-for-a-paid-plan-discount).
+
+## Upgrade to a paid plan
+
 ### Do I have to upgrade my server first?
 
 While upgrading your Zulip server to version 8.0+ makes it more convenient to
@@ -126,58 +88,123 @@ you:
 - Easily log in to Zulip plan management, without an additional server
   authentication step.
 
-- Separately manage plans for all the organizations on your server.
+- Separately manage plans for all the organizations hosted on your server.
 
-- Upload only the [basic
+- Upload only the [basic metadata][basic-metadata] required for the service,
-  metadata](https://zulip.readthedocs.io/en/latest/production/mobile-push-notifications.html#uploading-basic-metadata)
+  without also [uploading usage statistics][usage-statistics].
-  required for the service, without also [uploading usage
-  statistics](https://zulip.readthedocs.io/en/latest/production/mobile-push-notifications.html#uploading-usage-statistics).
 
 If you upgrade your server after signing up for a plan, you will be able to
-transfer your plan to an organization on your server. If your server has one
+transfer your plan to an organization on your server. If your server only
-organization on it, this will happen automatically. Otherwise, contact
+hosts one organization, this will happen automatically. Otherwise, contact
-[support@zulip.com](mailto:support@zulip.com) for help.
+[support@zulip.com](mailto:support@zulip.com) for assistance.
 
-## Manage billing
+### Start a free trial
 
-{!self-hosted-billing-multiple-organizations.md!}
+**New customers** are eligible for a free 30-day trial of the **Basic** plan.
+An organization is considered to be a new customer if:
+
+- It was not registered for Zulip's [Mobile Push Notification
+  Service][push-notifications] prior to December 12, 2023, and
+
+- It has never previously signed up for a self-hosted Zulip plan (Basic,
+  Business, Community or Enterprise).
 
 {start_tabs}
 
-{tab|v8}
+{tab|by-card}
 
-{!self-hosted-log-in.md!}
+{!self-hosted-billing-log-in-step.md!}
 
-{tab|all-versions}
+1. On the page listing Zulip's self-hosted plans, click the **Start
+   30-day trial** button at the bottom of the **Basic** plan.
 
-{!legacy-log-in-intro.md!}
+1. Click **Add card** to enter your payment details.
 
-{!legacy-log-in.md!}
+1. *(optional)* Update the billing details included on receipts so that
+   they are different from the information entered for the payment method,
+   e.g. in case you would prefer that the company's name be on receipts
+   instead of the card holder's name.
+
+1. Click **Start 30-day trial** to start your free trial.
+
+!!! tip ""
+
+    Once you start the trial, you can switch between monthly and annual
+    billing on your organization's billing page.
+
+{tab|by-invoice}
+
+!!! warn ""
+
+    Only [manual license
+    management](#how-does-manual-license-management-work) is available
+    when paying by invoice.
+
+{!self-hosted-billing-log-in-step.md!}
+
+1. On the page listing Zulip's self-hosted plans, click the **Start
+   30-day trial** button at the bottom of the **Basic** plan.
+
+1. Select **pay by invoice**.
+
+1. Select your preferred option from the **Payment schedule** dropdown.
+
+1. Select the **Number of licenses** you would like to purchase for your
+   organization. You can adjust this number to update your initial invoice any
+   time during your trial.
+
+1. Click **Update billing information** to enter your billing details, which
+   will be included on invoices and receipts.
+
+1. Click **Start 30-day trial** to start your free trial.
+
+{end_tabs}
+
+### Upgrade directly to a paid plan
+
+{start_tabs}
+
+{tab|by-card}
+
+{!self-hosted-billing-log-in-step.md!}
+
+1. On the page listing Zulip's self-hosted plans, click the button at the bottom
+   of the plan you would like to purchase.
+
+{!plan-upgrade-steps.md!}
+
+{tab|by-invoice}
+
+!!! warn ""
+
+    Only [manual license
+    management](#how-does-manual-license-management-work) is available
+    when paying by invoice.
+
+{!self-hosted-billing-log-in-step.md!}
+
+{!pay-by-invoice-steps.md!}
+
+{end_tabs}
+
+## Manage billing
+
+{!manage-billing-intro.md!}
+
+{start_tabs}
+
+{!self-hosted-billing-log-in-step.md!}
 
 {end_tabs}
 
 ## Cancel paid plan
 
-{!self-hosted-billing-multiple-organizations.md!}
-
 If you cancel your plan, your organization will be downgraded to the
 **Free** plan at the end of the current billing period.
 
 {start_tabs}
 
-{tab|v8}
+{!self-hosted-billing-log-in-step.md!}
-
-{!self-hosted-log-in.md!}
-
-1. At the bottom of the page, click **Cancel plan**.
-
-2. Click **Downgrade** to confirm.
-
-{tab|all-versions}
-
-{!legacy-log-in-intro.md!}
-
-{!legacy-log-in.md!}
 
 1. At the bottom of the page, click **Cancel plan**.
 
@@ -188,7 +215,7 @@ If you cancel your plan, your organization will be downgraded to the
 ## Free Community plan
 
 Zulip sponsors free plans for over 1000 worthy organizations. The following
-types of organizations are generally eligible for the free Community plan.
+types of organizations are generally eligible for the **Community** plan.
 
 - Open-source projects, including projects with a small paid team.
 - Research in an academic setting, such as research groups, cross-institutional
@@ -200,60 +227,36 @@ types of organizations are generally eligible for the free Community plan.
   friends, volunteer groups, etc.).
 
 Organizations that have up to 10 users, or do not require mobile push
-notifications, will likely find the Free plan to be the most convenient
+notifications, will likely find the **Free** plan to be the most convenient
-option. Larger organizations are encouraged to apply for the free Community
+option. Larger organizations are encouraged to apply for the **Community**
 plan, which includes unlimited push notifications and support for many Zulip
 features.
 
 If you aren't sure whether your organization qualifies, submitting a sponsorship
 form describing your situation is a great starting point. Many organizations
-that don't qualify for the Community plan can still receive [discounted paid
+that don't qualify for the **Community** plan can still receive [discounted paid
 plan pricing](#paid-plan-discounts).
 
 ### Apply for Community plan
 
-These instructions describe the Community plan application process for an
+These instructions describe the **Community** plan application process for an
-existing Zulip server. If you would like to inquire about Community plan
+existing Zulip server. If you would like to inquire about eligibility prior to
-eligibility prior to setting up a server, contact
+setting up a self-hosted server, contact [sales@zulip.com](mailto:sales@zulip.com).
-[sales@zulip.com](mailto:sales@zulip.com).
-
-!!! tip ""
-
-    Organizations that do not qualify for a Community plan may be offered a
-    discount on the Business plan.
 
 {start_tabs}
 
-{tab|v8}
+{!self-hosted-billing-log-in-step.md!}
-
-{!register-server.md!}
-
-{!self-hosted-log-in.md!}
 
 1. On the page listing Zulip's self-hosted plans, scroll down to the
    **Sponsorship and discounts** area, and click **Apply here**.
 
 1. Fill out the requested information, and click **Submit**. Your application
-   will be reviewed for Community plan eligibility.
+   will be reviewed for **Community** plan eligibility.
-
-{tab|all-versions}
-
-{!legacy-log-in-intro.md!}
-
-{!register-server-legacy.md!}
-
-{!legacy-log-in.md!}
-
-1. On the page listing Zulip's self-hosted plans, scroll down to the
-   **Sponsorship and discounts** area, and click **Apply here**.
-
-1. Fill out the requested information, and click **Submit**. Your application
-   will be reviewed for Community plan eligibility.
 
 !!! tip ""
 
-    Organizations that do not qualify for a Community plan may be offered a
+    Organizations that do not qualify for a **Community** plan may be offered a
-    discount on the Business plan.
+    discount for the **Basic** plan.
 
 {end_tabs}
 
@@ -279,8 +282,8 @@ situation.
 ### Education pricing
 
 Organizations operated by individual educators (for example, a professor
-teaching one or more classes) are generally eligible for a free
+teaching one or more classes) are generally eligible for [the Community
-Community plan.
+plan](#free-community-plan).
 
 Departments and other institutions using Zulip with students are eligible for
 discounted education pricing. Other educational uses (e.g., by teaching staff or
@@ -300,7 +303,8 @@ university IT) may qualify for [non-profit pricing](#non-profit-pricing).
 
 ### Non-profit pricing
 
-Non-profits with no paid staff are eligible for the free Community plan.
+Non-profits with no paid staff are eligible for [the Community
+plan](#free-community-plan).
 
 For non-profits with paid staff, volunteers and other unpaid participants in
 your community are eligible for free Zulip accounts. Additionally, discounts are
@@ -331,32 +335,12 @@ may contact [sales@zulip.com](mailto:sales@zulip.com) to arrange a discounted ra
 
 These instructions describe the paid plan discount application process for an
 existing Zulip server. If you would like to inquire about paid plan discount
-eligibility prior to setting up a server, contact
+eligibility prior to setting up a self-hosted server, contact
 [sales@zulip.com](mailto:sales@zulip.com).
 
 {start_tabs}
 
-{tab|v8}
+{!self-hosted-billing-log-in-step.md!}
-
-{!register-server.md!}
-
-{!self-hosted-log-in.md!}
-
-1. On the page listing Zulip's self-hosted plans, scroll down to the
-   **Sponsorship and discounts** area, and click **Apply here**.
-
-1. Select your preferred option from the **Plan** dropdown.
-
-1. Fill out the requested information, and click **Submit**. Your application
-   will be reviewed for discount eligibility.
-
-{tab|all-versions}
-
-{!legacy-log-in-intro.md!}
-
-{!register-server-legacy.md!}
-
-{!legacy-log-in.md!}
 
 1. On the page listing Zulip's self-hosted plans, scroll down to the
    **Sponsorship and discounts** area, and click **Apply here**.
@@ -370,10 +354,9 @@ eligibility prior to setting up a server, contact
 
 ## Payment methods
 
-### Can I pay by credit card and/or invoice?
+### What are my payment options?
 
-You can always use a credit card to pay. If you would like to pay by invoice,
+{!payment-options.md!}
-you will need to sign up for an annual plan.
 
 ### How does automatic license management work?
 
@@ -381,42 +364,29 @@ you will need to sign up for an annual plan.
 
 ### How does manual license management work?
 
-{!manual-billing-intro.md!}
+With manual license management, you choose and pay for a fixed number of
+licenses for your organization or server. [Deactivating a
+user](/help/deactivate-or-reactivate-a-user) frees up their license for reuse.
 
-#### Manually manage licenses
+If the number of active users exceeds the number of licenses you've purchased,
+any paid services included in your plan will be paused until this is addressed.
+For example, you will lose access to the [Mobile Push Notification
+Service][push-notifications] until you have purchased more licenses or
+deactivated enough users.
+
+#### Manually update number of licenses
 
 {start_tabs}
 
-{tab|v8}
+{!self-hosted-billing-log-in-step.md!}
 
-{!self-hosted-log-in.md!}
+{!manual-add-license-instructions.md!}
-
-1. Modify **Number of licenses for current billing period** or **Number of
-   licenses for next billing period**, and click **Update**.
-
-!!! tip ""
-
-    You can only increase the number of licenses for the current billing period.
-
-{tab|all-versions}
-
-{!legacy-log-in-intro.md!}
-
-{!legacy-log-in.md!}
-
-1. Modify **Number of licenses for current billing period** or **Number of
-   licenses for next billing period**, and click **Update**.
-
-!!! tip ""
-
-    You can only increase the number of licenses for the current billing period.
 
 {end_tabs}
 
 ## How paid plans support the Zulip project
 
-Zulip is proudly independent, with [no venture capital
+Zulip is proudly independent, with [no venture capital funding][sustainable-growth],
-funding](https://zulip.com/values/#building-a-sustainable-business-aligned-with-our-values),
 which means that revenue strongly impacts the pace of Zulip’s development. Paid
 plans for self-hosted customers help fund improvements in Zulip's self-hosting
 experience, and overall product development. Zulip needs the support of
@@ -430,13 +400,11 @@ the Zulip project.
 
 Zulip is 100% open-source. Organizations that do not require support with their
 installation can always use Zulip for free with no limitations. Additionally,
-the [Mobile Push Notification
+the [Mobile Push Notification Service][push-notifications] is provided free of
-Service](https://zulip.readthedocs.io/en/stable/production/mobile-push-notifications.html)
+charge for organizations with up to 10 users.
-is provided free of charge for organizations with up to 10 users.
 
 You can self-manage your Zulip installation without signing up for a plan. Get
-started with the [installation
+started with the [installation guide][production-install].
-guide](https://zulip.readthedocs.io/en/stable/production/install.html).
 
 ## Related articles
 
@@ -444,3 +412,9 @@ guide](https://zulip.readthedocs.io/en/stable/production/install.html).
 * [Zulip Cloud or self-hosting?](/help/zulip-cloud-or-self-hosting)
 * [Migrating from other chat tools](/help/migrating-from-other-chat-tools)
 * [Contact support](/help/contact-support)
+
+[basic-metadata]: https://zulip.readthedocs.io/en/latest/production/mobile-push-notifications.html#uploading-basic-metadata
+[usage-statistics]: https://zulip.readthedocs.io/en/latest/production/mobile-push-notifications.html#uploading-usage-statistics
+[push-notifications]: https://zulip.readthedocs.io/en/stable/production/mobile-push-notifications.html
+[production-install]: https://zulip.readthedocs.io/en/stable/production/install.html
+[sustainable-growth]: https://zulip.com/values/#building-a-sustainable-business-aligned-with-our-values

help/zulip-cloud-billing.md

@@ -8,6 +8,8 @@ don't hesitate to reach out at [sales@zulip.com](mailto:sales@zulip.com).
 
 {start_tabs}
 
+{tab|by-card}
+
 {relative|gear|plans}
 
 1. On the page listing Zulip Cloud plans, click the button at the bottom
@@ -15,10 +17,27 @@ don't hesitate to reach out at [sales@zulip.com](mailto:sales@zulip.com).
 
 {!plan-upgrade-steps.md!}
 
+{tab|by-invoice}
+
+!!! warn ""
+
+    Only [manual license
+    management](#how-does-manual-license-management-work) is available
+    when paying by invoice.
+
+{relative|gear|plans}
+
+1. On the page listing Zulip Cloud plans, click the button at the bottom
+   of the plan you would like to purchase.
+
+{!pay-by-invoice-steps.md!}
+
 {end_tabs}
 
 ## Manage billing
 
+{!manage-billing-intro.md!}
+
 {start_tabs}
 
 {tab|desktop-web}
@@ -47,7 +66,7 @@ Free** at the end of the current billing period.
 ## Free and discounted Zulip Cloud Standard
 
 Zulip sponsors free plans for over 1000 worthy organizations. The following
-types of organizations are generally eligible for a free Zulip Cloud Standard plan.
+types of organizations are generally eligible for a free **Zulip Cloud Standard** plan.
 
 - Open-source projects, including projects with a small paid team.
 - Research in an academic setting, such as research groups, cross-institutional
@@ -57,7 +76,7 @@ types of organizations are generally eligible for a free Zulip Cloud Standard pl
 - Most communities that need features beyond the Free plan in order to use Zulip.
 
 The following types of organizations are generally eligible for significant
-discounts on Zulip Cloud Standard.
+discounts on **Zulip Cloud Standard**.
 
 - Education organizations are eligible for [education
   pricing](https://zulip.com/for/education/#feature-pricing).
@@ -95,8 +114,8 @@ sponosorship](#apply-for-sponsorship). Contact
 
 ### Apply for sponsorship
 
-Submit a sponsorship request to apply for a free or discounted Zulip Cloud
+Submit a sponsorship request to apply for a free or discounted **Zulip Cloud
-Standard plan. If you do not have a Zulip organization yet, contact
+Standard** plan. If you do not have a Zulip organization yet, contact
 [sales@zulip.com](mailto:sales@zulip.com) to inquire about sponsorship
 eligibility.
 
@@ -111,6 +130,14 @@ eligibility.
 
 1. Fill out the requested information, and click **Submit**.
 
+!!! tip ""
+
+     If you don't see the **Request sponsorship** link in the gear menu,
+     update your [organization type](/help/organization-type) to one of
+     the eligible types of organizations [listed
+     above](#free-and-discounted-zulip-cloud-standard) that best fits
+     your organization.
+
 {tab|request-education-pricing}
 
 1. Click on the **gear** (<i class="zulip-icon zulip-icon-gear"></i>) icon in
@@ -120,6 +147,12 @@ eligibility.
 
 1. Fill out the requested information, and click **Submit**.
 
+!!! tip ""
+
+     If you don't see the **Request education pricing** link in the gear menu,
+     update your [organization type](/help/organization-type) to either
+     **Education (non-profit)** or **Education (for-profit)**.
+
 {end_tabs}
 
 ## Differences between Zulip Cloud plans
@@ -128,7 +161,7 @@ eligibility.
 
 Only the most recent 10,000 messages can be viewed and searched on the Zulip
 Cloud Free plan. Older messages are still stored and will become available
-again if the organization is upgraded to Zulip Cloud Standard.
+again if the organization is upgraded to **Zulip Cloud Standard**.
 
 ### Will you switch to limiting Zulip Cloud Free history to messages sent in the last 90 days (like Slack has)?
 
@@ -139,10 +172,9 @@ tool.
 
 ## Payment methods
 
-### Can I pay by credit card and/or invoice?
+### What are my payment options?
 
-You can always use a credit card to pay. If you would like to pay by invoice,
+{!payment-options.md!}
-you will need to sign up for an annual plan.
 
 ### How does automatic license management work?
 
@@ -152,10 +184,7 @@ you will need to sign up for an annual plan.
 
 {!manual-billing-intro.md!}
 
-#### Manually manage licenses
+#### Manually update number of licenses
-
-If your organization is on a manual billing plan, you can manage the number of
-licenses on your organization's billing page.
 
 {start_tabs}
 
@@ -163,12 +192,7 @@ licenses on your organization's billing page.
 
 {relative|gear|billing}
 
-1. Modify **Number of licenses for current billing period** or **Number of
+{!manual-add-license-instructions.md!}
-   licenses for next billing period**, and click **Update**.
-
-!!! tip ""
-
-    You can only increase the number of licenses for the current billing period.
 
 {end_tabs}
 

zerver/lib/markdown/tabbed_sections.py

@@ -116,6 +116,8 @@ TAB_SECTION_LABELS = {
     "v6": "Zulip Server 6.0+",
     "v4": "Zulip Server 4.0+",
     "all-versions": "All versions",
+    "by-card": "Pay by credit card",
+    "by-invoice": "Pay by invoice",
     "for-a-bot": "For a bot",
     "for-yourself": "For yourself",
 }