PR for Timers in 5.5

README.adoc

@@ -1,22 +1,43 @@
 = Couchbase Server Documentation
 // Settings:
+<<<<<<< HEAD
+ifndef::env-github[:icons: font]
+=======
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // URLs:
 :url-org: https://github.com/couchbase
+<<<<<<< HEAD
+=======
 :url-contribute: https://docs.couchbase.com/home/contribute/index.html
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 :url-ui: {url-org}/docs-ui
 :url-playbook: {url-org}/docs-site
 :url-cli: {url-org}/couchbase-cli
 :url-backup: {url-org}/backup
 :url-analytics: https://github.com/couchbaselabs/asterix-opt
 
+<<<<<<< HEAD
+.Work In Progress!
+[WARNING]
+This repository is managed by an automated migration process.
+*DO NOT* submit pull requests to this repository.
+Send documentation changes to the {url-org}/docs-cb4[docs-cb4 repository].
+
+Documentation component for Couchbase Server.
+
+== Contributing
+
+Check out our contributing guide to learn how to:
+=======
 This repository hosts the documentation source for Couchbase Server.
 
 == Contributing
 
 Check out our {url-contribute}[contributing guide] to learn how to:
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 * submit a bug or feedback issue
 * set up your documentation workspace

antora.yml

@@ -1,6 +1,11 @@
 name: server
+<<<<<<< HEAD
+title: Couchbase Server
+version: '5.5'
+=======
 version: '5.5'
 title: Couchbase Server
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 start_page: introduction:intro.adoc
 nav:
 - modules/ROOT/nav.adoc

modules/ROOT/nav.adoc

@@ -122,13 +122,16 @@
  ** xref:eventing:eventing-Terminologies.adoc[Terminology]
  ** xref:eventing:eventing-language-constructs.adoc[Language Constructs]
  ** xref:eventing:eventing-adding-function.adoc[Adding a Couchbase Function]
- ** xref:eventing:eventing-function-export.adoc[Exporting Functions]
  ** xref:eventing:eventing-examples.adoc[Examples: Using the Eventing Service]
  ** xref:eventing:eventing-debugging-and-diagnosability.adoc[Debugging and Diagnosability]
  ** xref:eventing:eventing-statistics.adoc[Statistics]
  ** xref:eventing:troubleshooting-best-practices.adoc[Troubleshooting and Best Practices]
  ** xref:eventing:eventing-faq.adoc[Frequently Asked Questions]
+<<<<<<< HEAD
+include::../analytics/pages/_partials/nav.adoc[]
+=======
 include::analytics:partial$nav.adoc[]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 .Managing Clusters
 * xref:admin:admin-intro.adoc[Administration Tools]
@@ -299,6 +302,10 @@ include::analytics:partial$nav.adoc[]
  ** xref:install:install-uninstalling.adoc[Uninstalling Couchbase Server]
 * xref:install:running-couchbase-in-containers.adoc[Deploying Couchbase Server in Containers]
  ** xref:install:getting-started-docker.adoc[Running Couchbase Server Using Docker]
+<<<<<<< HEAD
+ ** xref:operator::overview.adoc[Autonomous Operator]
+=======
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 * xref:cloud:couchbase-cloud-deployment.adoc[Deploying Couchbase in the Cloud]
  ** xref:cloud:couchbase-aws.adoc[Amazon Web Services (AWS) and Couchbase]
   *** xref:cloud:couchbase-aws-marketplace.adoc[Deploying Couchbase from AWS Marketplace]
@@ -401,8 +408,13 @@ include::analytics:partial$nav.adoc[]
 * xref:cli:cli-intro.adoc[CLI Reference]
 +
 --
+<<<<<<< HEAD
+include::../backup-restore/pages/_partials/nav.adoc[]
+include::../cli/pages/_partials/cbcli/nav.adoc[]
+=======
 include::backup-restore:partial$nav.adoc[]
 include::cli:partial$cbcli/nav.adoc[]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 --
 
  ** xref:cli:cbanalyze-core-tool.adoc[cbanalyze-core]
@@ -574,6 +586,17 @@ include::cli:partial$cbcli/nav.adoc[]
  ** Data Import/Export Tools
 +
 --
+<<<<<<< HEAD
+include::../tools/pages/_partials/nav-cbimport.adoc[]
+include::../tools/pages/_partials/nav-cbexport.adoc[]
+--
+
+.Release Notes
+* xref:release-notes:relnotes.adoc[Release Notes for Couchbase Server 5.5.x]
+
+.Licenses
+* xref:third-party-licenses.adoc[Licenses for Third-Party Components]
+=======
 include::tools:partial$nav-cbimport.adoc[]
 include::tools:partial$nav-cbexport.adoc[]
 --
@@ -584,3 +607,4 @@ include::tools:partial$nav-cbexport.adoc[]
 
 .Contributing
 * xref:home:contribute:index.adoc[Contribute to the Documentation]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6

modules/backup-restore/pages/incremental-backup.adoc

@@ -32,7 +32,11 @@ The following figure shows an example of a differential incremental backup strat
 Every Sunday, a full backup is made.
 On the other days of the week, a differential incremental backup is made.
 
+<<<<<<< HEAD
+image::admin/picts/backup-differential-incremental.jpg[,720,align=left]
+=======
 image::admin/backup-differential-incremental.jpg[,720,align=left]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 In this example, the Monday backup contains the changes made since the full backup on Sunday, the Tuesday backup contains the changes made since the Monday backup, the Wednesday backup contains the changes made since the Tuesday backup, and so on.
 For example, a restore operation performed on Wednesday uses the full backup from Sunday and the differential incremental backups from Monday and Tuesday.
@@ -46,7 +50,11 @@ The following figure shows an example of a cumulative incremental backup strateg
 Every Sunday, a full backup is made.
 On the other days of the week, a cumulative incremental backup is made.
 
+<<<<<<< HEAD
+image::admin/picts/backup-cumulative-incremental.jpg[,720,align=left]
+=======
 image::admin/backup-cumulative-incremental.jpg[,720,align=left]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 In this example, the Monday backup contains all the changes made since the full backup on Sunday, the Tuesday backup contains all the changes made since the full backup on Sunday, the Wednesday backup contains all the changes made since the full backup on Sunday, and so on.
 For example, a restore operation performed on Wednesday uses the full backup from Sunday and the cumulative incremental backup from Tuesday.
@@ -59,7 +67,11 @@ The following figure shows an example of a backup strategy that incorporates bot
 Every Sunday, a full backup is made.
 For the remainder of the week, depending on the day, either a differential or cumulative incremental backup is made.
 
+<<<<<<< HEAD
+image::admin/picts/backup-combined-incremental.jpg[,720,align=left]
+=======
 image::admin/backup-combined-incremental.jpg[,720,align=left]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 In this example, the backup schedule includes differential and cumulative incremental backups on different days.
 On Monday, Tuesday, Wednesday, Friday, and Saturday a differential incremental backup is made.

modules/cloud/pages/couchbase-azure-marketplace.adoc

@@ -61,8 +61,12 @@ The password must satisfy at least three of the following four conditions:
 
 | Subscription
 |
+<<<<<<< HEAD
+// <draft-comment author="amarantha">What are the available options? I see
+=======
 // <draft-comment author="amarantha">What are the available options?
 // I see
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 // Pay-As-You-Go in your video, and Documentation in the version that I'm playing
 // with.</draft-comment>
 

modules/cloud/pages/couchbase-gcp-cloud-launcher.adoc

@@ -84,8 +84,12 @@ IMPORTANT: Note the Couchbase Username and Password displayed on the screen.
 +
 image::gcp/deploying/gcp-new-couchbase-ee-deploy-done.png[,570]
 
+<<<<<<< HEAD
+That's it! It may take a short while for Couchbase to be up and running.
+=======
 That's it!
 It may take a short while for Couchbase to be up and running.
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 At this point a number of Instance Group Managers have been deployed.
 It may take several minutes for the VMs that the Instance Group Managers manage to start, and for their start-up scripts to complete installing and configuring Couchbase.

modules/clustersetup/pages/adding-nodes.adoc

@@ -24,7 +24,11 @@ image::admin-tasks-rebalance-node-added.png[,align=left]
 Using the same method, you can add a server that was previously part of this or another cluster.
 During this process, Couchbase Server must be running.
 
+<<<<<<< HEAD
+image::admin/picts/add-server-new2.png[,align=left]
+=======
 image::admin/add-server-new2.png[,align=left]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 To add a new node to an existing cluster using the Web Console:
 

modules/clustersetup/pages/hard-failover.adoc

@@ -34,7 +34,11 @@ For example, if you have four nodes running the Data service, and one node has f
 
 The vBucket resources will look like below:
 
+<<<<<<< HEAD
+image::admin/picts/vbucket-resources.png[,350,align=left]
+=======
 image::admin/vbucket-resources.png[,350,align=left]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 The moment you initiate a hard failover  (either by using the Couchbase Web Console, CLI, REST API or automatic failover), the Couchbase Cluster Manager communicates with the remaining nodes in the Data service to begin the process.
 The Cluster Manager has information about the location of all active and replica vBuckets across the cluster, as well as about the physical topology of the cluster.
@@ -127,8 +131,12 @@ This process all happens in fractions of a second.
 It is then repeated for the remaining 255 vBuckets of the bucket, one bucket at a time.
 If there were more buckets, it would proceed to the next bucket and repeat the process there until complete.
 
+<<<<<<< HEAD
+What is happening in the application during this process, one might ask? Until the down node is failed over (either automatically or manually) to promote the replica vBuckets to active, the application is receiving errors or timeouts for one-quarter of the reads and writes that would have gone to the now down node.
+=======
 What is happening in the application during this process, one might ask?
 Until the down node is failed over (either automatically or manually) to promote the replica vBuckets to active, the application is receiving errors or timeouts for one-quarter of the reads and writes that would have gone to the now down node.
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 We had four nodes; now we have three.
 If there were ten nodes in the Data service, the application would be unable to address one tenth of the data until failover is initiated.
 If the application needs to read before failover happens, the application developer may want to use Replica Reads (see SDK-specific documentation), which is only used for such circumstances.

modules/clustersetup/pages/remove-nodes.adoc

@@ -31,7 +31,11 @@ To prevent such problems, make sure that you provide one of the following soluti
 
 == Using the UI
 
+<<<<<<< HEAD
+image::admin/picts/active-servers.png[,align=left]
+=======
 image::admin/active-servers.png[,align=left]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 To remove a node from an existing cluster using the Web Console:
 

modules/clustersetup/pages/server-setup.adoc

@@ -14,7 +14,11 @@ For more information, see xref:manage-groups.adoc[Managing Server Groups].
 * To add a new server, click [.ui]*Add Server*.
 For more information, see xref:adding-nodes.adoc[Adding a Node].
 
+<<<<<<< HEAD
+image::admin/picts/ui-server.png[,720]
+=======
 image::admin/ui-server.png[,720]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 .Server Details
 [cols="3,8"]

modules/clustersetup/pages/services-mds.adoc

@@ -13,7 +13,11 @@ With MDS, admins can achieve both the existing homogeneous scalability model and
 
 To better understand the new multidimensional scaling model, it is beneficial to take a look at the current homogeneous scaling model.
 
+<<<<<<< HEAD
+image::admin/picts/homogenous-scaling.png[,600,align=left]
+=======
 image::admin/homogenous-scaling.png[,600,align=left]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 In this model, your applications workload is distributed equally across a cluster made up of the homogeneous set of nodes.
 Each node that does the core processing takes a similar slice of the work and has the same HW resources.
@@ -31,11 +35,19 @@ When you separate the competing workloads into independent service and isolate t
 The figure below demonstrates a deployment topology that can be achieved with MDS.
 In this topology, each service is deployed to an independent zone within the cluster.
 
+<<<<<<< HEAD
+image::admin/picts/independent-scaling.jpg[,600,align=left]
+
+Each service zone within a cluster (data, query, and index services) can now scale independently so that the best computational capacity is provided for each of them.
+
+image::admin/picts/mds-scaling.png[,600,align=left]
+=======
 image::admin/independent-scaling.jpg[,600,align=left]
 
 Each service zone within a cluster (data, query, and index services) can now scale independently so that the best computational capacity is provided for each of them.
 
 image::admin/mds-scaling.png[,600,align=left]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 In the figure above, the green additions signify the direction of scaling for each service.
 In this case, query and index services scale up over the fewer sets of powerful nodes and data service scale out with an additional node.

modules/clustersetup/pages/setup-failover-graceful.adoc

@@ -31,7 +31,11 @@ Use Graceful failover only when the following conditions are met; otherwise, use
 If not, first fix the problems and rebalance the cluster.
 For each bucket, look at the `vBucket Resources` section of the metrics, then look at the active and replica vBucket graphs to confirm that each graph has 1024 for that bucket.
 +
+<<<<<<< HEAD
+image::admin/picts/graceful-failover.png[,550,align=left]
+=======
 image::admin/graceful-failover.png[,550,align=left]
+>>>>>>> 410e17157f915875034f4610572bd61e46bf52c6
 
 For example:
 

modules/eventing/pages/eventing-Terminologies.adoc

@@ -107,9 +107,3 @@ Newly created handlers start in an undeployed state.
 
 When a Function gets deleted, the source code implementing the Function, all processing checkpoints, and other artifacts in the metadata provider are purged.
 Before deleting, make sure you have undeployed the Function.
-
-== Timers
-
-Timers provide execution of code at a preconfigured clock time or after a specified number of seconds.
-Using timers, you can write a simple JavaScript Function handler code to delay or trigger the execution of a Function at specific wall-clock time events.
-Timers allow archiving of expired documents at a preconfigured clock time.

modules/eventing/pages/eventing-adding-function.adoc

@@ -16,7 +16,8 @@ To add a new Function, proceed as follows:
 | Source Bucket
 | The name of a bucket currently defined on the cluster.
 
-For more information on Source Bucket, refer to xref:clustersetup:create-bucket.adoc[Create a Bucket].
+For more information on creating a bucket, refer to xref:clustersetup:create-bucket.adoc[Create a Bucket].
+
 
 | Metadata Bucket
 | The name of a bucket currently defined on the cluster.
@@ -61,7 +62,7 @@ Additional controls are now displayed: The controls are:
 . Click *Deploy*.
 This displays the *Confirm Deploy Function* dialog.
 The Feed Boundary determines whether documents previously in existence needs to be included in the Function's activities: the options are *Everything* and *From now*.
-The *Everything* option invokes a Function on all the data present in the cluster.
+The *Everything* option invokes a Function on all mutations available in the cluster.
 The *From now* option invokes a Function during future instances of data mutation, post Function deployment.
 . Click *Deploy* Function.
 This deploys the Function and returns you to the main Eventing screen.

modules/eventing/pages/eventing-api.adoc

@@ -3,6 +3,8 @@
 [abstract]
 The Functions REST API, available by default at port 8096, provides the methods available to work with Couchbase Functions.
 
+NOTE: The Functions REST API is a Beta feature intended for development purposes only, do not use them in production; no Enterprise Support is provided for Beta features.
+
 .Functions API
 [cols="2,3,6"]
 |===