Skip to content

Commit d449f00

Browse files
committed
DOC-10444 N1QL to SQL++ Rebrand for Tools
- Replace N1QL with {sqlpp} attrib in running text - Define {sqlpp} attrib at AsciiDoctor runtime - Update Antora component version to 7.2 - Add sqlpp to Aspell dictionary Change-Id: Ie92b8ba0fad5bc218aeff16c6eec3d6348607adf Reviewed-on: https://review.couchbase.org/c/couchbase-cli/+/181318 Reviewed-by: James Lee <james.lee@couchbase.com> Tested-by: Build Bot <build@couchbase.com>
1 parent 03c82f6 commit d449f00

6 files changed

Lines changed: 16 additions & 13 deletions

File tree

docs/antora.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
name: server
2-
version: '7.1'
2+
version: '7.2'

docs/generate.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ def _generate_html(self, adoc: ADoc, build_version: str) -> Path:
107107
f"-a manmanual='{PRODUCT} Manual' "
108108
f"-a author='{AUTHOR}' "
109109
f"-a partialsdir={DIR / 'modules' / self.module / 'pages' / '_partials' } "
110+
f"-a sqlpp=SQL++ "
110111
"-a nofooter "
111112
f"-r {DIR / 'asciidoctor-ext.rb'} "
112113
f"-o {path} "
@@ -129,6 +130,7 @@ def _generate_man(self, adoc: ADoc, build_version: str) -> Path:
129130
f"-a manmanual='{PRODUCT} Manual' "
130131
f"-a author='{AUTHOR}' "
131132
f"-a partialsdir={DIR / 'modules' / self.module / 'pages' / '_partials' } "
133+
f"-a sqlpp=SQL++ "
132134
f"-r {DIR / 'asciidoctor-ext.rb'} "
133135
f"-o {path} "
134136
f"{adoc.path}"

docs/modules/cli/pages/cbcli/couchbase-cli-bucket-create.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ include::{partialsdir}/cbcli/part-common-options.adoc[]
4848
The type of bucket to create. Accepted bucket types are "couchbase",
4949
"ephemeral", and "memcached". The Couchbase bucket is the standard bucket
5050
type. It supports data persistence, replication, caching, indexing, views,
51-
and N1QL queries. The Ephemeral bucket is an in-memory bucket similar to the
51+
and {sqlpp} queries. The Ephemeral bucket is an in-memory bucket similar to the
5252
Couchbase bucket; but it does not support data persistence or views. The
5353
Memcached bucket is a cache-only bucket that does not support persistence,
54-
replication, indexing, views, or N1QL querying: this bucket type provides
54+
replication, indexing, views, or {sqlpp} querying: this bucket type provides
5555
the same behavior as Memcached Server. Memcached buckets are deprecated
5656
and Ephemeral buckets should be used instead.
5757

docs/modules/cli/pages/cbcli/couchbase-cli-setting-query.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ include::{partialsdir}/cbcli/part-common-options.adoc[]
7070
The default is 1.
7171

7272
--n1ql-feature-control <num>::
73-
N1QL Feature Controls.
73+
{sqlpp} Feature Controls.
7474
0x0001 (1) Disable Index Aggregation
7575

7676
--temp-dir <path>::

docs/modules/cli/pages/cbcli/couchbase-cli-user-manage.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,17 +279,17 @@ query_execute_external_functions[...]::
279279
query_execute_external_functions[default:scope0].
280280

281281
query_execute_functions[...]::
282-
Allows the user to execute N1QL functions for a given scope. To allow the
283-
user to execute N1QL functions for all scopes in bucket _default_ use the
284-
role query_execute_functions[default]. If the user needs to execute N1QL
282+
Allows the user to execute {sqlpp} functions for a given scope. To allow the
283+
user to execute {sqlpp} functions for all scopes in bucket _default_ use the
284+
role query_execute_functions[default]. If the user needs to execute {sqlpp}
285285
functions for a scope _scope0_ of bucket _default_ then give them the role
286286
query_execute_functions[default:scope0].
287287

288288
query_execute_global_external_functions::
289289
Allows the user to execute global external language functions.
290290

291291
query_execute_global_functions::
292-
Allows the user to execute global N1QL functions.
292+
Allows the user to execute global {sqlpp} functions.
293293

294294
query_insert[...]::
295295
Allows the user to execute INSERT query statements on the specified bucket,
@@ -313,17 +313,17 @@ query_manage_external_functions[...]::
313313
query_manage_external_functions[default:scope0].
314314

315315
query_manage_functions[...]::
316-
Allows the user to manage N1QL functions for a given scope. To allow the user
317-
to manage N1QL functions for all scopes in bucket _default_ use the
318-
role query_manage_functions[default]. If the user needs to manage N1QL
316+
Allows the user to manage {sqlpp} functions for a given scope. To allow the user
317+
to manage {sqlpp} functions for all scopes in bucket _default_ use the
318+
role query_manage_functions[default]. If the user needs to manage {sqlpp}
319319
functions for a scope _scope0_ of bucket _default_ then give them the role
320320
query_manage_functions[default:scope0].
321321

322322
query_manage_global_external_functions::
323323
Allows the user to manage global external language functions.
324324

325325
query_manage_global_functions::
326-
Allows the user to manage global N1QL functions.
326+
Allows the user to manage global {sqlpp} functions.
327327

328328
query_manage_index[...]::
329329
Allows the user to create and delete indexes on the specified bucket, scope

jenkins/.aspell.en.pws

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ FTS
7474
fts
7575
fullEviction
7676
gamesim
77-
gcs
7877
GCS
78+
gcs
7979
geolocation
8080
GSI
8181
gsi
@@ -151,6 +151,7 @@ sdk
151151
SDKs
152152
seqno
153153
SIGINT
154+
sqlpp
154155
SSL
155156
ssl
156157
startTLS

0 commit comments

Comments
 (0)