You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by km...@apache.org on 2017/03/13 15:53:54 UTC
geode-native git commit: GEODE-2513 Unbrand docs section on
Preserving Data
Repository: geode-native
Updated Branches:
refs/heads/develop 783654952 -> 8ddafe94e
GEODE-2513 Unbrand docs section on Preserving Data
- Remove references to GemFire
- Fix typos
- Clarify links that leave the native-manual
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/8ddafe94
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/8ddafe94
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/8ddafe94
Branch: refs/heads/develop
Commit: 8ddafe94ee758750206b1083d7a01f722cf93dea
Parents: 7836549
Author: Karen Miller <km...@pivotal.io>
Authored: Wed Mar 8 12:11:02 2017 -0800
Committer: Karen Miller <km...@pivotal.io>
Committed: Mon Mar 13 08:53:46 2017 -0700
----------------------------------------------------------------------
.../master_middleman/source/subnavs/geode-nc-nav.erb | 4 ++--
.../about_native_client_users_guide.html.md.erb | 2 +-
.../preserving-data/client-side-config.html.md.erb | 6 +++---
.../config-durable-reconnect.html.md.erb | 4 ++--
.../preserving-data/configuring-durable-nc.html.md.erb | 12 ++++++------
.../preserving-data/configuring-nc-ha.html.md.erb | 7 +++----
.../disconnecting-from-server.html.md.erb | 2 --
.../preserving-data/disconnection.html.md.erb | 2 +-
.../durable-client-messaging-req.html.md.erb | 4 ++--
.../high-availability-client-server.html.md.erb | 11 ++++-------
.../preserving-data/preserving-data.html.md.erb | 10 +++++-----
.../sending-cache-ready-message.html.md.erb | 4 ++--
.../preserving-data/using-queue-conflation.html.md.erb | 6 +++---
13 files changed, 34 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb b/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
index 495dc2a..ef131ca 100644
--- a/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
+++ b/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
@@ -503,7 +503,7 @@ limitations under the License.
<a href="/docs/guide-native/11/preserving-data/high-availability-client-server.html">High Availability for Client-Server Communication</a>
<ul>
<li>
- <a href="/docs/guide-native/11/preserving-data/configuring-nc-ha.html">Configuring Native Clients for High Availability</a>
+ <a href="/docs/guide-native/11/preserving-data/configuring-nc-ha.html">Configuring Clients for High Availability</a>
</li>
<li>
<a href="/docs/guide-native/11/preserving-data/sending-periodic-ack.html">Sending Periodic Acknowledgment</a>
@@ -523,7 +523,7 @@ limitations under the License.
<a href="/docs/guide-native/11/preserving-data/client-side-config.html">Client-Side Configuration</a>
<ul>
<li>
- <a href="/docs/guide-native/11/preserving-data/configuring-durable-nc.html">Configuring a Durable Native Client</a>
+ <a href="/docs/guide-native/11/preserving-data/configuring-durable-nc.html">Configuring a Durable Client</a>
</li>
<li>
<a href="/docs/guide-native/11/preserving-data/config-durable-interest-keys.html">Configuring Durable Interest in Keys</a>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/about_native_client_users_guide.html.md.erb b/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
index 4526a9f..b83ee7a 100644
--- a/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
+++ b/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
@@ -51,7 +51,7 @@ This documentation provides step-by-step procedures for installation, configurat
- **[Preserving Data](preserving-data/preserving-data.html)**
- A server may preserve the data queued and intended to be sent to a native client, such that the data is not discarded if communication between the server and native client is disrupted. Preservation prevents message loss, which can cause a native client to have inconsistent data. Redundant queues and a high availability server implementation may further ensure that queued data is not lost.
+ A server may preserve the data queued and intended to be sent to a client, such that the data is not discarded if communication between the server and client is disrupted. Preservation prevents message loss, which can cause a client to have inconsistent data. Redundant queues and a high availability server implementation may further ensure that queued data is not lost.
- **[Security](security/overviewsecurity.html)**
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/preserving-data/client-side-config.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/client-side-config.html.md.erb b/docs/geode-native-docs/preserving-data/client-side-config.html.md.erb
index cbde881..8617efd 100644
--- a/docs/geode-native-docs/preserving-data/client-side-config.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/client-side-config.html.md.erb
@@ -21,9 +21,9 @@ limitations under the License.
All durable messaging configurations are performed on the client.
-- **[Configuring a Durable Native Client](configuring-durable-nc.html)**
+- **[Configuring a Durable Client](configuring-durable-nc.html)**
- The durable native client can be configured in the `gfcpp.properties` file, or in the `CacheFactory::set(name, value)` call.
+ The durable client can be configured in the `gfcpp.properties` file, or in the `CacheFactory::set(name, value)` call.
- **[Configuring Durable Interest in Keys](config-durable-interest-keys.html)**
@@ -31,6 +31,6 @@ All durable messaging configurations are performed on the client.
- **[Configuring Durable Client Reconnection](config-durable-reconnect.html)**
- You can configure the durable native client to obtain an approximate count of pending events upon durable client reconnection. Based on the returned number, you can determine whether to proceed and receive the pending events or to close the cache.
+ You can configure the durable client to obtain an approximate count of pending events upon durable client reconnection. Based on the returned number, you can determine whether to proceed and receive the pending events or to close the cache.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/preserving-data/config-durable-reconnect.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/config-durable-reconnect.html.md.erb b/docs/geode-native-docs/preserving-data/config-durable-reconnect.html.md.erb
index b179c44..2f6815e 100644
--- a/docs/geode-native-docs/preserving-data/config-durable-reconnect.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/config-durable-reconnect.html.md.erb
@@ -19,9 +19,9 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-You can configure the durable native client to obtain an approximate count of pending events upon durable client reconnection. Based on the returned number, you can determine whether to proceed and receive the pending events or to close the cache.
+You can configure a durable client to obtain an approximate count of pending events upon durable client reconnection. Based on the returned number, you can determine whether to proceed and receive the pending events or to close the cache.
-Use the `getPendingEventCount` (C++ API) and the `PendingEventCount` (C\# .NET API) property to detect whether the previously registered subscription queue is available upon durable client reconnection and the count of pending events in the queue. Based on the returned results, you can then decide whether to receive the remaining events or close the cache if the number is too large.
+Use the `getPendingEventCount` (C++ API) and the `PendingEventCount` (.NET API) property to detect whether the previously registered subscription queue is available upon durable client reconnection and the count of pending events in the queue. Based on the returned results, you can then decide whether to receive the remaining events or close the cache if the number is too large.
For example, consider this code fragment for a client with only the default pool created:
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/preserving-data/configuring-durable-nc.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/configuring-durable-nc.html.md.erb b/docs/geode-native-docs/preserving-data/configuring-durable-nc.html.md.erb
index 3f42c36..a39897c 100644
--- a/docs/geode-native-docs/preserving-data/configuring-durable-nc.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/configuring-durable-nc.html.md.erb
@@ -1,5 +1,5 @@
---
-title: Configuring a Durable Native Client
+title: Configuring a Durable Client
---
<!--
@@ -19,19 +19,19 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The durable native client can be configured in the `gfcpp.properties` file, or in the `CacheFactory::set(name, value)` call.
+The durable client can be configured in the `gfcpp.properties` file, or in the `CacheFactory::set(name, value)` call.
-- **Durable client ID**\u2014You indicate that the client is durable by giving it a `durable-client-ID`. The servers use this ID to identify the client. For a non-durable client, the `durable-client-ID` is an empty string. The ID can be any number that is unique among the clients attached to servers in the same distributed system.
+- **Durable client ID**\u2014Indicate that the client is durable by giving it a `durable-client-ID`. The servers use this ID to identify the client. For a non-durable client, the `durable-client-ID` is an empty string. The ID can be any number that is unique among the clients attached to servers in the same distributed system.
- **Durable timeout**\u2014The `durable-timeout` setting specifies how long this client\u2019s servers should wait after the client disconnects before terminating its message queue. During that time, the servers consider the client alive and continue to accumulate messages for it. The default is 300 seconds.
The `durable-timeout` setting is a tuning parameter. When setting the timeout, take into account the normal activity of your application, the average size of your messages, and the level of risk you can handle. Assuming that no messages are being removed from the queue, how long can the application run before the queue reaches the maximum message count? In addition, how long can it run before the queued messages consume all the memory on the client host? How serious is each of those failures to your operation?
-To assist with tuning, Geode provides statistics that track message queues for durable clients through the disconnect and reconnect cycles. For statistics documentation, see [Statistics](geodeman/managing/statistics/chapter_overview.html).
+To assist with tuning, Geode statistics track message queues for durable clients through the disconnect and reconnect cycles.
-When the queue is full, it blocks further operations that add messages until the queue size drops to an acceptable level. The action to take is specified on the server. For details on configuring the queue, see [Implementing Durable Client/Server Messaging](geodeman/developing/events/implementing_durable_client_server_messaging.html).
+When the queue is full, it blocks further operations that add messages until the queue size drops to an acceptable level. Server configuration sets the action to take. See details on server configuration of the queue in the server documentation section [Implementing Durable Client/Server Messaging](geodeman/developing/events/implementing_durable_client_server_messaging.html).
-## Configuring a Durable Native Client Using gfcpp.properties
+## Configuring a Durable Client Using gfcpp.properties
The following example shows `gfcpp.properties` settings to make the client durable and set the durable timeout to 200seconds.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/preserving-data/configuring-nc-ha.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/configuring-nc-ha.html.md.erb b/docs/geode-native-docs/preserving-data/configuring-nc-ha.html.md.erb
index c6ee0eb..4eceeba 100644
--- a/docs/geode-native-docs/preserving-data/configuring-nc-ha.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/configuring-nc-ha.html.md.erb
@@ -1,5 +1,5 @@
---
-title: Configuring Native Clients for High Availability
+title: Configuring Clients for High Availability
---
<!--
@@ -19,12 +19,11 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Configure high availability by setting the pool attribute `subscription-redundancy` to the number of copies you want maintained.
+Configure high availability by setting the pool attribute `subscription-redundancy` to the number of copies to be maintained.
A client maintains its queue redundancy level at the time of a primary server failure by connecting to additional secondary servers.
-<a id="concept_7CEFF513CED14397A385ED88F3287AF1__section_BC1693F33FA1448296C00220962EDDEE"></a>
-Native clients can specify the number of secondary servers where the client registers interest and maintains subscription channels, in addition to the subscription channel with the primary server. The secondary servers maintain redundant update queues for the client. If the primary server fails, a secondary becomes a primary to provide uninterrupted messaging to the client. If possible, another secondary is then initialized so the total number of secondaries is not reduced by the failover.
+Clients can specify the number of secondary servers where the client registers interest and maintains subscription channels, in addition to the subscription channel with the primary server. The secondary servers maintain redundant update queues for the client. If the primary server fails, a secondary becomes a primary to provide uninterrupted messaging to the client. If possible, another secondary is then initialized so the total number of secondaries is not reduced by the failover.
## Setting the Server Redundancy Level in cache.xml
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/preserving-data/disconnecting-from-server.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/disconnecting-from-server.html.md.erb b/docs/geode-native-docs/preserving-data/disconnecting-from-server.html.md.erb
index 676b656..a480ca8 100644
--- a/docs/geode-native-docs/preserving-data/disconnecting-from-server.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/disconnecting-from-server.html.md.erb
@@ -25,8 +25,6 @@ For this purpose, use the version of `Cache::close` with the boolean `keepalive`
Only the resources and data related to the session are removed, such as port numbers and non-durable subscriptions. If the setting is false, the servers do the same cleanup that they would do for a nondurable client.
-## Durable Client Disconnect With Queues Maintained
-
``` pre
// Close the Cache and disconnect with keepalive=true.
// Server will queue events for durable registrations and CQs
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/preserving-data/disconnection.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/disconnection.html.md.erb b/docs/geode-native-docs/preserving-data/disconnection.html.md.erb
index 37d6b7d..be85e5a 100644
--- a/docs/geode-native-docs/preserving-data/disconnection.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/disconnection.html.md.erb
@@ -23,7 +23,7 @@ While the client and servers are disconnected, their operation varies depending
## <a id="concept_915EAD135DD942F28A38513097ACB1F1__section_6AB8F4B8993F4EF9B32A93A100F07BEC" class="no-quick-link"></a>Normal disconnect
-When a durable client disconnects normally, the `Cache.close` request states whether to maintain the client's message queue and durable subscriptions. The servers stop sending messages to the client and release its connection. See[Disconnecting From the Server](disconnecting-from-server.html#concept_3A9AC62F96FA44DBBB5CCBFD3EA19B56) for more information.
+When a durable client disconnects normally, the `Cache.close` request states whether to maintain the client's message queue and durable subscriptions. The servers stop sending messages to the client and release its connection. See [Disconnecting From the Server](disconnecting-from-server.html#concept_3A9AC62F96FA44DBBB5CCBFD3EA19B56) for more information.
If requested, the servers maintain the queues and durable interest list until the client reconnects or times out. The non-durable interest list is discarded. The servers continue to queue up incoming messages for entries on the durable interest list. All messages that were in the queue when the client disconnected remain in the queue, including messages for entries on the non-durable list.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/preserving-data/durable-client-messaging-req.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/durable-client-messaging-req.html.md.erb b/docs/geode-native-docs/preserving-data/durable-client-messaging-req.html.md.erb
index 4ce7165..a03e054 100644
--- a/docs/geode-native-docs/preserving-data/durable-client-messaging-req.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/durable-client-messaging-req.html.md.erb
@@ -21,7 +21,7 @@ limitations under the License.
The messaging queues used for durable messaging are the same regular messaging queues used for basic server-to-client messaging, with additional requirements.
-See [Implementing Durable Client/Server Messaging](geodeman/developing/events/implementing_durable_client_server_messaging.html) for requirements, options, and functionality of messaging queues. If you are using highly available servers, see [High Availability for Client-Server Communication](high-availability-client-server.html#concept_F7A143F51EEA46B28AC612DEB7849D99)for additional requirements.
+See the server documentation at [Implementing Durable Client/Server Messaging](geodeman/developing/events/implementing_durable_client_server_messaging.html) for requirements, options, and functionality of messaging queues. If you are using highly available servers, see [High Availability for Client-Server Communication](high-availability-client-server.html#concept_F7A143F51EEA46B28AC612DEB7849D99) for additional requirements.
For durable client messaging, you also need the following:
@@ -32,5 +32,5 @@ For durable client messaging, you also need the following:
- **Durable interest registration**. A durable client\u2019s interest registrations specify whether its interest in a key is durable. If it is, the servers continue queuing messages for that key while the client is disconnected.
- **Reconnection conditions.** You can program the durable client to detect whether the previously registered subscription queue is available upon reconnection and determine an approximate count of pending events in the queue. Based on the results, you can then decide whether to receive the remaining events (`Cache.readyForEvents`) or close the cache if the number is too large.
- **Cache ready message**. When it is ready to receive the stored messages, a durable client must call `Cache.readyForEvents` to send a cache ready message to the server.
-- **Disconnect keepalive specification**. When a durable client disconnects normally it must tell the server whether to maintain the message queue or delete it.
+- **Disconnect keepalive specification**. When a durable client disconnects normally, the client must tell the server whether to maintain the message queue or delete it.
- **Durable client callback method**. If you use cache listeners on the durable clients, you have the option to implement the `afterRegionLive` callback method. This callback is invoked after the durable client connects to its servers, when it has received all of its stored messages and replayed the events.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/preserving-data/high-availability-client-server.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/high-availability-client-server.html.md.erb b/docs/geode-native-docs/preserving-data/high-availability-client-server.html.md.erb
index cfc44f8..4995022 100644
--- a/docs/geode-native-docs/preserving-data/high-availability-client-server.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/high-availability-client-server.html.md.erb
@@ -19,16 +19,13 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The Geode native client provides reliable event messaging from cache server to client to prevent data loss during server failover operations. High availability is implemented in the cache server and is configured in the native client.
+The client provides reliable event messaging from cache server to client to prevent data loss during server failover operations. High availability is implemented in the cache server and is configured in the client.
-See [Configuring Highly Available Servers](geodeman/developing/events/configuring_highly_available_servers.html) for details about configuring a Java cache server for high availability.
+See server documentation at [Configuring Highly Available Servers](geodeman/developing/events/configuring_highly_available_servers.html) for details about configuring a server for high availability.
-**Note:**
-High availability functions the same whether the region is partitioned or not. See [Partitioned Regions](geodeman/developing/partitioned_regions/chapter_overview.html) for information about partitioned regions.
+- **[Configuring Clients for High Availability](configuring-nc-ha.html)**
-- **[Configuring Native Clients for High Availability](configuring-nc-ha.html)**
-
- Configure high availability by setting the pool attribute `subscription-redundancy` to the number of copies you want maintained.
+ Configure high availability by setting the pool attribute `subscription-redundancy` to the number of copies maintained.
- **[Sending Periodic Acknowledgment](sending-periodic-ack.html)**
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/preserving-data/preserving-data.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/preserving-data.html.md.erb b/docs/geode-native-docs/preserving-data/preserving-data.html.md.erb
index a45b5d2..3792eab 100644
--- a/docs/geode-native-docs/preserving-data/preserving-data.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/preserving-data.html.md.erb
@@ -19,20 +19,20 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-A server may preserve the data queued and intended to be sent to a native client, such that the data is not discarded if communication between the server and native client is disrupted. Preservation prevents message loss, which can cause a native client to have inconsistent data. Redundant queues and a high availability server implementation may further ensure that queued data is not lost.
+A server may preserve the data queued and intended to be sent to a client, such that the data is not discarded if communication between the server and client is disrupted. Preservation prevents message loss, which can cause a client to have inconsistent data. Redundant queues and a high availability server implementation may further ensure that queued data is not lost.
-There is a tradeoff between the quantity of data that a server must queue and the amount of time that the server maintains and continues to queue data intended for a native client that is not communicating with the distributed system. Client configuration specifies the amount of time that the server is to continue queueing messages. High availability permits a secondary server to assume the role of a primary server with respect to queued data in the event that the primary server no longer functions. Designation of primary and secondary servers, as well as the number of redundant copies of the queue are configurable.
+There is a tradeoff between the quantity of data that a server must queue and the amount of time that the server maintains and continues to queue data intended for a client that is not communicating with the distributed system. Client configuration specifies the amount of time that the server is to continue queueing messages. High availability permits a secondary server to assume the role of a primary server with respect to queued data in the event that the primary server no longer functions. Designation of primary and secondary servers, as well as the number of redundant copies of the queue are configurable.
- **[High Availability for Client-Server Communication](high-availability-client-server.html)**
- The Geode native client provides reliable event messaging from cache server to client to prevent data loss during server failover operations. High availability is implemented in the cache server and is configured in the native client.
+ The client provides reliable event messaging from cache server to client to prevent data loss during server failover operations. High availability is implemented in the cache server and is configured in the client.
- **[Enabling Queue Conflation to Improve Update Performance](using-queue-conflation.html)**
- Conflation of entry update messages can reduce the number of update messages a native client receives, thereby increasing performance. The native client receives only the most recent update for a particular entry key.
+ Conflation of entry update messages can reduce the number of update messages a client receives, thereby increasing performance. The client receives only the most recent update for a particular entry key.
- **[Durable Client Messaging](durable-client-messaging.html)**
- You can configure the redundancy level for client queues that are stored on cache servers. This ensures that the client will not lose messages if it loses the connection to its primary server.
+ Configure the redundancy level for client queues that are stored on cache servers. This ensures that the client will not lose messages if it loses the connection to its primary server.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/preserving-data/sending-cache-ready-message.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/sending-cache-ready-message.html.md.erb b/docs/geode-native-docs/preserving-data/sending-cache-ready-message.html.md.erb
index dae32d8..14b6e94 100644
--- a/docs/geode-native-docs/preserving-data/sending-cache-ready-message.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/sending-cache-ready-message.html.md.erb
@@ -26,8 +26,8 @@ After a durable client connects and initializes its cache, regions, cache listen
The following example shows how to call `readyForEvents`.
``` pre
-//Send ready for event message to server(only for durable clients).
-//Server will send queued events to client after receiving this.
+// Send ready for event message to server (only for durable clients).
+// Server will send queued events to client after receiving this.
cachePtr->readyForEvents();
```
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8ddafe94/docs/geode-native-docs/preserving-data/using-queue-conflation.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/using-queue-conflation.html.md.erb b/docs/geode-native-docs/preserving-data/using-queue-conflation.html.md.erb
index df678c5..a8a42cc 100644
--- a/docs/geode-native-docs/preserving-data/using-queue-conflation.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/using-queue-conflation.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Conflation of entry update messages can reduce the number of update messages a native client receives, thereby increasing performance. The native client receives only the most recent update for a particular entry key.
+Conflation of entry update messages can reduce the number of update messages a client receives, thereby increasing performance. The client receives only the most recent update for a particular entry key.
Conflation is enabled for a cache server region, so all clients receiving updates for a particular region benefit from the conflation. To enable conflation, set the cache server\u2019s `enable-subscription-conflation` region attribute to `true`. This region attribute is `false` by default.
@@ -27,11 +27,11 @@ The queue managment code conflates entry updates as part of the enqueue operatio
Only entry `update` messages in a cache server region with `distributed-no-ack` scope are conflated. Region operations and entry operations other than updates are not conflated.
-For more information, see [Conflate the Server Subscription Queue](geodeman/developing/events/conflate_server_subscription_queue.html).
+For more information, see the server documentation at [Conflate the Server Subscription Queue](geodeman/developing/events/conflate_server_subscription_queue.html).
## <a id="concept_AEFA04AF9ABD42C0A37ED31806596D24__section_BE506A32A8E44073B197B03AC5232C01" class="no-quick-link"></a>Overriding Queue Conflation Per-Client
-Override conflation on a per-client basis by setting the conflate-events property in the native client\u2019s `gfcpp.properties` file.
+Override conflation on a per-client basis by setting the conflate-events property in the client\u2019s `gfcpp.properties` file.
Valid settings are: