From 3aaeb6c58ef3a4aadf0e24ce808a601b3b81e08f Mon Sep 17 00:00:00 2001 From: Andrea Anderson Date: Fri, 23 Aug 2024 22:38:06 -0400 Subject: [PATCH] updates for unified billing (#1808) --- about/billing.html.markerb | 2 +- about/pricing.html.markerb | 4 ++-- blueprints/staging-prod-isolation.html.md | 2 +- getting-started/essentials.html.md | 2 +- security/sso.html.markerb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/about/billing.html.markerb b/about/billing.html.markerb index 5f2a2facf7..2add56a4b3 100644 --- a/about/billing.html.markerb +++ b/about/billing.html.markerb @@ -6,7 +6,7 @@ nav: firecracker redirect_from: /docs/about/credit-cards/ --- -Billing for Fly.io is monthly per organization. Organizations are administrative entities that enable you to add members, share app development environments, and manage billing separately. +Billing for Fly.io is monthly per organization. Organizations are administrative entities that enable you to add members, share app development environments, and manage billing. The amount you're charged depends on your plan. For the Pay As You Go plan, you pay for resource usage. For other plans, you pay for the cost of the plan plus your resource usage beyond the included usage and [free allowances](/docs/about/pricing/#free-allowances). diff --git a/about/pricing.html.markerb b/about/pricing.html.markerb index dbaba303f1..db97fe9b21 100644 --- a/about/pricing.html.markerb +++ b/about/pricing.html.markerb @@ -9,10 +9,10 @@ nav: firecracker ## How it works -Fly.io services are billed per organization. Every organization is on a [plan](https://fly.io/plans). If you want to scale beyond your plan, then you can upgrade, or just pay for what you need at the usage-based pricing listed below. +Fly.io services are billed per organization. Every organization is on a [plan](https://fly.io/plans), with [linked organizations](/docs/about/billing/#unified-billing) sharing a plan with their parent billing organization. If you want to scale beyond your plan, then you can upgrade, or just pay for what you need at the usage-based pricing listed below.
-Organizations are administrative entities on Fly.io that let you add members, share app development environments, and manage billing separately. [Billing](/docs/about/billing/) is based on the resources provisioned for your apps, pro-rated for the time they are provisioned. +Organizations are administrative entities on Fly.io that let you add members, share app development environments, and manage billing. [Billing](/docs/about/billing/) is based on the resources provisioned for your apps, pro-rated for the time they are provisioned.
## Plans diff --git a/blueprints/staging-prod-isolation.html.md b/blueprints/staging-prod-isolation.html.md index 7a4c237a5e..03d46dd185 100644 --- a/blueprints/staging-prod-isolation.html.md +++ b/blueprints/staging-prod-isolation.html.md @@ -11,7 +11,7 @@ All Fly.io accounts start with a "personal" organization. You can create as many Before you create a new organization, here's what you need to know: -- We bill organizations separately and each org has its own [plan](https://fly.io/plans). When you create the new org, you need to enter a payment method and choose a plan. You'll be invoiced per organization at the end of each billing cycle. +- You can consolidate billing for multiple organizations under a a single parent organization, or you can create regular organizations with separate payment methods and billing. Learn more about [unified billing](/docs/about/billing/#unified-billing). - You invite or remove members in each organization separately. - An organization can have multiple apps and those apps can communicate with each other securely over the org's private network. diff --git a/getting-started/essentials.html.md b/getting-started/essentials.html.md index 445ab7e323..81d1142674 100644 --- a/getting-started/essentials.html.md +++ b/getting-started/essentials.html.md @@ -55,4 +55,4 @@ Learn more about [Fly Apps](/docs/apps/overview/). **[Fly Volumes](/docs/volumes/):** Local persistent storage for Fly Machines. Every Fly Volume can be attached to one Machine at a time and belongs to one Fly App. -**Organizations**: Administrative entities on Fly.io that let you to manage billing separately, control access by adding and removing members, and share app development environments. +**Organizations**: Administrative entities on Fly.io that let you to manage billing, control access by adding and removing members, and share app development environments. diff --git a/security/sso.html.markerb b/security/sso.html.markerb index c95679b76c..a3b0dbe9f4 100644 --- a/security/sso.html.markerb +++ b/security/sso.html.markerb @@ -4,7 +4,7 @@ layout: docs nav: firecracker --- -Organizations are administrative entities on Fly.io that let you to manage billing separately, control access by adding and removing members, and share app development environments. You can, and usually should, require members of your organizations to use SSO. Fly.io supports Google and GitHub as Identity Providers, and you can use one or both. If you already use Google or GitHub, enabling SSO takes advantage of their built-in security, like 2FA/MFA and passkeys. +Organizations are administrative entities on Fly.io that let you to manage billing, control access by adding and removing members, and share app development environments. You can, and usually should, require members of your organizations to use SSO. Fly.io supports Google and GitHub as Identity Providers, and you can use one or both. If you already use Google or GitHub, enabling SSO takes advantage of their built-in security, like 2FA/MFA and passkeys. ## Authenticating user accounts vs. organizations