Merge branch 'main' into change-block-usersetting

Author: ramyaparimi

content/billing/index.md

@@ -1,15 +1,46 @@
 ---
-title: Billing and payments for GitHub
+title: Billing and payments on GitHub
 shortTitle: Billing and payments
-intro: '{% ifversion fpt %}{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade, downgrade, and view pending changes to your account''s subscription at any time.{% elsif ghec or ghes or ghae %}{% data variables.product.company_short %} bills for your enterprise members'' {% ifversion ghec or ghae %}usage of {% data variables.product.product_name %}{% elsif ghes %} licence seats for {% data variables.product.product_name %}{% ifversion ghes > 3.0 %} and any additional services that you purchase{% endif %}{% endif %}.{% endif %}'
+intro: '{% ifversion fpt %}{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade or downgrade your account''s subscription and manage your billing settings at any time.{% elsif ghec or ghes or ghae %}{% data variables.product.company_short %} bills for your enterprise members'' {% ifversion ghec or ghae %}usage of {% data variables.product.product_name %}{% elsif ghes %} licence seats for {% data variables.product.product_name %}{% ifversion ghes > 3.0 %} and any additional services that you purchase{% endif %}{% endif %}. {% endif %}{% ifversion ghec %} You can view your subscription and manage your billing settings at any time. {% endif %}{% ifversion fpt or ghec %} You can also view usage and manage spending limits for {% data variables.product.product_name %} features such as {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, and {% data variables.product.prodname_codespaces %}.{% endif %}'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github
   - /categories/setting-up-and-managing-billing-and-payments-on-github
+introLinks:
+  overview: '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/about-billing-on-github{% elsif ghes%}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+featuredLinks:
+  guides:
+    - '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method{% endif %}'
+    - '{% ifversion fpt %}/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription{% endif %}'
+    - '{% ifversion ghec %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/setting-your-billing-email{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-github-account/about-per-user-pricing{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise{% endif %}'
+    - '{% ifversion ghae %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+  popular: 
+    - '{% ifversion ghec %}/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-github-actions/about-billing-for-github-actions{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server{% endif %}'
+    - '{% ifversion ghae %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+  guideCards:  
+    - /billing/managing-your-github-billing-settings/removing-a-payment-method
+    - /billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
+    - /billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
+    - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud{% endif %}'
+layout: product-landing
 versions:
   fpt: '*'
-  ghec: '*'
   ghes: '*'
   ghae: '*'
+  ghec: '*'
+topics:
+  - Billing
 children:
   - /managing-your-github-billing-settings
   - /managing-billing-for-your-github-account
@@ -23,5 +54,4 @@ children:
   - /managing-billing-for-github-marketplace-apps
   - /managing-billing-for-git-large-file-storage
   - /setting-up-paid-organizations-for-procurement-companies
----
-
+---

data/graphql/ghae/schema.docs-ghae.graphql

@@ -21460,6 +21460,11 @@ type Organization implements Actor & MemberStatusable & Node & ProfileOwner & Pr
   Find Repository.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     Name of Repository to find.
     """
@@ -26690,6 +26695,11 @@ type Query {
   Lookup a given repository by the owner and repository name.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     The name of the repository
     """
@@ -32798,6 +32808,11 @@ interface RepositoryOwner {
   Find Repository.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     Name of Repository to find.
     """
@@ -40580,6 +40595,11 @@ type User implements Actor & Node & ProfileOwner & ProjectOwner & RepositoryDisc
   Find Repository.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     Name of Repository to find.
     """

data/graphql/ghec/schema.docs.graphql

@@ -23303,6 +23303,11 @@ type Organization implements Actor & MemberStatusable & Node & PackageOwner & Pr
   Find Repository.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     Name of Repository to find.
     """
@@ -26181,7 +26186,7 @@ type ProjectEdge {
 }
 
 """
-New projects that manage issues, pull requests and drafts with tables and.
+New projects that manage issues, pull requests and drafts using tables and boards.
 """
 type ProjectNext implements Closable & Node & Updatable {
   """
@@ -26418,7 +26423,7 @@ type ProjectNextFieldEdge {
 }
 
 """
-An item in a Memex project.
+An item within a new Project.
 """
 type ProjectNextItem implements Node {
   """
@@ -26529,7 +26534,7 @@ type ProjectNextItemEdge {
 }
 
 """
-An value of a field in an item of Memex project.
+An value of a field in an item of a new Project.
 """
 type ProjectNextItemFieldValue implements Node {
   """
@@ -29873,6 +29878,11 @@ type Query {
   Lookup a given repository by the owner and repository name.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     The name of the repository
     """
@@ -36384,6 +36394,11 @@ interface RepositoryOwner {
   Find Repository.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     Name of Repository to find.
     """
@@ -45888,6 +45903,11 @@ type User implements Actor & Node & PackageOwner & ProfileOwner & ProjectNextOwn
   Find Repository.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     Name of Repository to find.
     """

data/graphql/schema.docs.graphql

@@ -23303,6 +23303,11 @@ type Organization implements Actor & MemberStatusable & Node & PackageOwner & Pr
   Find Repository.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     Name of Repository to find.
     """
@@ -26181,7 +26186,7 @@ type ProjectEdge {
 }
 
 """
-New projects that manage issues, pull requests and drafts with tables and.
+New projects that manage issues, pull requests and drafts using tables and boards.
 """
 type ProjectNext implements Closable & Node & Updatable {
   """
@@ -26418,7 +26423,7 @@ type ProjectNextFieldEdge {
 }
 
 """
-An item in a Memex project.
+An item within a new Project.
 """
 type ProjectNextItem implements Node {
   """
@@ -26529,7 +26534,7 @@ type ProjectNextItemEdge {
 }
 
 """
-An value of a field in an item of Memex project.
+An value of a field in an item of a new Project.
 """
 type ProjectNextItemFieldValue implements Node {
   """
@@ -29873,6 +29878,11 @@ type Query {
   Lookup a given repository by the owner and repository name.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     The name of the repository
     """
@@ -36384,6 +36394,11 @@ interface RepositoryOwner {
   Find Repository.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     Name of Repository to find.
     """
@@ -45888,6 +45903,11 @@ type User implements Actor & Node & PackageOwner & ProfileOwner & ProjectNextOwn
   Find Repository.
   """
   repository(
+    """
+    Follow repository renames. If disabled, a repository referenced by its old name will return an error.
+    """
+    followRenames: Boolean = true
+
     """
     Name of Repository to find.
     """

data/release-notes/enterprise-server/3-3/0-rc1.yml

@@ -54,7 +54,7 @@ sections:
         - '{% data variables.product.prodname_ghe_server %} 3.3 includes improvements to the maintenance of repositories, especially for repositories that contain many unreachable objects. Note that the first maintenance cycle after upgrading to {% data variables.product.prodname_ghe_server %} 3.3 may take longer than usual to complete.'
 
         # https://github.com/github/releases/issues/1533
-        - '{% data variables.product.prodname_ghe_server %} 3.3 includes a repository cache for geographically-distributed teams and CI infrastructure. The repository cache keeps a read-only copy of your repositories available in additional geographies, which prevents clients from downloading duplicate Git content from your primary instance. For more information, see "[About repository caching](/admin/enterprise-management/caching-repositories/about-repository-caching)."'
+        - '{% data variables.product.prodname_ghe_server %} 3.3 includes the public beta of a repository cache for geographically-distributed teams and CI infrastructure. The repository cache keeps a read-only copy of your repositories available in additional geographies, which prevents clients from downloading duplicate Git content from your primary instance. For more information, see "[About repository caching](/admin/enterprise-management/caching-repositories/about-repository-caching)."'
 
         # https://github.com/github/releases/issues/1616
         - '{% data variables.product.prodname_ghe_server %} 3.3 includes improvements to the user impersonation process. An impersonation session now requires a justification for the impersonation, actions are recorded in the audit log as being performed as an impersonated user, and the user who is impersonated will receive an email notification that they have been impersonated by an enterprise administrator. For more information, see "[Impersonating a user](/enterprise-server@3.3/admin/user-management/managing-users-in-your-enterprise/impersonating-a-user)."'