Skip to content

Commit 9733058

Browse files
committed
CASSANDRA-21342: Fix broken Antora xref/anchor targets in cassandra docs
Forward-merge of the trunk fix (commit 32826fe) to cassandra-5.0. Restricted to the changes whose broken-target patterns exist on this branch. Two trunk commits intentionally omitted: - P1 (memtable.adoc retarget): the memtable sections containing the broken xref were added on trunk only and do not exist on 5.0. - R1 (commands-toc.adoc rewrite): commands-toc.adoc on 5.0 diverges from trunk by ~9 lines; the 38-row retarget mapping will be applied as a separate follow-up commit on this branch. patch by Patrick McFadin; reviewed by TBD for CASSANDRA-21342
1 parent af6930c commit 9733058

23 files changed

Lines changed: 36 additions & 36 deletions

doc/modules/ROOT/nav.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
* xref:index.adoc[Main]
22
** xref:master@_:ROOT:glossary.adoc[Glossary]
33
** xref:master@_:ROOT:bugs.adoc[How to report bugs]
4-
** xref:master@_:ROOT:contactus.adoc[Contact us]
4+
** xref:master@_:ROOT:community.adoc[Contact us]
55
** xref:master@_:ROOT:development/index.adoc[Development]
66
*** xref:master@_:ROOT:development/gettingstarted.adoc[Getting started]
77
*** xref:master@_:ROOT:development/ide.adoc[Building and IDE integration]

doc/modules/ROOT/pages/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ If you would like to contribute to this documentation, you are welcome to do so
4747
== Meta information
4848

4949
* xref:master@_:ROOT:bugs.adoc[Reporting bugs]
50-
* xref:master@_:ROOT:contactus.adoc[Contact us]
50+
* xref:master@_:ROOT:community.adoc[Contact us]
5151
* xref:master@_:ROOT:development/index.adoc[Contributing code]
5252
* xref:master@_:ROOT:docdev/index.adoc[Contributing to the docs]
5353
* xref:master@_:ROOT:community.adoc[Community]

doc/modules/cassandra/nav.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119

120120
** xref:reference/index.adoc[]
121121
*** xref:reference/cql-commands/commands-toc.adoc[CQL commands]
122-
*** xref:developing/cql/cql_singlefile.html[CQL specification]
122+
*** xref:cassandra:developing/cql/cql_singlefile.adoc[CQL specification]
123123
*** xref:reference/java17.adoc[Java 17]
124124
*** xref:reference/native-protocol.adoc[Native Protocol specification]
125125
*** xref:reference/sai-virtual-table-indexes.adoc[SAI virtual table]

doc/modules/cassandra/pages/developing/cql/batch/batch-good-example.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ All the `INSERT` and `UPDATE` statements in this batch write to the same partiti
2424
include::cassandra:example$CQL/cyclist_expenses-table.cql[tag=batch_Vera]
2525
----
2626
+
27-
This batching example includes conditional updates combined with using xref:reference:static.adoc[static columns].
27+
This batching example includes conditional updates combined with using xref:cassandra:developing/cql/ddl.adoc#static-column[static columns].
2828
Recall that single partition batches are not logged.
2929
+
3030
[NOTE]

doc/modules/cassandra/pages/developing/cql/collections/list.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Use the `list` data type to store data that has a possible many-to-many relation
99

1010
== Prerequisite
1111

12-
* xref:developing/cql/keyspace-check.adoc[Keyspace] must exist
12+
* xref:cassandra:developing/cql/ddl.adoc#create-keyspace-statement[Keyspace] must exist
1313

1414
In the following example, a `list` called `events` stores all the race events on an upcoming calendar.
1515
The table is called `upcoming_calendar`. Each event listed in the `list` will have a `text` data type.

doc/modules/cassandra/pages/developing/cql/collections/map.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Each element can have an individual time-to-live and expire when the TTL ends.
1111

1212
== Prerequisite
1313

14-
* xref:developing/cql/keyspace-check.adoc[Keyspace] must exist
14+
* xref:cassandra:developing/cql/ddl.adoc#create-keyspace-statement[Keyspace] must exist
1515

1616
In the following example, each team listed in the `map` called `teams` will have a `year` of integer type and a `team name` of text type.
1717
The table is named `cyclist_teams`.

doc/modules/cassandra/pages/developing/cql/collections/set.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Use the `set` data type to store data that has a many-to-one relationship with a
88

99
== Prerequisite
1010

11-
* xref:developing/cql/keyspace-check.adoc[Keyspace] must exist
11+
* xref:cassandra:developing/cql/ddl.adoc#create-keyspace-statement[Keyspace] must exist
1212

1313
In the following example, a `set` called `teams` stores all the teams that a cyclist has been a member of during their career.
1414
The table is `cyclist_career_teams`.

doc/modules/cassandra/pages/developing/cql/create-custom-index.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ SAI allows only alphanumeric characters and underscores in names.
5555
SAI returns `InvalidRequestException` if you try to define an index on a column name that contains other characters, and does not create the index.
5656

5757
map_name::
58-
Used with xref:cassandra:developing/collections/collection-create.adoc[collections], identifier of the `map_name` specified in `CREATE TABLE` ...
58+
Used with xref:cassandra:developing/cql/collections/collection-create.adoc[collections], identifier of the `map_name` specified in `CREATE TABLE` ...
5959
`map(<map_name>)`.
6060
The regular column syntax applies for collection types `list` and `set`.
6161

@@ -119,7 +119,7 @@ Also refer xref:cassandra:developing/cql/indexing/sai/sai-query.adoc[Examine SAI
119119
=== SAI collection map examples with keys, values, and entries
120120

121121
The following examples demonstrate using collection maps of multiple types (`keys`, `values`, `entries`) in SAI indexes.
122-
For related information, see xref:cassandra:developing/collections/collection-create.adoc[Creating collections] and xref:cassandra:developing/collections/map.adoc[Using map type].
122+
For related information, see xref:cassandra:developing/cql/collections/collection-create.adoc[Creating collections] and xref:cassandra:developing/collections/map.adoc[Using map type].
123123

124124
Also refer to the SAI collection examples of type xref:#saiCreateCustomIndexCollectionsListAndSetExamples[list and set] in this topic.
125125

@@ -293,7 +293,7 @@ Remember that in CQL queries using SAI indexes, the `CONTAINS` clauses are suppo
293293
These examples demonstrate using collections with the `list` and `set` types in SAI indexes.
294294
For related information, see:
295295

296-
* xref:cassandra:developing/collections/collection-create.adoc[Creating collections]
296+
* xref:cassandra:developing/cql/collections/collection-create.adoc[Creating collections]
297297
* xref:cassandra:developing/collections/list.adoc[Using list type]
298298
* xref:cassandra:developing/collections/set.adoc[Using set type]
299299

doc/modules/cassandra/pages/developing/cql/create-index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ To index map keys, use the `KEYS` keyword and map name in nested parentheses:
9090
include::cassandra:example$CQL/sai/cyclist_teams-table.cql[tag=keysidx]
9191
----
9292

93-
To query the table, you can use xref:cassandra:reference/cql-commands/select.adoc#filtering-on-collections[CONTAINS KEY] in `WHERE` clauses.
93+
To query the table, you can use xref:cassandra:developing/cql/dml.adoc#allow-filtering[CONTAINS KEY] in `WHERE` clauses.
9494

9595
[source,language-cql]
9696
----

doc/modules/cassandra/pages/developing/cql/indexing/2i/2i-working-with.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
== Prerequisites
66

7-
* xref:developing/keyspace-create.adoc[Keyspace created]
8-
* xref:developing/table-create.adoc[Table created]
7+
* xref:cassandra:developing/cql/ddl.adoc#create-keyspace-statement[Keyspace created]
8+
* xref:cassandra:developing/cql/ddl.adoc#create-table-statement[Table created]
99

1010
include::_2i-create.adoc[leveloffset=+1]
1111

0 commit comments

Comments
 (0)