Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor updates for unified billing #1808

Merged
merged 1 commit into from
Aug 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion about/billing.html.markerb
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
4 changes: 2 additions & 2 deletions about/pricing.html.markerb
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<div class="callout">
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.
</div>

## Plans
Expand Down
2 changes: 1 addition & 1 deletion blueprints/staging-prod-isolation.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion getting-started/essentials.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion security/sso.html.markerb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down