From 339ccd9041e9eb574320d3e4f49822a819064c1d Mon Sep 17 00:00:00 2001 From: Jesse Seldess Date: Wed, 18 Jan 2017 15:17:52 -0500 Subject: [PATCH 1/3] add note to top of full grammar --- sql-grammar.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sql-grammar.md b/sql-grammar.md index 085221b6ec8..0a526eeaddb 100644 --- a/sql-grammar.md +++ b/sql-grammar.md @@ -17,4 +17,6 @@ a[name]:focus { } +{{site.data.alerts.callout_success}}This page describes the full CockroachDB SQL grammar. However, as a starting point, it's best to reference our statement-specific pages first, which provide detailed explanations and examples.{{site.data.alerts.end}} + {% include sql/diagrams/grammar.html %} From 5f527fdca073e62a9d47c994e1c6e3d8e082ad7b Mon Sep 17 00:00:00 2001 From: Jesse Seldess Date: Wed, 18 Jan 2017 15:20:16 -0500 Subject: [PATCH 2/3] add link to warning on beta-20170112.md --- beta-20170112.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/beta-20170112.md b/beta-20170112.md index 0c96701565e..bfb55975478 100644 --- a/beta-20170112.md +++ b/beta-20170112.md @@ -23,8 +23,8 @@ Get future release notes emailed to you: {{site.data.alerts.callout_danger}} Data corruption has been observed with this release and is still under investigation. -Until the root cause has been determined we recommend using -beta-20170105 instead of this release. +Until the root cause has been determined, we recommend using +beta-20170105 instead of this release. {{site.data.alerts.end}} ### Binaries From 254a26b62e3a99a5d1dd7181e1f51e3dcfa30137 Mon Sep 17 00:00:00 2001 From: Jesse Seldess Date: Wed, 18 Jan 2017 17:23:02 -0500 Subject: [PATCH 3/3] adjust alerts to accept markdown formatting --- _data/alerts.yml | 12 ++++++------ sql-grammar.md | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/_data/alerts.yml b/_data/alerts.yml index 157e1622b00..6c0f04d95c3 100644 --- a/_data/alerts.yml +++ b/_data/alerts.yml @@ -4,12 +4,12 @@ important: '' -callout_danger: '
' -callout_default: '
' -callout_primary: '
' -callout_success: '
' -callout_info: '
' -callout_warning: '
' +callout_danger: '
' +callout_default: '
' +callout_primary: '
' +callout_success: '
' +callout_info: '
' +callout_warning: '
' hr_faded: '
' hr_shaded: '
' \ No newline at end of file diff --git a/sql-grammar.md b/sql-grammar.md index 0a526eeaddb..ea62d408b68 100644 --- a/sql-grammar.md +++ b/sql-grammar.md @@ -17,6 +17,8 @@ a[name]:focus { } -{{site.data.alerts.callout_success}}This page describes the full CockroachDB SQL grammar. However, as a starting point, it's best to reference our statement-specific pages first, which provide detailed explanations and examples.{{site.data.alerts.end}} +{{site.data.alerts.callout_success}} +This page describes the full CockroachDB SQL grammar. However, as a starting point, it's best to reference our [sql-statements pages](sql-statements.html) first, which provide detailed explanations and examples. +{{site.data.alerts.end}} {% include sql/diagrams/grammar.html %}