DOC-12386: Replace {tkn-db} (#854)

* Replace {tkn-db}
* Remove double escaping

Author: simon-dew

modules/ROOT/pages/_partials/_define_page_index.adoc

@@ -632,26 +632,26 @@ endif::xref--pfx-sgw[]
 :rest-api-admin--xref: {rest-api-admin--pfx}[Admin REST API]
 
 
-:rest-api-admin--pfx--database-configuration: {rest-api-admin--pfx}#/Database_Configuration/
+:rest-api-admin--pfx--database-configuration: xref:rest_api_admin.adoc#tag/Database-Configuration
 :rest-api-admin--xref--database-configuration: {rest-api-admin--pfx--database-configuration}[Database Configuration]
-:rest-api-admin--xref--database-security: {rest-api-admin--pfx}#/Database_Security[Database Security]
-:rest-api-admin--xref--access-control: {rest-api-admin--pfx}#/Access_Control[Access Control]
-:rest-api-admin--xref--import-filter: {rest-api-admin--pfx--database-configuration}update_import_filter[/\{db}/_config/import_filter]
-:rest-api-admin--xref--sync-function: {rest-api-admin--pfx--database-configuration}/update_sync_function[\{db\}/_config/sync]
-:rest-api-admin--xref--replication: {rest-api-admin--pfx}#/Replication[Replication]
+:rest-api-admin--xref--database-security: xref:rest_api_admin.adoc#tag/Database-Security[Database Security]
+:rest-api-admin--xref--access-control: xref:rest_api_admin.adoc#tag/Authentication[Authentication]
+:rest-api-admin--xref--import-filter: {rest-api-admin--pfx--database-configuration}/operation/put_keyspace-_config-import_filter[/\{keyspace}/_config/import_filter]
+:rest-api-admin--xref--sync-function: {rest-api-admin--pfx--database-configuration}/operation/put_keyspace-_config-sync[\{keyspace\}/_config/sync]
+:rest-api-admin--xref--replication: xref:rest_api_admin.adoc#tag/Replication[Replication]
 
-:rest-api-admin-role-get--xref: {rest-api-admin--pfx}#/role/get__db___role__name_[/\{tkn-db}/_role/]
-:rest-api-admin-role-post--xref: {rest-api-admin--pfx}#/role/post__db___role[/\{tkn-db}/_role/]
-:rest-api-admin-role-put--xref: {rest-api-admin--pfx}#/role/put__db___role__name_[/\{tkn-db}/_role/\{name}]
+:rest-api-admin-role-get--xref: xref:rest_api_admin.adoc#tag/Database-Security/operation/get_db-_role-name[/\{db}/_role/\{name}]
+:rest-api-admin-role-post--xref: xref:rest_api_admin.adoc#tag/Database-Security/operation/post_db-_role-[/\{db}/_role/]
+:rest-api-admin-role-put--xref: xref:rest_api_admin.adoc#tag/Database-Security/operation/put_db-_role-name[/\{db}/_role/\{name}]
 
-:rest-api-admin-user-get--xref: {rest-api-admin--pfx}#/user/post\__db___user_name_[/\{tkn-db}/_user/\{name}]
-:rest-api-admin-user-post--xref: {rest-api-admin--pfx}#/user/post\__db___user_[/\{tkn-db}/_user]
-:rest-api-admin-user-put--xref: {rest-api-admin--pfx}#/user/post\__db___user_name_[/\{tkn-db}/_user/\{name}]
+:rest-api-admin-user-get--xref: xref:rest_api_admin.adoc#tag/Database-Security/operation/get_db-_user-name[/\{db}/_user/\{name}]
+:rest-api-admin-user-post--xref: xref:rest_api_admin.adoc#tag/Database-Security/operation/post_db-_user-[/\{db}/_user]
+:rest-api-admin-user-put--xref: xref:rest_api_admin.adoc#tag/Database-Security/operation/put_db-_user-name[/\{db}/_user/\{name}]
 
-:rest-api-admin--pfx--database-management: {rest-api-admin--pfx}#/Database_Management/
-:rest-api-admin--xref--database-management--compact: {rest-api-admin--pfx--database-management}post__db___compact[\{db\}/_compact]
+:rest-api-admin--pfx--database-management: xref:rest_api_admin.adoc#tag/Database-Management
+:rest-api-admin--xref--database-management--compact: {rest-api-admin--pfx--database-management}/operation/post_db-_compact[\{db\}/_compact]
 
-:rest-api-admin-doc-channels-get--xref: {rest-api-admin--pfx}#/database/get__db___all_docs[/\{tkn-db}/_alldocs]
+:rest-api-admin-doc-channels-get--xref: xref:rest_api_admin.adoc#tag/Document/operation/get_keyspace-_all_docs[/\{keyspace}/_alldocs]
 
 
 // :configuration-schema-access-control--page:  rest-api-admin-access-control.adoc
@@ -663,15 +663,15 @@ endif::xref--pfx-sgw[]
 // :configuration-schema-database--xref-configure-model: {sgw--xref}{configuration-schema-database--page}#/configure/put__db___config[Database Configuration - Data Model]
 
 :rest-api-admin-user--page:  rest-api-admin.adoc
-:rest-api-admin-user-post--xref:  {sgw--xref}{rest-api-admin--page}#/user/put__db___user__name_[\{db\}/_user/\{name\}]
+:rest-api-admin-user-post--xref:  {sgw--xref}{rest-api-admin--page}#tag/Database-Security/operation/put_db-_user-name[\{db\}/_user/\{name\}]
 
 // :configuration-schema--isgr--page:  rest-api-admin-isgr.adoc
 // :configuration-schema--isgr--xref: {sgw--xref}{configuration-schema--isgr--page}[Inter-Sync Gateway Configuration API]
 // :configuration-schema--isgr--xref: {sgw--xref}{configuration-schema--isgr--page}[Sync API]
 
 // :configuration-schema--isgr--xref-purge-on-removal: {sgw--xref}{configuration-schema--isgr--page}#purge-on-removal[purge_on_removal]
 
-:rest-api-admin-replication--xref--put: {sgw--xref}{rest-api-admin--page}#/Replication/put__db___replication__replicationID_[Replication -- put model]
+:rest-api-admin-replication--xref--put: {sgw--xref}{rest-api-admin--page}#tag/Replication/operation/put_db-_replication-replicationid[Replication -- put model]
 
 :rest-api-client-app--page: rest-api-client-app.adoc
 :rest-api-client-app--xref: {sgw--xref}{rest-api-client-app--page}[Use the REST API?]
@@ -851,25 +851,25 @@ endif::xref--pfx-sgw[]
 :sgw-pg-write-access: write-access.adoc
 
 // :xref-sgw-bmk-icr-sgreplicate--conflict: {sgw--xref}{sgw-pg-icr-sgreplicate}#conflict-resolution[Conflict Resolution]
-:xref-sgw--xref-admin-api-attachment: {rest-api-admin--pfx}#/attachment
-:rest-api-admin--pfx-attachment-get: {xref-sgw--xref-admin-api-attachment}/get__db___doc___attachment_[Get Attachment (/\{db}/\{docid}/\{attachment})]
-:rest-api-admin--pfx-attachment-put: {xref-sgw--xref-admin-api-attachment}/put__db___doc___attachment_[Add/Update Attachment (/\{db}/\{docid}/\{attachment})]
-:rest-api-admin--pfx-attachment: {xref-sgw--xref-admin-api-attachment}[/\{db}/\{docid}/\{attachment}]
-
-:xref-sgw--xref-admin-api-document: {rest-api-admin--pfx}#/document
-:rest-api-admin--pfx-document-get-docid: {xref-sgw--xref-admin-api-document}/get__db___doc_[get /\{db}/\{docid}]
-:rest-api-admin--pfx-document-post-purge: {xref-sgw--xref-admin-api-document}/post__db___purge[/\{db}/_purge]
-:rest-api-admin--pfx-document-put-docid: {xref-sgw--xref-admin-api-document}/put__db___doc_[put /\{db}/\{docid}]
+:xref-sgw--xref-admin-api-attachment: xref:rest_api_admin.adoc#tag/Document
+:rest-api-admin--pfx-attachment-get: {xref-sgw--xref-admin-api-attachment}/operation/get_keyspace-docid-attach[Get Attachment (/\{keyspace}/\{docid}/\{attach})]
+:rest-api-admin--pfx-attachment-put: {xref-sgw--xref-admin-api-attachment}/operation/put_keyspace-docid-attach[Add/Update Attachment (/\{keyspace}/\{docid}/\{attach})]
+:rest-api-admin--pfx-attachment: {xref-sgw--xref-admin-api-attachment}[/\{keyspace}/\{docid}/\{attach}]
+
+:xref-sgw--xref-admin-api-document: xref:rest_api_admin.adoc#tag/Document
+:rest-api-admin--pfx-document-get-docid: {xref-sgw--xref-admin-api-document}/operation/get_keyspace-docid[get /\{keyspace}/\{docid}]
+:rest-api-admin--pfx-document-post-purge: {xref-sgw--xref-admin-api-document}/operation/post_keyspace-_purge[/\{keyspace}/_purge]
+:rest-api-admin--pfx-document-put-docid: {xref-sgw--xref-admin-api-document}/operation/put_keyspace-docid[put /\{keyspace}/\{docid}]
 :rest-api-admin--pfx-document: {xref-sgw--xref-admin-api-document}
-:xref-sgw--xref-admin-api-replication: {rest-api-admin--pfx}#/replication
-:xref-sgw--xref-admin-api-replication-post: {xref-sgw--xref-admin-api-replication}/post__db___replication__replicationID_
-:rest-api-admin--pfx-replication-delete: {xref-sgw--xref-admin-api-replication}/delete__db___replication__replicationID_[DELETE/\{tkn-url}/\{tkn-db}/_replication/example-rep-db1]
+:xref-sgw--xref-admin-api-replication: xref:rest_api_admin.adoc#tag/Replication
+:xref-sgw--xref-admin-api-replication-post: {xref-sgw--xref-admin-api-replication}/operation/post_db-_replication-
+:rest-api-admin--pfx-replication-delete: {xref-sgw--xref-admin-api-replication}/operation/delete_db-_replication-replicationid[DELETE /\{db}/_replication/\{replicationId}]
 :rest-api-admin--pfx-replication-post-remote: {xref-sgw--xref-admin-api-replication-post}[remote]
-:rest-api-admin--pfx-replication-post: {xref-sgw--xref-admin-api-replication-post}[POST/\{tkn-url}/\{tkn-db}/_replication/example-rep-db1]
-:rest-api-admin--pfx-replication-put: {xref-sgw--xref-admin-api-replication}/put__db___replication__replicationID_[PUT/\{tkn-url}/\{tkn-db}/_replication/example-rep-db1]
-:rest-api-admin--pfx-replication-repstatus-query: {xref-sgw--xref-admin-api-replication}/get__db___replicationStatus__queryString_[_replicationStatus]
-:rest-api-admin--pfx-replication-repstatus-set: {xref-sgw--xref-admin-api-replication}/put__db___replicationStatus__replicationID__action__action_[_replicationStatus(replicationID)?action={tkn-action}]
-:rest-api-admin--pfx-replication-repstatus: {xref-sgw--xref-admin-api-replication}/get__db___replicationStatus__replicationID_[_replicationStatus(replicationID)]
+:rest-api-admin--pfx-replication-post: {xref-sgw--xref-admin-api-replication-post}[POST/\{url}/\{db}/_replication]
+:rest-api-admin--pfx-replication-put: {xref-sgw--xref-admin-api-replication}/operation/put_db-_replication-replicationid[PUT/\{url}/\{db}/_replication/\{replicationId}]
+:rest-api-admin--pfx-replication-repstatus-query: {xref-sgw--xref-admin-api-replication}/operation/get_db-_replicationStatus-replicationid[/\{db}/_replicationStatus/\{replicationid}]
+:rest-api-admin--pfx-replication-repstatus-set: {xref-sgw--xref-admin-api-replication}/operation/put_db-_replicationStatus-replicationid[/\{db}/_replicationStatus/\{replicationid}]
+:rest-api-admin--pfx-replication-repstatus: {xref-sgw--xref-admin-api-replication}/operation/get_db-_replicationStatus-replicationid[/\{db}/_replicationStatus/\{replicationid}]
 :rest-api-admin--pfx-replication: {xref-sgw--xref-admin-api-replication}
 
 :xref-sgw-ep-public-api: {sgw--xref}{rest-api-admin--page}

modules/ROOT/pages/_partials/block_related_content_menulists.adoc

@@ -115,7 +115,7 @@ Blog Entries
 
 // tag::concept-syncfunc[]
   * xref:configuration-schema-access-control.adoc[Access Control]
-  * xref:rest-api-admin.html#/Access_Control/update_sync_function[Add/Update Sync Function]
+  * xref:rest_api_admin.adoc#tag/Database-Configuration/operation/put_keyspace-_config-sync[Add/Update Sync Function]
   * xref:sync-function-overview.adoc[Sync Function Overview]
 // end::concept-syncfunc[]
 

modules/ROOT/pages/_partials/incpg-icr-initialization.adoc

@@ -78,9 +78,9 @@ Running highlights::
 
 * REST ONLY
 
-** POST databases/\{tkn-db}/_replication creates a replication using the {rep-id} specified in the body or if none specified, a unique UUID.
+** POST databases/\{db}/_replication creates a replication using the replication ID specified in the body or if none specified, a unique UUID.
 
-** PUT databases/\{tkn-db}/_replication/\{rep-id} upserts replication {rep-id}.
+** PUT databases/\{db}/_replication/\{replicationID} upserts the replication with the specified ID.
 
 * {enterprise} only:
 

modules/ROOT/pages/_partials/sync-api/sync-function-api-expiry.adoc

@@ -69,7 +69,7 @@ This expiration time is not propagated when the document is replicated.
 The purge of the document does not cause it to be deleted on any other database.
 
 === Inspect a Document Expiry Value
-You can retrieve a document's expiration time, as it is returned in the response of GET xref:{rest-api--page}##/document/get__db___doc_[+/\{db/\{doc}] use `show_exp=true` as the querystring.
+You can retrieve a document's expiration time, as it is returned in the response of GET xref:rest_api_public.adoc#tag/Document/operation/get_keyspace-docid[+/{keyspace}/{docid}+] using `show_exp=true` as the querystring.
 
 [source, bash]
 ----

modules/ROOT/pages/audit-logging.adoc

@@ -148,6 +148,6 @@ Above is a successful login by `user1` to retrieve a document named `doc`.
 
 * xref:sgcollect-info.adoc[]
 
-* xref:rest-api-admin.adoc[Admin REST API Reference]
+* xref:rest-api-admin.adoc[Admin REST API]
 
-* xref:rest_api_admin_static.adoc[Admin REST API Reference]
+* xref:rest_api_admin.adoc[Admin REST API Reference]

modules/ROOT/pages/authentication-users.adoc

@@ -88,8 +88,8 @@ image::static-auth-provider.png[]
 
 API reference:
 
-- xref:rest-api.adoc#/auth/post\__db___facebook[/+\{db}+/_facebook]
-- xref:rest-api.adoc#/auth/post\__db___google[/+\{db}+/_google]
+- xref:rest_api_public.adoc#tag/Authentication/operation/post_db-_facebook[/+{db}+/_facebook]
+- xref:rest_api_public.adoc#tag/Authentication/operation/post_db-_google[/+{db}+/_google]
 
 For other providers we recommend to use Custom Authentication or OpenID Connect.
 
@@ -104,7 +104,7 @@ The last request creates a session.
 
 image::custom-auth-flow.png[]
 
-Given a user that has already been created, a new session for that user can be created on the Admin {rest-api-admin--pfx}#/session/post\__db___session[POST /+\{db}+/_session] endpoint.
+Given a user that has already been created, a new session for that user can be created on the Admin xref:rest_api_admin.adoc#tag/Session/operation/post_db-_session[POST /+{db}+/_session] endpoint.
 
 [source,bash]
 ----
@@ -124,7 +124,7 @@ The HTTP response body contains the credentials of the session.
 * *name* corresponds to the `cookie_name`
 * *value* corresponds to the `session_id`
 * *path* is the hostname of the {sgw}
-* *expirationDate* corresponds to the cookie's expiration time. The endpoint's {rest-api-admin--pfx}#/session/post\__db___session[API reference] contains more information about how the expiration time is automatically extended according to the user session activity.
+* *expirationDate* corresponds to the cookie's expiration time. The endpoint's xref:rest_api_admin.adoc#tag/Session/operation/post_db-_session[API reference] contains more information about how the expiration time is automatically extended according to the user session activity.
 * *secure* Whether the cookie should only be sent using a secure protocol (e.g. HTTPS)
 * *httpOnly* Whether the cookie should only be used when transmitting HTTP, or HTTPS, requests thus restricting access from other, non-HTTP APIs
 
@@ -143,7 +143,7 @@ There are two implementation methods available with OpenID Connect:
 
 <<implicit-flow>>::
 With this method, the retrieval of the ID token takes place on the device.
-You can then create a user session using the POST `+/\{tkn-db}/_session+` endpoint on the Public REST API with the ID token.
+You can then create a user session using the POST `+/{db}/_session+` endpoint on the Public REST API with the ID token.
 <<authorization-code-flow>>::
 This method relies on {sgw} to retrieve the ID token.
 
@@ -166,32 +166,32 @@ In the algorithm dropdown, make sure to select `RS256` as the signing algorithm
 . Upon successful validation, {sgw} authenticates the user based on the subject and issuer in the token.
 
 Since Open ID tokens are typically large, the usual approach is to use the Open ID token to obtain a {sgw} session id (using the
-xref:rest-api.adoc#/session/post\__db___session[POST /db/_session]
+xref:rest_api_public.adoc#tag/Session/operation/post_db-_session[+POST /{db}/_session+]
 endpoint), and then use the returned session id for subsequent authentication requests.
 
 =====
 *Note:* This example is based on a deployment using legacy configuration.
+
 [{tabs}]
 ====
 
 REST API::
 +
 --
 include::{examples-lib}[tags="oidc-rest-api-simple"]
+
+<.> Use `register` to auto-register a {sgw} user on successful completion of the validation
 --
 
 Configuration File::
 +
 --
-
 Here is a sample {sgw} config file, configured to use the Implicit Flow.
 
 include::{examples-lib}[tags="oidc-config-simple"]
 
---
-
 <.> Use `register` to auto-register a {sgw} user on successful completion of the validation
-
+--
 ====
 =====
 
@@ -205,7 +205,7 @@ By doing this, the application can then use the token to create a {sgw} session.
 image::client-auth.png[]
 
 . The Google SignIn SDK prompts the user to login and if successful it returns an ID token to the application.
-. The ID token is used to create a {sgw} session by sending a POST `+/\{tkn-db}/_session+` request.
+. The ID token is used to create a {sgw} session by sending a POST `+/{db}/_session+` request.
 . {sgw} returns a cookie session in the response header.
 . The {sgw} cookie session is used on the replicator object.
 

modules/ROOT/pages/changes-feed.adoc

@@ -41,7 +41,7 @@ For instance, if you have a channel called 'needs-email', you could have a bot t
 == Endpoint
 
 
-The changes feed API is a REST API endpoint (xref:rest-api.adoc#/database/get\__db___changes[`+/\{tkn-db}/_changes+`]) that returns a sorted list of changes made to documents in the database.
+The changes feed API is a REST API endpoint (xref:rest_api_public.adoc#tag/Database-Management/operation/get_keyspace-_changes[`+/{keyspace}/_changes+`]) that returns a sorted list of changes made to documents in the database.
 It permits applications to implement business logic that reacts to changes in documents.