Skip to content

Note on grammar page #1014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: fixed broken layout (ascii table)
merged 3 commits into from
Jan 18, 2017
Merged

Note on grammar page #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
339ccd9
add note to top of full grammar
Jan 18, 2017
5f527fd
add link to warning on beta-20170112.md
Jan 18, 2017
254a26b
adjust alerts to accept markdown formatting
Jan 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions _data/alerts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ important: '<div class="alert alert-warning" role="alert"><i class="fa fa-warnin
warning: '<div class="alert alert-danger" role="alert"><i class="fa fa-exclamation-circle"></i> <b>Warning: </b>'
end: '</div>'

callout_danger: '<div class="bs-callout bs-callout-danger">'
callout_default: '<div class="bs-callout bs-callout-default">'
callout_primary: '<div class="bs-callout bs-callout-primary">'
callout_success: '<div class="bs-callout bs-callout-success">'
callout_info: '<div class="bs-callout bs-callout-info">'
callout_warning: '<div class="bs-callout bs-callout-warning">'
callout_danger: '<div class="bs-callout bs-callout-danger" markdown="1">'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I didn't know you had to add this stuff :( Thanks for figuring that out though.

callout_default: '<div class="bs-callout bs-callout-default" markdown="1">'
callout_primary: '<div class="bs-callout bs-callout-primary" markdown="1">'
callout_success: '<div class="bs-callout bs-callout-success" markdown="1">'
callout_info: '<div class="bs-callout bs-callout-info" markdown="1">'
callout_warning: '<div class="bs-callout bs-callout-warning" markdown="1">'

hr_faded: '<hr class="faded"/>'
hr_shaded: '<hr class="shaded"/>'
4 changes: 2 additions & 2 deletions beta-20170112.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Get future release notes emailed to you:
{{site.data.alerts.callout_danger}}
<a href="https://github.com/cockroachdb/cockroach/issues/12875">Data corruption</a> has
been observed with this release and is still under investigation.
Until the root cause has been determined we recommend using
<code>beta-20170105</code> instead of this release.
Until the root cause has been determined, we recommend using
<a href="beta-20170105.html"><code>beta-20170105</code></a> instead of this release.
{{site.data.alerts.end}}

### Binaries
Expand Down
4 changes: 4 additions & 0 deletions sql-grammar.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ a[name]:focus {
}
</style>

{{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 %}