Skip to content

Commit cd19f98

Browse files
Sharra-writesSharra-writes
authored
Merge branch 'main' into issue-39707
2 parents d50a3c5 + 2bbba3c commit cd19f98

33 files changed

+529
-361
lines changed

‎content/account-and-profile/concepts/about-your-organizations-profile.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,17 @@ versions:
1313
ghec: '*'
1414
topics:
1515
- Profiles
16-
shortTitle: Organization's profile
16+
shortTitle: Organization profile
1717
---
1818

19-
You can optionally choose to add a description, location, website, and email address for your organization, and pin important repositories. You can customize your organization's public profile by adding a `README.md` file. For more information, see [AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile).
19+
You can customize your organization's profile by adding any of the following:
20+
21+
* A description
22+
* A location
23+
* A website
24+
* An email address
25+
26+
You can also pin important repositories and add a `README.md` file to help orient visitors. For more information, see [AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/customizing-your-organizations-profile).
2027

2128
{% ifversion fpt %}
2229
Organizations that use {% data variables.product.prodname_ghe_cloud %} can confirm their organization's identity and display a "Verified" badge on their organization's profile page by verifying the organization's domains with {% data variables.product.github %}. For more information, see [AUTOTITLE](/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization) in the {% data variables.product.prodname_ghe_cloud %} documentation.
@@ -25,7 +32,3 @@ To confirm your organization's identity and display a "Verified" badge on your o
2532
{% endif %}
2633

2734
![Screenshot of the profile page for the @docs organization.](/assets/images/help/profile/org-profile.png)
28-
29-
## Further reading
30-
31-
* [AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/about-organizations)

‎content/account-and-profile/concepts/about-your-profile.md‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: About your profile
3-
intro: 'Your profile page tells people the story of your work through the repositories you''re interested in, the contributions you''ve made, and the conversations you''ve had.'
3+
shortTitle: Personal profile
4+
intro: 'Your profile page tells people your story through the information you share, the contributions you make, and the projects you showcase.'
45
redirect_from:
56
- /articles/viewing-your-feeds
67
- /articles/profile-pages
@@ -15,31 +16,27 @@ versions:
1516
topics:
1617
- Profiles
1718
---
18-
You can add personal information about yourself in your bio, like previous places you've worked, projects you've contributed to, or interests you have that other people may like to know about. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile#adding-a-bio-to-your-profile).
19+
You can tell other people a little bit about yourself by writing a bio. Consider including previous places you've worked, projects you've contributed to, or interests you have that other people may like to know about.
1920

20-
{% data reusables.profile.profile-readme %}
21+
You can further showcase your current work, interests, expertise, and more by creating a profile README. If you add a README file to the root of a public repository with the same name as your username, that README will automatically appear on your profile page.
2122

2223
![Screenshot of the profile page for @octocato. In the top-right corner, a profile README greets the viewer and lists information about the user's work.](/assets/images/help/repository/profile-with-readme.png)
2324

24-
People who visit your profile see a timeline of your contribution activity, like issues and pull requests you've opened, commits you've made, and pull requests you've reviewed. You can choose to display only public contributions or to also include private, anonymized contributions. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/viewing-contributions-on-your-profile) or [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/showing-your-private-contributions-and-achievements-on-your-profile).
25+
People who visit your profile can also see:
2526

26-
People who visit your profile can also see the following information:
27-
28-
* Repositories and gists you own or contribute to. You can showcase your best work by pinning repositories and gists to your profile. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/pinning-items-to-your-profile).
29-
* Repositories you've starred{% ifversion fpt or ghec %} and organized into lists{% endif %}. For more information, see [AUTOTITLE](/get-started/exploring-projects-on-github/saving-repositories-with-stars).
30-
* An overview of your activity in organizations, repositories, and teams you're most active in. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/showing-an-overview-of-your-activity-on-your-profile).{% ifversion fpt or ghec %}
31-
* Badges and Achievements that highlight your activity and show if you use {% data variables.product.prodname_pro %} or participate in programs like the {% data variables.product.prodname_arctic_vault %}, {% data variables.product.prodname_sponsors %}, or the {% data variables.product.company_short %} Developer Program. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile#displaying-badges-on-your-profile).{% endif %}
27+
* A timeline of your contribution activity, like issues and pull requests you've opened, commits you've made, and pull requests you've reviewed
28+
* Repositories and gists you own or contribute to. You can showcase your best work by pinning repositories and gists to your profile.
29+
* Repositories you've starred{% ifversion fpt or ghec %} and organized into lists{% endif %}
30+
* An overview of your activity in organizations, repositories, and teams you're most active in{% ifversion fpt or ghec %}
31+
* Badges and Achievements that highlight your activity and show if you use {% data variables.product.prodname_pro %} or participate in programs like the {% data variables.product.prodname_arctic_vault %}, {% data variables.product.prodname_sponsors %}, or the {% data variables.product.company_short %} Developer Program{% endif %}
3232
{%- ifversion profile-pronouns %}
33-
* Your pronouns if you've set them. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile#adding-pronouns-to-your-profile).
33+
* Your pronouns (if you have set them)
3434
{%- endif %}
3535
{%- ifversion fpt or ghec %}
36-
* Mutual connections you share with someone who is viewing your profile. The person viewing your profile can see which of the people they follow are also followed by you.
36+
* Mutual connections, including people both you and the viewer follow
3737
{%- endif %}
38+
* Your status message sharing information about your availability (if you have set one)
3839

39-
You can also set a status on your profile to provide information about your availability. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile#setting-a-status).
40-
41-
## Further reading
40+
## Next steps
4241

43-
* [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile)
44-
* [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/showing-your-private-contributions-and-achievements-on-your-profile)
45-
* [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/viewing-contributions-on-your-profile)
42+
To start customizing your profile, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile) and [AUTOTITLE](/account-and-profile/how-tos/setting-up-and-managing-your-github-profile/customizing-your-profile/managing-your-profile-readme).

‎content/account-and-profile/concepts/index.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ topics:
1010
- Accounts
1111
- Profiles
1212
children:
13+
- /about-your-profile
1314
- /viewing-contributions-on-your-profile
1415
- /about-your-organizations-profile
15-
- /about-your-profile
1616
- /about-organization-membership
1717
- /changing-your-github-username
1818
---
19-

‎content/billing/concepts/enterprise-billing/azure-devops-licenses.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
title: Combined use of GitHub Enterprise and Azure DevOps
3+
intro: '{% data variables.product.prodname_ghe_cloud %} customers can use Azure DevOps without additional costs.'
4+
versions:
5+
fpt: '*'
6+
ghec: '*'
7+
topics:
8+
- Billing
9+
- Enterprise
10+
- Licensing
11+
shortTitle: Azure DevOps licenses
12+
contentType: concepts
13+
---
14+
15+
{% data variables.product.prodname_ghe_cloud %} customers can use Azure DevOps without additional costs per user. For customers using Microsoft Entra, users can sign in with the same credentials on {% data variables.product.github %} and Azure DevOps.
16+
17+
No additional setup is required. {% data variables.product.prodname_enterprise %} users are detected automatically when they sign in to Azure DevOps. See [User and permissions management](https://learn.microsoft.com/en-us/azure/devops/organizations/accounts/faq-user-and-permissions-management?view=azure-devops#github-enterprise) in the Microsoft Learn documentation.
18+
19+
Combined use is not currently available with {% data variables.enterprise.data_residency %}, but this is planned as a future improvement.

‎content/billing/concepts/enterprise-billing/combined-enterprise-use.md‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,51 +15,56 @@ redirect_from:
1515
contentType: concepts
1616
---
1717

18-
19-
{% data reusables.billing.usage-based-billing %}
20-
2118
## About licensing for {% data variables.product.prodname_enterprise %}
2219

2320
{% data reusables.enterprise.about-deployment-methods %}
2421

25-
{% data reusables.enterprise-licensing.unique-user-licensing-model %} To understand how {% data variables.product.company_short %} bills you for consumed {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %}, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing). For more about the price of {% data variables.product.prodname_enterprise %} licenses, see [Pricing](https://github.com/pricing) on the {% data variables.product.prodname_dotcom %} website.
26-
27-
To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you can synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} deployments.
22+
{% data reusables.enterprise-licensing.unique-user-licensing-model %}
2823

29-
{% ifversion ghes %}
24+
To use a {% data variables.product.prodname_ghe_server %} instance, you must upload a license file that {% data variables.product.company_short %} provides. See [AUTOTITLE](/billing/concepts/enterprise-billing/ghes-license-files).
3025

31-
{% data reusables.billing.license-type-overview %}
32-
{% data reusables.billing.license-models %}
26+
## Syncing licenses
3327

34-
{% endif %}
28+
{% data reusables.enterprise-licensing.about-license-sync %}
3529

36-
In order to use a {% data variables.product.prodname_ghe_server %} instance, you must upload a license file that {% data variables.product.company_short %} provides when you purchase, renew, or add user licenses to {% data variables.product.prodname_enterprise %}.
30+
## Usage-based and volume licensing
3731

38-
{% data variables.product.prodname_ghe_cloud %} customers can use Azure DevOps without additional per user charges. Access is available to customers using Microsoft Entra and users logging in with the same credentials in {% data variables.product.github %} and Azure DevOps.
32+
There are two types of {% data variables.product.prodname_enterprise %} (GHE) licensing models, with different processes for enabling combined use of {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}.
3933

40-
There is no action required; {% data variables.product.prodname_enterprise %} users will be detected automatically when they log in to Azure DevOps. See [User and permissions management](https://learn.microsoft.com/en-us/azure/devops/organizations/accounts/faq-user-and-permissions-management?view=azure-devops#github-enterprise) in the Microsoft Learn documentation.
34+
* **GHE (Usage-based, also called metered)**: A cloud-first license where users must first be assigned to a {% data variables.product.prodname_ghe_cloud %} organization.
35+
* All Cloud users automatically receive a use right for {% data variables.product.prodname_ghe_server %}.
36+
* Billing is based on the number of active users each month.
37+
* Users can generate their own Server license, which covers the number of assigned Cloud seats at the time of generation and is valid for one year.
38+
* Server-only users will be added to GHE (Metered) billing. These users are de-duplicated with email matching to avoid double billing.
4139

42-
Access is not yet available in [new data residency regions](https://github.blog/engineering/engineering-principles/github-enterprise-cloud-with-data-residency/) but will be coming in the future.
40+
* **GHE (Volume/Subscription, also called GHE Unified)**: A bundled license for both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}.
41+
* One license covers both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, allowing users to work in either or both.
42+
* Users can access both services via {% data variables.product.prodname_github_connect %}.
43+
* This license requires manual setup and is provided by {% data variables.product.github %} Sales.
4344

44-
## About synchronization of license usage for {% data variables.product.prodname_enterprise %}
45-
46-
{% data reusables.enterprise-licensing.about-license-sync %} For more information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud).
47-
48-
## About license files for {% data variables.product.prodname_enterprise %}
49-
50-
When you purchase or renew {% data variables.product.prodname_enterprise %}, {% data variables.product.company_short %} provides a license file {% ifversion ghec %}for your deployments of {% data variables.product.prodname_ghe_server %}{% elsif ghes %}for {% data variables.location.product_location_enterprise %}{% endif %}. A license file has an expiration date and controls the number of people who can use {% data variables.location.product_location_enterprise %}. After you download and install {% data variables.product.prodname_ghe_server %}, you must upload the license file to unlock the application for you to use.
45+
{% data reusables.billing.usage-based-billing %}
5146

52-
For more information about downloading your license file, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise).
47+
### Detailed comparison
5348

54-
For more information about uploading your license file, see {% ifversion ghec %}[AUTOTITLE](/enterprise-server@latest/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server).{% endif %}
49+
{% rowheaders %}
5550

56-
If your license expires, you won't be able to access {% data variables.product.prodname_ghe_server %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see {% ifversion ghec %}[Configuring backups on your appliance](/enterprise-server@latest/admin/guides/installation/configuring-backups-on-your-appliance) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance).{% endif %}
51+
| License model | Usage-based | Volume or subscription |
52+
|----------------------------------|-------------------------------------|-----------------------------------------------------------------------------------------------|
53+
| **Cloud vs. Server** | Cloud-first, with a Server use right for Cloud users | 1 user license covers both Cloud and Server (hybrid, Cloud-only, or Server-only) |
54+
| **Setup** | Self-service | Manual setup via {% data variables.product.github %} Sales |
55+
| **Server license generation** | Users generate their own {% data variables.product.prodname_ghe_server %} license | Enterprise owners download their own {% data variables.product.prodname_ghe_server %} license |
56+
| **License file scope** | Covers Cloud-assigned users at time of generation | Covers all purchased users for both Cloud and Server |
57+
| **License expiration** | Expires in 12 months | Aligned with volume license term |
58+
| **License key usage** | Limits max Server users | Covers all users in the volume subscription |
59+
| **Required {% data variables.product.prodname_enterprise %} version** | {% data variables.product.prodname_enterprise %} 3.13+, with {% data variables.product.prodname_github_connect %} | No specific version required |
60+
| **Billing model** | Invoiced for users not assigned on Cloud via {% data variables.product.prodname_github_connect %} | Fixed cost based on purchased volume |
5761

58-
If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}.
62+
{% endrowheaders %}
5963

6064
## Further reading
6165

66+
* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)
67+
* [Pricing](https://github.com/pricing)
6268
* [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise)
63-
* The [People that consume a license](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing#people-that-consume-a-license) section in "About per-user pricing"
6469
* [AUTOTITLE]({% ifversion fpt or ghec %}/enterprise-server@latest{% endif %}/admin/installation/setting-up-a-github-enterprise-server-instance)
6570
* The [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website

0 commit comments

Comments
 (0)