Skip to content

Commit

Permalink
Merge branch 'publish' into view-dynamic-members
Browse files Browse the repository at this point in the history
  • Loading branch information
addison-martin1 authored and GitHub Enterprise committed Mar 25, 2022
2 parents fc85cca + d4bba50 commit b01665b
Show file tree
Hide file tree
Showing 13 changed files with 241 additions and 295 deletions.
9 changes: 6 additions & 3 deletions account-upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

copyright:
years: 2015, 2022
lastupdated: "2022-02-18"

lastupdated: "2022-03-24"

keywords: account upgrade, paid account, upgrade to Pay-As-You-Go, upgrade to Subscription, upgrade my account

Expand Down Expand Up @@ -33,6 +34,8 @@ To upgrade your account, you must have an access policy with the Editor role or

## Upgrading to a Pay-As-You-Go account
{: #upgrade-paygo}
{: support}
{: help}

With a Pay-As-You-Go account, you pay for only what you use beyond the free runtime and service allowances. After you upgrade, you can continue to use any instances that you created with your Lite account.

Expand All @@ -46,7 +49,7 @@ After your payment information is processed, your account is upgraded and you ca

If you're upgrading to reactivate a deactivated account, your account might take a few days to be fully available. If your account continues to be in a pending state, see [Why can't I upgrade my account?](/docs/account?topic=account-ts_upgrade_cc) for help.

### Promotional credit for upgrading your account
## Promotional credit for upgrading your account
{: #promotional-credit-for-upgrading-your-account}

If your upgrade included a promotional credit, the credit might take a few hours to appear in your account. Any unused upgrade credit expires after the 30 day period ends. You are invoiced for any usage that exceeds the promotional credit. You can view the promotional credit on the [Promotions](/billing/promotions){: external} page or the [Invoices](/billing/invoices){: external} page in the console. The following table lists the current upgrade promotional amounts for different currencies:
Expand Down Expand Up @@ -95,7 +98,7 @@ To upgrade from a Lite account to a Subscription account, complete the following
Your subscription renews automatically. If you want to discontinue your subscription renewal, [contact support](/unifiedsupport/supportcenter).
{: note}

### Converting a Pay-As-You-Go account to a Subscription account
## Converting a Pay-As-You-Go account to a Subscription account
{: #paygo-to-subscription}

You can convert your Pay-As-You-Go account to a Subscription account at any time. Contact [{{site.data.keyword.Bluemix_notm}} Sales](https://cloud.ibm.com/catalog?contactmodule){: external} to get started.
19 changes: 17 additions & 2 deletions acct-getstart-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
copyright:
years: 2020, 2022

lastupdated: "2022-02-28"
lastupdated: "2022-03-21"

keywords: getting started, account, Subscription, Pay-As-You-Go, enterprise, catalog, upgrade account, IAM, access groups, invite users, notifications, email preferences, account settings, authentication, MFA, TOTP, U2F, FIDO U2F, security key

Expand Down Expand Up @@ -55,12 +55,27 @@ If you're not a part of a company that uses a federated ID, use your IBMid to cr
1. Click **Create account**.
1. Confirm your account by clicking the link in the confirmation email that's sent to your provided email address.

### Personal use availability
{: #signup-personalaccts}

Personal use of our platform that is not related to business, trade, craft, or professional purposes are not supported for the following countries or regions:

```text
Albania, Algeria, Armenia, Bahrain, Belarus, Cameroon, Canary Islands, Egypt, Ghana, Ivory Coast, Kazakstan, Kenya, Kingdom of Saudi Arabia, Mauritania, Moldova, Nigeria, Norway, Saudi Arabia, Serbia, Seychelles, Switzerland, Taiwan, Tanzania, Turkey, UAE, Uganda, Ukraine, United Arab Emirates, Uzbekistan, Vietnam
```
{: screen}

{{site.data.keyword.IBM}} Norway and {{site.data.keyword.IBM}} Switzerland are able to contract with local customers to offer personal use accounts.
{: note}

To work with a local Business Partner, go to the [IBM Business Partner Directory](https://www.ibm.com/partnerworld/bpdirectory/). Customers are not required to have a VAT ID to work with a local Business Partner.

### Using a federated ID
{: #signup-federated}

A federated ID is an ID within a company's domain that is registered with {{site.data.keyword.IBM_notm}} so that the domain and user credentials can be used to access {{site.data.keyword.IBM_notm}} web applications. You can sign up for {{site.data.keyword.Bluemix_notm}} with a federated ID only if your company is already registered with {{site.data.keyword.IBM_notm}}. Registering a company's domain with {{site.data.keyword.IBM_notm}} enables users to log in to {{site.data.keyword.IBM_notm}} products and services by using their existing company user credentials. Authentication is then handled by your company's identity provider (IdP) through single sign-on (SSO).

{{site.data.keyword.IBM_notm}} uses the Security Assertion Markup Language 2.0 (SAML 2.0) for this identity federation. SAML 2.0 is a standard version for exchanging authentication data between security domains. It’s an XML-based protocol using a security token that contains assertions to pass information between the organization's IdP, and the {{site.data.keyword.IBM_notm}} Rely Party (RP), otherwise known as the Service Provider.
{{site.data.keyword.IBM_notm}} uses the Security Assertion Markup Language 2.0 (SAML 2.0) for this identity federation. SAML 2.0 is a standard version for exchanging authentication data between security domains. It’s an XML-based protocol that uses a security token that contains assertions to pass information between the organization's IdP, and the {{site.data.keyword.IBM_notm}} Rely Party (RP), otherwise known as the Service Provider.

For information about how to register your company for a federated ID, see the [IBMid Enterprise Federation Adoption Guide](https://ibm.ent.box.com/notes/78040808400?v=IBMid-Federation-Guide){: external}. An {{site.data.keyword.IBM_notm}} sponsor, such as an offering advocate or client advocate, is required when you request to register federated IDs.

Expand Down
6 changes: 2 additions & 4 deletions faqs-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

copyright:
years: 2015, 2022
lastupdated: "2022-03-16"
lastupdated: "2022-03-22"

keywords: account settings, delete account, account errors, reassign account, view tags, batch registration, transfer account ownership, upgrade, convert, trial, Lite, cancel account, terminate account, suspend account

Expand Down Expand Up @@ -42,7 +42,6 @@ If you can't log in to an {{site.data.keyword.Bluemix_notm}} account, [create an
## How do I update my credit card?
{: #updatepayment}
{: faq}
{: support}

If you have a Pay-As-You-Go account type that is billed in US Dollars, complete the following steps:
1. Go to the [Payments](/billing/payments) page.
Expand All @@ -63,7 +62,6 @@ If your credit card requires a MasterCard SecureCode that is sent to a mobile ph
## How do I upgrade my account?
{: #changeacct}
{: faq}
{: support}

To upgrade your Lite account, go to your [account settings](/account/settings). In the Account Upgrade section, click **Add credit card** to upgrade to a Pay-As-You-Go account, or click **Upgrade** for a Subscription account.

Expand All @@ -78,7 +76,6 @@ Yes, when you upgrade to a Pay-As-You-Go or Subscription account, you can contin
## Can I convert my account?
{: #convertacct}
{: faq}
{: support}

Yes, the following options are available depending on your account type:

Expand Down Expand Up @@ -303,6 +300,7 @@ When you register users for {{site.data.keyword.Bluemix_notm}}, you must registe
## What are tags?
{: #know-about-tags}
{: faq}
{: support}

Tags are `key:value` pairs that you use to organize your resources or control access to them.

Expand Down
3 changes: 2 additions & 1 deletion faqs-enterprise.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

copyright:
years: 2015, 2022
lastupdated: "2022-02-18"
lastupdated: "2022-03-22"

keywords: account settings, delete account, account errors, reassign account, view tags, batch registration, transfer account ownership

Expand All @@ -24,6 +24,7 @@ FAQs for your {{site.data.keyword.cloud}} enterprise might include questions abo
## How do I set up an enterprise account?
{: #enterprise-setup}
{: faq}
{: support}

To set up an enterprise, you must be the account owner or an administrator on the Billing account management service. You use the {{site.data.keyword.cloud_notm}} console to create an enterprise account, enter the name of your company, provide your company's domain, create your enterprise structure, and more. For more information, see [Setting up an enterprise](/docs/account?topic=account-enterprise-tutorial).

Expand Down
7 changes: 4 additions & 3 deletions faqs-iam.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
copyright:

years: 2018, 2022
lastupdated: "2022-03-18"
lastupdated: "2022-03-25"


keywords: frequently asked questions for iam, iam faq, iam questions, identity and access management questions

Expand Down Expand Up @@ -193,7 +194,6 @@ The account owner can remove any users from the account, and any user with the f
## How do I require IBMid multifactor authentication for my account?
{: #multi-factor}
{: faq}
{: support}

1. In the {{site.data.keyword.cloud_notm}} console, go to **Manage** > **Access (IAM)**, and select **Settings**.
2. From the Account login section, select **Update** to select MFA for all users or non-federated users only.
Expand Down Expand Up @@ -354,4 +354,5 @@ For more information, see [Using Trusted Profiles in your Kubernetes and OpenShi
{: #dynamic-members}
{: faq}

To view a list of dynamic members in an access group, go to **Manage** > **Access (IAM)** > **Access groups** in the {{site.data.keyword.cloud_notm}} console. Select an access group and click **Users**. Dynamically added users are indicated by the type `Dynamic`. For more information, see [Viewing dynamic members of access groups](/docs/account?topic=account-rules&interface=ui#view-dynamic-users)
To view a list of dynamic members in an access group, go to **Manage** > **Access (IAM)** > **Access groups** in the {{site.data.keyword.cloud_notm}} console. Select an access group and click **Users**. Dynamically added users are indicated by the type `Dynamic`. For more information, see [Viewing dynamic members of access groups](/docs/account?topic=account-rules&interface=ui#view-dynamic-users)

3 changes: 2 additions & 1 deletion faqs-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
copyright:
years: 2015, 2022

lastupdated: "2022-02-18"
lastupdated: "2022-03-22"

keywords: resource FAQs, resource frequently asked questions, resource group, resource list, dashboard widget

Expand Down Expand Up @@ -48,6 +48,7 @@ When you have Cloud Foundry services that can be migrated to a resource group, y
## Why can't I add a resource to a resource group?
{: #create-add-resource}
{: faq}
{: support}

Most likely you're dealing with an access issue. You must have at least the Viewer role on the resource group itself and at least the Editor role on the service in the account. Learn more in [Adding resources to a resource group](/docs/account?topic=account-rgs#add_to_rgs).

Expand Down
Loading

0 comments on commit b01665b

Please sign in to comment.