Merge branch 'main' into patch-2

Author: Gregg Juan Eduardo Palomo Herrera

content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/custom-properties.md

@@ -4,7 +4,7 @@ intro: 'Custom properties allow you to add structured metadata to repositories a
 permissions: 'Repository custom properties can be managed by organization owners and users with admin permissions to the repository. Organization custom properties can be managed by enterprise owners and users with the "Manage the Enterprise''s custom properties definitions" permission.'
 versions:
   ghec: '*'
-  ghes: '*'
+  ghes: '>= 3.21'
 topics:
   - Enterprise
   - Organizations

content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-custom-properties-for-organizations.md

@@ -4,7 +4,7 @@ intro: 'With custom properties, you can add metadata to organizations in your en
 permissions: 'Enterprise owners {% ifversion custom-org-roles %}and users with the "Manage the Enterprise''s custom properties definitions" permission {% endif %}can add and set a custom property schema at the enterprise level.'
 versions:
   ghec: '*'
-  ghes: '*'
+  ghes: '>= 3.21'
 topics:
   - Enterprise
   - Organizations

content/copilot/how-tos/copilot-cli/cli-getting-started.md

@@ -25,21 +25,23 @@ Use one of these commands:
 
 * **Cross-platform (npm)**
 
-    ```bash copy
-    npm install -g @github/copilot
-    ```
+  Prerequisite: {% data variables.copilot.copilot_cli_npm_version %}.
+
+  ```bash copy
+  npm install -g @github/copilot
+  ```
 
 * **Windows (WinGet)**
 
-    ```bash copy
-    winget install GitHub.Copilot
-    ```
+  ```bash copy
+  winget install GitHub.Copilot
+  ```
 
 * **macOS/Linux (Homebrew)**
 
-    ```bash copy
-    brew install copilot-cli
-    ```
+  ```bash copy
+  brew install copilot-cli
+  ```
 
 ## Starting the CLI for the first time
 

content/copilot/how-tos/copilot-cli/install-copilot-cli.md

@@ -36,6 +36,27 @@ If you have access to {% data variables.product.prodname_copilot %} via your org
 
 You can install {% data variables.copilot.copilot_cli_short %} using WinGet (Windows), Homebrew (macOS and Linux), npm (all platforms), or an install script (macOS and Linux).
 
+### Installing with npm (all platforms)
+
+Prerequisite: {% data variables.copilot.copilot_cli_npm_version %}.
+
+```shell copy
+npm install -g @github/copilot
+```
+
+> [!NOTE]
+> If you have `ignore-scripts=true` in your `~/.npmrc` file, you must use the command:
+>
+> ```shell copy
+> npm_config_ignore_scripts=false npm install -g @github/copilot
+> ```
+
+To install the prerelease version:
+
+```shell copy
+npm install -g @github/copilot@prerelease
+```
+
 ### Installing with WinGet (Windows)
 
 ```powershell copy
@@ -60,18 +81,6 @@ To install the prerelease version:
 brew install copilot-cli@prerelease
 ```
 
-### Installing with npm (all platforms, requires Node.js 22+)
-
-```shell copy
-npm install -g @github/copilot
-```
-
-To install the prerelease version:
-
-```shell copy
-npm install -g @github/copilot@prerelease
-```
-
 ### Installing with the install script (macOS and Linux)
 
 ```shell copy

data/reusables/enterprise-accounts/org-custom-properties-public-preview.md

@@ -1,3 +1,2 @@
 > [!NOTE]
-> Organization custom properties are in public preview and subject to change.
-> For {% data variables.product.prodname_ghe_server %}, this feature will only be available from version 3.22.
+> For {% data variables.product.prodname_ghe_server %}, this feature will only be available from version 3.21.

data/variables/copilot.yml

@@ -72,6 +72,7 @@ copilot_cli_short: 'Copilot CLI'
 copilot_cli: 'GitHub Copilot CLI'
 copilot_old-cli_short: 'Copilot in the CLI'
 copilot_old-cli: 'GitHub Copilot in the CLI'
+copilot_cli_npm_version: 'Node.js 22 or later'
 
 ## Copilot custom agents
 copilot_custom_agent: 'Copilot custom agent'