Update SQL reference docs concerning global configurations

cockroachdb · Apr 27, 2017 · 504f082 · 504f082
1 parent af14ca4
commit 504f082
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/show-all.md b/show-all.md
@@ -1,10 +1,12 @@
 ---
 title: SHOW ALL
-summary: The SHOW ALL statement lists all current run-time settings. 
+summary: The SHOW ALL statement lists all run-time settings for the current session.
 toc: false
 ---
 
-The `SHOW ALL` [statement](sql-statements.html) lists all current run-time settings.
+The `SHOW ALL` [statement](sql-statements.html) lists all run-time settings for the current session.
+
+{{site.data.alerts.callout_success}}For details about global settings that apply across all nodes in a cluster, see <a href="global-configurations.html">Global Configurations</a>.{{site.data.alerts.end}}
 
 <div id="toc"></div>
 
@@ -22,8 +24,8 @@ The following run-time variables are returned by `SHOW ALL`:
 
 Variable | Description
 ------|------------
-`DATABASE` | The default database for the current session, as set by [`SET DATABASE`](set-database.html) or the client's connection string. This variable can be viewed with [`SHOW DATABASE`](show-database.html) as well. 
-`DEFAULT_TRANSACTION_ISOLATION` | The default transaction isolation level for the current session, as set by `SET DEFAULT_TRANSACTION_ISOLATION` or the client's connection string. 
+`DATABASE` | The default database for the current session, as set by [`SET DATABASE`](set-database.html) or the client's connection string. This variable can be viewed with [`SHOW DATABASE`](show-database.html) as well.
+`DEFAULT_TRANSACTION_ISOLATION` | The default transaction isolation level for the current session, as set by `SET DEFAULT_TRANSACTION_ISOLATION` or the client's connection string.
 `MAX_INDEX_KEYS` | Not usable; exposed only for ORM compatibility.
 `SEARCH_PATH` | A list of databases or namespaces that will be searched to resolve unqualified table or function names, as set by `SET SEARCH_PATH`. This variable can be viewed with `SHOW SEARCH_PATH` as well. For more details, see [Name Resolution](sql-name-resolution.html).
 `SERVER_VERSION` | The version of PostgreSQL that CockroachDB emulates.

diff --git a/sql-statements.md b/sql-statements.md
@@ -87,6 +87,13 @@ Statement | Usage
 [`SHOW TIME ZONE`](show-time-zone.html) | View the default time zone for the session.
 [`SHOW TRANSACTION`](show-transaction.html) | View the isolation level or priority for the session or for an individual [transaction](transactions.html).
 
+## Cluster Management Statements
+
+Statement | Usage
+----------|------------
+[`SHOW ALL CLUSTER SETTINGS`](global-configurations.html#view-current-global-configurations) | List the current cluster-wide settings.
+[`SET CLUSTER SETTING`](global-configurations.html#change-a-global-configuration) | Set a cluster-wide setting.
+
 ## Backup & Restore Statements (Enterprise)
 
 The following statements are availably only to [enterprise license](https://www.cockroachlabs.com/pricing/) users.
@@ -97,5 +104,3 @@ Statement | Usage
 ----------|------------
 [`BACKUP`](backup.html) | Create disaster recovery backups of databases and tables.
 [`RESTORE`](restore.html) | Restore databases and tables using your backups.
-
-