Skip to content

Commit 3b2e786

Browse files
authored
Merge branch 'main' into copilot/fix-732df555-77d5-46d3-9f9f-6593b98b2695
2 parents d71dc87 + eea297f commit 3b2e786

File tree

357 files changed

+1971
-2078
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

357 files changed

+1971
-2078
lines changed

.github/ISSUE_TEMPLATE/blank-issue.md

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: FOR DOCS TEAM USE ONLY
3+
about: 'Blank issue for use when copying docs-content issues. '
4+
title: 'Copied from docs-content: '
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# ---------------------------------------------------------------
99
# To update the sha:
1010
# https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
11-
FROM ghcr.io/github/gh-base-image/gh-base-noble:20250522-041000-g9c0993b27 AS base
11+
FROM ghcr.io/github/gh-base-image/gh-base-noble:20250529-200944-g9be5a274f AS base
1212

1313
# Install curl for Node install and determining the early access branch
1414
# Install git for cloning docs-early-access & translations repos

content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/using-your-github-profile-to-enhance-your-resume.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Hiring managers usually consider many applicants for each role. Expect that they
5555

5656
### Write a helpful README
5757

58-
The README for your project's repository is a perfect space to give a concise project overview. Use [{% data variables.product.prodname_copilot_chat_short %}](https://github.com/copilot) to help write your README, with a prompt like this:
58+
The README for your project's repository is a perfect space to give a concise project overview. Use [{% data variables.copilot.copilot_chat_short %}](https://github.com/copilot) to help write your README, with a prompt like this:
5959

6060
>Write a README for my lottery-number-generator repository.
6161

content/actions/monitoring-and-troubleshooting-workflows/troubleshooting-workflows/using-copilot-to-troubleshoot-workflows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ To open a chat about a failed workflow run, you can either:
1616

1717
This opens a chat window with {% data variables.product.prodname_copilot %}, where it will provide instructions to resolve the issue.
1818

19-
>[!NOTE] If you are on a {% data variables.product.prodname_copilot_free %} subscription, this will count towards your monthly chat message limit.
19+
>[!NOTE] If you are on a {% data variables.copilot.copilot_free %} subscription, this will count towards your monthly chat message limit.

content/actions/writing-workflows/choosing-what-your-workflow-does/caching-dependencies-to-speed-up-workflows.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ on:
342342
jobs:
343343
cleanup:
344344
runs-on: ubuntu-latest
345+
permissions:
346+
actions: write
345347
steps:
346348
- name: Cleanup
347349
run: |

content/actions/writing-workflows/choosing-what-your-workflow-does/evaluate-expressions-in-workflows-and-actions.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,21 +109,7 @@ env:
109109
* {% data variables.product.prodname_dotcom %} ignores case when comparing strings.
110110
* Objects and arrays are only considered equal when they are the same instance.
111111

112-
{% data variables.product.prodname_dotcom %} offers ternary operator like behaviour that you can use in expressions. By using a ternary operator in this way, you can dynamically set the value of an environment variable based on a condition, without having to write separate if-else blocks for each possible option.
113-
114-
### Example
115-
116-
{% raw %}
117-
118-
```yaml
119-
env:
120-
MY_ENV_VAR: ${{ github.ref == 'refs/heads/main' && 'value_for_main_branch' || 'value_for_other_branches' }}
121-
```
122-
123-
{% endraw %}
124-
125-
In this example, we're using a ternary operator to set the value of the `MY_ENV_VAR` environment variable based on whether the {% data variables.product.prodname_dotcom %} reference is set to `refs/heads/main` or not. If it is, the variable is set to `value_for_main_branch`. Otherwise, it is set to `value_for_other_branches`.
126-
It is important to note that the first value after the `&&` must be truthy. Otherwise, the value after the `||` will always be returned.
112+
% data variables.product.prodname_dotcom %} provides a way to create conditional logic in expressions using binary logical operators (`&&` and `||`). This pattern can be used to achieve similar functionality to the ternary operator (`?:`) found in many programming languages, while actually using only binary operators.
127113

128114
## Functions
129115

content/admin/copilot-business-only/about-enterprise-accounts-for-copilot-business.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: About enterprise accounts for Copilot Business
3-
intro: 'Learn about the options for creating an enterprise account to manage {% data variables.product.prodname_copilot_business_short %} licenses, without adopting {% data variables.product.prodname_enterprise %}.'
3+
intro: 'Learn about the options for creating an enterprise account to manage {% data variables.copilot.copilot_business_short %} licenses, without adopting {% data variables.product.prodname_enterprise %}.'
44
versions:
55
ghec: '*'
66
topics:
@@ -12,15 +12,15 @@ redirect_from:
1212
- /early-access/copilot/managing-copilot-business-licenses-with-an-enterprise-account
1313
---
1414

15-
You can use an enterprise account to manage licenses for {% data variables.product.prodname_copilot_for_business %}, without adopting {% data variables.product.prodname_enterprise %}.
15+
You can use an enterprise account to manage licenses for {% data variables.copilot.copilot_for_business %}, without adopting {% data variables.product.prodname_enterprise %}.
1616

1717
>[!NOTE] Access to this feature is currently managed by {% data variables.contact.contact_enterprise_sales %}.
1818
19-
## What is an enterprise account for {% data variables.product.prodname_copilot_business_short %}?
19+
## What is an enterprise account for {% data variables.copilot.copilot_business_short %}?
2020

21-
To use {% data variables.product.prodname_copilot %}, a user must authenticate to an account on {% data variables.product.prodname_dotcom %} that has a license for {% data variables.product.prodname_copilot_short %}. Organizations and enterprises on {% data variables.product.prodname_dotcom %} can manage members' access to {% data variables.product.prodname_copilot_short %} through a {% data variables.product.prodname_copilot_business_short %} subscription.
21+
To use {% data variables.product.prodname_copilot %}, a user must authenticate to an account on {% data variables.product.prodname_dotcom %} that has a license for {% data variables.product.prodname_copilot_short %}. Organizations and enterprises on {% data variables.product.prodname_dotcom %} can manage members' access to {% data variables.product.prodname_copilot_short %} through a {% data variables.copilot.copilot_business_short %} subscription.
2222

23-
If you don't already manage users through an organization or enterprise, you can create an enterprise account specifically for allocating {% data variables.product.prodname_copilot_business_short %} licenses.
23+
If you don't already manage users through an organization or enterprise, you can create an enterprise account specifically for allocating {% data variables.copilot.copilot_business_short %} licenses.
2424

2525
* You'll only pay for the {% data variables.product.prodname_copilot_short %} licenses you assign. For pricing, see [AUTOTITLE](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot#pricing-for-github-copilot-business).
2626
* You won't pay for {% data variables.product.prodname_enterprise %} seats.
@@ -37,7 +37,7 @@ How you will add users to your enterprise and manage license assignment depends
3737
If you request an enterprise with personal accounts:
3838

3939
* You'll **add users** to the enterprise by sending an invitation to their personal {% data variables.product.prodname_dotcom %} account.
40-
* You'll **create teams** in the enterprise to manage which users receive {% data variables.product.prodname_copilot_business_short %} licenses. You can manage membership of the teams on {% data variables.product.prodname_dotcom %} or with the REST API.
40+
* You'll **create teams** in the enterprise to manage which users receive {% data variables.copilot.copilot_business_short %} licenses. You can manage membership of the teams on {% data variables.product.prodname_dotcom %} or with the REST API.
4141
* When users receive a license, they can authenticate to {% data variables.product.prodname_dotcom %} from their development environment and **gain access** to {% data variables.product.prodname_copilot_short %}.
4242
* Optionally, you can configure **SAML single sign-on** (SSO), so that users must authenticate to an external identity system in addition to their personal account.
4343

@@ -46,7 +46,7 @@ If you request an enterprise with personal accounts:
4646
If you request an {% data variables.enterprise.prodname_emu_enterprise %}:
4747

4848
* You'll **add users** to the enterprise by provisioning {% data variables.enterprise.prodname_managed_users %} from an identity provider (IdP), using SCIM.
49-
* You'll **create teams** in the enterprise to manage which users receive {% data variables.product.prodname_copilot_business_short %} licenses. You can manage membership of the teams from your IdP, on {% data variables.product.prodname_dotcom %}, or with the REST API.
49+
* You'll **create teams** in the enterprise to manage which users receive {% data variables.copilot.copilot_business_short %} licenses. You can manage membership of the teams from your IdP, on {% data variables.product.prodname_dotcom %}, or with the REST API.
5050
* When users receive a license, they can use single sign-on to authenticate to their {% data variables.product.prodname_dotcom %} account from their development environment and **gain access** to {% data variables.product.prodname_copilot_short %}.
5151

5252
## Limitations
@@ -60,7 +60,7 @@ If you request an {% data variables.enterprise.prodname_emu_enterprise %}:
6060

6161
## Getting started
6262

63-
To get started, you will work with {% data variables.contact.contact_enterprise_sales %} to create an enterprise account, then add users to your enterprise and assign {% data variables.product.prodname_copilot_business_short %} licenses.
63+
To get started, you will work with {% data variables.contact.contact_enterprise_sales %} to create an enterprise account, then add users to your enterprise and assign {% data variables.copilot.copilot_business_short %} licenses.
6464

6565
See the setup guide for your chosen type of enterprise.
6666

content/admin/copilot-business-only/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Using a dedicated enterprise account for Copilot Business
3-
intro: Get started with an enterprise account for managing {% data variables.product.prodname_copilot_business_short %} licenses.
3+
intro: Get started with an enterprise account for managing {% data variables.copilot.copilot_business_short %} licenses.
44
versions:
55
ghec: '*'
66
children:

content/admin/copilot-business-only/setting-up-a-dedicated-enterprise-for-copilot-business-managed-users.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ redirect_from:
1414

1515
---
1616

17-
You can use an enterprise account to manage licenses for {% data variables.product.prodname_copilot_for_business %}, without adopting {% data variables.product.prodname_enterprise %}.
17+
You can use an enterprise account to manage licenses for {% data variables.copilot.copilot_for_business %}, without adopting {% data variables.product.prodname_enterprise %}.
1818

1919
This article describes the setup for an **enterprise with managed users**. If you haven't chosen an enterprise type, see [AUTOTITLE](/admin/copilot-business-only/about-enterprise-accounts-for-copilot-business).
2020

0 commit comments

Comments
 (0)