Skip to content

Commit

Permalink
Propagate v23.1 link fixes to v22.1 pages to fix links
Browse files Browse the repository at this point in the history
  • Loading branch information
mdlinville committed Sep 12, 2024
1 parent ea29cdf commit 48c8316
Show file tree
Hide file tree
Showing 8 changed files with 367 additions and 171 deletions.
19 changes: 19 additions & 0 deletions src/current/_includes/v22.1/connect/connection-url.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<div class="filter-content" markdown="1" data-scope="mac linux">
Set a `DATABASE_URL` environment variable to your connection string.

{% include_cached copy-clipboard.html %}
~~~ shell
export DATABASE_URL="{connection string}"
~~~

</div>

<div class="filter-content" markdown="1" data-scope="windows">
Set a `DATABASE_URL` environment variable to your connection string.

{% include_cached copy-clipboard.html %}
~~~ shell
$env:DATABASE_URL = "{connection string}"
~~~

</div>
7 changes: 7 additions & 0 deletions src/current/_includes/v22.1/connect/core-note.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{{site.data.alerts.callout_info}}
The connection information shown on this page uses [client certificate and key authentication]({% link {{ page.version.version }}/authentication.md %}#client-authentication) to connect to a secure, CockroachDB {{ site.data.products.core }} cluster.

To connect to a CockroachDB {{ site.data.products.core }} cluster with client certificate and key authentication, you must first [generate server and client certificates]({% link {{ page.version.version }}/authentication.md %}#using-digital-certificates-with-cockroachdb).

For instructions on starting a secure cluster, see [Start a Local Cluster (Secure)]({% link {{ page.version.version }}/secure-a-cluster.md %}).
{{site.data.alerts.end}}
19 changes: 19 additions & 0 deletions src/current/_includes/v22.1/connect/jdbc-connection-url.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Set a `JDBC_DATABASE_URL` environment variable to your JDBC connection string.

<div class="filter-content" markdown="1" data-scope="mac linux">

{% include_cached copy-clipboard.html %}
~~~ shell
export JDBC_DATABASE_URL="{connection string}"
~~~

</div>

<div class="filter-content" markdown="1" data-scope="windows">

{% include_cached copy-clipboard.html %}
~~~ shell
$env:JDBC_DATABASE_URL = "{connection string}"
~~~

</div>
7 changes: 7 additions & 0 deletions src/current/_includes/v22.1/core-note.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{{site.data.alerts.callout_info}}
The connection information shown on this page uses [client certificate and key authentication]({% link {{ page.version.version }}/authentication.md %}#client-authentication) to connect to a secure, CockroachDB {{ site.data.products.core }} cluster.

To connect to a CockroachDB {{ site.data.products.core }} cluster with client certificate and key authentication, you must first [generate server and client certificates]({% link {{ page.version.version }}/authentication.md %}#using-digital-certificates-with-cockroachdb).

For instructions on starting a secure cluster, see [Start a Local Cluster (Secure)]({% link {{ page.version.version }}/secure-a-cluster.md %}).
{{site.data.alerts.end}}
7 changes: 7 additions & 0 deletions src/current/_includes/v22.1/faq/what-is-crdb.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CockroachDB is a [distributed SQL](https://www.cockroachlabs.com/blog/what-is-distributed-sql/) database built on a transactional and strongly-consistent key-value store. It **scales** horizontally; **survives** disk, machine, rack, and even datacenter failures with minimal latency disruption and no manual intervention; supports **strongly-consistent** ACID transactions; and provides a familiar **SQL** API for structuring, manipulating, and querying data.

CockroachDB is inspired by Google's [Spanner](http://research.google.com/archive/spanner.html) and [F1](http://research.google.com/pubs/pub38125.html) technologies, and the [source code](https://github.com/cockroachdb/cockroach) is freely available.

{{site.data.alerts.callout_success}}
For a deeper dive into CockroachDB's capabilities and how it fits into the database landscape, take the free [**Intro to Distributed SQL and CockroachDB**](https://university.cockroachlabs.com/courses/course-v1:crl+intro-to-distributed-sql-and-cockroachdb+self-paced/about) course on Cockroach University.
{{site.data.alerts.end}}
19 changes: 19 additions & 0 deletions src/current/_includes/v22.1/jdbc-connection-url.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Set a `JDBC_DATABASE_URL` environment variable to your JDBC connection string.

<div class="filter-content" markdown="1" data-scope="mac linux">

{% include_cached copy-clipboard.html %}
~~~ shell
export JDBC_DATABASE_URL="{connection string}"
~~~

</div>

<div class="filter-content" markdown="1" data-scope="windows">

{% include_cached copy-clipboard.html %}
~~~ shell
$env:JDBC_DATABASE_URL = "{connection string}"
~~~

</div>
384 changes: 253 additions & 131 deletions src/current/v22.1/connect-to-the-database.md

Large diffs are not rendered by default.

76 changes: 36 additions & 40 deletions src/current/v22.1/frequently-asked-questions.md

Large diffs are not rendered by default.

0 comments on commit 48c8316

Please sign in to comment.