Fix logging page issues

modules/cli/pages/cbepctl/set-checkpoint_param.adoc

@@ -15,7 +15,7 @@ cbepctl [host]:11210 -b [bucket-name] set checkpoint_param [parameter] [value]
 
 == Description
 
-This command configures a checkpoint.
+This command changes checkpoint configuration parameters.
 
 == Options
 
@@ -26,22 +26,27 @@ The following are the command options:
 |===
 | Options | Description
 
-| `chk_max_items`
-| Max number of items allowed in a checkpoint.
+| `max_checkpoints`
+| The expected maximum number of checkpoints in each vBucket on a balanced system.
 
-| `chk_period`
-| Time bound (in sec.) on a checkpoint.
+NOTE: This value does not act as a hard limit for a single vBucket.
+The system uses it along with `checkpoint_memory_ratio` to compute `checkpoint_max_size`, which triggers checkpoint creation.
 
-| `item_num_based_new_chk`
-| True if a new checkpoint can be created based on.
-The number of items in the open checkpoint.
+| `checkpoint_memory_ratio`
+| Maximum portion of the bucket quota that the system can allocate to checkpoints.
 
-| `keep_closed_chks`
-| True if we want to keep closed checkpoints in memory, as long as the current memory usage is below high water mark.
+| `checkpoint_memory_recovery_upper_mark`
+| Fraction of the checkpoint quota computed by `checkpoint_memory_ratio` that triggers an attempt to release memory from checkpoints.
 
-| `max_checkpoints`
-| Max number of checkpoints allowed per vBucket.
+| `checkpoint_memory_recovery_lower_mark`
+| Fraction of the checkpoint quota computed by `checkpoint_memory_ratio` that represents the target for checkpoint memory recovery.
+Memory recovery stops when this target is reached.
+
+| `checkpoint_max_size`
+| Maximum size in bytes of a single checkpoint.
+Use `0` to allow ep-engine to configure this value automatically.
+
+| `checkpoint_destruction_tasks`
+| Number of background tasks that destroy closed and unreferenced checkpoints to free memory.
 
-| `enable_chk_merge`
-| True, if merging closed checkpoints is enabled.
 |===

modules/cli/pages/cbstats/cbstats-warmup.adoc

@@ -10,7 +10,7 @@
 The basic syntax is:
 
 ----
-cbstats [host]:[dataport] -b [bucket_name] -p [bucket_password] raw warmup
+cbstats [host]:[dataport] -b [bucket_name] -p [bucket_password] warmup
 ----
 
 == Description
@@ -47,36 +47,28 @@ Look for values: loading keys, loading access log, and done.
 | Number of failures due to duplicate keys.
 | Integer
 
+| ep_warmup_estimate_time
+| The time taken, measured in milliseconds, to discover the estimated number of keys that may be warmed up.
+| Integer.
+
 | ep_warmup_estimated_key_count
 | The estimated number of keys in database.
 | Integer.
 Default: unknown
 
-| ep_warmup_estimate_time
-| Thne estimated time in microseconds to do warmup.
-| Integer.
-
 | ep_warmup_estimated_value_count
 | The estimated number of key data to read based on the access log.
 | Integer.
 Default: unknown
 
-| ep_warmup_keys_count
+| ep_warmup_key_count
 | Number of keys warmed up.
 | Integer
 
 | ep_warmup_keys_time
 | Total time (in microseconds)  spent by loading persisted keys.
 | Integer
 
-| ep_warmup_min_items_threshold
-| Enable data traffic after loading this percentage of key data.
-| Integer
-
-| ep_warmup_min_memory_threshold
-| Enable data traffic after filling this % of memory.
-| Integer (%)
-
 | ep_warmup_oom
 | Number of out of memory failures during warmup.
 | Integer
@@ -119,26 +111,27 @@ The following are the command options:
 *Request*
 
 ----
-cbstats 10.5.2.117:11210 warmup
+cbstats localhost:11210 warmup \
+-u Administrator \
+-p password \
+-b travel-sample
 ----
 
 *Response*
 
 Example response:
 
 ----
- ep_warmup:                       enabled
- ep_warmup_dups:                  0
- ep_warmup_estimate_time:         57546
- ep_warmup_estimated_key_count:   0
- ep_warmup_estimated_value_count: unknown
- ep_warmup_key_count:             0
- ep_warmup_keys_time:             529022
- ep_warmup_min_items_threshold:    100
- ep_warmup_min_memory_threshold:  100
- ep_warmup_oom:                   0
- ep_warmup_state:                 done
- ep_warmup_thread:                complete
- ep_warmup_time:                  529192
- ep_warmup_value_count:           0
+ep_warmup:                       enabled
+ep_warmup_dups:                  0
+ep_warmup_estimate_time:         8159
+ep_warmup_estimated_key_count:   63325
+ep_warmup_estimated_value_count: unknown
+ep_warmup_key_count:             63325
+ep_warmup_keys_time:             199582
+ep_warmup_oom:                   0
+ep_warmup_state:                 done
+ep_warmup_thread:                complete
+ep_warmup_time:                  199586
+ep_warmup_value_count:           63325
 ----

modules/cli/pages/mcstat.adoc

@@ -1,15 +1,11 @@
 = mcstat
-:description: pass:q[The `mcstat` tool provides memory-related information for a specified bucket, or for all buckets on a cluster.]
+:description: pass:q[The mcstat tool provides detailed information for a node, specified bucket, or for all buckets on a cluster.]
 :page-topic-type: reference
 :page-aliases: cli:cbstats/cbstats-allocator
 
 [abstract]
 {description}
 
-== Description
-
-The `mcstat` tool provides memory-related information for a specified bucket, or for all buckets on a cluster.
-
 The tool is located as follows:
 
 [cols="2,3"]
@@ -40,9 +36,7 @@ The `options` are as follows:
 | Options | Description
 
 | `-h[=statkey]`or `--help[=statkey]`
-| Show the help message and exit.
-If `=statkey` is not specified, the common options for the command are listed.
-If `=statkey` _is_ specified, the available _statkeys_ for the command are listed instead.
+| Outputs possible `statkey` values with descriptions and indications of the stat's scope and required privileges.
 
 | `-h` or `--hostname`, with the parameter `<hostname[:port]>` (for IPv4), or `[address]:port` (for IPv6)
 | The name of the host (and optionally, the port number) to connect to.