diff options
| author | christine betts <[email protected]> | 2025-08-21 14:38:10 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-08-21 14:38:10 +0000 |
| commit | a90ca626d3dfcd9b52302f42a8f7b75a836f6dfa (patch) | |
| tree | 754b1fe6aa2690b9485573d5b1c8c3a103e9601c /docs | |
| parent | 589f5e6823eca456d9c93cadea664e5c19eebb90 (diff) | |
Quick fix for enterprise docs (#6753)
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/cli/enterprise.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/cli/enterprise.md b/docs/cli/enterprise.md index 9f5c9466..5ccc2ef3 100644 --- a/docs/cli/enterprise.md +++ b/docs/cli/enterprise.md @@ -6,7 +6,7 @@ This document outlines configuration patterns and best practices for deploying a ## Centralized Configuration: The System Settings File -The most powerful tool for enterprise administration is the system-wide `settings.json` file. This file allows you to define a baseline configuration that applies to all users on a machine. For a complete overview of configuration options, see the [Configuration documentation](./configuration.md). Settings from system, user, and project-level `settings.json` files are merged together. For most settings, the system-wide configuration takes precedence, overriding any conflicting user or project-level settings. However, some settings, like `customThemes`, `mcpServers`, and `includeDirectories`, are merged from all configuration files, and if there are conflicting values (e.g., both workspace and system settings have a 'github' MCP server defined), the workspace value will take precedence. +The most powerful tool for enterprise administration is the system-wide `settings.json` file. This file allows you to define a baseline configuration that applies to all users on a machine. For a complete overview of configuration options, see the [Configuration documentation](./configuration.md). Settings from system, user, and project-level `settings.json` files are merged together. For most settings, the system-wide configuration takes precedence, overriding any conflicting user or project-level settings. However, some settings, like `customThemes`, `mcpServers`, and `includeDirectories`, are merged from all configuration files, and if there are conflicting values (e.g., both workspace and system settings have a 'github' MCP server defined), the system value will take precedence. **Example of Merging and Precedence:** |