This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit bfea5446d75b870350db01fb5c06099bbb38dc8a Merge: 7f1503d9c9 38f3afcd42 Author: mck <m...@apache.org> AuthorDate: Sat Apr 5 12:58:27 2025 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Several doc fixes, particularly developing/cql/ , developing/data-modeling/ and managing/ .../examples/CQL/create_ks_trans_repl.cql | 2 +- doc/modules/cassandra/examples/CQL/no_revoke.cql | 10 +++---- .../CQL/vector-search/vector-search-cycling.cql | 4 +-- .../cassandra/examples/RESULTS/2i/2i-check.result | 8 ++++- .../cassandra/pages/developing/cql/SASI.adoc | 34 +++++++++++----------- .../cassandra/pages/developing/cql/changes.adoc | 10 +++---- .../cassandra/pages/developing/cql/ddl.adoc | 2 +- .../cassandra/pages/developing/cql/functions.adoc | 2 +- .../cassandra/pages/developing/cql/mvs.adoc | 4 +-- .../cassandra/pages/developing/cql/security.adoc | 6 ++-- .../data-modeling/data-modeling_conceptual.adoc | 2 +- .../data-modeling/data-modeling_logical.adoc | 6 ++-- .../data-modeling/data-modeling_physical.adoc | 6 ++-- .../data-modeling/data-modeling_queries.adoc | 2 +- .../data-modeling/data-modeling_rdbms.adoc | 2 +- .../data-modeling/data-modeling_refining.adoc | 2 +- .../configuration/cass_jvm_options_file.adoc | 2 +- .../cassandra/pages/managing/operating/cdc.adoc | 4 +-- .../managing/operating/compaction/tombstones.adoc | 2 +- .../pages/managing/operating/topo_changes.adoc | 2 +- .../managing/tools/sstable/sstableverify.adoc | 4 +-- .../pages/reference/cql-commands/create-index.adoc | 4 +-- .../cql-commands/create-table-examples.adoc | 2 +- doc/modules/cassandra/pages/reference/static.adoc | 2 +- .../cassandra/pages/troubleshooting/use_tools.adoc | 4 +-- .../pages/vector-search/data-modeling.adoc | 4 +-- .../cassandra/partials/cql-syntax-legend.adoc | 4 +-- .../partials/table-column-definitions.adoc | 2 +- .../cassandra/partials/table-properties.adoc | 4 +-- 29 files changed, 74 insertions(+), 68 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org