diff --git a/modules/ROOT/pages/_partials/_attributes-local.adoc b/modules/ROOT/pages/_partials/_attributes-local.adoc index a9f0bb449..cea6d33ec 100644 --- a/modules/ROOT/pages/_partials/_attributes-local.adoc +++ b/modules/ROOT/pages/_partials/_attributes-local.adoc @@ -107,8 +107,6 @@ :couchbase-tutorials--mobile-workshop--xref: {url-tutorial-mobile-workshop}[Couchbase Mobile Workshop] - - :url-downloads-all: {url-cb-pfx}downloads :downloads-all--xref: {url-downloads-all}[Get Started with Couchbase Today] :url-downloads-mobile: {url-downloads-all}#extend-with-mobile diff --git a/modules/ROOT/pages/_partials/_page-index.adoc b/modules/ROOT/pages/_partials/_page-index.adoc index d9b7dc3a5..a54e157d5 100644 --- a/modules/ROOT/pages/_partials/_page-index.adoc +++ b/modules/ROOT/pages/_partials/_page-index.adoc @@ -510,7 +510,7 @@ endif::xref--pfx-sgw[] :configuration-properties-legacy--page: configuration-properties-legacy.adoc :configuration-properties-legacy--pfx: {sgw--xref}{configuration-properties-legacy--page} -:configuration-properties-legacy--pfx--db: {sgw--xref}{configuration-properties-legacy--page}#databases +:configuration-properties-legacy--pfx--db: {configuration-properties-legacy--pfx}#databases :configuration-properties-legacy--pfx--db-rep: {configuration-properties-legacy--pfx--db}-this_db-replications-this_rep- :configuration-properties-legacy--pfx--eventhandlers: {configuration-properties-legacy--pfx--db}-this_db-event_handlers @@ -763,12 +763,13 @@ endif::xref--pfx-sgw[] :sync-inter-syncgateway-conflict-resolution--page: sync-inter-syncgateway-conflict-resolution.adoc :sync-inter-syncgateway-conflict-resolution--xref: {sgw--xref}{sync-inter-syncgateway-conflict-resolution--page}[Inter Sync Gateway Sync - Conflict Resolution] +:sync-inter-syncgateway-conflict-resolution--custom-conflict-resolution: {sgw--xref}{sync-inter-syncgateway-conflict-resolution--page}#custom-conflict-resolution-ee[Inter Sync Gateway Sync - Custom Conflict Resolution] :sync-inter-syncgateway-manage--page: sync-inter-syncgateway-manage.adoc :sync-inter-syncgateway-manage--xref: {sgw--xref}{sync-inter-syncgateway-manage--page}[Inter Sync Gateway Sync - Manage] :sync-inter-syncgateway-monitor--page: sync-inter-syncgateway-monitor.adoc :sync-inter-syncgateway-monitor--xref: {sgw--xref}{sync-inter-syncgateway-monitor--page}[Inter Sync Gateway Sync - Monitor] :sync-inter-syncgateway-overview--page: sync-inter-syncgateway-overview.adoc -:sync-inter-syncgateway-overview--xref: {sgw--xref}{sync-inter-syncgateway-overview--page}[Inter Sync Gateway Sync - Overview] +:sync-inter-syncgateway-overview--xref: {sgw--xref}{sync-inter-syncgateway-overview--page}[Inter Sync Gateway Sync - Overview] :sync-inter-syncgateway-run--page: sync-inter-syncgateway-run.adoc :sync-inter-syncgateway-run--xref: {sgw--xref}{sync-inter-syncgateway-run--page}[Inter Sync Gateway Sync - Run] diff --git a/modules/ROOT/pages/_partials/incpg-icr-conflict.adoc b/modules/ROOT/pages/_partials/incpg-icr-conflict.adoc index 023978264..d53610640 100644 --- a/modules/ROOT/pages/_partials/incpg-icr-conflict.adoc +++ b/modules/ROOT/pages/_partials/incpg-icr-conflict.adoc @@ -32,8 +32,7 @@ _Alternatively_: Run the replicator from the other side; flipping the direction See also -- our blog post: {url-blog-doc-how-conflicts-work} -- -For {enterprise}, a custom conflict resolver policy is available, providing additional flexibility by allowing users to provide their own conflict resolution logic -- see: {xref-sgw-pg-icr-conflict-resolution-custom}. - +For {enterprise}, a custom conflict resolver policy is available, providing additional flexibility by allowing users to provide their own conflict resolution logic -- see: {sync-inter-syncgateway-conflict-resolution--custom-conflict-resolution}{ // end::overview-full[] [#configure-conflict-resolution] diff --git a/modules/ROOT/pages/_partials/topic-group-inter-syncgateway.adoc b/modules/ROOT/pages/_partials/topic-group-inter-syncgateway.adoc index c5f85d3e5..0f6efcb48 100644 --- a/modules/ROOT/pages/_partials/topic-group-inter-syncgateway.adoc +++ b/modules/ROOT/pages/_partials/topic-group-inter-syncgateway.adoc @@ -19,7 +19,7 @@ ifdef::param-title[:this-title: {param-title}] :title-5: Conflict // Set the pages for the xrefs to link to (we are using attributes from _page-index.adoc here) -:topic-1: {sync-inter-syncgateway-overview--xref} +:topic-1: {sync-inter-syncgateway-overview--page} :topic-2: {sync-inter-syncgateway-run--page} :topic-3: {sync-inter-syncgateway-manage--page} :topic-4: {sync-inter-syncgateway-monitor--page} diff --git a/modules/ROOT/pages/logging.adoc b/modules/ROOT/pages/logging.adoc index 79ca6c431..00d89b69e 100644 --- a/modules/ROOT/pages/logging.adoc +++ b/modules/ROOT/pages/logging.adoc @@ -48,6 +48,7 @@ include::partial$block-caveats.adoc[tags=logfilefolderuse] // BEGIN Content == Overview + Sync Gateway provides a robust <>{fn-clog} solution that delivers flexibility in terms of how logs are generated and retained, whilst also maintaining the level of logging required by Couchbase Support for investigation of issues. Its logs are written to <> filtered by log level, with each log level supporting individual retention policies. You control what is logged using the {configuration-schema-bootstrap--xref} {bootstrap-schema--xref--logging} properties @@ -57,8 +58,10 @@ In addition to the log files, you can also independently configure and control < With _console logging_, system administrators can easily fine-tune diagnostic output to suit specific debug scenarios. All without interfering with the logging required by Couchbase Support for the investigation of issues. + == Configuration + You configure _continuous_ and _console_ logging requirements in the {configuration-schema-bootstrap--xref} file, using the {bootstrap-schema--xref--logging} properties {fn-legacy-pre-3-0} -- see: <>. [#sample-log-cfg] @@ -109,14 +112,20 @@ You configure _continuous_ and _console_ logging requirements in the {configurat See: {configuration-schema-bootstrap--xref} for more information on these settings {fnref-legacy-pre-3-0}. ==== + [#lbl-log-redaction] == Log Redaction + + All log outputs -- _console_ or _continuous_ -- can optionally be redacted, which will remove any user-data considered private. You enable this feature by setting the {bootstrap-schema--xref--logging-redaction-level} property {fnref-legacy-pre-3-0}. + [#lbl-console-logs] == Console Logging + + *In this section*: <> | <> | <> | <> | <> TIP: By default only HTTP logging is enabled @@ -153,7 +162,7 @@ The console log will show the following after this command: 2021-01-08T13:26:23.884Z [INF] HTTP: #110: POST /_logging?logLevel=trace (as ADMIN) 2021-01-08T13:26:23.885Z [INF] Setting log level to: trace 2021-01-08T13:26:23.885Z [INF] Setting log keys to: [DCP Replicate WS WSFrame] ---- +---- ==== @@ -222,9 +231,11 @@ a|This wildcard log key, enables all log keys [source, console] ---- + curl --location --request PUT 'http://localhost:4985/_logging?logLevel=trace' \ --header 'Content-Type: application/json' \ --data-raw '{"*": true}' + ---- |none @@ -334,6 +345,8 @@ logcollector my_sg_logs.txt [#lbl-continuous-logging] == Continuous Logging + + *In this section*: <> | <> _Continuous logging_ produces a set of log files aimed primarily at providing appropriate diagnostic information for the Couchbase Support team should their intervention be required. @@ -392,7 +405,7 @@ h|Minimum max_age |1 Day |=== -TIP: Each log level and its parameters are defined using the (xref-sgw-bmk-config-properties-log-level) property. +TIP: Each log level and its parameters are defined using the {bootstrap-schema--xref--logging-console-log-level} property. [#lbl-logrotate] === Log File Rotation diff --git a/modules/ROOT/pages/release-notes.adoc b/modules/ROOT/pages/release-notes.adoc index 3ec0f4bbc..f4f29196a 100644 --- a/modules/ROOT/pages/release-notes.adoc +++ b/modules/ROOT/pages/release-notes.adoc @@ -33,6 +33,7 @@ include::partial$block-abstract.adoc[] :xref-sgw-bmk-cfg-dbsvr: xref:{configuration-properties-legacy--page}#databases-this_db-server[Couchbase Server Connection String] :xref-sgw-bmk-cfg-hideprodvn: xref:{configuration-properties-legacy--page}#hide_product_version[Hide Product Version in Headers] +:legacy-config--xref: {:configuration-properties-legacy--pfx}# // END DO NOT REMOVE @@ -178,7 +179,7 @@ The change _ought to be_ transparent to the user, *if*: Old documents are automatically migrated to the `xattr` metadata format. -| xref:2.8@sync-gateway:ROOT:configuration-properties.adoc#databases-this_db-enable_shared_bucket_access[enable_shared_bucket_access] +| {legacy-config--xref}databases-this_db-enable_shared_bucket_access[enable_shared_bucket_access] | Enforce TLS by default | xref:secure-sgw-access.html#lbl-cbs-comms[Couchbase Server Connection] @@ -187,8 +188,6 @@ Old documents are automatically migrated to the `xattr` metadata format. === Deprecated -:legacy-config-2.8--xref: xref:2.8@sync-gateway::configuration-properties.adoc# - .Deprecated [#tbl-deprecated, cols="1a,1a", options="header"] |=== @@ -196,16 +195,16 @@ Old documents are automatically migrated to the `xattr` metadata format. .>| Link | allow_conflicts confg -| {legacy-config-2.8--xref}databases-this_db-allow_conflicts[allow_conflicts] +| {legacy-config--xref}databases-this_db-allow_conflicts[allow_conflicts] | enable_shared_bucket_access -- disabled option | | Facebook User Auth Config -| {legacy-config-2.8--xref}facebook[facebook] +| {legacy-config--xref}facebook[facebook] | Google User Auth Config -| {legacy-config-2.8--xref}facebook[Google] +| {legacy-config--xref}facebook[Google] | Logging API | @@ -223,43 +222,43 @@ Old documents are automatically migrated to the `xattr` metadata format. | | configServer property -| {legacy-config-2.8--xref}configServer[configserver] +| {legacy-config--xref}configServer[configserver] | databases.this_db.cache.channel_cache_expiry -| {legacy-config-2.8--xref}databases-this_db-cache-channel_cache_expiry[channel_cache_expiry] +| {legacy-config--xref}databases-this_db-cache-channel_cache_expiry[channel_cache_expiry] | databases.this_db.feed_type -| xref:2.8@sync-gateway:ROOT:configuration-properties.adoc#databases-this_db-feed_type[feed_type] +| {legacy-config--xref}databases-this_db-feed_type[feed_type] | logging.default config section | xref:legacy-logging-pre2-1.adoc[Legacy - Pre-2.1 Logging] | old cache config values :databases.this_db.cache.channel_cache_max_length -| xref:2.8@sync-gateway:ROOT:configuration-properties.adoc#databases-this_db-cache-channel_cache_max_length[channel_cache_max_length] +| {legacy-config--xref}databases-this_db-cache-channel_cache_max_length[channel_cache_max_length] | old cache config values :databases.this_db.cache.channel_cache_min_length -| xref:2.8@sync-gateway:ROOT:configuration-properties.adoc#databases-this_db-cache-channel_cache_min_length[channel_cache_min_length] +| {legacy-config--xref}databases-this_db-cache-channel_cache_min_length[channel_cache_min_length] | old cache config values :databases.this_db.cache.enable_star_channel -| xref:2.8@sync-gateway:ROOT:configuration-properties.adoc#databases-this_db-cache-enable_star_channel[enable_star_channel] +| {legacy-config--xref}databases-this_db-cache-enable_star_channel[enable_star_channel] | old cache config values :databases.this_db.cache.max_num_pending -| xref:2.8@sync-gateway:ROOT:configuration-properties.adoc#databases-this_db-cache-max_num_pending[max_num_pending] +| {legacy-config--xref}databases-this_db-cache-max_num_pending[max_num_pending] | old cache config values :databases.this_db.cache.max_wait_pending -| xref:2.8@sync-gateway:ROOT:configuration-properties.adoc#databases-this_db-cache-max_wait_pending[db-cache-max_wait_pending] +| {legacy-config--xref}databases-this_db-cache-max_wait_pending[db-cache-max_wait_pending] | old cache config values :databases.this_db.cache.max_wait_skipped -| xref:2.8@sync-gateway:ROOT:configuration-properties.adoc#databases-this_db-cache-max_wait_skipped[max_num_skipped] +| {legacy-config--xref}databases-this_db-cache-max_wait_skipped[max_num_skipped] | old cache config values: databases.this_db.rev_cache_size -| xref:2.8@sync-gateway:ROOT:configuration-properties.adoc#databases-this_db-rev_cache_size[rev_cache_size] +| {legacy-config--xref}databases-this_db-rev_cache_size[rev_cache_size] | SG-Replicate | xref:2.8@sync-gateway:ROOT:legacy-sg-replicate.adoc[Legacy -- SG-Replicate] | walrus (should not be default database mode) -| xref:2.8@sync-gateway:ROOT:configuration-properties.adoc#databases-this_db-server[server] +| {legacy-config--xref}databases-this_db-server[server] | Dropped |=== diff --git a/modules/ROOT/pages/rest-api-access-rbac-roles.adoc b/modules/ROOT/pages/rest-api-access-rbac-roles.adoc index ce3efbfcb..329ccf880 100644 --- a/modules/ROOT/pages/rest-api-access-rbac-roles.adoc +++ b/modules/ROOT/pages/rest-api-access-rbac-roles.adoc @@ -19,6 +19,7 @@ include::partial$block-abstract.adoc[] == Admin + The table below identifies the RBAC roles required by Sync Gateway to execute endpoint actions. *Couchbase Server 7.0.2 Developer Preview* introduces new roles offering fine grained access control; existing roles will remain available. @@ -26,7 +27,7 @@ For more on RBAC roles, see the Couchbase Server documentation: {server-security .REST API Admin Endpoints -[#tbl-endpoint-role-xref, cols="1,1,1,2,2", options="header"] +[#tbl-endpoint-role-crossref, cols="1,1,1,2,2", options="header"] |=== 3+^| Rest API Endpoint @@ -292,9 +293,6 @@ Read Only Admin, | Sync Gateway Dev Ops, External Stats Reader - - - | Cluster | /_status | GET @@ -311,7 +309,6 @@ Full Admin Role, | Sync Gateway Architect - | Cluster | /{db}/ | PUT @@ -319,8 +316,6 @@ Full Admin Role, Full Admin Role, | Sync Gateway Architect - - | DB | /_compact | POST @@ -330,8 +325,6 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_config | GET @@ -341,8 +334,6 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_config | PUT @@ -353,8 +344,6 @@ Full Admin | Sync Gateway Architect Sync Gateway Application - - | DB | /_config/import_filter | DELETE @@ -364,8 +353,6 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_config/import_filter | GET @@ -375,8 +362,6 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_config/import_filter | PUT @@ -386,8 +371,6 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_config/sync | DELETE @@ -397,8 +380,6 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_config/sync | GET @@ -408,8 +389,6 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_config/sync | PUT @@ -419,8 +398,6 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_dump/{view} | GET @@ -431,8 +408,6 @@ Full Admin | Sync Gateway Application Sync Gateway Application Read Only - - | DB | /_dumpchannel/{channel} | GET @@ -443,8 +418,6 @@ Full Admin | Sync Gateway Application Sync Gateway Application Read Only - - | DB | /_flush | POST @@ -463,8 +436,6 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_online | POST @@ -474,8 +445,6 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_purge | POST @@ -485,8 +454,6 @@ Bucket Application Access Full Admin | Sync Gateway Application - - | DB | /_raw/{docid} | GET / HEAD @@ -497,8 +464,6 @@ Full Admin | Sync Gateway Application Sync Gateway Application Read Only - - | DB | /_repair | POST @@ -508,8 +473,6 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_replication/ | GET / HEAD @@ -519,8 +482,6 @@ Bucket Application Access Full Admin | Sync Gateway Replicator - - | DB | /_replication/ | POST @@ -530,8 +491,6 @@ Bucket Application Access Full Admin | Sync Gateway Replicator - - | DB | /_replication/{replicationID} | DELETE @@ -541,8 +500,6 @@ Bucket Application Access Full Admin | Sync Gateway Replicator - - | DB | /_replication/{replicationID} | GET / HEAD @@ -552,8 +509,6 @@ Bucket Application Access Full Admin | Sync Gateway Replicator - - | DB | /_replication/{replicationID} | PUT @@ -563,8 +518,6 @@ Bucket Application Access Full Admin | Sync Gateway Replicator - - | DB | /_replicationStatus | GET / HEAD @@ -574,8 +527,6 @@ Bucket Application Access Full Admin | Sync Gateway Replicator - - | DB | /_replicationStatus/{replicationID} | GET / HEAD @@ -585,8 +536,6 @@ Bucket Application Access Full Admin | Sync Gateway Replicator - - | DB | /_replicationStatus/{replicationID} | PUT @@ -596,8 +545,6 @@ Bucket Application Access Full Admin | Sync Gateway Replicator - - | DB | /_resync | GET @@ -607,17 +554,12 @@ Bucket Application Access Full Admin | Sync Gateway Architect - - | DB | /_resync | POST | | Sync Gateway Architect - - - | DB | /_revtree/{docid} | GET @@ -628,8 +570,6 @@ Full Admin | Sync Gateway Application Sync Gateway Application Read Only - - | DB | /_role/ | GET / HEAD @@ -641,8 +581,6 @@ Full Admin Sync Gateway Application Sync Gateway Application Read Only - - | DB | /_role/ | POST @@ -653,8 +591,6 @@ Full Admin | Sync Gateway Architect Sync Gateway Application - - | DB | /_role/{name} | DELETE @@ -665,8 +601,6 @@ Full Admin | Sync Gateway Architect Sync Gateway Application - - | DB | /_role/{name} | GET / HEAD @@ -678,8 +612,6 @@ Full Admin Sync Gateway Application Sync Gateway Application Read Only - - | DB | /_role/{name} | PUT @@ -690,8 +622,6 @@ Full Admin | Sync Gateway Architect Sync Gateway Application - - | DB | /_session | POST @@ -702,8 +632,6 @@ Full Admin | Sync Gateway Architect Sync Gateway Application - - | DB | /_session/{sessionid} | DELETE @@ -714,8 +642,6 @@ Full Admin | Sync Gateway Architect Sync Gateway Application - - | DB | /_session/{sessionid} | GET @@ -727,8 +653,6 @@ Full Admin Sync Gateway Application Sync Gateway Application Read Only - - | DB | /_user/ | GET / HEAD @@ -740,8 +664,6 @@ Full Admin Sync Gateway Application Sync Gateway Application Read Only - - | DB | /_user/ | POST @@ -752,8 +674,6 @@ Full Admin | Sync Gateway Architect Sync Gateway Application - - | DB | /_user/{name} | DELETE @@ -764,8 +684,6 @@ Full Admin | Sync Gateway Architect Sync Gateway Application - - | DB | /_user/{name} | GET / HEAD @@ -777,8 +695,6 @@ Full Admin Sync Gateway Application Sync Gateway Application Read Only - - | DB | /_user/{name} | PUT @@ -789,8 +705,6 @@ Full Admin | Sync Gateway Architect Sync Gateway Application - - | DB | /_user/{name}/_session | DELETE @@ -801,8 +715,6 @@ Full Admin | Sync Gateway Architect Sync Gateway Application - - | DB | /_user/{name}/_session/{sessionid} | DELETE @@ -813,8 +725,6 @@ Full Admin | Sync Gateway Architect Sync Gateway Application - - | DB | /_view/{view} | GET @@ -830,7 +740,7 @@ Sync Gateway Application Read Only == Common Endpoints .Common Endpoints (with Admin) -[#tbl-endpoint-role-xref2, cols="1,1,1,2,2", options="header"] +[#tbl-endpoint-role-crossref2, cols="1,1,1,2,2", options="header"] |=== @@ -846,8 +756,6 @@ Full Admin Role Read Only Admin | Sync Gateway Dev Ops - - | Cluster | /{db}/ | POST @@ -864,8 +772,6 @@ Bucket Application Access, Full Admin | Sync Gateway Application, Sync Gateway Application Read Only - - | DB | /_bulk_docs | POST @@ -884,8 +790,6 @@ Bucket Application Access, Full Admin | Sync Gateway Application, Sync Gateway Application Read Only - - | DB | /_changes | GET / HEAD / POST @@ -895,8 +799,6 @@ Bucket Application Access, Full Admin | Sync Gateway Application, Sync Gateway Application Read Only - - | DB | /_design/{ddoc} | GET / HEAD @@ -906,8 +808,6 @@ Bucket Application Access, Full Admin | Sync Gateway Application, Sync Gateway Application Read Only - - | DB | /_design/{ddoc} | PUT @@ -935,8 +835,6 @@ Bucket Application Access, Full Admin | Sync Gateway Application, Sync Gateway Application Read Only - - | DB | /_ensure_full_commit | POST @@ -946,8 +844,6 @@ Bucket Application Access, Full Admin | Sync Gateway Application, Sync Gateway Application Read Only - - | DB | /_revs_diff | POST @@ -966,8 +862,6 @@ Bucket Application Access, Full Admin | Sync Gateway Application, Sync Gateway Application Read Only - - | DB | /_local/{docid} | PUT @@ -995,8 +889,6 @@ Bucket Application Access, Full Admin | Sync Gateway Application, Sync Gateway Application Read Only - - | DB | /{docid} | PUT @@ -1024,8 +916,6 @@ Bucket Application Access, Full Admin | Sync Gateway Application, Sync Gateway Application Read Only - - | DB | /{docid}/{attach} | PUT @@ -1048,8 +938,10 @@ Full Admin == Metrics Endpoints + + .REST API Admin Endpoints -[#tbl-endpoint-role-xref, cols="1,1,1,2,2", options="header"] +[#tbl-endpoint-role-crossref, cols="1,1,1,2,2", options="header"] |=== 3+^| Rest API Endpoint @@ -1066,4 +958,5 @@ Read Only Admin External Stats Reader |=== + include::partial$block-related-content-api.adoc[] \ No newline at end of file diff --git a/modules/ROOT/pages/sync-inter-syncgateway-overview.adoc b/modules/ROOT/pages/sync-inter-syncgateway-overview.adoc index 84856e845..861222e3d 100644 --- a/modules/ROOT/pages/sync-inter-syncgateway-overview.adoc +++ b/modules/ROOT/pages/sync-inter-syncgateway-overview.adoc @@ -11,7 +11,6 @@ include::partial$_std-hdr-sgw.adoc[] :param-topic-group: inter-syncgateway :param-related: {configuration-properties-legacy--xref} | {rest-api-admin--xref} -// {sync-inter-syncgateway-overview--xref} | :param-abstract: pass:q[_Inter-Sync Gateway_ replication supports resilient, secure, scalable bidirectional synchronization of data cloud-to-edge.] include::partial$block-abstract.adoc[] @@ -77,6 +76,7 @@ image::icr-active-mobile-sync200713.svg[,600] == Replication Characteristics _In this section_: <> | <> | <> | <> | <> | <> + === Context Sync Gateway supports the ability to run replications between Sync Gateway clusters using a new websockets based protocol, with the {glos-term-active-replicator} {glos-term-synchronizing} changes between two {glos-term-sync-gateway-databases}. @@ -210,9 +210,10 @@ include::partial$incpg-icr-availability.adoc[leveloffset=+1] == Conflict Resolution + include::partial$incpg-icr-conflict.adoc[tags=overview-full, leveloffset=+1] -For more on conflict resolution -- see: {xref-sgw-pg-icr-conflict-resolution} +For more on conflict resolution -- see: {sync-inter-syncgateway-conflict-resolution--custom-conflict-resolution} // == Replication Initialization