Merge pull request github#36282 from github/repo-sync

Repo sync

Author: docs-bot

.devcontainer/devcontainer.json

@@ -64,6 +64,6 @@
   "remoteUser": "node",
 
   "hostRequirements": {
-    "memory": "8gb"
+    "memory": "32gb"
   }
 }

assets/images/help/repository/import-a-ruleset.png

@@ -11,6 +11,7 @@ environments:
     require_pipeline: false
     notify_still_locked: true # Notify last person to lock this after an hour
     secret_environment: production
+    required_review_tasks: []
     cluster_selector:
       profile: general
       region: iad
@@ -19,6 +20,7 @@ environments:
     require_pipeline: false
     notify_still_locked: true # Notify last person to lock this after an hour
     secret_environment: production
+    required_review_tasks: []
     cluster_selector:
       profile: general
       region: iad
@@ -27,6 +29,7 @@ environments:
     require_pipeline: false
     notify_still_locked: true # Notify last person to lock this after an hour
     secret_environment: production
+    required_review_tasks: []
     cluster_selector:
       profile: general
       region: iad

assets/images/help/repository/ruleset-history.png

@@ -25,13 +25,11 @@ You can create rulesets to control how users can interact with code in repositor
 
 To learn more, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets).
 
-## Importing prebuilt rulesets
+## Importing rulesets
 
 To import a prebuilt ruleset created by {% data variables.product.company_short %}, see [`github/ruleset-recipes`](https://github.com/github/ruleset-recipes).
 
-{% ifversion repo-rules-management %}
 {% data reusables.repositories.import-a-ruleset-conceptual %} For more information, see [AUTOTITLE](/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization#using-ruleset-history).
-{% endif %}
 
 ## How will I define where my ruleset applies?
 

config/moda/deployment.yaml

@@ -20,6 +20,9 @@ topics:
   - User account
 shortTitle: Cancel a Marketplace app
 ---
+
+{% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %}
+
 When you cancel an app, your subscription remains active until the end of your current billing cycle. The cancellation takes effect on your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace).
 
 When you cancel a free trial on a paid plan, your subscription is immediately canceled and you will lose access to the app. If you don't cancel your free trial within the trial period, the payment method on file for your account will be charged for the plan you chose at the end of the trial period. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace).

content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-governance.md

@@ -19,6 +19,9 @@ topics:
   - User account
 shortTitle: Downgrade billing plan
 ---
+
+{% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %}
+
 When you downgrade an app, your subscription remains active until the end of your current billing cycle. The downgrade takes effect on your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace).
 
 {% data reusables.marketplace.downgrade-marketplace-only %}

content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md

@@ -19,6 +19,9 @@ topics:
   - User account
 shortTitle: Upgrade billing plan
 ---
+
+{% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %}
+
 When you upgrade an app, your payment method is charged a prorated amount based on the time remaining until your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace).
 
 ## Upgrading an app for your personal account

content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md

@@ -30,6 +30,8 @@ topics:
 shortTitle: Downgrade plan
 ---
 
+{% data reusables.billing.enhanced-billing-platform-personal-accounts %}
+
 ## About downgrades
 
 When you downgrade your personal account, organization, or enterprise account's subscription, pricing and account feature changes take effect on your next billing date. Downgrading your plan does not affect other subscriptions or usage-based billing for your account. For more information, see [AUTOTITLE](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process).

content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md

@@ -31,3 +31,5 @@ children:
   - /one-time-payments-for-customers-in-india
   - /discounted-plans-for-github-accounts
 ---
+
+{% ifversion fpt %}{% data reusables.billing.enhanced-billing-platform-personal-accounts %}{% endif %}