Skip to content
Merged
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3c6e38d
Update content-style-guide.md
sophietheking Apr 6, 2022
0bde70a
Update contributing/content-style-guide.md
sophietheking Apr 7, 2022
dfd4253
Added more context and examples
sophietheking Apr 7, 2022
788ab94
Merge branch 'sophietheking-personalaccount' of https://github.com/gi…
sophietheking Apr 7, 2022
276faeb
Added more examples
sophietheking Apr 7, 2022
35186f9
Update contributing/content-style-guide.md
sophietheking Apr 7, 2022
13b78f6
Merge branch 'main' into sophietheking-personalaccount
sophietheking Apr 7, 2022
80c32c9
Change the order
sophietheking Apr 7, 2022
59a28ca
merge conflict
sophietheking Apr 7, 2022
a4927d2
small fix
sophietheking Apr 7, 2022
7426a67
last smoll fix
sophietheking Apr 7, 2022
31515e1
Update contributing/content-style-guide.md
sophietheking Apr 8, 2022
fb0bc54
Added suggestions
sophietheking Apr 8, 2022
65b272b
fix merge conflict
sophietheking Apr 8, 2022
4782a7d
Added better description of user accounts on GHEC
sophietheking Apr 8, 2022
236e447
Update contributing/content-style-guide.md
sophietheking Apr 8, 2022
b036a69
Update contributing/content-style-guide.md
sophietheking Apr 8, 2022
cc9377b
Update contributing/content-style-guide.md
sophietheking Apr 8, 2022
9ee8a1f
Update contributing/content-style-guide.md
sophietheking Apr 8, 2022
ca856ca
Update contributing/content-style-guide.md
sophietheking Apr 8, 2022
394af3e
Update contributing/content-style-guide.md
sophietheking Apr 8, 2022
57ced12
Update contributing/content-style-guide.md
sophietheking Apr 11, 2022
3b36490
Added two minor things
sophietheking Apr 11, 2022
76ca135
Incorporate @lecoursen's ✨ feedback
mattpollard Apr 11, 2022
acbe6d6
Merge branch 'main' into sophietheking-personalaccount
mattpollard Apr 11, 2022
f97e563
Deduplicate 😱
mattpollard Apr 11, 2022
eb4bb77
Update contributing/content-style-guide.md
sophietheking Apr 11, 2022
aacdaad
Merge branch 'main' into sophietheking-personalaccount
sophietheking Apr 11, 2022
74c6fb3
Merge pull request #26737 from github/sophietheking-personalaccount
sophietheking Apr 11, 2022
f353c32
Merge branch 'main' into repo-sync
Octomerger Apr 11, 2022
8a15c9b
Merge branch 'main' into repo-sync
docubot Apr 11, 2022
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
54 changes: 51 additions & 3 deletions contributing/content-style-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -540,12 +540,60 @@ Do not use symbols or octicons that aren’t used in GitHub’s user interface.

### Accounts

To avoid ambiguity and confusion, do not use product names as adjectives to describe accounts in any of our products. Instead, clarify the account type and choose clearer phrasing that avoids conflating accounts and products. When talking about accounts, only refer to the product name when needed to disambiguate between products.
- **Use:** Your organization account
- **Use:** Your user account on GitHub Enterprise Cloud
#### Product names and accounts

To avoid ambiguity and confusion, do not use product names as adjectives to describe accounts in any of our products. Instead, clarify the account type and choose clearer phrasing that avoids conflating accounts and products. When talking about accounts, only refer to the product name when needed to disambiguate between products. For more information about types of accounts available in GitHub's products, see "[Types of GitHub accounts](https://docs.github.com/en/get-started/learning-about-github/types-of-github-accounts)."
- **Use:** Your organization on GitHub Enterprise Cloud
- **Avoid:** Your GitHub Enterprise Cloud account
- **Avoid:** Your GitHub Enterprise Server organization
- **Use:** You can highlight your work on GitHub Enterprise Server by sending the contribution counts to your GitHub.com profile.

#### Individual people's accounts on GitHub

We refer to an account that an individual person signs into in various ways depending on the context.

Unless the content is about administering an enterprise product, describe an individual person's account on GitHub as a "personal account." This creates consistency with the UI and prevents readers from being confused by seeing two terms that mean the same thing.

- **Use:** Managing scheduled reminders for your personal account
- **Avoid:** Managing scheduled reminders for your user account

#### Accounts for enterprise products

With GitHub's enterprise products, administrators manage an enterprise account. An enterprise account can own multiple organizations, and people's user accounts can be members of the organizations. For more information, see the "Roles in an enterprise" article for each product.

- [GitHub Enterprise Cloud](https://docs.github.com/en/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise)
- [GitHub Enterprise Server](https://docs.github.com/en/enterprise-server/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise)
- [GitHub AE](https://docs.github.com/en/github-ae@latest/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise)

If the reader manages an enterprise account, and you're describing the people's accounts that they manage, use "user account." This applies to the following products.

- GitHub Enterprise Cloud with Enterprise Managed Users
- **Use:** With Enterprise Managed Users, you can create and manage user accounts for your enterprise members.
- **Avoid:** With Enterprise Managed Users, you can create and manage the personal accounts for your enterprise members.
- GitHub Enterprise Server
- **Use:** If you need to temporarily take over a user account...
- **Avoid:** If you need to temporarily take over a personal account...
- GitHub AE
- **Use:** Authorized users can access your enterprise from any IP address.
- **Avoid:** Authorized personal accounts can access your enterprise from any IP address.

The following documentation should reference "user accounts."

- The "[Enterprise administrators](https://docs.github.com/en/enterprise-cloud@latest/admin)" product
- Enterprise-specific billing documentation, like "[About billing for your enterprise](https://docs.github.com/en/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)"
- Content within other products that's intended for an administrative audience, like "[Best practices for securing accounts](https://docs.github.com/en/enterprise-cloud@latest/code-security/supply-chain-security/end-to-end-supply-chain/securing-accounts)" in the "Code security" product or "[Setting up a trial of GitHub Enterprise Cloud](https://docs.github.com/en/enterprise-cloud@latest/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud)" in the "Get started" product
- Enterprise-specific API content, like the "[GitHub Enterprise administration](https://docs.github.com/en/enterprise-cloud@latest/rest/reference/enterprise-admin)" REST API reference documentation

For enterprises on GitHub Enterprise Cloud that don't use Enterprise Managed Users, use "personal account" when describing members of organizations owned by the enterprise.

- **Use:** If you configure SAML SSO, members of your organization will continue to log into their personal accounts on GitHub.com.
- **Avoid:** If you configure SAML SSO, members of your organization will continue to log into their user accounts on GitHub.com.

Documentation that describes GitHub Enterprise Cloud without Enterprise Managed Users is generally in the "[Managing SAML single sign-on for your organization](https://docs.github.com/en/enterprise-cloud@latest/organizations/managing-saml-single-sign-on-for-your-organization)" category.

#### People's accounts for other services

When you describe a person's account for a service other than GitHub, such as an integration or authentication provider, use "user account."
### Acronyms

Spell out acronyms the first time they’re used in an article, except in titles or headers.
Expand Down