geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmil...@apache.org
Subject [1/3] geode-native git commit: GEODE-2513 Unbrand C++ API docs
Date Wed, 22 Mar 2017 22:31:17 GMT
Repository: geode-native
Updated Branches:
  refs/heads/develop 8805fbbea -> 43a724a4e


GEODE-2513 Unbrand C++ API docs


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/dfaf5db8
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/dfaf5db8
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/dfaf5db8

Branch: refs/heads/develop
Commit: dfaf5db8bb919d02e435934366b6b3ed61e5ab04
Parents: d480999
Author: Karen Miller <kmiller@pivotal.io>
Authored: Wed Mar 22 12:55:27 2017 -0700
Committer: Karen Miller <kmiller@pivotal.io>
Committed: Wed Mar 22 12:57:12 2017 -0700

----------------------------------------------------------------------
 .../source/subnavs/geode-nc-nav.erb             |  6 +-
 .../about_native_client_users_guide.html.md.erb |  4 +-
 .../cpp-caching-api/accessing-entry.html.md.erb |  6 +-
 .../add-entry-to-cache.html.md.erb              |  8 +--
 .../cpp-caching-api/cpp-caching-api.html.md.erb | 14 ++---
 .../cpp-caching-api/creating-cache.html.md.erb  |  2 +-
 .../creating-new-statistics.html.md.erb         |  2 +-
 .../cpp-caching-api/creating-region.html.md.erb |  2 +-
 .../cpp-caching-api/data-as-blob.html.md.erb    |  3 -
 .../cpp-caching-api/gfe-cpp-api.html.md.erb     | 16 +++---
 .../cpp-caching-api/object-graphs.html.md.erb   |  3 -
 .../pdx_auto_serialization.html.md.erb          | 58 +++++++++-----------
 .../pdx_serialization.html.md.erb               |  6 +-
 .../pdx_with_delta_propagation.html.md.erb      |  2 +-
 .../pdxserializable_interface.html.md.erb       |  5 --
 .../cpp-caching-api/removing-entry.html.md.erb  | 10 ++--
 .../serialization_options.html.md.erb           | 11 ++--
 .../serialization_overview.html.md.erb          |  8 +--
 ...serialization_using_serializable.html.md.erb | 21 +++----
 .../using-custom-class.html.md.erb              |  4 +-
 .../using_enum_type_with_pdx.html.md.erb        |  2 +-
 .../using_pdxinstancefactory.html.md.erb        |  6 +-
 22 files changed, 86 insertions(+), 113 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/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 bea210e..25cbc79 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
@@ -25,7 +25,7 @@ limitations under the License.
         </ul>
         <ul>
             <li>
-                <a href="/docs/guide-native/11/getting_started/system_requirements/gemfire_native_client_requirements.html">Supported Configurations and System Requirements</a>
+                <a href="/docs/guide-native/11/getting_started/system_requirements/client_requirements.html">Supported Configurations and System Requirements</a>
             </li>
         </ul>
         <ul>
@@ -255,10 +255,10 @@ limitations under the License.
                         </ul>
                     </li>
                     <li class="has_submenu">
-                        <a href="/docs/guide-native/11/cpp-caching-api/cpp-caching-api.html">Pivotal GemFire Native Client C++ API</a>
+                        <a href="/docs/guide-native/11/cpp-caching-api/cpp-caching-api.html">C++ Client API</a>
                         <ul>
                             <li>
-                                <a href="/docs/guide-native/11/cpp-caching-api/gfe-cpp-api.html">About the Native Client C++ API</a>
+                                <a href="/docs/guide-native/11/cpp-caching-api/gfe-cpp-api.html">About the C++ Client API</a>
                             </li>
                             <li>
                                 <a href="/docs/guide-native/11/cpp-caching-api/creating-cache.html">Creating a Cache</a>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/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 bf24acc..538c284 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
@@ -39,9 +39,9 @@ This documentation provides step-by-step procedures for installation, configurat
 
     *Configuring the Client Cache* describes the client cache functionality, initialization file, and APIs. It provides information about creating and working with caches, cache regions, and region entries.
 
--   **[Apache Geode Client C++ API](cpp-caching-api/cpp-caching-api.html)**
+-   **[C++ Client API](cpp-caching-api/cpp-caching-api.html)**
 
-    This section describes the primary classes, and usage conventions for the client C++ API. It demonstrates how to use the API to create caches and perform data serialization. The C++ API documentation is available on the [Geode website](http://geode.apache.org/docs/).
+    This section describes the primary classes, and usage conventions for the C++ client API. It demonstrates how to use the API to create caches and perform data serialization. See the [C++ API](/releases/latest/api/cppdocs) documentation for API details.
 
 -   **[Apache Geode Client .NET API](dotnet-caching-api/dotnet-caching-api.html)**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/accessing-entry.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/accessing-entry.html.md.erb b/docs/geode-native-docs/cpp-caching-api/accessing-entry.html.md.erb
index ea850fb..66f30c6 100644
--- a/docs/geode-native-docs/cpp-caching-api/accessing-entry.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/accessing-entry.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-The standard `Region::get API` method returns the value associated with the specified key, and passes the callback argument to any cache loaders or cache writers that are invoked in the operation.
+The `Region::get` method returns the value associated with the specified key, and passes the callback argument to any cache loaders or cache writers that are invoked in the operation.
 
 If the value is not present locally, it is requested from the cache server. If the cache server request is unsuccessful, a local cache loader is invoked.
 
@@ -35,11 +35,11 @@ for ( int32_t i=0; i< 100; i++) {
 
 ## <a id="concept_2B85EC4AB9FA446998147A1539D818CC__section_80F9A9E8F8514A9FBA19106C2473B370" class="no-quick-link"></a>Bulk Get Operations Using getAll
 
-You can use the `Region::getAll` API (`Region.GetAll` for .NET) to get values for an array of keys from the local cache or server. If the value for a key is not present locally, then it is requested from the server.
+You can use the `Region::getAll` methond to get values for an array of keys from the local cache or server. If the value for a key is not present locally, then it is requested from the server.
 
 **Note:**
 The value returned is not copied, so multi-threaded applications should not modify the value directly, but should instead use the update methods.
 
-The getAll API also supports providing a callback argument to any cache loaders or cache writers that are invoked in the operation. See the Region API documentation for more information about using `getAll`.
+The `getAll` method also supports providing a callback argument to any cache loaders or cache writers that are invoked in the operation.
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/add-entry-to-cache.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/add-entry-to-cache.html.md.erb b/docs/geode-native-docs/cpp-caching-api/add-entry-to-cache.html.md.erb
index cc64055..66accee 100644
--- a/docs/geode-native-docs/cpp-caching-api/add-entry-to-cache.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/add-entry-to-cache.html.md.erb
@@ -19,13 +19,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-You can populate a native client region with cache entries using the `Region::put` or the `Region::create` API functions. Code examples demonstrate these actions.
+You can populate a client region with cache entries using the `Region::put` or the `Region::create` API functions.
 
 The `put` function places a new value into a region entry with the specified key, while the `create` function creates a new entry in the region. Both functions provide a user-defined parameter object to any cache writer invoked in the process, and new values for both functions are propagated to a connected cache server.
 
 ## Adding Entries Using create
 
-When the put function adds an entry, the previous value is overwritten if there is already an entry associated with the specified key in the region. In the next example, the program uses the API to put 100 entries into the cache by iteratively creating keys and values, both of which are integers.
+When the put function adds an entry, the previous value is overwritten if there is already an entry associated with the specified key in the region. In this example, the program uses the API to put 100 entries into the cache by iteratively creating keys and values, both of which are integers.
 
 ``` pre
 for ( int32_t i=0; i < 100; i++ ) {
@@ -35,7 +35,7 @@ for ( int32_t i=0; i < 100; i++ ) {
 
 ## <a id="concept_26D4E6C6BC6F4AB8884E33119999656D__section_748916759F0246619CD27E7456DCA365" class="no-quick-link"></a>Bulk Put Operations Using putAll
 
-You can batch up multiple key/value pairs into a hashmap and put them into the cache with a single operation using the `Region::putAll` API function (`Region.PutAll` for .NET) . Each entry is processed for interest registration on the server, so each entry requires its own unique event ID. Updates and creates can be mixed in a `putAll` operation, so those events need to be addressed on the cache server for appropriate cache listener invocation on distributed system members. Map entries retain their original order when they are processed at the server.
+You can batch up multiple key/value pairs into a hashmap and put them into the cache with a single operation using the `Region::putAll` API function. Each entry is processed for interest registration on the server, so each entry requires its own unique event ID. Updates and creates can be mixed in a `putAll` operation, so those events need to be addressed on the cache server for appropriate cache listener invocation on distributed system members. Map entries retain their original order when they are processed at the server.
 
 The following table lists the client and cache server statistics for `putAll`.
 
@@ -55,6 +55,6 @@ The following table lists the client and cache server statistics for `putAll`.
 
 <span class="tablecap">**Table 1.** putAll Statistics for Cache Server and Client</span>
 
-The putAll API also supports providing a callback argument to any cache loaders or cache writers that are invoked in the operation.
+The `putAll` function also supports providing a callback argument to any cache loaders or cache writers that are invoked in the operation.
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/cpp-caching-api.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/cpp-caching-api.html.md.erb b/docs/geode-native-docs/cpp-caching-api/cpp-caching-api.html.md.erb
index f793ec5..ca478ab 100644
--- a/docs/geode-native-docs/cpp-caching-api/cpp-caching-api.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/cpp-caching-api.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  Pivotal GemFire Native Client C++ API
+title:  C++ Client API
 ---
 
 <!--
@@ -19,15 +19,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-This section describes the primary classes and usage conventions for the native client C++ API. It demonstrates how to use the API to create caches and perform data serialization.
+This section describes the primary classes and usage conventions for the C++ client API. It demonstrates how to use the API to create caches and perform data serialization.
 
-The C++ API documentation is available at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io). It provides extensive implementation details for the C++ structures and functions.
+The C++ API documentation is available at [C++ API](/releases/latest/api/cppdocs). It provides extensive implementation details for the C++ structures and functions.
 
 Several example API programs are included in the `SampleCode` directory. See [QuickStart Examples and Guide](../introduction/examples-quickstart.html#examples-quickstart).
 
--   **[About the Native Client C++ API](gfe-cpp-api.html)**
+-   **[About the C++ Client API](gfe-cpp-api.html)**
 
-    The native client C++ API allows C++ and .NET developers to programmatically create, populate, and manage a Geode distributed system. The C++ library is thread-safe, except where specified otherwise in the API documentation at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io).
+    The C++ client API allows C++ developers to programmatically create, populate, and manage a distributed system. The C++ library is thread-safe, except where specified otherwise in the API documentation.
 
 -   **[Creating a Cache](creating-cache.html)**
 
@@ -39,7 +39,7 @@ Several example API programs are included in the `SampleCode` directory. See [Qu
 
 -   **[Adding an Entry to the Cache](add-entry-to-cache.html)**
 
-    You can populate a native client region with cache entries using the `Region::put` or the `Region::create` API functions. Code examples demonstrate these actions.
+    You can populate a client region with cache entries using the `Region::put` or the `Region::create` API functions. Code examples demonstrate these actions.
 
 -   **[Accessing an Entry](accessing-entry.html)**
 
@@ -51,7 +51,7 @@ Several example API programs are included in the `SampleCode` directory. See [Qu
 
 -   **[Serializing Data](serialization_overview.html)**
 
-    All data that Geode moves out of the local cache must be serializable.
+    All data moved out of the local cache must be serializable.
 
 -   **[Implementing User-Defined Objects in Java Clients](user-defined-objects.html)**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/creating-cache.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/creating-cache.html.md.erb b/docs/geode-native-docs/cpp-caching-api/creating-cache.html.md.erb
index 250a0ad..0163714 100644
--- a/docs/geode-native-docs/cpp-caching-api/creating-cache.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/creating-cache.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-The code snippets in this section show cache creation.
+The code snippet in this section shows cache creation.
 
 When you create your cache, the system automatically connects your process to the server tier. For systems with security enabled, the credentials for a connecting client are authenticated when it creates the cache. See [Security](../security/overviewsecurity.html#security) for more information about authenticated connections.
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/creating-new-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/creating-new-statistics.html.md.erb b/docs/geode-native-docs/cpp-caching-api/creating-new-statistics.html.md.erb
index 53a2ccb..cdc1578 100644
--- a/docs/geode-native-docs/cpp-caching-api/creating-new-statistics.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/creating-new-statistics.html.md.erb
@@ -21,7 +21,7 @@ limitations under the License.
 
 This example provides a programmatic code sample for creating and registering new statistics.
 
-For information about the `gemfire_statistics` API, see [Statistics API](gfe-cpp-api.html#concept_AB12290E89CA4724AC9F51EFF7B8B8EA__section_42764C6327944514AE4A26684D7EBCB0).
+For information about the `geode_statistics` API, see [Statistics API](gfe-cpp-api.html#concept_AB12290E89CA4724AC9F51EFF7B8B8EA__section_42764C6327944514AE4A26684D7EBCB0).
 
 ## Creating New Statistics Programmatically
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/creating-region.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/creating-region.html.md.erb b/docs/geode-native-docs/cpp-caching-api/creating-region.html.md.erb
index 634a96d..050f249 100644
--- a/docs/geode-native-docs/cpp-caching-api/creating-region.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/creating-region.html.md.erb
@@ -22,7 +22,7 @@ limitations under the License.
 This section provides code examples for creating and customizing proxy client-side regions.
 
 **Note:**
-Creating a region through the native client API creates only a proxy client-side region. A corresponding region with the same name and path should also exist on the servers that have been configured for client connections and upon which the client will perform its operations.
+Creating a region through the client API creates only a proxy client-side region. A corresponding region with the same name and path should also exist on the servers that have been configured for client connections and upon which the client will perform its operations.
 
 To create a region, you create a `RegionFactory` using the `RegionShortcut` that most closely fits your region configuration. From that, create your region, customizing the settings as region attributes as needed.
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/data-as-blob.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/data-as-blob.html.md.erb b/docs/geode-native-docs/cpp-caching-api/data-as-blob.html.md.erb
index 3caaaa5..e3c45f2 100644
--- a/docs/geode-native-docs/cpp-caching-api/data-as-blob.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/data-as-blob.html.md.erb
@@ -23,6 +23,3 @@ If you have data that is best handled as a blob, such as structs that do not con
 
 `CacheableBytes` also provides direct access to the blob data. Because it is not derived from the `CacheableKey` interface, `CacheableBytes` enables you to modify data in place and then put it into the region again to distribute the change.
 
-For more information, see the API documentation for `CacheableBytes.`
-
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/gfe-cpp-api.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/gfe-cpp-api.html.md.erb b/docs/geode-native-docs/cpp-caching-api/gfe-cpp-api.html.md.erb
index db083d9..5884cf3 100644
--- a/docs/geode-native-docs/cpp-caching-api/gfe-cpp-api.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/gfe-cpp-api.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  About the Native Client C++ API
+title:  About the C++ Client API
 ---
 
 <!--
@@ -19,20 +19,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-The native client C++ API allows C++ and .NET developers to programmatically create, populate, and manage a Geode distributed system. The C++ library is thread-safe, except where specified otherwise.
+The C++ client API allows C++ developers to programmatically create, populate, and manage a distributed system. The C++ library is thread-safe, except where specified otherwise.
 
-This chapter gives a general overview of the classes in the `gemfire`, `gemfire_statistics`, and `gemfire_admin` namespaces. For complete and current information on the classes listed here, see the C++ API documentation at [http://gemfire-apis.docs.pivotal.io](http://gemfire-apis.docs.pivotal.io).
+This chapter gives a general overview of the classes in the `apache::geode::client` namespace. For complete and current information on the classes listed here, see the [C++ API](/releases/latest/api/cppdocs).
 
 ## <a id="concept_AB12290E89CA4724AC9F51EFF7B8B8EA__section_14B45E09CA014951AD38D0E051DF8727" class="no-quick-link"></a>Cache Classes
 
-The native client C++ API has the following cache classes:
+The C++ client API has the following cache classes:
 
 -   **CacheFactory**. Use this class to create and configure a `Cache` instance. If `cache.xml` is specified, the cache is created based on the declarations loaded from that file.
 -   **Cache**. Entry point to the client caching API. The cache is created by calling the `create` function of the factory class, `CacheFactory`. Regions are configured and obtained using the `Cache::createRegionFactory()` API.
 
 ## <a id="concept_AB12290E89CA4724AC9F51EFF7B8B8EA__section_9F27929D85CC4EBFB29925974776C985" class="no-quick-link"></a>Region Classes
 
-The native client C++ API has the following region classes:
+The C++ client API has the following region classes:
 
 -   **Region**. Provides functions for managing regions and cached data. Use these functions to perform the following actions:
     -   Retrieve information about the region, such as its parent region and region attribute objects.
@@ -52,7 +52,7 @@ The native client C++ API has the following region attribute classes:
 
 ## <a id="concept_AB12290E89CA4724AC9F51EFF7B8B8EA__section_658D04298E13459382D48544AF36A2FA" class="no-quick-link"></a>Application Plug-In Classes
 
-The native client C++ API has the following application plug-in classes:
+The C++ client API has the following application plug-in classes:
 
 -   **CacheLoader**. Loads data into a region on a cache miss.
 -   **CacheWriter**. Synchronously handles region and entry events before the events occur. Entry events are `create`, `update`, `invalidate`, and `destroy`. Region events are invalidate and destroy. This class has the ability to abort events.
@@ -60,14 +60,14 @@ The native client C++ API has the following application plug-in classes:
 
 ## <a id="concept_AB12290E89CA4724AC9F51EFF7B8B8EA__section_B3479F5739B048C0BD3EDA89BE0266E0" class="no-quick-link"></a>Event Handling Classes
 
-The native client C++ API has the following event handling classes:
+The C++ client API has the following event handling classes:
 
 -   **RegionEvent**. Provides information about the event, such as in what region the event originated, whether the event originated in a cache remote to the event handler, and whether the event resulted from a distributed operation.
 -   **EntryEvent**. Provides all available information for the `RegionEvent`, and provides entry-specific information such as the old and new entry values and whether the event resulted from a `load` operation.
 
 ## <a id="concept_AB12290E89CA4724AC9F51EFF7B8B8EA__section_42764C6327944514AE4A26684D7EBCB0" class="no-quick-link"></a>Statistics API
 
-The `StatisticsType` API represents a blueprint for the same type of `Statistics`. The `StatisticsType` API is a collection of `StatisticDescriptor`. Internally, each `StatisticDescriptor` describes data of each individual statistic. `StatisticsFactory` provides functionality for creating `StatisticDescriptor`, `StatisticsType`, and `Statistics`.
+The `StatisticsType` API represents a blueprint for the same type of `Statistics`. The `StatisticsType` API is a collection of `StatisticDescriptor`. Internally, each `StatisticDescriptor` describes data of each individual statistic. `StatisticsFactory` provides functionality for creating `StatisticDescriptor`, `StatisticsType`, and `Statistics` objects.
 
 -   **CacheStatistics** --This class defines common statistics functions. `Region` and `RegionEntry` both have functions that return a `CacheStatistics` object for accessing and resetting their statistics counts.
 -   **StatisticDescriptor**. An instance of this class describes a statistic whose value is updated by an application and may be archived by the native client. Each statistic has a type of either `int`, `long`, or `double`, and either a gauge or a counter. The value of a gauge can increase and decrease, and the value of a counter strictly increases. Create an instance of `StatisticDescriptor` by calling one of these `StatisticsFactory` functions: `createDoubleCounter`, `createDoubleGauge`, `createIntCounter`, `createIntGauge`, `createLongCounter`, `createLongGauge`.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/object-graphs.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/object-graphs.html.md.erb b/docs/geode-native-docs/cpp-caching-api/object-graphs.html.md.erb
index 62097df..182b72d 100644
--- a/docs/geode-native-docs/cpp-caching-api/object-graphs.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/object-graphs.html.md.erb
@@ -21,6 +21,3 @@ limitations under the License.
 
 If you have a graph of objects where each node can be serializable, the parent node can call `DataOutput::writeObject` to delegate the serialization responsibility to its child nodes. Similarly, your application can call `DataInput::readObject` to deserialize the object graph.
 
-For more information, see the API documentation for `DataOutput` and `DataInput`.
-
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/pdx_auto_serialization.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/pdx_auto_serialization.html.md.erb b/docs/geode-native-docs/cpp-caching-api/pdx_auto_serialization.html.md.erb
index ec62426..1bcd19a 100644
--- a/docs/geode-native-docs/cpp-caching-api/pdx_auto_serialization.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/pdx_auto_serialization.html.md.erb
@@ -19,18 +19,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-You can allow your native client C++ applications to automatically PDX serialize and deserialize domain objects without having to add any extra code by using the `pdxautoserializer` command line tool provided with the native client.
+You can allow your C++ client applications to automatically PDX serialize and deserialize domain objects without having to add any extra code by using the provided `pdxautoserializer` command line tool.
 
-When using the native client C++ API, you can automatically serialize and deserialize domain objects without making any code changes to those objects or having to implement a `PdxSerializer` or `PdxSerializable` interface and their related `fromData` and `toData` methods. The Geode native client includes a command-line utility, `pdxautoserializer`, that allows you to generate C++ code that will serialize your domain objects in the PDX format for you.
+When using the C++ client API, you can automatically serialize and deserialize domain objects without making any code changes to those objects or having to implement a `PdxSerializer` or `PdxSerializable` interface and their related `fromData` and `toData` methods. The `pdxautoserializer` command-line utility allows you to generate C++ code that will serialize your domain objects in the PDX format for you.
 
 ## <a id="task_czj_wnw_dl" class="no-quick-link"></a>How to Use Automatic PDX Serialization
 
-**Prerequisites:**
-
--   Understand generally how to configure the Geode cache.
-
--   Understand how PDX serialization works and how to configure your application to use PdxSerializer.
-
 The procedure below uses the following sample class:
 
 ``` pre
@@ -55,7 +49,7 @@ class PortfolioPdx
 
 For each domain class you provide, all fields are considered for serialization except those defined as static or transient and those you explicitly exclude using macros.
 
-1.  Inherit your class from `gemfire::PdxSerializable`.
+1.  Inherit your class from `apache::geode::client::PdxSerializable`.
 
     ``` pre
     class PortfolioPdx : public PdxSerializable
@@ -65,8 +59,8 @@ For each domain class you provide, all fields are considered for serialization e
 
     ``` pre
     const char* getClassName() const;
-    virtual void toData(gemfire::PdxWriterPtr pw);
-    virtual void fromData(gemfire::PdxReaderPtr pr);
+    virtual void toData(apache::geode::client::PdxWriterPtr pw);
+    virtual void fromData(apache::geode::client::PdxReaderPtr pr);
     static PdxSerializable* createDeserializable();
     ```
 
@@ -82,31 +76,31 @@ The following is an example of a generated file:
 
 ``` pre
 #include "PortfolioPdx.hpp"
-#include <gfcpp/PdxWriter.hpp>
-#include <gfcpp/PdxReader.hpp>
-#include <gfcpp/PdxAutoSerializer.hpp>
+#include <geode/PdxWriter.hpp>
+#include <geode/PdxReader.hpp>
+#include <geode/PdxAutoSerializer.hpp>
 namespace testobject
 {
-  void PortfolioPdx::toData(gemfire::PdxWriterPtr var)
+  void PortfolioPdx::toData(apache::geode::client::PdxWriterPtr var)
   {
-    gemfire::PdxAutoSerializable::writePdxObject(var, "id", id);
-    gemfire::PdxAutoSerializable::writePdxObject(var, "pkid", pkid);
-    gemfire::PdxAutoSerializable::writePdxObject(var, "position1", position1);
-    gemfire::PdxAutoSerializable::writePdxObject(var, "position2", position2);
-    gemfire::PdxAutoSerializable::writePdxObject(var, "positions", positions);
-    gemfire::PdxAutoSerializable::writePdxObject(var, "status", status);
-    gemfire::PdxAutoSerializable::writePdxObject(var, "creationDate", creationDate);
+    apache::geode::client::PdxAutoSerializable::writePdxObject(var, "id", id);
+    apache::geode::client::PdxAutoSerializable::writePdxObject(var, "pkid", pkid);
+    apache::geode::client::PdxAutoSerializable::writePdxObject(var, "position1", position1);
+    apache::geode::client::PdxAutoSerializable::writePdxObject(var, "position2", position2);
+    apache::geode::client::PdxAutoSerializable::writePdxObject(var, "positions", positions);
+    apache::geode::client::PdxAutoSerializable::writePdxObject(var, "status", status);
+    apache::geode::client::PdxAutoSerializable::writePdxObject(var, "creationDate", creationDate);
   }
 
   void PortfolioPdx::fromData(PdxReaderPtr var)
   {
-    gemfire::PdxAutoSerializable::readPdxObject(var, "id", id);
-    gemfire::PdxAutoSerializable::readPdxObject(var, "pkid", pkid);
-    gemfire::PdxAutoSerializable::readPdxObject(var, "position1", position1);
-    gemfire::PdxAutoSerializable::readPdxObject(var, "position2", position2);
-    gemfire::PdxAutoSerializable::readPdxObject(var, "positions", positions);
-    gemfire::PdxAutoSerializable::readPdxObject(var, "status", status);
-    gemfire::PdxAutoSerializable::readPdxObject(var, "creationDate", creationDate);
+    apache::geode::client::PdxAutoSerializable::readPdxObject(var, "id", id);
+    apache::geode::client::PdxAutoSerializable::readPdxObject(var, "pkid", pkid);
+    apache::geode::client::PdxAutoSerializable::readPdxObject(var, "position1", position1);
+    apache::geode::client::PdxAutoSerializable::readPdxObject(var, "position2", position2);
+    apache::geode::client::PdxAutoSerializable::readPdxObject(var, "positions", positions);
+    apache::geode::client::PdxAutoSerializable::readPdxObject(var, "status", status);
+    apache::geode::client::PdxAutoSerializable::readPdxObject(var, "creationDate", creationDate);
   }
   
   const char* PortfolioPdx::getClassName()  const
@@ -240,7 +234,7 @@ Currently, the `pdxautoserializer` tool will fail to recognize `TESTOBJECT_EXPOR
 #define TESTOBJECT_EXPORT
 #endif
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 #define GFIGNORE(X) X
 #define GFID
@@ -253,7 +247,7 @@ namespace PdxAutoTests {
 
 The `pdxautoserializer` tool takes classes as input and generates code that will serialize the class into the PDX format for you.
 
-The `pdxautoserializer` tool is located in `$GFCPP/bin` where `$GFCPP` corresponds to the installation location of the native client.
+The `pdxautoserializer` tool is located in `$GEODE/bin` where `$GEODE` corresponds to the installation location of the client.
 
 Some additional notes about using the `pdxautoserializer` tool:
 
@@ -337,7 +331,7 @@ pdxautoserializer --outDir=<outDir> --className=CharTypes --suffix="generated"
 
 ``` pre
 CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
-    // Create a GemFire Cache with the "clientPdxRemoteQuery.xml" Cache XML file.
+    // Create a cache with the "clientPdxRemoteQuery.xml" Cache XML file.
     CachePtr cachePtr = cacheFactory->set("cache-xml-file", "XMLs\\clientPdxRemoteQuery.xml")
                         ->create();
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/pdx_serialization.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/pdx_serialization.html.md.erb b/docs/geode-native-docs/cpp-caching-api/pdx_serialization.html.md.erb
index 51f43ae..58c0a3a 100644
--- a/docs/geode-native-docs/cpp-caching-api/pdx_serialization.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/pdx_serialization.html.md.erb
@@ -19,11 +19,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-PDX is a cross-language data format that can reduce the cost of distributing and serializing your objects. PDX stores data in named fields that you can access individually to avoid the cost of deserializing the entire data object. When you use PDX serialization with the native client C++ API, you can register a `PdxSerializer` for the entire cache, implement PDX serialization for each domain object or use automatic PDX serialization by running the `pdxautoserializer` tool.
+PDX is a cross-language data format that can reduce the cost of distributing and serializing your objects. PDX stores data in named fields that you can access individually to avoid the cost of deserializing the entire data object. When you use PDX serialization with the C++ client API, you can register a `PdxSerializer` for the entire cache, implement PDX serialization for each domain object or use automatic PDX serialization by running the `pdxautoserializer` tool.
 
 You can also set the object preference of the cache to the `PdxInstance` type, which allows you to access fields of a PDX object without deserializing the entire object.
 
-When using the native client C++ API, you can opt to use PDX autoserialization. The Geode native client provides a command line tool called `pdxautoserializer` that will automatically generate C++ code to PDX serialize the class you want to serialize.
+When using the C++ client API, you can opt to use PDX autoserialization. The command line tool `pdxautoserializer` will automatically generate C++ code to PDX serialize the class you want to serialize.
 
 -   **[Serialize Your Domain Objects with PdxSerializer and PdxWrapper](using_pdxserializer.html)**
 
@@ -35,7 +35,7 @@ When using the native client C++ API, you can opt to use PDX autoserialization.
 
 -   **[Using Automatic PDX Serialization](pdx_auto_serialization.html)**
 
-    You can allow your native client C++ applications to automatically PDX serialize and deserialize domain objects without having to add any extra code by using the `pdxautoserializer` command line tool provided with the native client.
+    You can allow your C++ client applications to automatically PDX serialize and deserialize domain objects without having to add any extra code by using the `pdxautoserializer` command line tool.
 
 -   **[Programming Your Application to Use PdxInstances](using_pdxinstance.html)**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/pdx_with_delta_propagation.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/pdx_with_delta_propagation.html.md.erb b/docs/geode-native-docs/cpp-caching-api/pdx_with_delta_propagation.html.md.erb
index 5a3b19d..4f9bbf4 100644
--- a/docs/geode-native-docs/cpp-caching-api/pdx_with_delta_propagation.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/pdx_with_delta_propagation.html.md.erb
@@ -21,7 +21,7 @@ limitations under the License.
 
 <a id="concept_F33AC930A8F14F0A9EE07AC31FFD8C8F__section_6C08121D7A034993A7422985FBC9A0D9"></a>
 You can include delta propagation support with PDX serialization by implementing the `Delta` interface methods. 
-However, using delta propagation with PDX will requires that you implement Java side classes. The objects will remain in deserialized form at all times on the server and you will lose one of the main benefits of PDX.
+However, using delta propagation with PDX will require that you implement Java side classes. The objects will remain in deserialized form at all times on the server and you will lose one of the main benefits of PDX.
 
 In addition, you must set `read-serialized` to `false`. Otherwise, Java objects will be deserialized to instances of `PdxInstance`, which never implements deltas.
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/pdxserializable_interface.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/pdxserializable_interface.html.md.erb b/docs/geode-native-docs/cpp-caching-api/pdxserializable_interface.html.md.erb
index 2299982..72dfbbf 100644
--- a/docs/geode-native-docs/cpp-caching-api/pdxserializable_interface.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/pdxserializable_interface.html.md.erb
@@ -110,8 +110,3 @@ CacheableStringPtr PdxObject::toString() const {
 }
 ```
 
--   **[Performing put, get, and localDestroy Operations with a PDX Domain Object](performing_ops_with_pdx_object.html)**
-
-    This topic demonstrates how you can perform operations on a PDX domain object after you have implemented PDX serializable in your domain class.
-
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/removing-entry.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/removing-entry.html.md.erb b/docs/geode-native-docs/cpp-caching-api/removing-entry.html.md.erb
index 1a48a2a..975e9b9 100644
--- a/docs/geode-native-docs/cpp-caching-api/removing-entry.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/removing-entry.html.md.erb
@@ -19,18 +19,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-The standard `Region::remove` API removes the entry with specified key and provides a user-defined parameter object to any `CacheWriter` or `CacheListener` invoked in the process.
+The `Region::remove` function removes the entry with specified key and provides a user-defined parameter object to any `CacheWriter` or `CacheListener` invoked in the process.
 
-The `remove` call not only removes the value, but also the key and entry from this region. The remove operation is propagated to the Geode cache server to which the native client is connected. If the destroy operation fails due to an exception on the server (for example, a `CacheServerException` or security exception), then the local entry is still removed.
+The `remove` call not only removes the value, but also the key and entry from this region. The remove operation is propagated to the server to which the client is connected. If the destroy operation fails due to an exception on the server (for example, a `CacheServerException` or security exception), then the local entry is still removed.
 
 The `remove` operation updates `CacheStatistics::getLastAccessedTime` and `CacheStatistics::getLastModifiedTime` for this region and the entry.
 
-The `remove` API returns true if the entry (key, value) has been removed or false if the entry (key, value) has not been removed.
+The `remove` function returns true if the entry (key, value) has been removed or false if the entry (key, value) has not been removed.
 
 ## Bulk Remove Operations Using removeAll
 
-You can use the `Region::removeAll` API to remove all entries from the region for a collection of specified keys. The effect of this call is equivalent to that of calling `destroy` on this region once for each key in the specified collection. If an entry does not exist, then that key is skipped. Note that an `EntryNotFoundException` is not thrown.
+You can use the `Region::removeAll` function to remove all entries from the region for a collection of specified keys. The effect of this call is equivalent to that of calling `destroy` on this region once for each key in the specified collection. If an entry does not exist, then that key is skipped. Note that an `EntryNotFoundException` is not thrown.
 
-The `removeAll` API also supports providing a callback argument to any cache loaders or cache writers that are invoked in the operation. See the Region API documentation for more information about using `removeAll`.
+The `removeAll` function also supports providing a callback argument to any cache loaders or cache writers that are invoked in the operation.
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/serialization_options.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/serialization_options.html.md.erb b/docs/geode-native-docs/cpp-caching-api/serialization_options.html.md.erb
index c07db02..9b4d546 100644
--- a/docs/geode-native-docs/cpp-caching-api/serialization_options.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/serialization_options.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-The native client C++ API gives you two serialization options: the `GemFire::Serializable` interface and GemFire PDX serialization.
+The C++ client API gives two serialization options: the `apache::geode::client::Serializable` interface and Geode PDX serialization.
 
 Geode Portable Data eXchange (PDX) serialization is the recommended option. PDX serialization provides portability for PDX serializable objects so that clients can share data with Java servers and other non-C++ clients. PDX is a cross-language data format that can reduce the cost of distributing and serializing your objects. PDX stores data in named fields that you can access individually in order to avoid the cost of deserializing the entire data object. PDX also allows you to mix versions of objects where you have added or removed fields.
 
@@ -29,7 +29,7 @@ When using PDX serialization, you can use either `PdxSerializer` (for all your d
 
 `PdxSerializable` is used when the domain class that a user wants to serialize/deserialize is inherited from the `PdxSerializable` interface, and the user has registered the domain class using the `registerPdxType(domainClass)` API.
 
-The non-PDX serialization option is to use the `GemFire::Serializable` interface. The `GemFire::Serializable` interface can be a good option performance-wise if the size of your objects is small. The `GemFire::Serializable` is used whenever a user domain class is not inherited by `PdxSerializable` but the user has registered his or her class with the `registerType` API. See [Serializing Data with the Serializable Interface](serialization_using_serializable.html#concept_696AB5206C3E45898CC1A24CDD93D003) for more information.
+The non-PDX serialization option is to use the `apache::geode::client::Serializable` interface. This `Serializable` interface can be a good option performance-wise if the size of your objects is small. `Serializable` is used whenever a user domain class is not inherited by `PdxSerializable`, but the user has registered the class with the `registerType` API. See [Serializing Data with the Serializable Interface](serialization_using_serializable.html#concept_696AB5206C3E45898CC1A24CDD93D003) for more information.
 
 <a id="concept_7B6F272ACEA14753A723CB73B858ADBE__table_D61A94C4BFBE4712835F632F30BB488E"></a>
 
@@ -43,8 +43,8 @@ The non-PDX serialization option is to use the `GemFire::Serializable` interface
 <thead>
 <tr class="header">
 <th>Capability</th>
-<th>GemFire::Serializable</th>
-<th>GemFire::PdxSerializable</th>
+<th>Serializable</th>
+<th>PdxSerializable</th>
 </tr>
 </thead>
 <tbody>
@@ -77,6 +77,3 @@ The non-PDX serialization option is to use the `GemFire::Serializable` interface
 
 \*\* See [Using PDX Serialization with Delta Propagation](pdx_with_delta_propagation.html#concept_F33AC930A8F14F0A9EE07AC31FFD8C8F) for requirements.
 
-For detailed information on the interfaces, see the API documentation.
-
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/serialization_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/serialization_overview.html.md.erb b/docs/geode-native-docs/cpp-caching-api/serialization_overview.html.md.erb
index 917e36a..e8fc4ca 100644
--- a/docs/geode-native-docs/cpp-caching-api/serialization_overview.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/serialization_overview.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-All data that Geode moves out of the local cache must be serializable.
+All data moving out of the client cache must be serializable.
 
 -   **[Region Data Requiring Serialization](region_data_requiring_serialization.html)**
 
@@ -27,15 +27,15 @@ All data that Geode moves out of the local cache must be serializable.
 
 -   **[Data Serialization Options](serialization_options.html)**
 
-    The native client C++ API gives you two serialization options: the `GemFire::Serializable` interface and GemFire PDX serialization.
+    The C++ client API provides two serialization options: the `apache::geode::client::Serializable` interface and Geode PDX serialization.
 
 -   **[Serializing Data with PDX Serialization](pdx_serialization.html)**
 
-    PDX is a cross-language data format that can reduce the cost of distributing and serializing your objects. PDX stores data in named fields that you can access individually to avoid the cost of deserializing the entire data object. When you use PDX serialization with the native client C++ API, you can register a PdxSerializer for the entire cache, implement PDX serialization for each domain object or use automatic PDX serialization by running the `pdxautoserializer` tool.
+    PDX is a cross-language data format that can reduce the cost of distributing and serializing your objects. PDX stores data in named fields that you can access individually to avoid the cost of deserializing the entire data object. When you use PDX serialization with a C++ client, you can register a PdxSerializer for the entire cache, implement PDX serialization for each domain object or use automatic PDX serialization by running the `pdxautoserializer` tool.
 
 -   **[Serializing Data with the Serializable Interface](serialization_using_serializable.html)**
 
-    The native client C++ API provides a `Serializable` interface that you can use for fast and compact data serialization. This section discusses the Geode serializable interface, and presents implementation examples.
+    The C++ client API provides a `Serializable` interface that you can use for fast and compact data serialization. This section discusses the Geode serializable interface, and presents implementation examples.
 
 -   **[Serializing Object Graphs](object-graphs.html)**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/serialization_using_serializable.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/serialization_using_serializable.html.md.erb b/docs/geode-native-docs/cpp-caching-api/serialization_using_serializable.html.md.erb
index 24e5124..9b95e77 100644
--- a/docs/geode-native-docs/cpp-caching-api/serialization_using_serializable.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/serialization_using_serializable.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-The native client C++ API provides a `Serializable` interface that you can use for fast and compact data serialization. This section discusses the Geode serializable interface, and presents implementation examples.
+The C++ client API provides a `Serializable` interface that you can use for fast and compact data serialization. This section discusses the Geode serializable interface, and presents implementation examples.
 
 ## <a id="concept_696AB5206C3E45898CC1A24CDD93D003__section_8143F965A8C6495E8AB104FD36DA366A" class="no-quick-link"></a>How Serialization Works
 
@@ -48,11 +48,7 @@ To store your own data types in the cache, you need to derive a new subclass fro
 
     The `toData` function is responsible for copying all of the object’s data fields to the object stream.
 
-    The `DataOutput` class represents the output stream and provides methods for writing the primitives in a network byte order. For more about this, see the API documentation for `DataOutput` .
-
-    The `toData` function is responsible for copying all of the object’s data fields to the object stream.
-
-    The `DataOutput` class represents the output stream and provides methods for writing the primitives in a network byte order. For more about this, see the API documentation for `DataOutput` .
+    The `DataOutput` class represents the output stream and provides methods for writing the primitives in a network byte order.
 
 2.  Write a `fromData` function that consumes a data input stream and repopulates the object’s data fields.
 
@@ -60,11 +56,11 @@ To store your own data types in the cache, you need to derive a new subclass fro
     void fromData (DataInput& input)
     ```
 
-    The `DataInput` class represents the input stream and provides methods for reading input elements. The `fromData` function must read the elements of the input stream in the same order that they were written by `toData` . For more about this, see the API documentation for `DataInput`.
+    The `DataInput` class represents the input stream and provides methods for reading input elements. The `fromData` function must read the elements of the input stream in the same order that they were written by `toData`.
 
 ## Example 1. The Simple Class BankAccount
 
-This example demonstrates a simple `BankAccount` class that encapsulates two `ints`: `ownerId` and `accountId`:
+This example demonstrates a simple `BankAccount` class that encapsulates two `ints`, `ownerId` and `accountId`:
 
 ``` pre
 class BankAccount
@@ -157,7 +153,7 @@ Serializable* fromData( DataInput& input )
 
 ## <a id="concept_696AB5206C3E45898CC1A24CDD93D003__section_108942E549CE4DE68FF3956712DEC7AF" class="no-quick-link"></a>Registering the Type
 
-To be able to use the `BankAccount` type, you must register it with the type system so that when an incoming stream contains a `BankAccount` , it can be manufactured from the associated `TypeFactoryMethod`.
+To be able to use the `BankAccount` type, you must register it with the type system so that when an incoming stream contains a `BankAccount`, it can be manufactured from the associated `TypeFactoryMethod`.
 
 ``` pre
 Serializable::registerType( BankAccount::createInstance );
@@ -172,7 +168,7 @@ Type IDs must be unique to only one class.
 
 If your application uses key types that are too complex to easily force into `CacheableString`, you can likely improve performance by deriving a new class from `CacheableKey`. If you have hybrid data types you can implement your own derivation of `CacheableKey` that encapsulates the data type.
 
-See [Serialization in Native Client Mode with a Java Server](serialization_using_serializable.html#concept_696AB5206C3E45898CC1A24CDD93D003__section_AFB685227E4048BF9FB4FD7C55AED274) for information about implementing key types for a native client that is used with a Java cache server.
+See below for information about implementing key types for a client that is used with a Java cache server.
 
 To extend a `Serializable` class to be a `CacheableKey`, you need to modify the class definition as follows:
 
@@ -180,8 +176,6 @@ To extend a `Serializable` class to be a `CacheableKey`, you need to modify the
 
 -   Implement `operator==` and `hashcode` functions.
 
-The next example demonstrates how to extend a `serializable` class to be a cacheable key.
-
 ## Example 3. Extending a Serializable Class To Be a CacheableKey
 
 This example shows how to extend a serializable class to be a cacheable key.
@@ -258,6 +252,5 @@ virtual uint32_t objectSize() const
 
 ## <a id="concept_696AB5206C3E45898CC1A24CDD93D003__section_AFB685227E4048BF9FB4FD7C55AED274" class="no-quick-link"></a>Serialization in Native Client Mode with a Java Server
 
-Primitive object types supported in all languages (`CacheableInt32`, `CacheableString`, `CacheableBytes`) function without requiring custom definitions with the Java cache server. For the keys, the Java cache server has to deserialize them and locate the hashcode to be able to insert the internal maps. Because of this, key types for C++ and .NET native clients used with a Java server are required to be registered on the Java server, but the value types do not need to be registered. This needs to be done even if there are no Java clients. The Java serializable type should have the same `classId` as the .NET class, and it should serialize and deserialize the type in the same manner as the .NET implementation.
+Primitive object types supported in all languages (`CacheableInt32`, `CacheableString`, `CacheableBytes`) function without requiring custom definitions with the Java cache server. For the keys, the Java cache server has to deserialize them and locate the hashcode to be able to insert the internal maps. Because of this, key types for C++ clients used with a Java server are required to be registered on the Java server, but the value types do not need to be registered. This needs to be done even if there are no Java clients.
 
-See [Data Serialization](../dotnet-caching-api/dotnet-data-serialization.html#concept_28A7797A0342447ABF6A5014E0DCB05F) for more information about .NET data serialization.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/using-custom-class.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/using-custom-class.html.md.erb b/docs/geode-native-docs/cpp-caching-api/using-custom-class.html.md.erb
index 3c59ef0..8dc3aed 100644
--- a/docs/geode-native-docs/cpp-caching-api/using-custom-class.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/using-custom-class.html.md.erb
@@ -26,10 +26,10 @@ The example takes you through these basic operations: registering, creating a ca
 ## Using a BankAccount Object
 
 ``` pre
-#include <gfcpp/GemfireCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "BankAccount.hpp"
 #include "AccountHistory.hpp"
-using namespace gemfire;
+using namespace apache::geode::client;
 /*
 This example connects, registers types, creates the cache, creates a
 region, and then puts and gets user defined type BankAccount.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/using_enum_type_with_pdx.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/using_enum_type_with_pdx.html.md.erb b/docs/geode-native-docs/cpp-caching-api/using_enum_type_with_pdx.html.md.erb
index d51668e..b8d520e 100644
--- a/docs/geode-native-docs/cpp-caching-api/using_enum_type_with_pdx.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/using_enum_type_with_pdx.html.md.erb
@@ -112,7 +112,7 @@ LOG( "pdxPut 3 completed " );
 try {
     Serializable::registerPdxType(PdxEnumTestClass::createDeserializable);
     LOG("PdxEnumTestClass Registered Successfully....");
-} catch (gemfire::IllegalStateException&/* ex*/) {
+} catch (geode::IllegalStateException&/* ex*/) {
     LOG("PdxEnumTestClass IllegalStateException");
 }
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/dfaf5db8/docs/geode-native-docs/cpp-caching-api/using_pdxinstancefactory.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/using_pdxinstancefactory.html.md.erb b/docs/geode-native-docs/cpp-caching-api/using_pdxinstancefactory.html.md.erb
index cc70be0..940f67a 100644
--- a/docs/geode-native-docs/cpp-caching-api/using_pdxinstancefactory.html.md.erb
+++ b/docs/geode-native-docs/cpp-caching-api/using_pdxinstancefactory.html.md.erb
@@ -69,7 +69,7 @@ int main(int argc, char ** argv)
     CachePtr cachePtr = cacheFactory->set("cache-xml-file", 
                 "XMLs/clientPdxInstance.xml")->create();          
 
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Region from the Cache which is declared in the 
     // Cache XML file.
@@ -124,9 +124,9 @@ int main(int argc, char ** argv)
 
   }
   // An exception should not occur
-  catch(const Exception & gemfireExcp)
+  catch(const Exception & geodeExcp)
   {    
-    LOGERROR("PdxInstance Exception: %s", gemfireExcp.getMessage());
+    LOGERROR("PdxInstance Exception: %s", geodeExcp.getMessage());
   }
 }
 ```


Mime
View raw message