repo sync

content/billing/managing-your-github-billing-settings/about-billing-on-github.md

@@ -22,6 +22,8 @@ You can upgrade your personal account or organization to a paid subscription at
 
 ## Managing billing settings
 
+{% data reusables.sponsors.paypal-deprecation %}
+
 You must manage billing settings, payment method, and paid features and products for each of your accounts separately. You can choose to pay monthly or yearly for each account's paid products and features. Every paid feature or product associated with an account shares a billing date, payment method, and receipt.
 
 {% data reusables.dotcom_billing.payment-methods %} {% data reusables.dotcom_billing.same-payment-method %}
@@ -30,7 +32,7 @@ For more information, see "[Managing your {% data variables.product.prodname_dot
 
 ## Switching between settings for your different accounts
 
-If you're an organization or enterprise owner, you can switch between settings for your different accounts using the context switcher in your settings. 
+If you're an organization or enterprise owner, you can switch between settings for your different accounts using the context switcher in your settings.
 
 {% data reusables.user-settings.access_settings %}
 1. At the top of the page, to the right of your username, click **Switch to another account**.

content/developers/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps.md

@@ -44,7 +44,7 @@ Direct the user to the following URL in their browser:
 
 When your GitHub App specifies a `login` parameter, it prompts users with a specific account they can use for signing in and authorizing your app.
 
-#### Parameters
+#### Input parameters for `GET {% data variables.product.oauth_host_code %}/login/oauth/authorize`
 
 Name | Type | Description
 -----|------|------------
@@ -78,7 +78,7 @@ Make a request to the following endpoint to receive an access token:
 
     POST {% data variables.product.oauth_host_code %}/login/oauth/access_token
 
-#### Parameters
+#### Input parameters for `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`
 
 Name | Type | Description
 -----|------|------------
@@ -87,7 +87,7 @@ Name | Type | Description
 `code` | `string`   | **Required.** The code you received as a response to Step 1.
 `redirect_uri` | `string` | The URL in your application where users will be sent after authorization. This must be an exact match to {% ifversion fpt or ghes or ghec %} one of the URLs you provided as a **Callback URL** {% else %} the URL you provided in the **User authorization callback URL** field{% endif %} when setting up your GitHub App and can't contain any additional parameters.
 
-#### Response
+#### Response from `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`
 
 By default, the response takes the following form. The response parameters `expires_in`, `refresh_token`,  and `refresh_token_expires_in` are only returned when you enable expiring user-to-server access tokens.
 

content/developers/apps/building-oauth-apps/authorizing-oauth-apps.md

@@ -46,7 +46,7 @@ The web application flow to authorize users for your app is:
 
 When your GitHub App specifies a `login` parameter, it prompts users with a specific account they can use for signing in and authorizing your app.
 
-#### Parameters
+#### Input parameters for `GET {% data variables.product.oauth_host_code %}/login/oauth/authorize`
 
 Name | Type | Description
 -----|------|--------------
@@ -65,7 +65,7 @@ Exchange this `code` for an access token:
 
     POST {% data variables.product.oauth_host_code %}/login/oauth/access_token
 
-#### Parameters
+#### Input parameters for `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`
 
 Name | Type | Description
 -----|------|--------------
@@ -74,7 +74,7 @@ Name | Type | Description
 `code` | `string` | **Required.** The code you received as a response to Step 1.
 `redirect_uri` | `string` | The URL in your application where users are sent after authorization.
 
-#### Response
+#### Response from `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`
 
 By default, the response takes the following form:
 
@@ -143,14 +143,14 @@ Before you can use the device flow to authorize and identify users, you must fir
 
 Your app must request a user verification code and verification URL that the app will use to prompt the user to authenticate in the next step. This request also returns a device verification code that the app must use to receive an access token and check the status of user authentication.
 
-#### Input Parameters
+#### Input parameters for `POST {% data variables.product.oauth_host_code %}/login/device/code`
 
 Name | Type | Description
 -----|------|--------------
 `client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your app.
 `scope` | `string` | The scope that your app is requesting access to.
 
-#### Response
+#### Response from `POST {% data variables.product.oauth_host_code %}/login/device/code`
 
 By default, the response takes the following form:
 
@@ -182,7 +182,7 @@ Accept: application/xml
 </OAuth>
 ```
 
-#### Response parameters
+#### Response parameters for `POST {% data variables.product.oauth_host_code %}/login/device/code`
 
 Name | Type | Description
 -----|------|--------------
@@ -208,15 +208,15 @@ The user must enter a valid code within 15 minutes (or 900 seconds). After 15 mi
 
 Once the user has authorized, the app will receive an access token that can be used to make requests to the API on behalf of a user.
 
-#### Input parameters
+#### Input parameters for `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`
 
 Name | Type | Description
 -----|------|--------------
 `client_id` | `string` | **Required.** The client ID you received from {% data variables.product.product_name %} for your {% data variables.product.prodname_oauth_app %}.
 `device_code` | `string` | **Required.** The device verification code you received from the `POST {% data variables.product.oauth_host_code %}/login/device/code` request.
 `grant_type` | `string` | **Required.** The grant type must be `urn:ietf:params:oauth:grant-type:device_code`.
 
-#### Response
+#### Response from `POST {% data variables.product.oauth_host_code %}/login/oauth/access_token`
 
 By default, the response takes the following form:
 

content/developers/github-marketplace/listing-an-app-on-github-marketplace/writing-a-listing-description-for-your-app.md

@@ -26,17 +26,17 @@ Here are guidelines about the fields you'll need to fill out in the **Listing de
 
 Your listing's name will appear on the [{% data variables.product.prodname_marketplace %} homepage](https://github.com/marketplace). The name is limited to 255 characters and can be different from your app's name. Your listing cannot have the same name as an existing account on {% data variables.location.product_location %}, unless the name is your own user or organization name.
 
-### Very short description
+### Very short description of listing
 
 The community will see the "very short" description under your app's name on the [{% data variables.product.prodname_marketplace %} homepage](https://github.com/marketplace).
 
 ![{% data variables.product.prodname_marketplace %} app short description](/assets/images/marketplace/marketplace_short_description.png)
 
-#### Length
+#### Length of "Very short description"
 
 We recommend keeping short descriptions to 40-80 characters. Although you are allowed to use more characters, concise descriptions are easier for customers to read and understand quickly.
 
-#### Content
+#### Content of "Very short description"
 
 - Describe the app’s functionality. Don't use this space for a call to action. For example:
 
@@ -52,7 +52,7 @@ We recommend keeping short descriptions to 40-80 characters. Although you are al
 
   **DON'T:** Skycap is a container-native continuous integration tool
 
-#### Formatting
+#### Formatting of "Very short description"
 
 - Always use sentence-case capitalization. Only capitalize the first letter and proper nouns.
 
@@ -142,19 +142,19 @@ Clicking **Read more...**, displays the "Detailed description."
 
 Follow these guidelines for writing these descriptions.
 
-### Length
+### Length of "Introductory description" and "Detailed description"
 
 We recommend writing a 1-2 sentence high-level summary between 150-250 characters in the required "Introductory description" field when [listing your app](/marketplace/listing-on-github-marketplace/). Although you are allowed to use more characters, concise summaries are easier for customers to read and understand quickly.
 
 You can add more information in the optional "Detailed description" field. You see this description when you click **Read more...** below the introductory description on your app's landing page. A detailed description consists of 3-5 [value propositions](https://en.wikipedia.org/wiki/Value_proposition), with 1-2 sentences describing each one. You can use up to 1,000 characters for this description.
 
-### Content
+### Content of "Introductory description" and "Detailed description"
 
 - Always begin introductory descriptions with your app's name.
 
 - Always write descriptions and value propositions using the active voice.
 
-### Formatting
+### Formatting of "Introductory description" and "Detailed description"
 
 - Always use sentence-case capitalization in value proposition titles. Only capitalize the first letter and proper nouns.
 

content/packages/working-with-a-github-packages-registry/working-with-the-npm-registry.md

@@ -97,12 +97,24 @@ $ npm login --scope=@OWNER --auth-type=legacy --registry=https://HOSTNAME/_regis
 
 ## Publishing a package
 
+{% ifversion packages-npm-v2 %}
+{% note %}
+
+**Note:**
+
+- Package names and scopes must only use lowercase letters.
+- The tarball for an npm version must be smaller than 256MB in size.
+
+{% endnote %}
+{% else %}
 {% note %}
 
 **Note:** Package names and scopes must only use lowercase letters.
 
 {% endnote %}
 
+{% endif %}
+
 {% ifversion packages-npm-v2 %}
 The {% data variables.product.prodname_registry %} registry stores npm packages within your organization or personal account, and allows you to associate a package with a repository. You can choose whether to inherit permissions from a repository, or set granular permissions independently of a repository.
 

content/sponsors/getting-started-with-github-sponsors/about-github-sponsors.md

@@ -15,6 +15,8 @@ topics:
 
 ## About {% data variables.product.prodname_sponsors %}
 
+{% data reusables.sponsors.paypal-deprecation %}
+
 {% data reusables.sponsors.sponsorship-details %}
 
 {% data reusables.sponsors.no-fees %} For more information, see "[About billing for {% data variables.product.prodname_sponsors %}](/articles/about-billing-for-github-sponsors)."

content/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor.md

@@ -17,6 +17,8 @@ topics:
 shortTitle: Sponsor a contributor
 ---
 
+{% data reusables.sponsors.paypal-deprecation %}
+
 {% data reusables.sponsors.org-sponsors-release-phase %}
 
 ## About sponsorships
@@ -39,7 +41,7 @@ We may share certain limited tax information with sponsored accounts. For more i
 
 {% data reusables.sponsors.manage-updates-for-orgs %}
 
-You can choose whether to display your sponsorship publicly. One-time sponsorships remain visible for one month. 
+You can choose whether to display your sponsorship publicly. One-time sponsorships remain visible for one month.
 
 If the sponsored account retires your tier, the tier will remain in place for you until you choose a different tier or cancel your subscription. For more information, see "[Upgrading a sponsorship](/articles/upgrading-a-sponsorship)" and "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)."
 

data/graphql/ghae/graphql_upcoming_changes.public-ghae.yml

@@ -172,6 +172,54 @@ upcoming_changes:
     date: '2023-04-01T00:00:00+00:00'
     criticality: breaking
     owner: jamestran201
+  - location: MergeQueue.headOid
+    description: '`headOid` will be removed. Use `entry.headOid` instead.'
+    reason: '`headOid` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueue.mergeMethod
+    description: '`mergeMethod` will be removed. Use `configuration.merge_method` instead.'
+    reason: '`mergeMethod` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueue.mergingEntries
+    description: '`mergingEntries` will be removed.'
+    reason: '`mergingEntries` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueue.pendingRemovalEntries
+    description: '`pendingRemovalEntries` will be removed.'
+    reason: '`pendingRemovalEntries` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.blockedByMergeConflicts
+    description: '`blockedByMergeConflicts` will be removed. Use `state` instead.'
+    reason: '`blockedByMergeConflicts` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.checkStatus
+    description: '`checkStatus` will be removed. Use `state` instead.'
+    reason: '`checkStatus` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.hasJumpedQueue
+    description: '`hasJumpedQueue` will be removed. Use `jump` instead.'
+    reason: '`hasJumpedQueue` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.isSolo
+    description: '`isSolo` will be removed. Use `solo` instead.'
+    reason: '`isSolo` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
   - location: ProjectV2ItemFieldGroup.field
     description:
       '`field` will be removed. Check out the `ProjectV2ItemFieldGroup#groupByField`

data/graphql/ghec/graphql_upcoming_changes.public.yml

@@ -192,6 +192,54 @@ upcoming_changes:
     date: '2023-04-01T00:00:00+00:00'
     criticality: breaking
     owner: jamestran201
+  - location: MergeQueue.headOid
+    description: '`headOid` will be removed. Use `entry.headOid` instead.'
+    reason: '`headOid` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueue.mergeMethod
+    description: '`mergeMethod` will be removed. Use `configuration.merge_method` instead.'
+    reason: '`mergeMethod` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueue.mergingEntries
+    description: '`mergingEntries` will be removed.'
+    reason: '`mergingEntries` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueue.pendingRemovalEntries
+    description: '`pendingRemovalEntries` will be removed.'
+    reason: '`pendingRemovalEntries` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.blockedByMergeConflicts
+    description: '`blockedByMergeConflicts` will be removed. Use `state` instead.'
+    reason: '`blockedByMergeConflicts` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.checkStatus
+    description: '`checkStatus` will be removed. Use `state` instead.'
+    reason: '`checkStatus` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.hasJumpedQueue
+    description: '`hasJumpedQueue` will be removed. Use `jump` instead.'
+    reason: '`hasJumpedQueue` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.isSolo
+    description: '`isSolo` will be removed. Use `solo` instead.'
+    reason: '`isSolo` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
   - location: ProjectV2ItemFieldGroup.field
     description:
       '`field` will be removed. Check out the `ProjectV2ItemFieldGroup#groupByField`

data/graphql/graphql_upcoming_changes.public.yml

@@ -192,6 +192,54 @@ upcoming_changes:
     date: '2023-04-01T00:00:00+00:00'
     criticality: breaking
     owner: jamestran201
+  - location: MergeQueue.headOid
+    description: '`headOid` will be removed. Use `entry.headOid` instead.'
+    reason: '`headOid` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueue.mergeMethod
+    description: '`mergeMethod` will be removed. Use `configuration.merge_method` instead.'
+    reason: '`mergeMethod` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueue.mergingEntries
+    description: '`mergingEntries` will be removed.'
+    reason: '`mergingEntries` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueue.pendingRemovalEntries
+    description: '`pendingRemovalEntries` will be removed.'
+    reason: '`pendingRemovalEntries` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.blockedByMergeConflicts
+    description: '`blockedByMergeConflicts` will be removed. Use `state` instead.'
+    reason: '`blockedByMergeConflicts` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.checkStatus
+    description: '`checkStatus` will be removed. Use `state` instead.'
+    reason: '`checkStatus` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.hasJumpedQueue
+    description: '`hasJumpedQueue` will be removed. Use `jump` instead.'
+    reason: '`hasJumpedQueue` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
+  - location: MergeQueueEntry.isSolo
+    description: '`isSolo` will be removed. Use `solo` instead.'
+    reason: '`isSolo` will be removed.'
+    date: '2023-07-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/merge_queue
   - location: ProjectV2ItemFieldGroup.field
     description:
       '`field` will be removed. Check out the `ProjectV2ItemFieldGroup#groupByField`

data/reusables/sponsors/paypal-deprecation.md

@@ -0,0 +1,9 @@
+{% note %}
+
+**Note**: Starting on **February 23rd, 2023**, {% data variables.product.prodname_sponsors %} will no longer support PayPal as a payment processor. Sponsors that currently use PayPal will be required to update their payment method to pay by credit or debit card.
+
+If your sponsorship is still using PayPal as a payment method, it will be cancelled on your next billing date. For example: if you have a recurring sponsorship and paid on February 22nd using PayPal, your sponsorship will be cancelled on your next billing date on March 22nd.
+
+For more information about updating your payment method, see "[Adding or editing a payment method](/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method)."
+
+{% endnote %}