diff --git a/documentation/src/main/asciidoc/topics/json/distributed_cache.json b/documentation/src/main/asciidoc/topics/json/distributed_cache.json
index aa6b97d6edf1..2bad7890f0d1 100644
--- a/documentation/src/main/asciidoc/topics/json/distributed_cache.json
+++ b/documentation/src/main/asciidoc/topics/json/distributed_cache.json
@@ -25,11 +25,14 @@
"when-full": "REMOVE"
},
"indexing" : {
- "enabled" : true,
- "storage" : "local-heap",
- "index-reader" : {
- "refresh-interval" : "1000"
- }
+ "enabled" : true,
+ "storage" : "local-heap",
+ "index-reader" : {
+ "refresh-interval" : "1000"
+ },
+ "indexed-entities": [
+ "org.infinispan.Person"
+ ]
},
"partition-handling" : {
"when-split" : "ALLOW_READ_WRITES",
diff --git a/documentation/src/main/asciidoc/topics/json/replicated_cache.json b/documentation/src/main/asciidoc/topics/json/replicated_cache.json
index 308dc0061c1f..bba78b8846c6 100644
--- a/documentation/src/main/asciidoc/topics/json/replicated_cache.json
+++ b/documentation/src/main/asciidoc/topics/json/replicated_cache.json
@@ -26,7 +26,10 @@
"storage" : "local-heap",
"index-reader" : {
"refresh-interval" : "1000"
- }
+ },
+ "indexed-entities": [
+ "org.infinispan.Person"
+ ]
},
"partition-handling" : {
"when-split" : "ALLOW_READ_WRITES",
diff --git a/documentation/src/main/asciidoc/topics/proc_creating_caches_cli.adoc b/documentation/src/main/asciidoc/topics/proc_creating_caches_cli.adoc
index 9cab8b8a6ae9..9b120cfd524b 100644
--- a/documentation/src/main/asciidoc/topics/proc_creating_caches_cli.adoc
+++ b/documentation/src/main/asciidoc/topics/proc_creating_caches_cli.adoc
@@ -10,12 +10,13 @@ Use the {brandname} Command Line Interface (CLI) to add remote caches on {brandn
.Procedure
-. Start the CLI and enter your credentials when prompted.
+. Start the CLI.
+
[source,options="nowrap",subs=attributes+]
----
include::cmd_examples/cli_nix.adoc[]
----
+. Run the `connect` command and enter your username and password when prompted.
+
. Use the [command]`create cache` command to create remote caches.
+
diff --git a/documentation/src/main/asciidoc/topics/ref_cli_resource_tree.adoc b/documentation/src/main/asciidoc/topics/ref_cli_resource_tree.adoc
index 5fba948439f3..b1caa2e8f157 100644
--- a/documentation/src/main/asciidoc/topics/ref_cli_resource_tree.adoc
+++ b/documentation/src/main/asciidoc/topics/ref_cli_resource_tree.adoc
@@ -11,6 +11,7 @@ caches
counters
configurations
schemas
+tasks
----
`caches`::
@@ -35,7 +36,7 @@ server
`containers`::
Cache containers on the {brandname} cluster.
`cluster`::
-Lists {brandname} servers joined to the cluster.
+Lists {brandname} Servers joined to the cluster.
//dnaro: need to ask. think server is wip.
`server`::
-Resources for managing and monitoring {brandname} servers.
+Resources for managing and monitoring {brandname} Servers.
diff --git a/documentation/src/main/asciidoc/topics/ref_infinispan_caches.adoc b/documentation/src/main/asciidoc/topics/ref_infinispan_caches.adoc
index 498089e8d3c1..fae5d3033b4e 100644
--- a/documentation/src/main/asciidoc/topics/ref_infinispan_caches.adoc
+++ b/documentation/src/main/asciidoc/topics/ref_infinispan_caches.adoc
@@ -16,7 +16,7 @@ Write succinct cache names and cache template names.
[IMPORTANT]
====
A file system might set a limitation for the length of a file name, so ensure that a cache's name does not exceed this limitation.
-If a cache name exceeds a file system's naming limitation, general operations or initialing operations towards that cache might fail.
+If a cache name exceeds a file system's naming limitation, general operations or initialing operations towards that cache might fail.
Write succinct file names.
====
@@ -83,7 +83,8 @@ include::yaml/infinispan_caches.yaml[]
include::json/infinispan_caches.json[]
----
+
[role="_additional-resources"]
.Additional resources
* link:{configdocroot}[{brandname} configuration schema reference]
-* link:http://infinispan.org/schemas/infinispan-config-{infinispanversion}.xsd[infinispan-config-{infinispanversion}.xsd]
+* link:http://infinispan.org/schemas/infinispan-config-{schemaversion}.xsd[infinispan-config-{infinispanversion}.xsd]
diff --git a/documentation/src/main/asciidoc/topics/ref_listeners_synchronicity.adoc b/documentation/src/main/asciidoc/topics/ref_listeners_synchronicity.adoc
index 2638ba85c378..5644f3eb9f6b 100644
--- a/documentation/src/main/asciidoc/topics/ref_listeners_synchronicity.adoc
+++ b/documentation/src/main/asciidoc/topics/ref_listeners_synchronicity.adoc
@@ -27,4 +27,4 @@ include::code_examples/ListenerMyNonBlocking.java[]
[discrete]
== Asynchronous thread pool
-To tune the thread pool used to dispatch such asynchronous notifications, use the link:{configdocroot}/infinispan-config-{infinispanversion}.html[``] XML element in your configuration file.
+To tune the thread pool used to dispatch such asynchronous notifications, use the link:{configdocroot}/infinispan-config-{schemaversion}.html[``] XML element in your configuration file.
diff --git a/documentation/src/main/asciidoc/topics/xml/distributed_cache.xml b/documentation/src/main/asciidoc/topics/xml/distributed_cache.xml
index 3c8b3e41289e..6d61022456d6 100644
--- a/documentation/src/main/asciidoc/topics/xml/distributed_cache.xml
+++ b/documentation/src/main/asciidoc/topics/xml/distributed_cache.xml
@@ -15,6 +15,9 @@
+
+ org.infinispan.Person
+
diff --git a/documentation/src/main/asciidoc/topics/xml/replicated_cache.xml b/documentation/src/main/asciidoc/topics/xml/replicated_cache.xml
index 78d5923386e7..3076917e44f3 100644
--- a/documentation/src/main/asciidoc/topics/xml/replicated_cache.xml
+++ b/documentation/src/main/asciidoc/topics/xml/replicated_cache.xml
@@ -12,6 +12,9 @@
+
+ org.infinispan.Person
+
diff --git a/documentation/src/main/asciidoc/topics/yaml/distributed_cache.yaml b/documentation/src/main/asciidoc/topics/yaml/distributed_cache.yaml
index 9762cdc4129c..ad259d4c7c1c 100644
--- a/documentation/src/main/asciidoc/topics/yaml/distributed_cache.yaml
+++ b/documentation/src/main/asciidoc/topics/yaml/distributed_cache.yaml
@@ -23,6 +23,8 @@ distributedCache:
storage: "local-heap"
indexReader:
refreshInterval: "1000"
+ indexedEntities:
+ - "org.infinispan.Person"
partitionHandling:
whenSplit: "ALLOW_READ_WRITES"
mergePolicy: "PREFERRED_NON_NULL"
diff --git a/documentation/src/main/asciidoc/topics/yaml/replicated_cache.yaml b/documentation/src/main/asciidoc/topics/yaml/replicated_cache.yaml
index 87ad4948286f..627f317a218d 100644
--- a/documentation/src/main/asciidoc/topics/yaml/replicated_cache.yaml
+++ b/documentation/src/main/asciidoc/topics/yaml/replicated_cache.yaml
@@ -20,6 +20,8 @@ replicatedCache:
storage: "local-heap"
indexReader:
refreshInterval: "1000"
+ indexedEntities:
+ - "org.infinispan.Person"
partitionHandling:
whenSplit: "ALLOW_READ_WRITES"
mergePolicy: "PREFERRED_NON_NULL"