You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by db...@apache.org on 2017/04/04 16:26:32 UTC
[1/7] geode-native git commit: GEODE-2513: Rename and reorganize
client doc sources This closes #85
Repository: geode-native
Updated Branches:
refs/heads/develop 25a99fb70 -> 1dbe9e611
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/type_mappings/cpp-class-to-dotnet-class-mappings.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/type_mappings/cpp-class-to-dotnet-class-mappings.html.md.erb b/docs/geode-native-docs/type_mappings/cpp-class-to-dotnet-class-mappings.html.md.erb
deleted file mode 100644
index cc843c0..0000000
--- a/docs/geode-native-docs/type_mappings/cpp-class-to-dotnet-class-mappings.html.md.erb
+++ /dev/null
@@ -1,180 +0,0 @@
----
-title: C++ Class to .NET Class Mappings
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Wherever the native C++ class methods use pass-by-reference semantics to return data, the corresponding .NET methods shown in the following table return the object instead of using pass-by-reference semantics.
-
-<a id="concept_FD847E19497C4985ACB247C0FA2C2AD5__table_8D8D228E223E4E89A313A17DB5C38652"></a>
-
-<table>
-<colgroup>
-<col width="50%" />
-<col width="50%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th><p>C++ Class</p></th>
-<th><p>.NET Class</p></th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td>class <code class="ph codeph">apache::geode::client::AttributesFactory</code></td>
-<td>Sealed class <code class="ph codeph">AttributesFactory</code></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::AttributesMutator</code></p></td>
-<td>Sealed class <code class="ph codeph">AttributesMutator</code></td>
-</tr>
-<tr class="odd">
-<td>class <code class="ph codeph">apache::geode::client::Cache</code></td>
-<td>Sealed class <code class="ph codeph">Cache</code></td>
-</tr>
-<tr class="even">
-<td><p>abstract class <code class="ph codeph">apache::geode::client::Cacheable</code></p></td>
-<td><p>Interface <code class="ph codeph">IPdxSerializable</code> or interface <code class="ph codeph">IGeodeSerializable</code></p></td>
-</tr>
-<tr class="odd">
-<td><p>class <code class="ph codeph">apache::geode::client::CacheableBytes</code></p></td>
-<td><p><code class="ph codeph">Byte[]</code> or <code class="ph codeph">ArrayList<Byte></code></p></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::Cacheableint32</code></p></td>
-<td><p><code class="ph codeph">Int32</code></p></td>
-</tr>
-<tr class="odd">
-<td><p>class <code class="ph codeph">apache::geode::client::CacheableString</code></p></td>
-<td><p><code class="ph codeph">String</code></p></td>
-</tr>
-<tr class="even">
-<td><p>abstract class <code class="ph codeph">apache::geode::client::CacheableKey</code></p></td>
-<td><p>You can use any type that implements <code class="ph codeph">hashcode</code> and <code class="ph codeph">equals</code>. The generic .NET built-in types are all suitable.</p></td>
-</tr>
-<tr class="odd">
-<td><p>abstract class <code class="ph codeph">apache::geode::client::CacheListener</code></p></td>
-<td><p>Interface <code class="ph codeph">ICacheListener</code></p></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::CacheLoader</code></p></td>
-<td><p>Interface <code class="ph codeph">ICacheLoader</code> plus static class <code class="ph codeph">CacheLoader</code></p></td>
-</tr>
-<tr class="odd">
-<td><p>class <code class="ph codeph">apache::geode::client::CacheWriter</code></p></td>
-<td><p>Interface class <code class="ph codeph">ICacheWriter</code></p></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::CacheFactory</code></p></td>
-<td><p>Sealed class <code class="ph codeph">CacheFactory</code></p></td>
-</tr>
-<tr class="odd">
-<td><p>class <code class="ph codeph">apache::geode::client::DataInput</code></p></td>
-<td><p>With <code class="ph codeph">IPdxSerializable</code>, <code class="ph codeph">IPdxReader.</code></p>
-<p>With <code class="ph codeph">IGeodeSerializable</code>, sealed class <code class="ph codeph">DataInput</code>.</p></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::DataOutput</code></p></td>
-<td><p>With <code class="ph codeph">IPdxSerializable</code>, <code class="ph codeph">IPdxWriter.</code></p>
-<p>With <code class="ph codeph">IGeodeSerializable</code>, sealed class <code class="ph codeph">DataOutput</code>.</p></td>
-</tr>
-<tr class="odd">
-<td><p>class <code class="ph codeph">apache::geode::client::DiskPolicyType</code></p></td>
-<td><p>enum <code class="ph codeph">DiskPolicyType</code> plus static class <code class="ph codeph">DiskPolicy</code> containing convenience methods for <code class="ph codeph">DiskPolicyType</code> enumeration</p></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::DistributedSystem</code></p></td>
-<td><p>Sealed class <code class="ph codeph">DistributedSystem</code></p></td>
-</tr>
-<tr class="odd">
-<td><p>class <code class="ph codeph">apache::geode::client::EntryEvent</code></p></td>
-<td><p>Sealed class <code class="ph codeph">EntryEvent</code></p></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::Exception</code></p></td>
-<td><p>Class <code class="ph codeph">GeodeException</code></p></td>
-</tr>
-<tr class="odd">
-<td><p>all other exceptions deriving from <code class="ph codeph">apache::geode::client::Exception</code></p></td>
-<td><p>Corresponding exceptions deriving from <code class="ph codeph">GeodeException</code></p></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::ExpirationAction</code></p></td>
-<td><p>enum <code class="ph codeph">ExpirationAction</code> plus static class <code class="ph codeph">Expiration</code> containing convenience methods for <code class="ph codeph">ExpirationAction</code> enumeration</p></td>
-</tr>
-<tr class="odd">
-<td><p>class <code class="ph codeph">apache::geode::client::Log</code></p></td>
-<td><p>Static class <code class="ph codeph">Log</code>. The native <code class="ph codeph">Log::log</code> method is mapped to <code class="ph codeph">Log.Write</code> to avoid the conflict with the class name which is reserved for the constructors of Log class. The various loglevel <code class="ph codeph">Throw</code> or <code class="ph codeph">Catch</code> methods are not implemented, since they are redundant to <code class="ph codeph">Log::Log</code> , <code class="ph codeph">Log::LogThrow</code>, and <code class="ph codeph">Log::LogCatch</code> methods that take <code class="ph codeph">LogLevel</code> as a parameter.</p></td>
-</tr>
-<tr class="even">
-<td><p>enum <code class="ph codeph">apache::geode::client::MemberType</code></p></td>
-<td><p>enum <code class="ph codeph">MemberType</code></p></td>
-</tr>
-<tr class="odd">
-<td><p>abstract class <code class="ph codeph">apache::geode::client::PersistanceManager</code></p></td>
-<td><p>Not provided. You can register a C++ implementation using <code class="ph codeph">AttributesFactory.SetPersistenceManager</code> but you cannot implement a new one in .NET</p></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::Properties</code></p></td>
-<td><p>Sealed class <code class="ph codeph">Properties</code></p></td>
-</tr>
-<tr class="odd">
-<td><p>class <code class="ph codeph">apache::geode::client::Properties::Visitor</code></p></td>
-<td><p>Delegate <code class="ph codeph">PropertiesVisitor</code></p></td>
-</tr>
-<tr class="even">
-<td><p>abstract class <code class="ph codeph">apache::geode::client::Region</code></p></td>
-<td><p>Class <code class="ph codeph">IRegion</code></p></td>
-</tr>
-<tr class="odd">
-<td><p>class <code class="ph codeph">apache::geode::client::RegionAttributes</code></p></td>
-<td><p>Sealed class <code class="ph codeph">RegionAttributes</code></p></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::ScopeType</code></p></td>
-<td><p>enum <code class="ph codeph">ScopeType</code> plus static class <code class="ph codeph">Scope</code> containing convenience methods for <code class="ph codeph">ScopeType</code> enumeration+</p></td>
-</tr>
-<tr class="odd">
-<td><p>abstract class <code class="ph codeph">apache::geode::client::Serializable</code></p></td>
-<td><p>Two options:</p>
-<ul>
-<li><p>Interface <code class="ph codeph">IPdxSerializable</code></p></li>
-<li><p>Interface <code class="ph codeph">IGeodeSerializable</code> plus wrapper <code class="ph codeph">Serializable</code> class for native <code class="ph codeph">Serializable</code> and <code class="ph codeph">UserData</code> objects. The native <code class="ph codeph">toString</code> method is not provided, since the <code class="ph codeph">ToString</code> method of the base object class provides the same functionality.</p></li>
-</ul></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::SystemProperties</code></p></td>
-<td><p>Sealed class <code class="ph codeph">SystemProperties</code></p></td>
-</tr>
-<tr class="odd">
-<td><p>class <code class="ph codeph">apache::geode::client::UserData</code></p></td>
-<td><p>Two options:</p>
-<ul>
-<li><p>Interface <code class="ph codeph">IPdxSerializable</code></p></li>
-<li><p>Interface <code class="ph codeph">IGeodeSerializable</code></p></li>
-</ul></td>
-</tr>
-<tr class="even">
-<td><p>class <code class="ph codeph">apache::geode::client::VectorT<T></code></p></td>
-<td><p>Array of the given type, such as T[]</p></td>
-</tr>
-</tbody>
-</table>
-
-<span class="tablecap">Table 1. C++ Class to .NET Class Mappings</span>
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/type_mappings/java-to-dotnet-type-mapping.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/type_mappings/java-to-dotnet-type-mapping.html.md.erb b/docs/geode-native-docs/type_mappings/java-to-dotnet-type-mapping.html.md.erb
deleted file mode 100644
index faf90cf..0000000
--- a/docs/geode-native-docs/type_mappings/java-to-dotnet-type-mapping.html.md.erb
+++ /dev/null
@@ -1,163 +0,0 @@
----
-title: Java to .NET Type Mapping Table
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-The following table provides a mapping between Java and .NET types.
-
-<a id="concept_24D0AAC71FF1483AB47A7772DA018966__table_F85EC7AA1E1140E9888B753E812E65E4"></a>
-
-<table>
-<colgroup>
-<col width="50%" />
-<col width="50%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>Java Type</th>
-<th>.NET Type</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td><p>instances of <code class="ph codeph">PdxSerializable</code></p></td>
-<td><p>.NET class of same name</p></td>
-</tr>
-<tr class="even">
-<td><p>instances of <code class="ph codeph">PdxInstance</code></p></td>
-<td><p>.NET class of same name</p></td>
-</tr>
-<tr class="odd">
-<td><p>instances serialized by a <code class="ph codeph">PdxSerializer</code></p></td>
-<td><p>.NET class of same name</p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">java.lang.Byte </code></p></td>
-<td><p><code class="ph codeph">System.SByte </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">java.lang.Boolean </code></p></td>
-<td><p><code class="ph codeph">System.Boolean </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">java.lang.Character </code></p></td>
-<td><p><code class="ph codeph">System.Char </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">java.lang.Short </code></p></td>
-<td><p><code class="ph codeph">System.Int16 </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">java.lang.Integer </code></p></td>
-<td><p><code class="ph codeph">System.Int32 </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">java.lang.Long </code></p></td>
-<td><p><code class="ph codeph">System.Int64 </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">java.lang.Float </code></p></td>
-<td><p><code class="ph codeph">System.Float </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">java.lang.Double </code></p></td>
-<td><p><code class="ph codeph">System.Double </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">java.lang.String </code></p></td>
-<td><p><code class="ph codeph">System.String </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">java.util.Date </code></p></td>
-<td><p><code class="ph codeph">System.DateTime </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">byte[] </code></p></td>
-<td><p><code class="ph codeph">System.Byte[] </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">boolean[] </code></p></td>
-<td><p><code class="ph codeph">System.Boolean[] </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">char[] </code></p></td>
-<td><p><code class="ph codeph">System.Char[] </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">short[] </code></p></td>
-<td><p><code class="ph codeph">System.Int16[] </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">int[] </code></p></td>
-<td><p><code class="ph codeph">System.Int32[] </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">long[] </code></p></td>
-<td><p><code class="ph codeph">System.Int64[] </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">float[] </code></p></td>
-<td><p><code class="ph codeph">System.Float[] </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">double[] </code></p></td>
-<td><p><code class="ph codeph">System.Double[] </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">String[] </code></p></td>
-<td><p><code class="ph codeph">System.String[] </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">byte[][] </code></p></td>
-<td><p><code class="ph codeph">System.Byte[][] </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">Object[] </code></p></td>
-<td><p><code class="ph codeph">system.Collections.Generic.List<Object> </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">java.util.HashMap </code></p></td>
-<td><p><code class="ph codeph">System.Collections.Generics.IDictionary<Object, Object> </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">java.util.Hashtable </code></p></td>
-<td><p><code class="ph codeph">System.Collections.Hashtable </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">java.util.ArrayList </code></p></td>
-<td><p><code class="ph codeph">System.Collections.Generic.IList<Object> </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">java.util.Vector </code></p></td>
-<td><p><code class="ph codeph">Collections.ArrayList </code></p></td>
-</tr>
-<tr class="odd">
-<td><p><code class="ph codeph">java.util.HashSet </code></p></td>
-<td><p><code class="ph codeph">CacheableHashSet </code></p></td>
-</tr>
-<tr class="even">
-<td><p><code class="ph codeph">java.util.LinkedHashSet </code></p></td>
-<td><p><code class="ph codeph">CacheableLinkedHashSet </code></p></td>
-</tr>
-</tbody>
-</table>
-
-<span class="tablecap">**Table 1.** Java types and .NET types</span>
-
-
[7/7] geode-native git commit: GEODE-2513: Rename and reorganize
client doc sources This closes #85
Posted by db...@apache.org.
GEODE-2513: Rename and reorganize client doc sources
This closes #85
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/1dbe9e61
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/1dbe9e61
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/1dbe9e61
Branch: refs/heads/develop
Commit: 1dbe9e61185dc8ef62ec4ae744de3636a1d311ab
Parents: 25a99fb
Author: Dave Barnes <db...@pivotal.io>
Authored: Mon Apr 3 15:50:47 2017 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Tue Apr 4 09:25:22 2017 -0700
----------------------------------------------------------------------
.../source/subnavs/geode-nc-nav.erb | 112 +++---
docs/geode-native-book/redirects.rb | 4 +-
.../about-client-users-guide.html.md.erb | 98 +++++
.../about_native_client_users_guide.html.md.erb | 98 -----
.../client-cache/chapter-overview.html.md.erb | 2 +-
.../concurrency-checks-enabled.html.md.erb | 2 +-
.../consistency-checking-in-regions.html.md.erb | 34 ++
.../consistency_checking_in_regions.html.md.erb | 34 --
.../controlling-cache-size.html.md.erb | 4 +-
.../client-cache/region-attributes.html.md.erb | 2 -
.../common/images/client-overview.gif | Bin 0 -> 6421 bytes
.../common/images/native-client-overview.gif | Bin 6421 -> 0 bytes
.../client-pool-api.html.md.erb | 39 ++
.../configuring-pools.html.md.erb | 2 +-
.../native-client-pool-api.html.md.erb | 39 --
.../3-client-cq-api.html.md.erb | 56 +++
.../3-native-client-cq-api.html.md.erb | 56 ---
.../5-implementing-cq.html.md.erb | 10 +-
.../6-managing-cqs.html.md.erb | 2 +-
.../continuous-querying.html.md.erb | 2 +-
.../cpp-caching-api/cpp-caching-api.html.md.erb | 6 +-
.../pdx-auto-serialization.html.md.erb | 366 +++++++++++++++++++
.../pdx-ignore-unread-fields.html.md.erb | 37 ++
.../pdx-serialization.html.md.erb | 60 +++
.../pdx-with-delta-propagation.html.md.erb | 45 +++
.../pdx_auto_serialization.html.md.erb | 366 -------------------
.../pdx_ignore_unread_fields.html.md.erb | 37 --
.../pdx_serialization.html.md.erb | 60 ---
.../pdx_with_delta_propagation.html.md.erb | 45 ---
.../pdxserializable-interface.html.md.erb | 112 ++++++
.../pdxserializable_interface.html.md.erb | 112 ------
.../performing-ops-with-pdx-object.html.md.erb | 60 +++
.../performing_ops_with_pdx_object.html.md.erb | 60 ---
...ion-data-requiring-serialization.html.md.erb | 36 ++
...ion_data_requiring_serialization.html.md.erb | 36 --
.../serialization-options.html.md.erb | 79 ++++
.../serialization-overview.html.md.erb | 48 +++
...serialization-using-serializable.html.md.erb | 256 +++++++++++++
.../serialization_options.html.md.erb | 79 ----
.../serialization_overview.html.md.erb | 48 ---
...serialization_using_serializable.html.md.erb | 256 -------------
.../type-interoperability.html.md.erb | 63 ++++
.../type_interoperability.html.md.erb | 63 ----
.../using-enum-type-with-pdx.html.md.erb | 130 +++++++
.../using-pdxinstance.html.md.erb | 59 +++
.../using-pdxinstancefactory.html.md.erb | 134 +++++++
.../using-pdxserializer.html.md.erb | 119 ++++++
.../using_enum_type_with_pdx.html.md.erb | 130 -------
.../using_pdxinstance.html.md.erb | 59 ---
.../using_pdxinstancefactory.html.md.erb | 134 -------
.../using_pdxserializer.html.md.erb | 119 ------
.../dotnet-caching-api.html.md.erb | 2 +-
.../registering-the-type.html.md.erb | 2 +-
.../#client_requirements.html.md.erb# | 194 ----------
.../client-configurations.html.md.erb | 164 +++++++++
.../introduction/client-intro.html.md.erb | 38 ++
.../introduction/client-overview.html.md.erb | 37 ++
.../client_configurations.html.md.erb | 164 ---------
.../native-client-intro.html.md.erb | 38 --
.../native-client-overview.html.md.erb | 37 --
.../introduction/quickstart.html.md.erb | 4 +-
.../client-region.html.md.erb | 46 +++
.../native-client-region.html.md.erb | 46 ---
.../programming-examples.html.md.erb | 2 +-
.../1-quickintro-overview.html.md.erb | 2 +-
...uickintro-exampleportfolioregion.html.md.erb | 2 +-
.../94-indexes-overview.html.md.erb | 46 +++
.../94-indexes/indexes-overview.html.md.erb | 46 ---
.../security/LDAPserverauth.html.md.erb | 2 +-
.../cache-server-config.html.md.erb | 2 +-
.../chapter-overview.html.md.erb | 4 +-
.../client-config.html.md.erb | 52 +++
.../config-overview.html.md.erb | 6 +-
.../native-client-config.html.md.erb | 52 ---
.../propfile-attributes.html.md.erb | 278 ++++++++++++++
.../propfile-overriding.html.md.erb | 26 ++
.../propfile-overview.html.md.erb | 34 ++
.../propfile-sample.html.md.erb | 121 ++++++
.../propfile-search-path.html.md.erb | 28 ++
.../propfile_attributes.html.md.erb | 278 --------------
.../propfile_overriding.html.md.erb | 26 --
.../propfile_overview.html.md.erb | 34 --
.../propfile_sample.html.md.erb | 121 ------
.../propfile_search_path.html.md.erb | 28 --
.../chapter-overview.html.md.erb | 38 ++
.../chapter_overview.html.md.erb | 38 --
.../linux-install.html.md.erb | 60 +++
.../linux_install.html.md.erb | 60 ---
.../solaris-install.html.md.erb | 72 ++++
.../solaris_install.html.md.erb | 72 ----
.../windows-install.html.md.erb | 55 +++
.../windows_install.html.md.erb | 55 ---
.../cache-performance-statistics.html.md.erb | 47 +++
.../cache_performance_statistics.html.md.erb | 47 ---
.../chapter-overview.html.md.erb | 41 +++
.../chapter_overview.html.md.erb | 41 ---
.../continuous-query-statistics.html.md.erb | 31 ++
.../continuous_query_statistics.html.md.erb | 31 --
.../cq-service-statistics.html.md.erb | 32 ++
.../cq_service_statistics.html.md.erb | 32 --
.../delta-statistics.html.md.erb | 31 ++
.../delta_statistics.html.md.erb | 31 --
.../linux-os-statistics.html.md.erb | 34 ++
.../linux_os_statistics.html.md.erb | 34 --
.../operating-system-statistics.html.md.erb | 36 ++
.../operating_system_statistics.html.md.erb | 36 --
.../pool-statistics.html.md.erb | 47 +++
.../pool_statistics.html.md.erb | 47 ---
.../region-statistics.html.md.erb | 130 +++++++
.../region_statistics.html.md.erb | 130 -------
.../sampling-statistics.html.md.erb | 34 ++
.../sampling_statistics.html.md.erb | 34 --
.../solaris-os-statistics.html.md.erb | 34 ++
.../solaris_os_statistics.html.md.erb | 34 --
.../system-performance-statistics.html.md.erb | 48 +++
.../system_performance_statistics.html.md.erb | 48 ---
.../windows-os-statistics.html.md.erb | 43 +++
.../windows_os_statistics.html.md.erb | 43 ---
.../pulse/system_requirements.html.md.erb | 35 --
.../vsd/vsd_system_requirements.html.md.erb | 55 ---
.../how-client-xacts-work.html.md.erb | 56 +++
.../how-native-client-xacts-work.html.md.erb | 56 ---
.../running-client-xact.html.md.erb | 90 +++++
.../running-native-client-xact.html.md.erb | 90 -----
.../suspend-resume-xacts.html.md.erb | 2 +-
.../transactions/transactions.html.md.erb | 4 +-
.../type-mappings/chapter-overview.html.md.erb | 30 ++
...p-class-to-dotnet-class-mappings.html.md.erb | 180 +++++++++
.../java-to-dotnet-type-mapping.html.md.erb | 163 +++++++++
.../type_mappings/chapter_overview.html.md.erb | 30 --
...p-class-to-dotnet-class-mappings.html.md.erb | 180 ---------
.../java-to-dotnet-type-mapping.html.md.erb | 163 ---------
132 files changed, 4125 insertions(+), 4407 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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 ee46085..de0b2b9 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
@@ -20,20 +20,20 @@ limitations under the License.
<div class="nav-content">
<ul>
<li>
- <a href="/docs/guide-native/11/about_native_client_users_guide.html">Apache Geode Client Documentation</a>
+ <a href="/docs/guide-native/11/about-client-users-guide.html">Apache Geode Client Documentation</a>
</li>
</ul>
<ul>
<li>
- <a href="/docs/guide-native/11/introduction/native-client-overview.html">About the Client</a>
+ <a href="/docs/guide-native/11/introduction/client-overview.html">About the Client</a>
</li>
</ul>
<ul>
<li class="has_submenu">
- <a href="/docs/guide-native/11/introduction/native-client-intro.html">Getting Started with the Client</a>
+ <a href="/docs/guide-native/11/introduction/client-intro.html">Getting Started with the Client</a>
<ul>
<li>
- <a href="/docs/guide-native/11/introduction/client_configurations.html">System Configurations</a>
+ <a href="/docs/guide-native/11/introduction/client-configurations.html">System Configurations</a>
</li>
<li>
<a href="/docs/guide-native/11/introduction/install-overview.html">Installing the Client</a>
@@ -61,10 +61,10 @@ limitations under the License.
<a href="/docs/guide-native/11/setting-properties/chapter-overview.html">Setting System Properties</a>
<ul>
<li class="has_submenu">
- <a href="/docs/guide-native/11/setting-properties/config-overview.html">Configuring the Client and Cache Server</a>
+ <a href="/docs/guide-native/11/setting-properties/config-overview.html">Configuring the Client and Server</a>
<ul>
<li>
- <a href="/docs/guide-native/11/setting-properties/native-client-config.html">Client Configuration</a>
+ <a href="/docs/guide-native/11/setting-properties/client-config.html">Client Configuration</a>
</li>
<li>
<a href="/docs/guide-native/11/setting-properties/cache-server-config.html">Cache Server Configuration</a>
@@ -73,10 +73,10 @@ limitations under the License.
<a href="/docs/guide-native/11/setting-properties/attribute-def-priority.html">Attribute Definition Priority</a>
</li>
<li>
- <a href="/docs/guide-native/11/setting-properties/propfile_search_path.html">Search Path for Multiple Properties Files</a>
+ <a href="/docs/guide-native/11/setting-properties/propfile-search-path.html">Search Path for Multiple Properties Files</a>
</li>
<li>
- <a href="/docs/guide-native/11/setting-properties/propfile_overriding.html">Overriding Properties File Settings</a>
+ <a href="/docs/guide-native/11/setting-properties/propfile-overriding.html">Overriding Properties File Settings</a>
</li>
<li>
<a href="/docs/guide-native/11/setting-properties/define-programmatically.html">Defining Properties Programmatically</a>
@@ -84,13 +84,13 @@ limitations under the License.
</ul>
</li>
<li>
- <a href="/docs/guide-native/11/setting-properties/propfile_attributes.html">Attributes in the Properties File</a>
+ <a href="/docs/guide-native/11/setting-properties/propfile-attributes.html">Attributes in the Properties File</a>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/setting-properties/propfile_overview.html">Properties File Example</a>
+ <a href="/docs/guide-native/11/setting-properties/propfile-overview.html">Properties File Example</a>
<ul>
<li>
- <a href="/docs/guide-native/11/setting-properties/propfile_sample.html">Using the Default Sample File</a>
+ <a href="/docs/guide-native/11/setting-properties/propfile-sample.html">Using the Default Sample File</a>
</li>
</ul>
</li>
@@ -172,7 +172,7 @@ limitations under the License.
</ul>
</li>
<li>
- <a href="/docs/guide-native/11/client-cache/consistency_checking_in_regions.html">Region Consistency</a>
+ <a href="/docs/guide-native/11/client-cache/consistency-checking-in-regions.html">Region Consistency</a>
</li>
<li class="has_submenu">
<a href="/docs/guide-native/11/client-cache/region-attributes.html">Region Attributes</a>
@@ -262,50 +262,50 @@ limitations under the License.
<a href="/docs/guide-native/11/cpp-caching-api/removing-entry.html">Removing an Entry</a>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/cpp-caching-api/serialization_overview.html">Serializing Data</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/serialization-overview.html">Serializing Data</a>
<ul>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/region_data_requiring_serialization.html">Region Data Requiring Serialization</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/region-data-requiring-serialization.html">Region Data Requiring Serialization</a>
</li>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/serialization_options.html">Data Serialization Options</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/serialization-options.html">Data Serialization Options</a>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/cpp-caching-api/pdx_serialization.html">Serializing Data with PDX Serialization</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/pdx-serialization.html">Serializing Data with PDX Serialization</a>
<ul>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/using_pdxserializer.html">Serialize Your Domain Objects with PdxSerializer and PdxWrapper</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/using-pdxserializer.html">Serialize Your Domain Objects with PdxSerializer and PdxWrapper</a>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/cpp-caching-api/pdxserializable_interface.html">Serialize Using the PdxSerializable Class</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/pdxserializable-interface.html">Serialize Using the PdxSerializable Class</a>
<ul>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/performing_ops_with_pdx_object.html">Performing put, get, and localDestroy Operations with a PDX Domain Object</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/performing-ops-with-pdx-object.html">Performing put, get, and localDestroy Operations with a PDX Domain Object</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/pdx_auto_serialization.html">Using Automatic PDX Serialization</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/pdx-auto-serialization.html">Using Automatic PDX Serialization</a>
</li>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/using_pdxinstance.html">Programming Your Application to Use PdxInstances</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/using-pdxinstance.html">Programming Your Application to Use PdxInstances</a>
</li>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/pdx_ignore_unread_fields.html">Configuring PDX to Ignore Unread Fields During Deserialization</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/pdx-ignore-unread-fields.html">Configuring PDX to Ignore Unread Fields During Deserialization</a>
</li>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/using_pdxinstancefactory.html">Using PdxInstanceFactory to Create PdxInstances</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/using-pdxinstancefactory.html">Using PdxInstanceFactory to Create PdxInstances</a>
</li>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/using_enum_type_with_pdx.html">Using C++ Enum Type with PDX Serialization</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/using-enum-type-with-pdx.html">Using C++ Enum Type with PDX Serialization</a>
</li>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/pdx_with_delta_propagation.html">Using PDX Serialization with Delta Propagation</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/pdx-with-delta-propagation.html">Using PDX Serialization with Delta Propagation</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/serialization_using_serializable.html">Serializing Data with the Serializable Interface</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/serialization-using-serializable.html">Serializing Data with the Serializable Interface</a>
</li>
<li>
<a href="/docs/guide-native/11/cpp-caching-api/object-graphs.html">Serializing Object Graphs</a>
@@ -610,7 +610,7 @@ limitations under the License.
<a href="/docs/guide-native/11/remote-querying/91-quickintro/1-quickintro-overview.html">Remote Querying Basics</a>
<ul>
<li>
- <a href="/docs/guide-native/11/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html">Examples Data and Class Definitions</a>
+ <a href="/docs/guide-native/11/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html">Example Data and Class Definitions</a>
</li>
<li>
<a href="/docs/guide-native/11/remote-querying/91-quickintro/2-quickintro-querycodeexamples.html">Executing a Query from the Native Client</a>
@@ -622,7 +622,7 @@ limitations under the License.
<a href="/docs/guide-native/11/remote-querying/91-quickintro/42-quickintro-modify-cachecontents.html">Modifying Cache Contents</a>
</li>
<li>
- <a href="/docs/guide-native/11/remote-querying/94-indexes/indexes-overview.html">Creating Indexes</a>
+ <a href="/docs/guide-native/11/remote-querying/91-quickintro/94-indexes-overview.html">Creating Indexes</a>
</li>
<li>
<a href="/docs/guide-native/11/remote-querying/91-quickintro/3-quickintro-requirements.html">Remote Querying Requirements</a>
@@ -726,13 +726,13 @@ limitations under the License.
<a href="/docs/guide-native/11/continuous-querying/5-implementing-cq.html">Implementing a Continuous Query</a>
<ul>
<li>
- <a href="/docs/guide-native/11/continuous-querying/2-config-for-continuous-querying.html">Configuring Your System for Continuous Querying</a>
+ <a href="/docs/guide-native/11/continuous-querying/2-config-for-continuous-querying.html">Configuring for Continuous Querying</a>
</li>
<li>
<a href="/docs/guide-native/11/continuous-querying/5a-writing-cq.html">Writing the Continuous Query</a>
</li>
<li>
- <a href="/docs/guide-native/11/continuous-querying/5b-writing-cq-listener.html">Writing the CQ Listener or CQ Status Listener</a>
+ <a href="/docs/guide-native/11/continuous-querying/5b-writing-cq-listener.html">Writing the CQ Listener</a>
</li>
<li>
<a href="/docs/guide-native/11/continuous-querying/5c-cq-event-object.html">CqEvent Object</a>
@@ -752,7 +752,7 @@ limitations under the License.
<a href="/docs/guide-native/11/continuous-querying/6-managing-cqs.html">Managing Continuous Queries</a>
</li>
<li>
- <a href="/docs/guide-native/11/continuous-querying/3-native-client-cq-api.html">CQ API and Main Features</a>
+ <a href="/docs/guide-native/11/continuous-querying/3-client-cq-api.html">CQ API and Main Features</a>
</li>
</ul>
</li>
@@ -777,7 +777,7 @@ limitations under the License.
<a href="/docs/guide-native/11/connection-pools/configuring-pools.html">Configuring Pools</a>
<ul>
<li>
- <a href="/docs/guide-native/11/connection-pools/native-client-pool-api.html">Native Client Pool API</a>
+ <a href="/docs/guide-native/11/connection-pools/client-pool-api.html">Native Client Pool API</a>
</li>
<li>
<a href="/docs/guide-native/11/connection-pools/configuring-pools-attributes-example.html">Pool Configuration Example and Settings</a>
@@ -796,10 +796,10 @@ limitations under the License.
<a href="/docs/guide-native/11/transactions/transactions.html">Transactions</a>
<ul>
<li>
- <a href="/docs/guide-native/11/transactions/how-native-client-xacts-work.html">How Client Transactions Work</a>
+ <a href="/docs/guide-native/11/transactions/how-client-xacts-work.html">How Client Transactions Work</a>
</li>
<li>
- <a href="/docs/guide-native/11/transactions/running-native-client-xact.html">Running a Client Transaction</a>
+ <a href="/docs/guide-native/11/transactions/running-client-xact.html">Running a Client Transaction</a>
</li>
<li>
<a href="/docs/guide-native/11/transactions/suspend-resume-xacts.html">Suspending and Resuming Transactions</a>
@@ -855,7 +855,7 @@ limitations under the License.
<a href="/docs/guide-native/11/programming-examples/programming-examples.html">Programming Examples</a>
<ul>
<li>
- <a href="/docs/guide-native/11/programming-examples/native-client-region.html">Declaring a Client Region</a>
+ <a href="/docs/guide-native/11/programming-examples/client-region.html">Declaring a Client Region</a>
</li>
<li>
<a href="/docs/guide-native/11/programming-examples/csharp-example.html">API Programming Example \u2013 C#</a>
@@ -880,77 +880,77 @@ limitations under the License.
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/type_mappings/chapter_overview.html">Interoperability of Language Classes and Types</a>
+ <a href="/docs/guide-native/11/type-mappings/chapter-overview.html">Interoperability of Language Classes and Types</a>
<ul>
<li class="has_submenu">
- <a href="/docs/guide-native/11/type_mappings/cpp-class-to-dotnet-class-mappings.html">C++ Class to .NET Class Mappings</a>
+ <a href="/docs/guide-native/11/type-mappings/cpp-class-to-dotnet-class-mappings.html">C++ Class to .NET Class Mappings</a>
<ul>
<li>
- <a href="/docs/guide-native/11/cpp-caching-api/type_interoperability.html">Interoperability of C++ Types When Using PDX Serialization</a>
+ <a href="/docs/guide-native/11/cpp-caching-api/type-interoperability.html">Interoperability of C++ Types When Using PDX Serialization</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/guide-native/11/type_mappings/java-to-dotnet-type-mapping.html">Java to .NET Type Mapping Table</a>
+ <a href="/docs/guide-native/11/type-mappings/java-to-dotnet-type-mapping.html">Java to .NET Type Mapping Table</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/system-statistics/chapter_overview.html">System Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/chapter-overview.html">System Statistics</a>
<ul>
<li>
- <a href="/docs/guide-native/11/system-statistics/sampling_statistics.html">Sampling Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/sampling-statistics.html">Sampling Statistics</a>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/system-statistics/system_performance_statistics.html">System Performance Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/system-performance-statistics.html">System Performance Statistics</a>
<ul>
<li>
- <a href="/docs/guide-native/11/system-statistics/region_statistics.html">Region Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/region-statistics.html">Region Statistics</a>
</li>
<li>
- <a href="/docs/guide-native/11/system-statistics/cache_performance_statistics.html">Cache Performance Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/cache-performance-statistics.html">Cache Performance Statistics</a>
</li>
<li>
- <a href="/docs/guide-native/11/system-statistics/continuous_query_statistics.html">Continuous Query Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/continuous-query-statistics.html">Continuous Query Statistics</a>
</li>
<li>
- <a href="/docs/guide-native/11/system-statistics/cq_service_statistics.html">CQ Service Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/cq-service-statistics.html">CQ Service Statistics</a>
</li>
<li>
- <a href="/docs/guide-native/11/system-statistics/pool_statistics.html">Pool Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/pool-statistics.html">Pool Statistics</a>
</li>
<li>
- <a href="/docs/guide-native/11/system-statistics/delta_statistics.html">Delta Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/delta-statistics.html">Delta Statistics</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/system-statistics/operating_system_statistics.html">Operating System Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/operating-system-statistics.html">Operating System Statistics</a>
<ul>
<li>
- <a href="/docs/guide-native/11/system-statistics/linux_os_statistics.html">Linux Process Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/linux-os-statistics.html">Linux Process Statistics</a>
</li>
<li>
- <a href="/docs/guide-native/11/system-statistics/solaris_os_statistics.html">Solaris Process Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/solaris-os-statistics.html">Solaris Process Statistics</a>
</li>
<li>
- <a href="/docs/guide-native/11/system-statistics/windows_os_statistics.html">Windows Process Statistics</a>
+ <a href="/docs/guide-native/11/system-statistics/windows-os-statistics.html">Windows Process Statistics</a>
</li>
</ul>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/guide-native/11/sqlite-persistence/chapter_overview.html">Installing the SQLite Persistence Manager</a>
+ <a href="/docs/guide-native/11/sqlite-persistence/chapter-overview.html">Installing the SQLite Persistence Manager</a>
<ul>
<li>
- <a href="/docs/guide-native/11/sqlite-persistence/linux_install.html">Linux Installation</a>
+ <a href="/docs/guide-native/11/sqlite-persistence/linux-install.html">Linux Installation</a>
</li>
<li>
- <a href="/docs/guide-native/11/sqlite-persistence/solaris_install.html">Solaris Installation</a>
+ <a href="/docs/guide-native/11/sqlite-persistence/solaris-install.html">Solaris Installation</a>
</li>
<li>
- <a href="/docs/guide-native/11/sqlite-persistence/windows_install.html">Windows Installation</a>
+ <a href="/docs/guide-native/11/sqlite-persistence/windows-install.html">Windows Installation</a>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-book/redirects.rb
----------------------------------------------------------------------
diff --git a/docs/geode-native-book/redirects.rb b/docs/geode-native-book/redirects.rb
index 16652d3..9430681 100644
--- a/docs/geode-native-book/redirects.rb
+++ b/docs/geode-native-book/redirects.rb
@@ -24,5 +24,5 @@ r301 %r{/releases/latest/api/dotnetdocs/(.*)}, 'http://data-docs-samples.cfapps.
r301 %r{/geodeman/(.*)}, 'http://geode.apache.org/docs/guide/11/$1'
r301 %r{/serverman/(.*)}, 'http://geode.apache.org/docs/guide/11/$1'
r302 '/index-10.html', 'http://geode.apache.org/docs/guide-native/10/about_native_client_users_guide.html'
-rewrite '/', '/docs/guide-native/11/about_native_client_users_guide.html'
-rewrite '/index.html', '/docs/guide-native/11/about_native_client_users_guide.html'
+rewrite '/', '/docs/guide-native/11/about-client-users-guide.html'
+rewrite '/index.html', '/docs/guide-native/11/about-client-users-guide.html'
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/about-client-users-guide.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/about-client-users-guide.html.md.erb b/docs/geode-native-docs/about-client-users-guide.html.md.erb
new file mode 100644
index 0000000..fc70a5a
--- /dev/null
+++ b/docs/geode-native-docs/about-client-users-guide.html.md.erb
@@ -0,0 +1,98 @@
+---
+title: Apache Geode Client 1.3 Documentation
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Published April 1, 2017
+
+This documentation provides step-by-step procedures for installation, configuration, and development of clients.
+
+- **[C++ and .NET API](http://geode.apache.org/docs/)**
+
+- **[Getting Started with the Client](introduction/client-intro.html)**
+
+ This section gives you a conceptual overview of the client. It shows you how to install the product, build client applications on various platforms, and run the product examples.
+
+- **[Setting System Properties](setting-properties/chapter-overview.html)**
+
+ *Setting System Properties* describes how to configure Apache Geode clients and cache servers to participate in a distributed system.
+
+- **[Configuring the Client Cache](client-cache/chapter-overview.html)**
+
+ This section describes the client cache functionality, initialization file, and APIs. It provides information about creating and working with caches, cache regions, and region entries.
+
+- **[C++ Client API](cpp-caching-api/cpp-caching-api.html)**
+
+ 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.
+
+- **[.NET Client API](dotnet-caching-api/dotnet-caching-api.html)**
+
+ This section describes the primary classes, usage conventions, and C++ to .NET class mappings of the client .NET API. It demonstrates how to use the API to create caches and perform data serialization. See the [.NET API](/releases/latest/api/dotnetdocs) documentation for API details.
+
+- **[Preserving Data](preserving-data/preserving-data.html)**
+
+ 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)**
+
+ *Security* describes how to implement the security framework for the Geode client, including authentication, authorization, ecryption, and SSL client/server communication.
+
+- **[Remote Querying](remote-querying/remote-querying.html)**
+
+ *Remote Querying* documents remote querying from the client to the Geode cache server. Using examples and procedures, it describes how to use the APIs to run queries against cached data; work with query strings in the client; create and manage queries; and create indexes.
+
+- **[Continuous Querying](continuous-querying/continuous-querying.html)**
+
+ *Continuous Querying* describes how to implement continuous querying in the Apache Geode client so that C++ and .NET clients can run queries against events in the Geode cache server region. It also describes main features and the client CQ API.
+
+- **[Using Connection Pools](connection-pools/connection-pools.html)**
+
+ *Using Connection Pools* describes how connection pools achieve load balancing for the client and describes how to configure connection pools as server locators or as a list of servers.
+
+- **[Transactions](transactions/transactions.html)**
+
+ *Transactions* describes how transactions work on the client side. It provides examples for running, suspending, and resuming transactions.
+
+- **[Function Execution](function-execution/function-execution.html)**
+
+ *Function Execution* describes how you can execute application functions to achieve linear scalability. It explains how function execution works and lists specific use cases.
+
+- **[Delta Propagation](delta-propagation/delta-propagation.html)**
+
+ *Delta Propagation* describes how deltas (updates to data) are propagated and how to implement delta propagation. It also analyzes performance limitations.
+
+- **[Programming Examples](programming-examples/programming-examples.html)**
+
+ This chapter provides a set of programming examples to help you understand the Geode client API.
+
+- **[Interoperability of Language Classes and Types](type-mappings/chapter-overview.html)**
+
+ *Interoperability of Language Classes and Types* provides a table that maps C++ class methods to corresponding .NET class methods and a table that maps Java types to .NET types.
+
+- **[System Statistics](system-statistics/chapter-overview.html)**
+
+ *System Statistics* provides information on the statistics for caching and distribution activities.
+
+- **[Installing the SQLite Persistence Manager](sqlite-persistence/chapter-overview.html)**
+
+ *Installing the SQLite Persistence Manager* describes how to download, build and install the SQLite database libraries for use with disk overflow.
+
+- **[Glossary](glossary.html)**
+
+ This glossary defines terms used in the documentation.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
deleted file mode 100644
index 2294e5b..0000000
--- a/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
+++ /dev/null
@@ -1,98 +0,0 @@
----
-title: Apache Geode Client 1.3 Documentation
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Published April 1, 2017
-
-This documentation provides step-by-step procedures for installation, configuration, and development of clients.
-
-- **[C++ and .NET API](http://geode.apache.org/docs/)**
-
-- **[Getting Started with a Client](introduction/native-client-intro.html)**
-
- This section gives you a conceptual overview of the client. It shows you how to install the product, build client applications on various platforms, and run the product examples.
-
-- **[Setting System Properties](setting-properties/chapter-overview.html)**
-
- *Setting System Properties* describes how to configure Apache Geode clients and cache servers to participate in a distributed system.
-
-- **[Configuring the Client Cache](client-cache/chapter-overview.html)**
-
- This section describes the client cache functionality, initialization file, and APIs. It provides information about creating and working with caches, cache regions, and region entries.
-
-- **[C++ Client API](cpp-caching-api/cpp-caching-api.html)**
-
- 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.
-
-- **[.NET Client API](dotnet-caching-api/dotnet-caching-api.html)**
-
- This section describes the primary classes, usage conventions, and C++ to .NET class mappings of the client .NET API. It demonstrates how to use the API to create caches and perform data serialization. See the [.NET API](/releases/latest/api/dotnetdocs) documentation for API details.
-
-- **[Preserving Data](preserving-data/preserving-data.html)**
-
- 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)**
-
- *Security* describes how to implement the security framework for the Geode client, including authentication, authorization, ecryption, and SSL client/server communication.
-
-- **[Remote Querying](remote-querying/remote-querying.html)**
-
- *Remote Querying* documents remote querying from the client to the Geode cache server. Using examples and procedures, it describes how to use the APIs to run queries against cached data; work with query strings in the client; create and manage queries; and create indexes.
-
-- **[Continuous Querying](continuous-querying/continuous-querying.html)**
-
- *Continuous Querying* describes how to implement continuous querying in the Apache Geode client so that C++ and .NET clients can run queries against events in the Geode cache server region. It also describes main features and the client CQ API.
-
-- **[Using Connection Pools](connection-pools/connection-pools.html)**
-
- *Using Connection Pools* describes how connection pools achieve load balancing for the client and describes how to configure connection pools as server locators or as a list of servers.
-
-- **[Transactions](transactions/transactions.html)**
-
- *Transactions* describes how transactions work on the client side. It provides examples for running, suspending, and resuming transactions.
-
-- **[Function Execution](function-execution/function-execution.html)**
-
- *Function Execution* describes how you can execute application functions to achieve linear scalability. It explains how function execution works and lists specific use cases.
-
-- **[Delta Propagation](delta-propagation/delta-propagation.html)**
-
- *Delta Propagation* describes how deltas (updates to data) are propagated and how to implement delta propagation. It also analyzes performance limitations.
-
-- **[Programming Examples](programming-examples/programming-examples.html)**
-
- This chapter provides a set of programming examples to help you understand the Geode client API.
-
-- **[Interoperability of Language Classes and Types](type_mappings/chapter_overview.html)**
-
- *Interoperability of Language Classes and Types* provides a table that maps C++ class methods to corresponding .NET class methods and a table that maps Java types to .NET types.
-
-- **[System Statistics](system-statistics/chapter_overview.html)**
-
- *System Statistics* provides information on the statistics for caching and distribution activities.
-
-- **[Installing the SQLite Persistence Manager](sqlite-persistence/chapter_overview.html)**
-
- *Installing the SQLite Persistence Manager* describes how to download, build and install the SQLite database libraries for use with disk overflow.
-
-- **[Glossary](glossary.html)**
-
- This glossary defines terms used in the documentation.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/client-cache/chapter-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/client-cache/chapter-overview.html.md.erb b/docs/geode-native-docs/client-cache/chapter-overview.html.md.erb
index e68b316..31e73a4 100644
--- a/docs/geode-native-docs/client-cache/chapter-overview.html.md.erb
+++ b/docs/geode-native-docs/client-cache/chapter-overview.html.md.erb
@@ -39,7 +39,7 @@ The client cache provides a framework for clients to store, manage, and distribu
Region entries hold cached application data. Entries are automatically managed according to region attribute settings.
-- **[Region Consistency](consistency_checking_in_regions.html)**
+- **[Region Consistency](consistency-checking-in-regions.html)**
Geode ensures that all copies of a region eventually reach a consistent state on all members and clients that host the region.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/client-cache/concurrency-checks-enabled.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/client-cache/concurrency-checks-enabled.html.md.erb b/docs/geode-native-docs/client-cache/concurrency-checks-enabled.html.md.erb
index 8b0553d..3c85c50 100644
--- a/docs/geode-native-docs/client-cache/concurrency-checks-enabled.html.md.erb
+++ b/docs/geode-native-docs/client-cache/concurrency-checks-enabled.html.md.erb
@@ -30,6 +30,6 @@ Optionally enable concurrency checks for the region. Example:
</region-attributes>
```
-See [Region Consistency](consistency_checking_in_regions.html) for more information.
+See [Region Consistency](consistency-checking-in-regions.html) for more information.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/client-cache/consistency-checking-in-regions.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/client-cache/consistency-checking-in-regions.html.md.erb b/docs/geode-native-docs/client-cache/consistency-checking-in-regions.html.md.erb
new file mode 100644
index 0000000..f510c34
--- /dev/null
+++ b/docs/geode-native-docs/client-cache/consistency-checking-in-regions.html.md.erb
@@ -0,0 +1,34 @@
+---
+title: Region Consistency
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Geode ensures that all copies of a region eventually reach a consistent state on all members and clients that host the region.
+
+By default Geode members perform consistency checks when they apply updates to a distributed region, in order to ensure that all copies of the region eventually become consistent on all Geode members and client caches that host the region. Different types of region ensure consistency using different techniques. However, when consistency checking is enabled (the default) all entries in a region require additional overhead in order to store version and timestamp information.
+
+Although a region must have the same consistency checking configuration on all Geode members that host the region, you can optionally disable consistency checking in a client cache region while leaving consistency checking enabled for the region on Geode members. This configuration may be necessary in certain cases where the client must view all updates to a given region, even when Geode members discards an update in order to preserve region consistency.
+
+See [Consistency for Region Updates](geodeman/developing/distributed_regions/region_entry_versions.html#topic_CF2798D3E12647F182C2CEC4A46E2045) in the server's documentation for more information.
+
+## <a id="concept_77340A4999AC4861972A0EE10303E557__section_167CD194A5374C64B4064783490F3EA8" class="no-quick-link"></a>Client Overhead for Consistency Checks
+
+In the client regions, the overhead for performing consistency check is an additional 11 bytes per region entry. This overhead is slightly smaller than the overhead required to provide consistency checking on server-side region entries.
+
+If you cannot support the additional overhead in your deployment, you can disable consistency checks by setting the region attribute `concurrency-checks-enabled` to false for each region hosted by your client.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/client-cache/consistency_checking_in_regions.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/client-cache/consistency_checking_in_regions.html.md.erb b/docs/geode-native-docs/client-cache/consistency_checking_in_regions.html.md.erb
deleted file mode 100644
index f510c34..0000000
--- a/docs/geode-native-docs/client-cache/consistency_checking_in_regions.html.md.erb
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: Region Consistency
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Geode ensures that all copies of a region eventually reach a consistent state on all members and clients that host the region.
-
-By default Geode members perform consistency checks when they apply updates to a distributed region, in order to ensure that all copies of the region eventually become consistent on all Geode members and client caches that host the region. Different types of region ensure consistency using different techniques. However, when consistency checking is enabled (the default) all entries in a region require additional overhead in order to store version and timestamp information.
-
-Although a region must have the same consistency checking configuration on all Geode members that host the region, you can optionally disable consistency checking in a client cache region while leaving consistency checking enabled for the region on Geode members. This configuration may be necessary in certain cases where the client must view all updates to a given region, even when Geode members discards an update in order to preserve region consistency.
-
-See [Consistency for Region Updates](geodeman/developing/distributed_regions/region_entry_versions.html#topic_CF2798D3E12647F182C2CEC4A46E2045) in the server's documentation for more information.
-
-## <a id="concept_77340A4999AC4861972A0EE10303E557__section_167CD194A5374C64B4064783490F3EA8" class="no-quick-link"></a>Client Overhead for Consistency Checks
-
-In the client regions, the overhead for performing consistency check is an additional 11 bytes per region entry. This overhead is slightly smaller than the overhead required to provide consistency checking on server-side region entries.
-
-If you cannot support the additional overhead in your deployment, you can disable consistency checks by setting the region attribute `concurrency-checks-enabled` to false for each region hosted by your client.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/client-cache/controlling-cache-size.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/client-cache/controlling-cache-size.html.md.erb b/docs/geode-native-docs/client-cache/controlling-cache-size.html.md.erb
index 917088a..6486291 100644
--- a/docs/geode-native-docs/client-cache/controlling-cache-size.html.md.erb
+++ b/docs/geode-native-docs/client-cache/controlling-cache-size.html.md.erb
@@ -30,8 +30,8 @@ You can cap the size of any region with the region attribute [LruEntriesLimit](l
## <a id="controlling-cache-size__section_E59CA4D5724147DC83E8991E654AC155" class="no-quick-link"></a>Controlling Cache Size
-You can control overall cache size with the [heap-lru-limit](../setting-properties/propfile_attributes.html#attributes-gfcpp), which is set in `geode.properties`. This property sets the maximum amount of memory used for the cache, in megabytes. If a new entry causes memory to grow past this limit, the LRU algorithm is called to evict entries. Heap LRU causes eviction to occur on all regions in the cache, overriding region-level [LruEntriesLimit](lru-entries-limit.html#concept_75D723D60E044FF9AE97C939699AB10A) settings when it needs to reclaim memory.
+You can control overall cache size with the [heap-lru-limit](../setting-properties/propfile-attributes.html#attributes-gfcpp), which is set in `geode.properties`. This property sets the maximum amount of memory used for the cache, in megabytes. If a new entry causes memory to grow past this limit, the LRU algorithm is called to evict entries. Heap LRU causes eviction to occur on all regions in the cache, overriding region-level [LruEntriesLimit](lru-entries-limit.html#concept_75D723D60E044FF9AE97C939699AB10A) settings when it needs to reclaim memory.
For each region, evictions are performed according to the region's `DiskPolicy` and `PersistenceManager` settings. If you use `heap-lru-limit`, review these region attributes for all your caching regions, to be sure you are evicting the way you want to.
-The related [heap-lru-delta](../setting-properties/propfile_attributes.html#attributes-gfcpp) property, also set in `geode.properties`, is the amount of memory to free up once the LRU evictions have begun. Memory is reclaimed until the amount of memory used is below `heap-lru-limit` minus `heap-lru-delta`.
+The related [heap-lru-delta](../setting-properties/propfile-attributes.html#attributes-gfcpp) property, also set in `geode.properties`, is the amount of memory to free up once the LRU evictions have begun. Memory is reclaimed until the amount of memory used is below `heap-lru-limit` minus `heap-lru-delta`.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/client-cache/region-attributes.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/client-cache/region-attributes.html.md.erb b/docs/geode-native-docs/client-cache/region-attributes.html.md.erb
index 8fe0a88..5e272d3 100644
--- a/docs/geode-native-docs/client-cache/region-attributes.html.md.erb
+++ b/docs/geode-native-docs/client-cache/region-attributes.html.md.erb
@@ -45,8 +45,6 @@ Region attribute settings determine where the data resides, how the region is ma
- **[PersistenceManager](persistence-manager.html)**
-- **[Specifying Application Plug-In Attributes](application-plugins.html)**
-
- **[Specifying Expiration Attributes](expiration-attributes.html)**
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/common/images/client-overview.gif
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/common/images/client-overview.gif b/docs/geode-native-docs/common/images/client-overview.gif
new file mode 100644
index 0000000..a71a23a
Binary files /dev/null and b/docs/geode-native-docs/common/images/client-overview.gif differ
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/common/images/native-client-overview.gif
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/common/images/native-client-overview.gif b/docs/geode-native-docs/common/images/native-client-overview.gif
deleted file mode 100644
index a71a23a..0000000
Binary files a/docs/geode-native-docs/common/images/native-client-overview.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/connection-pools/client-pool-api.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/connection-pools/client-pool-api.html.md.erb b/docs/geode-native-docs/connection-pools/client-pool-api.html.md.erb
new file mode 100644
index 0000000..6bb7047
--- /dev/null
+++ b/docs/geode-native-docs/connection-pools/client-pool-api.html.md.erb
@@ -0,0 +1,39 @@
+---
+title: Native Client Pool API
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+The native client API allows your clients to create and manage connection pools. The server side does not have an API.
+
+This section lists the primary native client API for pool management. For complete information on the classes and interfaces described here, see the API documentation.
+
+**Note:**
+Only C\# versions of Pool API interfaces, classes, and methods are shown throughout the text in this section (example: `Pool.GetQueryService()`) . The code examples demonstrate both C++ and C\# versions.
+
+**Apache.Geode.Client.Cache**
+
+- `Pool` interface. API to retrieve pool attributes.
+- `PoolFactory` interface. API to configure pool attributes.
+- `PoolManager` interface. API to create a `PoolFactory` object and to find the pool objects.
+- `AttributesFactory` class. Has a new method `setPoolname` which assigns a pool to a region. Operations performed on the configured region use connections from the pool.
+
+**Note:**
+A region can have a pool attached to it. A pool may have multiple regions attached to it.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/connection-pools/configuring-pools.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/connection-pools/configuring-pools.html.md.erb b/docs/geode-native-docs/connection-pools/configuring-pools.html.md.erb
index 4b4d483..848c27a 100644
--- a/docs/geode-native-docs/connection-pools/configuring-pools.html.md.erb
+++ b/docs/geode-native-docs/connection-pools/configuring-pools.html.md.erb
@@ -23,7 +23,7 @@ A pool can be configured as locators or as a list of servers.
You configure locator, server, and pool settings declaratively in the client's `cache.xml` file or programmatically through the `PoolFactory` method. You create an instance of `PoolFactory` through `PoolManager`.
-- **[Native Client Pool API](native-client-pool-api.html)**
+- **[Native Client Pool API](client-pool-api.html)**
The native client API allows your clients to create and manage connection pools. The server side does not have an API.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/connection-pools/native-client-pool-api.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/connection-pools/native-client-pool-api.html.md.erb b/docs/geode-native-docs/connection-pools/native-client-pool-api.html.md.erb
deleted file mode 100644
index 6bb7047..0000000
--- a/docs/geode-native-docs/connection-pools/native-client-pool-api.html.md.erb
+++ /dev/null
@@ -1,39 +0,0 @@
----
-title: Native Client Pool API
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-The native client API allows your clients to create and manage connection pools. The server side does not have an API.
-
-This section lists the primary native client API for pool management. For complete information on the classes and interfaces described here, see the API documentation.
-
-**Note:**
-Only C\# versions of Pool API interfaces, classes, and methods are shown throughout the text in this section (example: `Pool.GetQueryService()`) . The code examples demonstrate both C++ and C\# versions.
-
-**Apache.Geode.Client.Cache**
-
-- `Pool` interface. API to retrieve pool attributes.
-- `PoolFactory` interface. API to configure pool attributes.
-- `PoolManager` interface. API to create a `PoolFactory` object and to find the pool objects.
-- `AttributesFactory` class. Has a new method `setPoolname` which assigns a pool to a region. Operations performed on the configured region use connections from the pool.
-
-**Note:**
-A region can have a pool attached to it. A pool may have multiple regions attached to it.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/continuous-querying/3-client-cq-api.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/continuous-querying/3-client-cq-api.html.md.erb b/docs/geode-native-docs/continuous-querying/3-client-cq-api.html.md.erb
new file mode 100644
index 0000000..8706d93
--- /dev/null
+++ b/docs/geode-native-docs/continuous-querying/3-client-cq-api.html.md.erb
@@ -0,0 +1,56 @@
+---
+title: CQ API and Main Features
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+This chapter documents the primary native client API for CQ management.
+
+The Apache Geode native client API allows your clients to create and manage CQs. (The server side does not have an API.) Continuous querying provides native client query syntax, events-based management, integration with client/server architecture, active query execution, and interest criteria based on data values. For complete information on the classes and interfaces described here,
+see the documentation for the [C++ API](/releases/latest/api/cppdocs) or the [.NET API](/releases/latest/api/dotnetdocs).
+
+**Apache.Geode.Client.Cache**
+
+Only C\# versions of CQ API interfaces, classes, and methods are shown here (example: `CqQuery.execute`). The code examples demonstrate both C++ and C\# versions.
+
+- `QueryService` interface. Provides methods that enable you to:
+ - Create a new CQ and specify whether it is durable (available for durable clients)
+ - Execute a CQ with or without an initial result
+ - List all the CQs registered by the client
+ - Close and stop CQs
+ - Get a handle on `CqStatistics` for the client
+
+ You run `QueryService` CQ methods against the server cache. The QueryService can be obtained from the cache or from a pool.
+- `CqQuery`interface. Provides methods for managing a continuous query after it is created through the `QueryService`. This interface is used typically to begin and end CQ execution and to retrieve other CQ-related objects such as CQ attributes, CQ statistics, and CQ state.
+- `CqListener` application plug-in interface. Handles continuous query events after they occur. You program this interface.
+- `CqEvent`interface. Provides all information sent from the server about the CQ event, which is passed to the CQ's `CqListener` methods.
+- `CqState` interface. Provides information on the state of a `CqQuery`, through the getState method of the `CqQuery` instance.
+- `CqAttributes, CqAttributesFactory, CqAttributesMutator` interfaces. Allow you to manage CQ attributes. The attributes consist of `CqListener `plug-in specifications.
+- `CqStatistics, CqServiceStatistics` interfaces. Allow you to access statistics information for a single CQ and for the query service's management of CQs as a whole. For details on statistics, see [Statistics API](../cpp-caching-api/gfe-cpp-api.html#concept_AB12290E89CA4724AC9F51EFF7B8B8EA__section_42764C6327944514AE4A26684D7EBCB0).
+
+## <a id="security__section_74A3A0ECC2B645CEAEFDF68350E55EB4" class="no-quick-link"></a>Main Features of Continuous Querying
+
+Continuous querying in the native client has the following features:
+
+- **Standard Geode native client query syntax and semantics**. CQ queries are expressed in the same language used for other native client queries. See [Remote Querying](../remote-querying/remote-querying.html).
+- **Standard Geode events-based management of CQ events**. The event handling used to process CQ events is based on the standard Geode event handling framework. The CQListener interface is similar to [Application Plug-Ins](../client-cache/application-plugins.html) and [Application Callbacks](../dotnet-caching-api/application-callbacks.html).
+- **Complete integration with the client/server architecture**. CQ functionality uses existing server-to-client messaging mechanisms to send events. All tuning of your server-to-client messaging also tunes the messaging of your CQ events. If your system is configured for high availability then your CQs are highly available, with seamless failover provided in case of server failure (see [High Availability for Client-to-Server Communication](../preserving-data/high-availability-client-server.html)). If your clients are durable, you can also define any of your CQs as durable (see [Durable Client Messaging](../preserving-data/durable-client-messaging.html)).
+- **Interest criteria based on data values**. CQ queries are run against the region's entry values. Compare this to register interest by reviewing [Registering Interest for Entries](../client-cache/registering-interest-for-entries.html).
+- **Active query execution**. Once initialized, the queries only operate on new events instead of on the entire region data set. Events that change the query result are sent to the client immediately.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/continuous-querying/3-native-client-cq-api.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/continuous-querying/3-native-client-cq-api.html.md.erb b/docs/geode-native-docs/continuous-querying/3-native-client-cq-api.html.md.erb
deleted file mode 100644
index 8706d93..0000000
--- a/docs/geode-native-docs/continuous-querying/3-native-client-cq-api.html.md.erb
+++ /dev/null
@@ -1,56 +0,0 @@
----
-title: CQ API and Main Features
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-This chapter documents the primary native client API for CQ management.
-
-The Apache Geode native client API allows your clients to create and manage CQs. (The server side does not have an API.) Continuous querying provides native client query syntax, events-based management, integration with client/server architecture, active query execution, and interest criteria based on data values. For complete information on the classes and interfaces described here,
-see the documentation for the [C++ API](/releases/latest/api/cppdocs) or the [.NET API](/releases/latest/api/dotnetdocs).
-
-**Apache.Geode.Client.Cache**
-
-Only C\# versions of CQ API interfaces, classes, and methods are shown here (example: `CqQuery.execute`). The code examples demonstrate both C++ and C\# versions.
-
-- `QueryService` interface. Provides methods that enable you to:
- - Create a new CQ and specify whether it is durable (available for durable clients)
- - Execute a CQ with or without an initial result
- - List all the CQs registered by the client
- - Close and stop CQs
- - Get a handle on `CqStatistics` for the client
-
- You run `QueryService` CQ methods against the server cache. The QueryService can be obtained from the cache or from a pool.
-- `CqQuery`interface. Provides methods for managing a continuous query after it is created through the `QueryService`. This interface is used typically to begin and end CQ execution and to retrieve other CQ-related objects such as CQ attributes, CQ statistics, and CQ state.
-- `CqListener` application plug-in interface. Handles continuous query events after they occur. You program this interface.
-- `CqEvent`interface. Provides all information sent from the server about the CQ event, which is passed to the CQ's `CqListener` methods.
-- `CqState` interface. Provides information on the state of a `CqQuery`, through the getState method of the `CqQuery` instance.
-- `CqAttributes, CqAttributesFactory, CqAttributesMutator` interfaces. Allow you to manage CQ attributes. The attributes consist of `CqListener `plug-in specifications.
-- `CqStatistics, CqServiceStatistics` interfaces. Allow you to access statistics information for a single CQ and for the query service's management of CQs as a whole. For details on statistics, see [Statistics API](../cpp-caching-api/gfe-cpp-api.html#concept_AB12290E89CA4724AC9F51EFF7B8B8EA__section_42764C6327944514AE4A26684D7EBCB0).
-
-## <a id="security__section_74A3A0ECC2B645CEAEFDF68350E55EB4" class="no-quick-link"></a>Main Features of Continuous Querying
-
-Continuous querying in the native client has the following features:
-
-- **Standard Geode native client query syntax and semantics**. CQ queries are expressed in the same language used for other native client queries. See [Remote Querying](../remote-querying/remote-querying.html).
-- **Standard Geode events-based management of CQ events**. The event handling used to process CQ events is based on the standard Geode event handling framework. The CQListener interface is similar to [Application Plug-Ins](../client-cache/application-plugins.html) and [Application Callbacks](../dotnet-caching-api/application-callbacks.html).
-- **Complete integration with the client/server architecture**. CQ functionality uses existing server-to-client messaging mechanisms to send events. All tuning of your server-to-client messaging also tunes the messaging of your CQ events. If your system is configured for high availability then your CQs are highly available, with seamless failover provided in case of server failure (see [High Availability for Client-to-Server Communication](../preserving-data/high-availability-client-server.html)). If your clients are durable, you can also define any of your CQs as durable (see [Durable Client Messaging](../preserving-data/durable-client-messaging.html)).
-- **Interest criteria based on data values**. CQ queries are run against the region's entry values. Compare this to register interest by reviewing [Registering Interest for Entries](../client-cache/registering-interest-for-entries.html).
-- **Active query execution**. Once initialized, the queries only operate on new events instead of on the entire region data set. Events that change the query result are sent to the client immediately.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/continuous-querying/5-implementing-cq.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/continuous-querying/5-implementing-cq.html.md.erb b/docs/geode-native-docs/continuous-querying/5-implementing-cq.html.md.erb
index 5804a00..365f476 100644
--- a/docs/geode-native-docs/continuous-querying/5-implementing-cq.html.md.erb
+++ b/docs/geode-native-docs/continuous-querying/5-implementing-cq.html.md.erb
@@ -29,7 +29,11 @@ Here are the high-level steps for implementing a continuous query, with links to
Each CQ can have any number of listeners. In addition to your core CQ listeners, you might have listeners that you use for all CQs to track statistics or other general information. See [Writing the CQ Listener](5b-writing-cq-listener.html#security).
-4. Write the client code to put the queries and their listeners into named CQ queries and execute the queries. Make sure you close the queries if your client no longer needs them and when the client exits. See [Running the Continuous Query Code](5e-running-cq-code.html#security).
-5. Write any code you need for monitoring and managing your CQ query. See [Managing Continuous Queries](6-managing-cqs.html#security).
-6. Run your code, monitor and tune as needed.
+4. The [`CqEvent` object](5c-cq-event-object.html) contains information about the CQ event.
+
+5. Write the client code to put the queries and their listeners into named CQ queries and execute the queries. Make sure you close the queries if your client no longer needs them and when the client exits. See [Running the Continuous Query Code](5e-running-cq-code.html#security).
+
+6. [CQ Execution Options](5f-cq-execution-options.html).
+7. [When an Error Occurs in a Running CQ](5d-when-error-occurs.html).
+8. Run your code, monitor and tune as needed.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/continuous-querying/6-managing-cqs.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/continuous-querying/6-managing-cqs.html.md.erb b/docs/geode-native-docs/continuous-querying/6-managing-cqs.html.md.erb
index a185b35..cb5bfd7 100644
--- a/docs/geode-native-docs/continuous-querying/6-managing-cqs.html.md.erb
+++ b/docs/geode-native-docs/continuous-querying/6-managing-cqs.html.md.erb
@@ -29,7 +29,7 @@ For detailed method usage, see the API documentation for the [C++ API](/releases
You can use the `QueryServicegetCq*` methods to access a single named CQ, an array of all CQs registered, and an array of all CQs registered in the client. You canuse the `CqEvent.getCq` method to access the CQ used to produce a `CqEvent`.
-CQ runtime statistics are available for the client through the `CqServiceStatistics` and `CqStatistics` interfaces described under [CQ API and Main Features](3-native-client-cq-api.html#security). You can get information on the events generated by a specific CQ from the `CqStatistics` object returned by `CqQuery.GetStatistics`. You can get higher-level information about the CQs the client has registered, running, and so on, from the `CqServiceStatistics` object returned by `QueryService.GetCqStatistics` .
+CQ runtime statistics are available for the client through the `CqServiceStatistics` and `CqStatistics` interfaces described under [CQ API and Main Features](3-client-cq-api.html#security). You can get information on the events generated by a specific CQ from the `CqStatistics` object returned by `CqQuery.GetStatistics`. You can get higher-level information about the CQs the client has registered, running, and so on, from the `CqServiceStatistics` object returned by `QueryService.GetCqStatistics` .
Client statistics are for the single client only. The server's pertain to all clients with CQs on this server.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/continuous-querying/continuous-querying.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/continuous-querying/continuous-querying.html.md.erb b/docs/geode-native-docs/continuous-querying/continuous-querying.html.md.erb
index 4f2a42f..9effa11 100644
--- a/docs/geode-native-docs/continuous-querying/continuous-querying.html.md.erb
+++ b/docs/geode-native-docs/continuous-querying/continuous-querying.html.md.erb
@@ -33,7 +33,7 @@ limitations under the License.
This section discusses how to access and manage your CQs from your client. The calls discussed here are all executed specifically for the calling client. A client cannot access or modify the CQs belonging to another client.
-- **[CQ API and Main Features](3-native-client-cq-api.html)**
+- **[CQ API and Main Features](3-client-cq-api.html)**
This chapter documents the primary native client API for CQ management.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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 ca478ab..8cf3f21 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
@@ -21,9 +21,9 @@ limitations under the License.
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 [C++ API](/releases/latest/api/cppdocs). It provides extensive implementation details for the C++ structures and functions.
+The C++ API documentation is available at [C++ API]((http://geode.apache.org/docs/). 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).
+Several example API programs are included in the `SampleCode` directory. See [QuickStart Examples](../introduction/quickstart.html).
- **[About the C++ Client API](gfe-cpp-api.html)**
@@ -49,7 +49,7 @@ Several example API programs are included in the `SampleCode` directory. See [Qu
The standard `Region::remove` API removes the entry with the specified key and provides a user-defined parameter object to any `CacheWriter` or `CacheListener` invoked in the process.
-- **[Serializing Data](serialization_overview.html)**
+- **[Serializing Data](serialization-overview.html)**
All data moved out of the local cache must be serializable.
[4/7] geode-native git commit: GEODE-2513: Rename and reorganize
client doc sources This closes #85
Posted by db...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/introduction/client_configurations.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/client_configurations.html.md.erb b/docs/geode-native-docs/introduction/client_configurations.html.md.erb
deleted file mode 100644
index 5c9c712..0000000
--- a/docs/geode-native-docs/introduction/client_configurations.html.md.erb
+++ /dev/null
@@ -1,164 +0,0 @@
----
-title: Apache Geode Client Configurations
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-The Apache Geode client provides access for C++ and Microsoft� .NET\u2122 clients to the Geode distributed system.
-As an open source project, the client (at least theoretically) can be built on nearly any system.
-In practical terms, the client is known to have been successfully built and used on platforms running Microsoft Windows, Linux (Intel), and Sun Solaris.
-
-For your convenience, this table shows configuration guidelines for some familiar operating systems.
-
-
-<table style="width:100%;">
-<colgroup>
-<col width="20%" />
-<col width="20%" />
-<col width="20%" />
-<col width="20%" />
-<col width="20%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>Operating System</th>
-<th>Processor and Architecture</th>
-<th>RAM</th>
-<th>Swap Space</th>
-<th>64-Bit Disk Space Required</th>
-</tr>
-</thead>
-<tbody>
-<tr class="even">
-<td>Solaris 11</td>
-<td>x86-64
-</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>90MB</td>
-</tr>
-<tr class="odd">
-<td>RHEL 7</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>120MB</td>
-</tr>
-<tr class="even">
-<td>SLES 12</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>120MB</td>
-</tr>
-<tr class="odd">
-<td>Windows 2012 Server R2</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>125MB</td>
-</tr>
-<tr class="odd">
-<td>Windows 10</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>125MB</td>
-</tr>
-<tr class="odd">
-<td>macOS 10.12 (Sierra)</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>125MB</td>
-</tr>
-</tbody>
-</table>
-
-## Host Machine Configuration Guidelines
-
-Each machine that runs a Geode client should meet the following guidelines:
-
-- A system clock set to the correct time and a time synchronization
-service such as Network Time Protocol (NTP).
-Correct time stamps permit the following activities:
- - Logs that are useful for troubleshooting. Synchronized time stamps ensure that log messages from different hosts can be merged to reproduce an accurate chronological history of a distributed run.
- - Aggregate product-level and application-level time statistics.
- - Accurate monitoring of the system with scripts and other tools that read the system statistics and log files.
-- The host name and host files are properly configured for the machine.
-- Many default Linux installations use SYN cookies to protect the
-system against malicious attacks that flood TCP SYN packets.
-The use of SYN cookies dramatically reduces network bandwidth,
-and can be triggered by a running GemFire distributed system.
-
- To disable SYN cookies permanently:
- 1. Edit the `/etc/sysctl.conf` file to include the following line:
-
- ``` pre
- net.ipv4.tcp_syncookies = 0
- ```
- Setting this value to zero disables SYN cookies.
- 2. Reload `sysctl.conf`:
-
- ``` pre
- sysctl -p
- ```
-
-## <a id="concept_7AE0C1CB11244095A50CCB52A09A09A1__section_3A8A0684D68E467EBA498D939E91C5AA" class="no-quick-link"></a>Windows Guidelines
-
-**Runtime Library**
-
-The Geode client requires the [Microsoft Visual C++ 2013 Redistributable Package](https://www.microsoft.com/en-us/download/details.aspx?id=40784).
-This package contains runtime libraries needed by the client; install it for your platform architecture on all machines that will run the client.
-
-**.NET Framework Version Support**
-
-The Geode client is supported with Microsoft .NET Framework 4.5.2.
-
-A Microsoft .NET Framework must be installed to support the C++/CLI (Common Language Infrastructure) library for the client.
-
-The Geode supports .NET 4.5.2 and Visual Studio 2013 (for compiling C++ applications on Windows).
-For more information on the features of .NET and Visual Studio Community Edition 2013 Update 5, see the [Visual Studio 2013 web page](https://msdn.microsoft.com/en-us/library/dd831853(v=vs.120).aspx).
-
-## <a id="concept_7AE0C1CB11244095A50CCB52A09A09A1__section_C5848F353C504844BAFFD3EB2BE7DA23" class="no-quick-link"></a>Linux
-
-For Linux, you can verify that you meet the client dependencies at the library level by using the `ldd` tool and entering this command:
-
-``` pre
-prompt> ldd $client-installdir/lib/libgfcppcache.so
-```
-where _client-installdir_ is the location in which you have installed the Geode client.
-
-The following libraries are external dependencies of the client library, `libgfcppcache.so`. Verify that the ldd tool output includes all of these:
-
-- libdl.so.2
-- libm.so.6
-- libpthread.so.0
-- libc.so.6
-- libz.so.1
-
-
-## <a id="concept_7AE0C1CB11244095A50CCB52A09A09A1__ssl_requirements" class="no-quick-link"></a>Software Requirements for Using SSL
-
-If you plan on using SSL in your Geode client and server deployment, you will need to download and install OpenSSL.
-
-The client requires OpenSSL 1.0.1t or later. For Windows platforms, you can use either the regular or the OpenSSL "Light" version.
-
-In addition, make sure that your system environment variables have been configured to include OpenSSL.
-
-See [SSL Client/Server Communication](../security/sslclientserver.html) for instructions.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/introduction/native-client-intro.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/native-client-intro.html.md.erb b/docs/geode-native-docs/introduction/native-client-intro.html.md.erb
deleted file mode 100644
index 1327727..0000000
--- a/docs/geode-native-docs/introduction/native-client-intro.html.md.erb
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: Getting Started with the Client
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-This section shows you how to build the product and run the quick start examples.
-
-The Geode client provides access for C++ and Microsoft<sup>�</sup> .NET\u2122 clients to a Geode distributed system.
-
-- **[System Configurations](client_configurations.html)**
-
- Configuration guidelines for some familiar operating systems.
-
-- **[Installing the Client](install-overview.html)**
-
- Procedures for building the client libraries from a source distribution.
-
-- **[QuickStart Examples](quickstart.html)**
-
- Run the native client QuickStart examples to understand client functionality.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/introduction/native-client-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/native-client-overview.html.md.erb b/docs/geode-native-docs/introduction/native-client-overview.html.md.erb
deleted file mode 100644
index e8253c0..0000000
--- a/docs/geode-native-docs/introduction/native-client-overview.html.md.erb
+++ /dev/null
@@ -1,37 +0,0 @@
----
-title: About the Client
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-The Geode client delivers the full set of capabilities supplied by Java clients communicating with a Geode server.
-
-The Geode client is written entirely in C++, so its initialization process does not involve the creation of a Java virtual machine. The .NET client provides operations for the .NET Framework application developer who writes in .NET languages and needs to access the Geode server.
-
-Clients in C++, Java, and .NET languages communicate only with the cache server and do not communicate with each other. The clients interface with the server at the sockets level and implement the same wire protocol to the server. These capabilities produce extremely high performance and system scalability.
-
-C++ and .NET clients provide access to the full region API, including support for application plug-ins, managed connectivity, highly available data, and reliable failover to a specified server list. All of this is transparent to the end user.
-
-You can configure clients to cache data locally, or they can act in a cacheless mode where they retrieve data from a cache server and directly pass it to other system members without incurring the caching overhead. They can be configured as read only caches, or be configured to receive notifications from the server whenever a key of interest to the client changes on the server.
-
-This figure diagrams how .NET and C++ applications access the cache server. <a id="concept_BCE696D352144690ADF786A0E3D2BD98__fig_C19B4B30942D4F1BA59DBDCC6146241A"></a>
-
-
-<img src="../common/images/native-client-overview.gif" alt="Client Overview" id="concept_BCE696D352144690ADF786A0E3D2BD98__image_A0805B5079C64B0E8F2E9DA2A8A5A7A6" class="image" />
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/introduction/quickstart.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/quickstart.html.md.erb b/docs/geode-native-docs/introduction/quickstart.html.md.erb
index 341978d..c62b537 100644
--- a/docs/geode-native-docs/introduction/quickstart.html.md.erb
+++ b/docs/geode-native-docs/introduction/quickstart.html.md.erb
@@ -270,7 +270,7 @@ following table:
You can also provide your own serializable objects. Examples of custom serializable objects are
`Position` and `Portfolio` in the RemoteQuery example. For more information regarding serialization,
-refer to [Serializing Data](../cpp-caching-api/serialization_overview.html) and the online API documentation for the client.
+refer to [Serializing Data](../cpp-caching-api/serialization-overview.html) and the online API documentation for the client.
## Data Expiration
@@ -425,7 +425,7 @@ The PdxInstance example shows the ability of clients to work with PDX serialized
-# <a id="RunningQSE" class="no-quick=link"></a>Running the Examples
+# <a id="RunningQSE" class="no-quick-link"></a>Running the Examples
You can run the quickstart examples by starting each C++ or C# example individually from the command line or by starting the examples from a menu.
The menu provides a numbered list of the example names, so you just enter the example number to start it.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/programming-examples/client-region.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/programming-examples/client-region.html.md.erb b/docs/geode-native-docs/programming-examples/client-region.html.md.erb
new file mode 100644
index 0000000..6aaf4bc
--- /dev/null
+++ b/docs/geode-native-docs/programming-examples/client-region.html.md.erb
@@ -0,0 +1,46 @@
+---
+title: Declaring a Client Region
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+This example shows how to declare a client region in a `cache.xml` file.
+
+``` pre
+<cache>
+ <region name = "root1" >
+ <region-attributes refid="CACHING_PROXY" pool-name="poolName1"/>
+ </region>
+ <region name = "root2" >
+ <region-attributes refid="PROXY" pool-name="poolName2"/>
+ </region>
+ <pool name="poolName1" subscription-enabled="true">
+ <server host="localhost" port="40404" />
+ </pool>
+ <pool name="poolName2" subscription-enabled="true">
+ <server host="localhost" port="40404" />
+ </pool>
+</cache>
+```
+
+- The pool defines a list of cache servers that the client region can communicate with.
+- The *CACHING\_PROXY* setting causes the client region to cache data and to communicate with the servers. The *PROXY* setting causes the client region to communicate with the servers, but cache no data.
+- The region *subscription-enabled* property, if `true` , indicates that the client should receive data updates when server data changes.
+- Clients do not specify cache loaders or writers, which are provided by the server.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/programming-examples/native-client-region.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/programming-examples/native-client-region.html.md.erb b/docs/geode-native-docs/programming-examples/native-client-region.html.md.erb
deleted file mode 100644
index 6aaf4bc..0000000
--- a/docs/geode-native-docs/programming-examples/native-client-region.html.md.erb
+++ /dev/null
@@ -1,46 +0,0 @@
----
-title: Declaring a Client Region
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-This example shows how to declare a client region in a `cache.xml` file.
-
-``` pre
-<cache>
- <region name = "root1" >
- <region-attributes refid="CACHING_PROXY" pool-name="poolName1"/>
- </region>
- <region name = "root2" >
- <region-attributes refid="PROXY" pool-name="poolName2"/>
- </region>
- <pool name="poolName1" subscription-enabled="true">
- <server host="localhost" port="40404" />
- </pool>
- <pool name="poolName2" subscription-enabled="true">
- <server host="localhost" port="40404" />
- </pool>
-</cache>
-```
-
-- The pool defines a list of cache servers that the client region can communicate with.
-- The *CACHING\_PROXY* setting causes the client region to cache data and to communicate with the servers. The *PROXY* setting causes the client region to communicate with the servers, but cache no data.
-- The region *subscription-enabled* property, if `true` , indicates that the client should receive data updates when server data changes.
-- Clients do not specify cache loaders or writers, which are provided by the server.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/programming-examples/programming-examples.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/programming-examples/programming-examples.html.md.erb b/docs/geode-native-docs/programming-examples/programming-examples.html.md.erb
index 748d9d4..c6e2d4b 100644
--- a/docs/geode-native-docs/programming-examples/programming-examples.html.md.erb
+++ b/docs/geode-native-docs/programming-examples/programming-examples.html.md.erb
@@ -21,7 +21,7 @@ limitations under the License.
This section provides a set of programming examples to further understanding of the client API.
-- **[Declaring a Client Region](native-client-region.html)**
+- **[Declaring a Client Region](client-region.html)**
The following example shows how to declare a client region in a `cache.xml` file.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/remote-querying/91-quickintro/1-quickintro-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/91-quickintro/1-quickintro-overview.html.md.erb b/docs/geode-native-docs/remote-querying/91-quickintro/1-quickintro-overview.html.md.erb
index 033ffcf..a9c8ac7 100644
--- a/docs/geode-native-docs/remote-querying/91-quickintro/1-quickintro-overview.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/91-quickintro/1-quickintro-overview.html.md.erb
@@ -29,4 +29,4 @@ This section assumes that you have general familiarity with SQL querying and ind
Query language features and grammar are described in the Geode manual at [Querying](geodeman/developing/querying_basics/chapter_overview.html). This section describes areas that are unique to the native client.
-If you are using the pool API, you should obtain the QueryService from the pool. For information about the pool API, see [Client Pool API](../../connection-pools/native-client-pool-api.html#native-client-pool-api).
+If you are using the pool API, you should obtain the QueryService from the pool. For information about the pool API, see [Client Pool API](../../connection-pools/client-pool-api.html#native-client-pool-api).
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html.md.erb b/docs/geode-native-docs/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html.md.erb
index 620bdee..a0ce9f6 100644
--- a/docs/geode-native-docs/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html.md.erb
+++ b/docs/geode-native-docs/remote-querying/91-quickintro/4-quickintro-exampleportfolioregion.html.md.erb
@@ -1,5 +1,5 @@
---
-title: Examples Data and Class Definitions
+title: Example Data and Class Definitions
---
<!--
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/remote-querying/91-quickintro/94-indexes-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/91-quickintro/94-indexes-overview.html.md.erb b/docs/geode-native-docs/remote-querying/91-quickintro/94-indexes-overview.html.md.erb
new file mode 100644
index 0000000..b7dda4c
--- /dev/null
+++ b/docs/geode-native-docs/remote-querying/91-quickintro/94-indexes-overview.html.md.erb
@@ -0,0 +1,46 @@
+---
+title: Creating Indexes
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+An index can provide significant performance gains for query execution. You create and maintain indexes on the cache server.
+
+A query run without an index iterates through every object in the collection on the cache server. If an index is available that matches part or all of the query specification, the query iterates only over the indexed set, and query processing time can be reduced.
+
+When you create your indexes on the cache server, remember that indexes incur maintenance costs as they must be updated when the indexed data changes. An index that requires many updates and is not used very often may require more system resources than no index at all. Indexes also consume memory. For information on the amount of memory used for indexes, see the system configuration information.
+
+You can create an index for remote querying declaratively on the cache server in a `cache.xml` file, as shown in this example.
+
+**Creating an Index on a Cache Server Using a Server XML File**
+
+``` pre
+<region name="portfolios">
+ <region-attributes . . . >
+ <value-constraint>cacheRunner.Portfolio</value-constraint>
+ </region-attributes>
+ <index name="myFuncIndex">
+ <functional from-clause="/portfolios" expression="status"/>
+ </index>
+ <index name="myPrimIndex">
+ <primary-key field="id"/>
+ </index>
+ <entry> . . .
+```
+
+For detailed information about working with indexes configured on a cache server, see [Working with Indexes](geodeman/developing/query_index/query_index.html) within the server's documentation.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/remote-querying/94-indexes/indexes-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/remote-querying/94-indexes/indexes-overview.html.md.erb b/docs/geode-native-docs/remote-querying/94-indexes/indexes-overview.html.md.erb
deleted file mode 100644
index b7dda4c..0000000
--- a/docs/geode-native-docs/remote-querying/94-indexes/indexes-overview.html.md.erb
+++ /dev/null
@@ -1,46 +0,0 @@
----
-title: Creating Indexes
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-An index can provide significant performance gains for query execution. You create and maintain indexes on the cache server.
-
-A query run without an index iterates through every object in the collection on the cache server. If an index is available that matches part or all of the query specification, the query iterates only over the indexed set, and query processing time can be reduced.
-
-When you create your indexes on the cache server, remember that indexes incur maintenance costs as they must be updated when the indexed data changes. An index that requires many updates and is not used very often may require more system resources than no index at all. Indexes also consume memory. For information on the amount of memory used for indexes, see the system configuration information.
-
-You can create an index for remote querying declaratively on the cache server in a `cache.xml` file, as shown in this example.
-
-**Creating an Index on a Cache Server Using a Server XML File**
-
-``` pre
-<region name="portfolios">
- <region-attributes . . . >
- <value-constraint>cacheRunner.Portfolio</value-constraint>
- </region-attributes>
- <index name="myFuncIndex">
- <functional from-clause="/portfolios" expression="status"/>
- </index>
- <index name="myPrimIndex">
- <primary-key field="id"/>
- </index>
- <entry> . . .
-```
-
-For detailed information about working with indexes configured on a cache server, see [Working with Indexes](geodeman/developing/query_index/query_index.html) within the server's documentation.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/security/LDAPserverauth.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/security/LDAPserverauth.html.md.erb b/docs/geode-native-docs/security/LDAPserverauth.html.md.erb
index f254929..08e91a7 100644
--- a/docs/geode-native-docs/security/LDAPserverauth.html.md.erb
+++ b/docs/geode-native-docs/security/LDAPserverauth.html.md.erb
@@ -21,7 +21,7 @@ limitations under the License.
An LDAP server can be used by a Geode cache server using the sample LDAP implementation provided in the server distribution.
-See the [Security](../../managing/security/chapter_overview.html#security) to verify authentication credentials for clients attempting to connect to the cache servers and sending user name and passwords using the sample UserPassword scheme.
+See [Security](geodeman/managing/security/chapter_overview.html#security) in the server manual to verify authentication credentials for clients attempting to connect to the cache servers and sending user name and passwords using the sample UserPassword scheme.
**Note:**
The user name and password with this sample implementation is sent out in plaintext. For better security, either turn on credential encryption using Diffie-Hellman key exchange, or use a scheme like PKCS.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/cache-server-config.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/cache-server-config.html.md.erb b/docs/geode-native-docs/setting-properties/cache-server-config.html.md.erb
index e7c2f5a..4518b35 100644
--- a/docs/geode-native-docs/setting-properties/cache-server-config.html.md.erb
+++ b/docs/geode-native-docs/setting-properties/cache-server-config.html.md.erb
@@ -27,7 +27,7 @@ The configuration of the caches is part of the application development process.
For the cache server, the `gemfire.properties` file is usually stored in the current working directory.
-For the `cache.xml` configuration file, a client looks for the path specified by the `cache-xml-file` attribute in `geode.properties` (see [Attributes in the Properties File](propfile_attributes.html#attributes-gfcpp)). If the `cache.xml` is not found, the process starts with an unconfigured cache.
+For the `cache.xml` configuration file, a client looks for the path specified by the `cache-xml-file` attribute in `geode.properties` (see [Attributes in the Properties File](propfile-attributes.html#attributes-gfcpp)). If the `cache.xml` is not found, the process starts with an unconfigured cache.
## <a id="cache-server-config__section_F47DE4D858B04244956B91360AD8967E" class="no-quick-link"></a>Modifying Attributes Outside the gemfire.properties File
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/chapter-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/chapter-overview.html.md.erb b/docs/geode-native-docs/setting-properties/chapter-overview.html.md.erb
index 2ea38cc..417736a 100644
--- a/docs/geode-native-docs/setting-properties/chapter-overview.html.md.erb
+++ b/docs/geode-native-docs/setting-properties/chapter-overview.html.md.erb
@@ -25,11 +25,11 @@ This section describes how to configure clients and cache servers to participate
You can configure clients through files and API calls. The servers are configured through command-line input and configuration files.
-- **[Attributes in the Properties File](propfile_attributes.html)**
+- **[Attributes in the Properties File](propfile-attributes.html)**
A variety of `geode.properties` settings can be used when a client connects to a distributed system.
-- **[Properties File Example](propfile_overview.html)**
+- **[Properties File Example](propfile-overview.html)**
Use the geode.properties file to configure distributed system connections for the client.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/client-config.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/client-config.html.md.erb b/docs/geode-native-docs/setting-properties/client-config.html.md.erb
new file mode 100644
index 0000000..b10608d
--- /dev/null
+++ b/docs/geode-native-docs/setting-properties/client-config.html.md.erb
@@ -0,0 +1,52 @@
+---
+title: Client Configuration
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+You configure the client in two files: `geode.properties` for system-level configuration and `cache.xml` for cache-level configuration.
+
+The configuration of the caches is part of the application development process. See [Cache Initialization File (cache.xml)](../cache-init-file/chapter-overview.html#chapter-overview). (The cache-level configuration file is generally referred to as `cache.xml`, but you can use any name.)
+
+## <a id="native-client-config__section_67D24B8F8C6C46CDA3474E6E42963D04" class="no-quick-link"></a>About the geode.properties Configuration File
+
+The `geode.properties` file provides local settings required to connect a client to a distributed system, along with settings for licensing, logging, and statistics. See [Attributes in the Properties File](propfile-attributes.html#attributes-gfcpp).
+
+The application software may include a set of `geode.properties` files. You set any attributes needed for the application design in these files, then you can add any attributes needed for the local site.
+
+If you do not have `geode.properties` files, use any text editor to create them. See [Properties File Example](propfile-overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format and contents.
+
+## <a id="native-client-config__section_88780874FD6C4BBD9B1B993758A985BB" class="no-quick-link"></a>Configuration File Locations
+
+A client looks for a `geode.properties` file first in the working directory where the process runs, then in <code>_product-dir_/defaultSystem</code>.
+Use the `defaultSystem` directory to group configuration files or to share them among processes for more convenient administration. If `geode.properties` is not found, the process starts up with the default settings.
+
+For the `cache.xml` cache configuration file, a client looks for the path specified by the `cache-xml-file` attribute in `geode.properties` (see [Attributes in the Properties File](propfile-attributes.html#attributes-gfcpp)). If the `cache.xml` is not found, the process starts with an unconfigured cache.
+
+## <a id="native-client-config__section_6EBE269F15A1497BB4ABBF659F978DA1" class="no-quick-link"></a>Configuring System Properties for the Client
+
+The typical configuration procedure for a client includes the high-level steps listed below. The rest of this chapter provides the details.
+
+1. Place the `geode.properties` file for the application in the working directory or in <code>_product-dir_/defaultSystem</code>.
+Use the configuration file that came with the application software if there is one, or create your own. See [Properties File Example](propfile-overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format and contents.
+2. Place the `cache.xml` file for the application in the desired location and specify its path in the `geode.properties` file.
+3. Add other attributes to the `geode.properties` file as needed for the local system architecture. See [Attributes in the Properties File](propfile-attributes.html#attributes-gfcpp) for the configurable attributes, and [Properties File Example](propfile-overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format.
+
+## <a id="native-client-config__section_7F09E85DD0144972AAA7028D81780129" class="no-quick-link"></a>Running a Client Out of the Box
+
+If you start a client without any configuration, it uses any attributes set programmatically plus any hard-coded defaults (listed in [Attributes in the Properties File](propfile-attributes.html#attributes-gfcpp)). Running with the defaults is a convenient way to learn the operation of the distributed system and to test which attributes need to be reconfigured for your environment.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/config-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/config-overview.html.md.erb b/docs/geode-native-docs/setting-properties/config-overview.html.md.erb
index 5354a71..f69674d 100644
--- a/docs/geode-native-docs/setting-properties/config-overview.html.md.erb
+++ b/docs/geode-native-docs/setting-properties/config-overview.html.md.erb
@@ -21,7 +21,7 @@ limitations under the License.
You can configure clients through files and API calls. The servers are configured through command-line input and configuration files.
-- **[Client Configuration](native-client-config.html)**
+- **[Client Configuration](client-config.html)**
You configure the client in two files: `geode.properties` for system-level configuration and `cache.xml` for cache-level configuration.
@@ -33,11 +33,11 @@ You can configure clients through files and API calls. The servers are configure
You can specify attributes in different ways, which can cause conflicting definitions. Applications can be configured programmatically, and that has priority over other settings.
-- **[Search Path for Multiple Properties Files](propfile_search_path.html)**
+- **[Search Path for Multiple Properties Files](propfile-search-path.html)**
The client and server processes first look for their properties file in the <code>_product-dir_/defaultSystem</code> directory, then in the working directory.
-- **[Overriding Properties File Settings](propfile_overriding.html)**
+- **[Overriding Properties File Settings](propfile-overriding.html)**
Application developers have the option of configuring system attributes programmatically, rather than using the `geode.properties` file.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/native-client-config.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/native-client-config.html.md.erb b/docs/geode-native-docs/setting-properties/native-client-config.html.md.erb
deleted file mode 100644
index 9076f6f..0000000
--- a/docs/geode-native-docs/setting-properties/native-client-config.html.md.erb
+++ /dev/null
@@ -1,52 +0,0 @@
----
-title: Client Configuration
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-You configure the client in two files: `geode.properties` for system-level configuration and `cache.xml` for cache-level configuration.
-
-The configuration of the caches is part of the application development process. See [Cache Initialization File (cache.xml)](../cache-init-file/chapter-overview.html#chapter-overview). (The cache-level configuration file is generally referred to as `cache.xml`, but you can use any name.)
-
-## <a id="native-client-config__section_67D24B8F8C6C46CDA3474E6E42963D04" class="no-quick-link"></a>About the geode.properties Configuration File
-
-The `geode.properties` file provides local settings required to connect a client to a distributed system, along with settings for licensing, logging, and statistics. See [Attributes in the Properties File](propfile_attributes.html#attributes-gfcpp).
-
-The application software may include a set of `geode.properties` files. You set any attributes needed for the application design in these files, then you can add any attributes needed for the local site.
-
-If you do not have `geode.properties` files, use any text editor to create them. See [Properties File Example](propfile_overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format and contents.
-
-## <a id="native-client-config__section_88780874FD6C4BBD9B1B993758A985BB" class="no-quick-link"></a>Configuration File Locations
-
-A client looks for a `geode.properties` file first in the working directory where the process runs, then in <code>_product-dir_/defaultSystem</code>.
-Use the `defaultSystem` directory to group configuration files or to share them among processes for more convenient administration. If `geode.properties` is not found, the process starts up with the default settings.
-
-For the `cache.xml` cache configuration file, a client looks for the path specified by the `cache-xml-file` attribute in `geode.properties` (see [Attributes in the Properties File](propfile_attributes.html#attributes-gfcpp)). If the `cache.xml` is not found, the process starts with an unconfigured cache.
-
-## <a id="native-client-config__section_6EBE269F15A1497BB4ABBF659F978DA1" class="no-quick-link"></a>Configuring System Properties for the Client
-
-The typical configuration procedure for a client includes the high-level steps listed below. The rest of this chapter provides the details.
-
-1. Place the `geode.properties` file for the application in the working directory or in <code>_product-dir_/defaultSystem</code>.
-Use the configuration file that came with the application software if there is one, or create your own. See [Properties File Example](propfile_overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format and contents.
-2. Place the `cache.xml` file for the application in the desired location and specify its path in the `geode.properties` file.
-3. Add other attributes to the `geode.properties` file as needed for the local system architecture. See [Attributes in the Properties File](propfile_attributes.html#attributes-gfcpp) for the configurable attributes, and [Properties File Example](propfile_overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format.
-
-## <a id="native-client-config__section_7F09E85DD0144972AAA7028D81780129" class="no-quick-link"></a>Running a Client Out of the Box
-
-If you start a client without any configuration, it uses any attributes set programmatically plus any hard-coded defaults (listed in [Attributes in the Properties File](propfile_attributes.html#attributes-gfcpp)). Running with the defaults is a convenient way to learn the operation of the distributed system and to test which attributes need to be reconfigured for your environment.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/propfile-attributes.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile-attributes.html.md.erb b/docs/geode-native-docs/setting-properties/propfile-attributes.html.md.erb
new file mode 100644
index 0000000..da55829
--- /dev/null
+++ b/docs/geode-native-docs/setting-properties/propfile-attributes.html.md.erb
@@ -0,0 +1,278 @@
+---
+title: Attributes in the Properties File
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+A variety of `geode.properties` settings can be used when a client connects to a distributed system.
+
+The following settings can be configured:
+
+- **[General Properties](#attributes-gfcpp__table_21004C9E93294F03BE3469C13EA33262)** Basic information for the process, such as cache creation parameters.
+- **[Logging Properties](#attributes-gfcpp__table_D42627049FD6432494BDE5170AF1BCCF)** How and where to log system messages.
+- **[Statistics Archiving Properties](#attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723)** How to collect and archive statistics information.
+- **[Durable Client Properties](#attributes-gfcpp__table_BA6DAF27947B4A9488787E6BDCFC15B9)** Information about the durable clients connected to the system.
+- **[Security Properties](#attributes-gfcpp__table_B3A8E9EB44A94557A97BB700E2BA1EF1)** Information about various security parameters.
+
+## <a id="attributes-gfcpp__section_655789BCC46642789F91CDA8AE03CD9B" class="no-quick-link"></a>Attribute Definitions
+
+The following tables list attributes that can be stored in the `geode.properties` file to be read by a client.
+
+For the system properties that relate to high availability, see [Sending Periodic Acknowledgement](../preserving-data/sending-periodic-ack.html#concept_868B8082463846DE9F35BBEA56105C82). For a list of security-related system properties and their descriptions, see the table [System Properties for Client Authentication and Authorization](../security/security-systemprops.html#security__table_92A6A66523764199A19BCD66BA189921).
+
+<a id="attributes-gfcpp__table_21004C9E93294F03BE3469C13EA33262" class="no-quick-link"></a>
+
+<table>
+<caption><span class="tablecap">Table 1. Attributes in geode.properties\u2014General Properties</span></caption>
+<colgroup>
+<col width="33%" />
+<col width="33%" />
+<col width="34%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th>geode.properties Attribute</th>
+<th>Description</th>
+<th>Default</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>appdomain-enabled</td>
+<td>If <code class="ph codeph">true</code>, allows client to work when multiple .NET appdomains are in use.</td>
+<td>false</td>
+</tr>
+<tr class="even">
+<td>cache-xml-file</td>
+<td>Name and path of the file whose contents are used by default to initialize a cache if one is created. If not specified, the client starts with an empty cache, which is populated at run time.
+<p>See <a href="../cache-init-file/chapter-overview.html#chapter-overview">Cache Initialization File</a> for more information on the cache initialization file.</p></td>
+<td>no default</td>
+</tr>
+<tr class="odd">
+<td>heap-lru-delta</td>
+<td>When heap LRU is triggered, this is the amount that gets added to the percentage that is above the <code class="ph codeph">heap-lru-limit</code> amount. LRU continues until the memory usage is below <code class="ph codeph">heap-lru-limit</code> minus this percentage. This property is only used if <code class="ph codeph">heap-lru-limit</code> is greater than 0 .</td>
+<td>10</td>
+</tr>
+<tr class="even">
+<td>heap-lru-limit</td>
+<td>Maximum amount of memory, in megabytes, used by the cache for all regions. If this limit is exceeded by <code class="ph codeph">heap-lru-delta</code> percent, LRU reduces the memory footprint as necessary. If not specified, or set to 0, memory usage is governed by each region's LRU entries limit, if any.</td>
+<td>0</td>
+</tr>
+<tr class="odd">
+<td>conflate-events</td>
+<td>Client side conflation setting, which is sent to the server.</td>
+<td>server</td>
+</tr>
+<tr class="even">
+<td>connect-timeout</td>
+<td>Amount of time (in seconds) to wait for a response after a socket connection attempt.</td>
+<td>59</td>
+</tr>
+<tr class="odd">
+<td>connection-pool-size</td>
+<td>Number of connections per endpoint</td>
+<td>5</td>
+</tr>
+<tr class="even">
+<td>crash-dump-enabled</td>
+<td>Whether crash dump generation for unhandled fatal errors is enabled. True is enabled, false otherwise.</td>
+<td>true</td>
+</tr>
+<tr class="odd">
+<td>disable-chunk-handler-thread</td>
+<td>When set to false, each application thread processes its own response. If set to true, the chunk-handler-thread processes the response for each application thread.</td>
+<td>false</td>
+</tr>
+<tr class="even">
+<td>disable-shuffling-of-endpoints</td>
+<td>If true, prevents server endpoints that are configured in pools from being shuffled before use.</td>
+<td>false</td>
+</tr>
+<tr class="odd">
+<td>grid-client</td>
+<td>If true, the client does not start various internal threads, so that startup and shutdown time is reduced.</td>
+<td>false</td>
+</tr>
+<tr class="even">
+<td>max-fe-threads</td>
+<td>Thread pool size for parallel function execution. An example of this is the GetAll operations.</td>
+<td>2 * number of CPU cores</td>
+</tr>
+<tr class="odd">
+<td>max-socket-buffer-size</td>
+<td>Maximum size of the socket buffers, in bytes, that the client will try to set for client-server connections.</td>
+<td>65 * 1024</td>
+</tr>
+<tr class="even">
+<td>notify-ack-interval</td>
+<td>Interval, in seconds, in which client sends acknowledgments for subscription notifications.</td>
+<td>1</td>
+</tr>
+<tr class="odd">
+<td>notify-dupcheck-life</td>
+<td>Amount of time, in seconds, the client tracks subscription notifications before dropping the duplicates.</td>
+<td>300</td>
+</tr>
+<tr class="even">
+<td>ping-interval</td>
+<td>Interval, in seconds, between communication attempts with the server to show the client is alive. Pings are only sent when the <code class="ph codeph">ping-interval</code> elapses between normal client messages. This must be set lower than the server's <code class="ph codeph">maximum-time-between-pings</code>.</td>
+<td>10</td>
+</tr>
+<tr class="odd">
+<td>redundancy-monitor-interval</td>
+<td>Interval, in seconds, at which the subscription HA maintenance thread checks for the configured redundancy of subscription servers.</td>
+<td>10</td>
+</tr>
+<tr class="even">
+<td>stacktrace-enabled</td>
+<td>If <code class="ph codeph">true</code>, the exception classes capture a stack trace that can be printed with their <code class="ph codeph">printStackTrace</code> function. If false, the function prints a message that the trace is unavailable.</td>
+<td>false</td>
+</tr>
+<tr class="odd">
+<td>tombstone-timeout</td>
+<td>Time in milliseconds used to timeout tombstone entries when region consistency checking is enabled.
+</td>
+<td>480000</td>
+</tr>
+</tbody>
+</table>
+
+
+<a id="attributes-gfcpp__table_D42627049FD6432494BDE5170AF1BCCF" class="no-quick-link"></a>
+
+<table>
+<caption><span class="tablecap">Table 2. Attributes in geode.properties\u2014Logging Properties</span></caption>
+<colgroup>
+<col width="34%" />
+<col width="33%" />
+<col width="33%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th>geode.properties Attribute</th>
+<th>Description</th>
+<th>Default</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>log-disk-space-limit</td>
+<td>Maximum amount of disk space, in megabytes, allowed for all log files, current, and rolled. If set to 0, the space is unlimited.</td>
+<td>0</td>
+</tr>
+<tr class="even">
+<td>log-file</td>
+<td>Name and full path of the file where a running client writes log messages. If not specified, logging goes to <code class="ph codeph">stdout</code>.</td>
+<td>no default file</td>
+</tr>
+<tr class="odd">
+<td>log-file-size-limit</td>
+<td>Maximum size, in megabytes, of a single log file. Once this limit is exceeded, a new log file is created and the current log file becomes inactive. If set to 0, the file size is unlimited.</td>
+<td>0</td>
+</tr>
+<tr class="even">
+<td>log-level</td>
+<td>Controls the types of messages that are written to the application's log. These are the levels, in descending order of severity and the types of message they provide:
+<ul>
+<li><strong>Error</strong> (highest severity) is a serious failure that will probably prevent program execution.</li>
+<li><strong>Warning</strong> is a potential problem in the system.</li>
+<li><strong>Info</strong> is an informational message of interest to the end user and system administrator.</li>
+<li><strong>Config</strong> is a static configuration message, often used to debug problems with particular configurations.</li>
+<li><strong>Fine, Finer, Finest, and Debug</strong> provide tracing information. Only use these with guidance from technical support.</li>
+</ul>
+<p>Enabling logging at any level enables logging for all higher levels.</p></td>
+<td>config</td>
+</tr>
+</tbody>
+</table>
+
+
+<a id="attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723" class="no-quick-link"></a>
+
+<table>
+<caption><span class="tablecap">Table 3. Attributes in geode.properties\u2014Statistics Archiving Properties</span></caption>
+<colgroup>
+<col width="33%" />
+<col width="33%" />
+<col width="34%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th>geode.properties Attribute</th>
+<th>Description</th>
+<th>Default</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>statistic-sampling-enabled</td>
+<td>Controls whether the process creates a statistic archive file.</td>
+<td>true</td>
+</tr>
+<tr class="even">
+<td>statistic-archive-file</td>
+<td>Name and full path of the file where a running system member writes archives statistics. If <code class="ph codeph">archive-disk-space-limit</code> is not set, the client appends the process ID to the configured file name, like <code class="ph codeph">statArchive-PID.gfs</code>. If the space limit is set, the process ID is not appended but each rolled file name is renamed to statArchive-ID.gfs, where ID is the rolled number of the file.</td>
+<td>./statArchive.gfs</td>
+</tr>
+<tr class="odd">
+<td>archive-disk-space-limit</td>
+<td>Maximum amount of disk space, in megabytes, allowed for all archive files, current, and rolled. If set to 0, the space is unlimited.</td>
+<td>0</td>
+</tr>
+<tr class="even">
+<td>archive-file-size-limit</td>
+<td>Maximum size, in bytes, of a single statistic archive file. Once this limit is exceeded, a new statistic archive file is created and the current archive file becomes inactive. If set to 0, the file size is unlimited.</td>
+<td>0</td>
+</tr>
+<tr class="odd">
+<td>statistic-sample-rate</td>
+<td>Rate, in seconds, that statistics are sampled. Operating system statistics are updated only when a sample is taken. If statistic archival is enabled, then these samples are written to the archive.
+<p>Lowering the sample rate for statistics reduces system resource use while still providing some statistics for system tuning and failure analysis.</p>
+</td>
+<td>1</td>
+</tr>
+<tr class="even">
+<td>enable-time-statistics</td>
+<td>Enables time-based statistics for the distributed system and caching. For performance reasons, time-based statistics are disabled by default. See <a href="../system-statistics/chapter-overview.html#concept_3BE5237AF2D34371883453E6A9474A79">System Statistics</a>. </td>
+<td>false</td>
+</tr>
+</tbody>
+</table>
+
+
+### <a id="attributes-gfcpp__table_BA6DAF27947B4A9488787E6BDCFC15B9" class="no-quick-link"></a>Table 4. Attributes in geode.properties\u2014Durable Client Properties
+
+| geode.properties Attribute | Description | Default |
+|----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
+| auto-ready-for-events | Whether client subscriptions automatically receive events when declaratively configured via XML. If set to `false`, event startup is not automatic and you need to call the `Cache.ReadyForEvents()` method API after subscriptions for the server to start delivering events. | true |
+| durable-client-id | Identifier to specify if you want the client to be durable. | empty |
+| durable-timeout | Time, in seconds, a durable client's subscription is maintained when it is not connected to the server before being dropped. | 300 |
+
+
+### <a id="attributes-gfcpp__table_B3A8E9EB44A94557A97BB700E2BA1EF1" class="no-quick-link"></a>Table 5. Attributes in geode.properties\u2014Security Properties
+
+| geode.properties Attribute | Description | Default |
+|------------------------------|----------------------------------------------------------------------|---------|
+| security-client-dhalgo | Diffie-Hellman secret key algorithm. | null |
+| security-client-kspath | keystore (.pem file ) path. | null |
+| security-client-auth-factory | Factory method for the security `AuthInitialize` module. | empty |
+| security-client-auth-library | Path to the client security library for the `AuthInitialize` module. | empty |
+| ssl-keystore-password | Keystore password. | null |
+
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/propfile-overriding.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile-overriding.html.md.erb b/docs/geode-native-docs/setting-properties/propfile-overriding.html.md.erb
new file mode 100644
index 0000000..63a9eff
--- /dev/null
+++ b/docs/geode-native-docs/setting-properties/propfile-overriding.html.md.erb
@@ -0,0 +1,26 @@
+---
+title: Overriding Properties File Settings
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Application developers have the option of configuring system attributes programmatically, rather than using the `geode.properties` file.
+
+Attributes set programmatically override any matching attribute settings in the `geode.properties` file, but additional attributes not set programmatically will be configured using the settings in `geode.properties`.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/propfile-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile-overview.html.md.erb b/docs/geode-native-docs/setting-properties/propfile-overview.html.md.erb
new file mode 100644
index 0000000..dfbb8d2
--- /dev/null
+++ b/docs/geode-native-docs/setting-properties/propfile-overview.html.md.erb
@@ -0,0 +1,34 @@
+---
+title: Properties File Example
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Use the `geode.properties` file to configure distributed system connections for the client.
+
+The following example shows the format of a geode.properties file. The first two attributes in this example should be set by programmers during application development, while other attributes are set on-site during system integration. The properties and their default settings that can be set in this file are described in detail in [Attributes in the Properites File](../setting-properties/propfile_attributes.html#attributes-gfcpp).
+
+## geode.properties File Format
+
+``` pre
+#Tue Feb 14 17:24:02 PDT 2006
+log-level=info
+cache-xml-file=./cache.xml
+stacktrace-enabled=true
+```
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/propfile-sample.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile-sample.html.md.erb b/docs/geode-native-docs/setting-properties/propfile-sample.html.md.erb
new file mode 100644
index 0000000..9e39420
--- /dev/null
+++ b/docs/geode-native-docs/setting-properties/propfile-sample.html.md.erb
@@ -0,0 +1,121 @@
+---
+title: Using the Default Sample File
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+A sample `geode.properties` file is included with the Apache Geode native client installation in the <code>_product-dir_/defaultSystem</code> directory.
+
+To use this file:
+
+1. Copy the file to the directory where you start the application.
+2. Uncomment the lines you need and edit the settings as shown in this example:
+
+ ``` pre
+ cache-xml-file=test.xml
+ ```
+
+3. Start the application.
+
+## Default geode.properties File
+
+``` pre
+# Default C++ distributed system properties
+# Copy to current directory and uncomment to override defaults.
+#
+## Debugging support, enables stacktraces in gemfire::Exception.
+#
+# The default is false, uncomment to enable stacktraces in exceptions.
+#stacktrace-enabled=true
+#crash-dump-enabled=true
+#
+#
+## Cache region configurtion
+#
+#cache-xml-file=cache.xml
+#
+## Log file config
+#
+#log-file=gemfire_cpp.log
+#log-level=config
+# zero indicates use no limit.
+#log-file-size-limit=0
+# zero indicates use no limit.
+#log-disk-space-limit=0
+#
+## Statistics values
+#
+# the rate is in seconds.
+#statistic-sample-rate=1
+#statistic-sampling-enabled=true
+#statistic-archive-file=statArchive.gfs
+# zero indicates use no limit.
+#archive-file-size-limit=0
+# zero indicates use no limit.
+#archive-disk-space-limit=0
+#enable-time-statistics=false
+#
+## Heap based eviction configuration
+#
+# maximum amount of memory used by the cache for all regions, 0 disables this feature
+#heap-lru-limit=0
+# percentage over heap-lru-limit when LRU will be called.
+#heap-lru-delta=10
+#
+## Durable client support
+#
+#durable-client-id=
+#durable-timeout=300
+#
+## SSL socket support
+#
+#ssl-enabled=false
+#ssl-keystore=
+#ssl-truststore=
+#
+## .NET AppDomain support
+#
+#appdomain-enabled=false
+#
+## Misc
+#
+#conflate-events=server
+#disable-shuffling-of-endpoints=false
+#grid-client=false
+#max-fe-threads=
+#max-socket-buffer-size=66560
+# the units are in seconds.
+#connect-timeout=59
+#notify-ack-interval=10
+#notify-dupcheck-life=300
+#ping-interval=10
+#redundancy-monitor-interval=10
+#auto-ready-for-events=true
+#
+## module name of the initializer pointing to sample
+## implementation from templates/security
+#security-client-auth-library=securityImpl
+## static method name of the library mentioned above
+#security-client-auth-factory=createUserPasswordAuthInitInstance
+## credential for Dummy Authenticator configured in server.
+## note: security-password property will be inserted by the initializer
+## mentioned in the above property.
+#security-username=root
+```
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/propfile-search-path.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile-search-path.html.md.erb b/docs/geode-native-docs/setting-properties/propfile-search-path.html.md.erb
new file mode 100644
index 0000000..cf1f60f
--- /dev/null
+++ b/docs/geode-native-docs/setting-properties/propfile-search-path.html.md.erb
@@ -0,0 +1,28 @@
+---
+title: Search Path for Multiple Properties Files
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+The client and cache server processes first look for their properties file in the <code>_product-dir_/defaultSystem</code> directory, then in the working directory.
+
+Any properties set in the working directory override settings in the `defaultSystem/geode.properties` file.
+
+If you are running multiple processes on one machine, you can configure the `geode.properties` file in the `defaultSystem` directory as a shared file that all processes can find. If a few processes need a slightly different configuration, you can put individual `geode.properties` files in their home directories to override specific properties.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/propfile_attributes.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile_attributes.html.md.erb b/docs/geode-native-docs/setting-properties/propfile_attributes.html.md.erb
deleted file mode 100644
index 6e2d5d3..0000000
--- a/docs/geode-native-docs/setting-properties/propfile_attributes.html.md.erb
+++ /dev/null
@@ -1,278 +0,0 @@
----
-title: Attributes in the Properties File
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-A variety of `geode.properties` settings can be used when a client connects to a distributed system.
-
-The following settings can be configured:
-
-- **[General Properties](#attributes-gfcpp__table_21004C9E93294F03BE3469C13EA33262)** Basic information for the process, such as cache creation parameters.
-- **[Logging Properties](#attributes-gfcpp__table_D42627049FD6432494BDE5170AF1BCCF)** How and where to log system messages.
-- **[Statistics Archiving Properties](#attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723)** How to collect and archive statistics information.
-- **[Durable Client Properties](#attributes-gfcpp__table_BA6DAF27947B4A9488787E6BDCFC15B9)** Information about the durable clients connected to the system.
-- **[Security Properties](#attributes-gfcpp__table_B3A8E9EB44A94557A97BB700E2BA1EF1)** Information about various security parameters.
-
-## <a id="attributes-gfcpp__section_655789BCC46642789F91CDA8AE03CD9B" class="no-quick-link"></a>Attribute Definitions
-
-The following tables list attributes that can be stored in the `geode.properties` file to be read by a client.
-
-For the system properties that relate to high availability, see [Sending Periodic Acknowledgement](../preserving-data/sending-periodic-ack.html#concept_868B8082463846DE9F35BBEA56105C82). For a list of security-related system properties and their descriptions, see the table [System Properties for Client Authentication and Authorization](../security/security-systemprops.html#security__table_92A6A66523764199A19BCD66BA189921).
-
-<a id="attributes-gfcpp__table_21004C9E93294F03BE3469C13EA33262" class="no-quick-link"></a>
-
-<table>
-<caption><span class="tablecap">Table 1. Attributes in geode.properties\u2014General Properties</span></caption>
-<colgroup>
-<col width="33%" />
-<col width="33%" />
-<col width="34%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>geode.properties Attribute</th>
-<th>Description</th>
-<th>Default</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td>appdomain-enabled</td>
-<td>If <code class="ph codeph">true</code>, allows client to work when multiple .NET appdomains are in use.</td>
-<td>false</td>
-</tr>
-<tr class="even">
-<td>cache-xml-file</td>
-<td>Name and path of the file whose contents are used by default to initialize a cache if one is created. If not specified, the client starts with an empty cache, which is populated at run time.
-<p>See <a href="../cache-init-file/chapter-overview.html#chapter-overview">Cache Initialization File</a> for more information on the cache initialization file.</p></td>
-<td>no default</td>
-</tr>
-<tr class="odd">
-<td>heap-lru-delta</td>
-<td>When heap LRU is triggered, this is the amount that gets added to the percentage that is above the <code class="ph codeph">heap-lru-limit</code> amount. LRU continues until the memory usage is below <code class="ph codeph">heap-lru-limit</code> minus this percentage. This property is only used if <code class="ph codeph">heap-lru-limit</code> is greater than 0 .</td>
-<td>10</td>
-</tr>
-<tr class="even">
-<td>heap-lru-limit</td>
-<td>Maximum amount of memory, in megabytes, used by the cache for all regions. If this limit is exceeded by <code class="ph codeph">heap-lru-delta</code> percent, LRU reduces the memory footprint as necessary. If not specified, or set to 0, memory usage is governed by each region's LRU entries limit, if any.</td>
-<td>0</td>
-</tr>
-<tr class="odd">
-<td>conflate-events</td>
-<td>Client side conflation setting, which is sent to the server.</td>
-<td>server</td>
-</tr>
-<tr class="even">
-<td>connect-timeout</td>
-<td>Amount of time (in seconds) to wait for a response after a socket connection attempt.</td>
-<td>59</td>
-</tr>
-<tr class="odd">
-<td>connection-pool-size</td>
-<td>Number of connections per endpoint</td>
-<td>5</td>
-</tr>
-<tr class="even">
-<td>crash-dump-enabled</td>
-<td>Whether crash dump generation for unhandled fatal errors is enabled. True is enabled, false otherwise.</td>
-<td>true</td>
-</tr>
-<tr class="odd">
-<td>disable-chunk-handler-thread</td>
-<td>When set to false, each application thread processes its own response. If set to true, the chunk-handler-thread processes the response for each application thread.</td>
-<td>false</td>
-</tr>
-<tr class="even">
-<td>disable-shuffling-of-endpoints</td>
-<td>If true, prevents server endpoints that are configured in pools from being shuffled before use.</td>
-<td>false</td>
-</tr>
-<tr class="odd">
-<td>grid-client</td>
-<td>If true, the client does not start various internal threads, so that startup and shutdown time is reduced.</td>
-<td>false</td>
-</tr>
-<tr class="even">
-<td>max-fe-threads</td>
-<td>Thread pool size for parallel function execution. An example of this is the GetAll operations.</td>
-<td>2 * number of CPU cores</td>
-</tr>
-<tr class="odd">
-<td>max-socket-buffer-size</td>
-<td>Maximum size of the socket buffers, in bytes, that the client will try to set for client-server connections.</td>
-<td>65 * 1024</td>
-</tr>
-<tr class="even">
-<td>notify-ack-interval</td>
-<td>Interval, in seconds, in which client sends acknowledgments for subscription notifications.</td>
-<td>1</td>
-</tr>
-<tr class="odd">
-<td>notify-dupcheck-life</td>
-<td>Amount of time, in seconds, the client tracks subscription notifications before dropping the duplicates.</td>
-<td>300</td>
-</tr>
-<tr class="even">
-<td>ping-interval</td>
-<td>Interval, in seconds, between communication attempts with the server to show the client is alive. Pings are only sent when the <code class="ph codeph">ping-interval</code> elapses between normal client messages. This must be set lower than the server's <code class="ph codeph">maximum-time-between-pings</code>.</td>
-<td>10</td>
-</tr>
-<tr class="odd">
-<td>redundancy-monitor-interval</td>
-<td>Interval, in seconds, at which the subscription HA maintenance thread checks for the configured redundancy of subscription servers.</td>
-<td>10</td>
-</tr>
-<tr class="even">
-<td>stacktrace-enabled</td>
-<td>If <code class="ph codeph">true</code>, the exception classes capture a stack trace that can be printed with their <code class="ph codeph">printStackTrace</code> function. If false, the function prints a message that the trace is unavailable.</td>
-<td>false</td>
-</tr>
-<tr class="odd">
-<td>tombstone-timeout</td>
-<td>Time in milliseconds used to timeout tombstone entries when region consistency checking is enabled.
-</td>
-<td>480000</td>
-</tr>
-</tbody>
-</table>
-
-
-<a id="attributes-gfcpp__table_D42627049FD6432494BDE5170AF1BCCF" class="no-quick-link"></a>
-
-<table>
-<caption><span class="tablecap">Table 2. Attributes in geode.properties\u2014Logging Properties</span></caption>
-<colgroup>
-<col width="34%" />
-<col width="33%" />
-<col width="33%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>geode.properties Attribute</th>
-<th>Description</th>
-<th>Default</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td>log-disk-space-limit</td>
-<td>Maximum amount of disk space, in megabytes, allowed for all log files, current, and rolled. If set to 0, the space is unlimited.</td>
-<td>0</td>
-</tr>
-<tr class="even">
-<td>log-file</td>
-<td>Name and full path of the file where a running client writes log messages. If not specified, logging goes to <code class="ph codeph">stdout</code>.</td>
-<td>no default file</td>
-</tr>
-<tr class="odd">
-<td>log-file-size-limit</td>
-<td>Maximum size, in megabytes, of a single log file. Once this limit is exceeded, a new log file is created and the current log file becomes inactive. If set to 0, the file size is unlimited.</td>
-<td>0</td>
-</tr>
-<tr class="even">
-<td>log-level</td>
-<td>Controls the types of messages that are written to the application's log. These are the levels, in descending order of severity and the types of message they provide:
-<ul>
-<li><strong>Error</strong> (highest severity) is a serious failure that will probably prevent program execution.</li>
-<li><strong>Warning</strong> is a potential problem in the system.</li>
-<li><strong>Info</strong> is an informational message of interest to the end user and system administrator.</li>
-<li><strong>Config</strong> is a static configuration message, often used to debug problems with particular configurations.</li>
-<li><strong>Fine, Finer, Finest, and Debug</strong> provide tracing information. Only use these with guidance from technical support.</li>
-</ul>
-<p>Enabling logging at any level enables logging for all higher levels.</p></td>
-<td>config</td>
-</tr>
-</tbody>
-</table>
-
-
-<a id="attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723" class="no-quick-link"></a>
-
-<table>
-<caption><span class="tablecap">Table 3. Attributes in geode.properties\u2014Statistics Archiving Properties</span></caption>
-<colgroup>
-<col width="33%" />
-<col width="33%" />
-<col width="34%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>geode.properties Attribute</th>
-<th>Description</th>
-<th>Default</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td>statistic-sampling-enabled</td>
-<td>Controls whether the process creates a statistic archive file.</td>
-<td>true</td>
-</tr>
-<tr class="even">
-<td>statistic-archive-file</td>
-<td>Name and full path of the file where a running system member writes archives statistics. If <code class="ph codeph">archive-disk-space-limit</code> is not set, the client appends the process ID to the configured file name, like <code class="ph codeph">statArchive-PID.gfs</code>. If the space limit is set, the process ID is not appended but each rolled file name is renamed to statArchive-ID.gfs, where ID is the rolled number of the file.</td>
-<td>./statArchive.gfs</td>
-</tr>
-<tr class="odd">
-<td>archive-disk-space-limit</td>
-<td>Maximum amount of disk space, in megabytes, allowed for all archive files, current, and rolled. If set to 0, the space is unlimited.</td>
-<td>0</td>
-</tr>
-<tr class="even">
-<td>archive-file-size-limit</td>
-<td>Maximum size, in bytes, of a single statistic archive file. Once this limit is exceeded, a new statistic archive file is created and the current archive file becomes inactive. If set to 0, the file size is unlimited.</td>
-<td>0</td>
-</tr>
-<tr class="odd">
-<td>statistic-sample-rate</td>
-<td>Rate, in seconds, that statistics are sampled. Operating system statistics are updated only when a sample is taken. If statistic archival is enabled, then these samples are written to the archive.
-<p>Lowering the sample rate for statistics reduces system resource use while still providing some statistics for system tuning and failure analysis.</p>
-</td>
-<td>1</td>
-</tr>
-<tr class="even">
-<td>enable-time-statistics</td>
-<td>Enables time-based statistics for the distributed system and caching. For performance reasons, time-based statistics are disabled by default. See <a href="../system-statistics/chapter_overview.html#concept_3BE5237AF2D34371883453E6A9474A79">System Statistics</a>. </td>
-<td>false</td>
-</tr>
-</tbody>
-</table>
-
-
-### <a id="attributes-gfcpp__table_BA6DAF27947B4A9488787E6BDCFC15B9" class="no-quick-link"></a>Table 4. Attributes in geode.properties\u2014Durable Client Properties
-
-| geode.properties Attribute | Description | Default |
-|----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
-| auto-ready-for-events | Whether client subscriptions automatically receive events when declaratively configured via XML. If set to `false`, event startup is not automatic and you need to call the `Cache.ReadyForEvents()` method API after subscriptions for the server to start delivering events. | true |
-| durable-client-id | Identifier to specify if you want the client to be durable. | empty |
-| durable-timeout | Time, in seconds, a durable client's subscription is maintained when it is not connected to the server before being dropped. | 300 |
-
-
-### <a id="attributes-gfcpp__table_B3A8E9EB44A94557A97BB700E2BA1EF1" class="no-quick-link"></a>Table 5. Attributes in geode.properties\u2014Security Properties
-
-| geode.properties Attribute | Description | Default |
-|------------------------------|----------------------------------------------------------------------|---------|
-| security-client-dhalgo | Diffie-Hellman secret key algorithm. | null |
-| security-client-kspath | keystore (.pem file ) path. | null |
-| security-client-auth-factory | Factory method for the security `AuthInitialize` module. | empty |
-| security-client-auth-library | Path to the client security library for the `AuthInitialize` module. | empty |
-| ssl-keystore-password | Keystore password. | null |
-
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/propfile_overriding.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile_overriding.html.md.erb b/docs/geode-native-docs/setting-properties/propfile_overriding.html.md.erb
deleted file mode 100644
index 63a9eff..0000000
--- a/docs/geode-native-docs/setting-properties/propfile_overriding.html.md.erb
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: Overriding Properties File Settings
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Application developers have the option of configuring system attributes programmatically, rather than using the `geode.properties` file.
-
-Attributes set programmatically override any matching attribute settings in the `geode.properties` file, but additional attributes not set programmatically will be configured using the settings in `geode.properties`.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/propfile_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile_overview.html.md.erb b/docs/geode-native-docs/setting-properties/propfile_overview.html.md.erb
deleted file mode 100644
index dfbb8d2..0000000
--- a/docs/geode-native-docs/setting-properties/propfile_overview.html.md.erb
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: Properties File Example
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Use the `geode.properties` file to configure distributed system connections for the client.
-
-The following example shows the format of a geode.properties file. The first two attributes in this example should be set by programmers during application development, while other attributes are set on-site during system integration. The properties and their default settings that can be set in this file are described in detail in [Attributes in the Properites File](../setting-properties/propfile_attributes.html#attributes-gfcpp).
-
-## geode.properties File Format
-
-``` pre
-#Tue Feb 14 17:24:02 PDT 2006
-log-level=info
-cache-xml-file=./cache.xml
-stacktrace-enabled=true
-```
-
[3/7] geode-native git commit: GEODE-2513: Rename and reorganize
client doc sources This closes #85
Posted by db...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/propfile_sample.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile_sample.html.md.erb b/docs/geode-native-docs/setting-properties/propfile_sample.html.md.erb
deleted file mode 100644
index 9e39420..0000000
--- a/docs/geode-native-docs/setting-properties/propfile_sample.html.md.erb
+++ /dev/null
@@ -1,121 +0,0 @@
----
-title: Using the Default Sample File
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-A sample `geode.properties` file is included with the Apache Geode native client installation in the <code>_product-dir_/defaultSystem</code> directory.
-
-To use this file:
-
-1. Copy the file to the directory where you start the application.
-2. Uncomment the lines you need and edit the settings as shown in this example:
-
- ``` pre
- cache-xml-file=test.xml
- ```
-
-3. Start the application.
-
-## Default geode.properties File
-
-``` pre
-# Default C++ distributed system properties
-# Copy to current directory and uncomment to override defaults.
-#
-## Debugging support, enables stacktraces in gemfire::Exception.
-#
-# The default is false, uncomment to enable stacktraces in exceptions.
-#stacktrace-enabled=true
-#crash-dump-enabled=true
-#
-#
-## Cache region configurtion
-#
-#cache-xml-file=cache.xml
-#
-## Log file config
-#
-#log-file=gemfire_cpp.log
-#log-level=config
-# zero indicates use no limit.
-#log-file-size-limit=0
-# zero indicates use no limit.
-#log-disk-space-limit=0
-#
-## Statistics values
-#
-# the rate is in seconds.
-#statistic-sample-rate=1
-#statistic-sampling-enabled=true
-#statistic-archive-file=statArchive.gfs
-# zero indicates use no limit.
-#archive-file-size-limit=0
-# zero indicates use no limit.
-#archive-disk-space-limit=0
-#enable-time-statistics=false
-#
-## Heap based eviction configuration
-#
-# maximum amount of memory used by the cache for all regions, 0 disables this feature
-#heap-lru-limit=0
-# percentage over heap-lru-limit when LRU will be called.
-#heap-lru-delta=10
-#
-## Durable client support
-#
-#durable-client-id=
-#durable-timeout=300
-#
-## SSL socket support
-#
-#ssl-enabled=false
-#ssl-keystore=
-#ssl-truststore=
-#
-## .NET AppDomain support
-#
-#appdomain-enabled=false
-#
-## Misc
-#
-#conflate-events=server
-#disable-shuffling-of-endpoints=false
-#grid-client=false
-#max-fe-threads=
-#max-socket-buffer-size=66560
-# the units are in seconds.
-#connect-timeout=59
-#notify-ack-interval=10
-#notify-dupcheck-life=300
-#ping-interval=10
-#redundancy-monitor-interval=10
-#auto-ready-for-events=true
-#
-## module name of the initializer pointing to sample
-## implementation from templates/security
-#security-client-auth-library=securityImpl
-## static method name of the library mentioned above
-#security-client-auth-factory=createUserPasswordAuthInitInstance
-## credential for Dummy Authenticator configured in server.
-## note: security-password property will be inserted by the initializer
-## mentioned in the above property.
-#security-username=root
-```
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/setting-properties/propfile_search_path.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile_search_path.html.md.erb b/docs/geode-native-docs/setting-properties/propfile_search_path.html.md.erb
deleted file mode 100644
index cf1f60f..0000000
--- a/docs/geode-native-docs/setting-properties/propfile_search_path.html.md.erb
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: Search Path for Multiple Properties Files
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-The client and cache server processes first look for their properties file in the <code>_product-dir_/defaultSystem</code> directory, then in the working directory.
-
-Any properties set in the working directory override settings in the `defaultSystem/geode.properties` file.
-
-If you are running multiple processes on one machine, you can configure the `geode.properties` file in the `defaultSystem` directory as a shared file that all processes can find. If a few processes need a slightly different configuration, you can put individual `geode.properties` files in their home directories to override specific properties.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/sqlite-persistence/chapter-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/sqlite-persistence/chapter-overview.html.md.erb b/docs/geode-native-docs/sqlite-persistence/chapter-overview.html.md.erb
new file mode 100644
index 0000000..54be45b
--- /dev/null
+++ b/docs/geode-native-docs/sqlite-persistence/chapter-overview.html.md.erb
@@ -0,0 +1,38 @@
+---
+title: Installing the SQLite Persistence Manager
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+This section describes how to download, build and install the SQLite database libraries for use with disk overflow.
+
+See [Persistence Manager](../client-cache/persistence-manager.html#persistence-manager) for additional information about the SQLite database libraries.
+
+- **[Linux Installation](linux-install.html)**
+
+ This topic describes how to install the SQLite Persistence Manager on Linux.
+
+- **[Solaris Installation](solaris-install.html)**
+
+ This topic describes how to install the SQLite Persistence Manager on Solaris.
+
+- **[Windows Installation](windows-install.html)**
+
+ This topic describes how to install the SQLite Persistence Manager on Windows.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/sqlite-persistence/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/sqlite-persistence/chapter_overview.html.md.erb b/docs/geode-native-docs/sqlite-persistence/chapter_overview.html.md.erb
deleted file mode 100644
index 42c36e1..0000000
--- a/docs/geode-native-docs/sqlite-persistence/chapter_overview.html.md.erb
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: Installing the SQLite Persistence Manager
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-This section describes how to download, build and install the SQLite database libraries for use with disk overflow.
-
-See [Persistence Manager](../client-cache/persistence-manager.html#persistence-manager) for additional information about the SQLite database libraries.
-
-- **[Linux Installation](linux_install.html)**
-
- This topic describes how to install the SQLite Persistence Manager on Linux.
-
-- **[Solaris Installation](solaris_install.html)**
-
- This topic describes how to install the SQLite Persistence Manager on Solaris.
-
-- **[Windows Installation](windows_install.html)**
-
- This topic describes how to install the SQLite Persistence Manager on Windows.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/sqlite-persistence/linux-install.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/sqlite-persistence/linux-install.html.md.erb b/docs/geode-native-docs/sqlite-persistence/linux-install.html.md.erb
new file mode 100644
index 0000000..99364c1
--- /dev/null
+++ b/docs/geode-native-docs/sqlite-persistence/linux-install.html.md.erb
@@ -0,0 +1,60 @@
+---
+title: Linux Installation
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+This topic describes how to install the SQLite Persistence Manager on Linux.
+
+The <code>_product-dir_</code> directory refers to the path to the directory
+that contains the built library.
+
+The following libraries must be present in the runtime linking path:
+
+- `libSqLiteImpl.so` is provided in <code>_product-dir_/lib</code>, so it is already present in the runtime linking path.
+- `libsqlite3.so` is the SQLite Library. You need to create this library and make available in the runtime linking path, or copied to <code>_product-dir_/lib</code>, as described below.
+
+The library has been tested with SQLite v3.7.14.1.
+
+## <a id="concept_CC9BD47B46DE4281BBB789FABE6ABEA9__section_FAB703D706D54311963399A714D466F9" class="no-quick-link"></a>Downloading, Building and Installing the Library
+
+Create the SQLite database library by downloading the latest .zip file and compiling the source code.
+
+1. Download the source code `sqlite-autoconf-NNNNNNN.tar.gz` file (where *NNNNNNN* corresponds to the version) for SQLite v3.7.14.1 or later from [http://www.sqlite.org/download.html](http://www.sqlite.org/download.html).
+2. Extract the source code from the .tar.gz file. For example:
+
+ ``` pre
+ tar -xvf sqlite-autoconf-3071401.tar.gz
+ ```
+
+3. Change directories to the extracted source files, and follow the install instructions located in the "INSTALL" file.
+ 1. Run the `configure` command for 32-bit or 64-bit with the following options, all entered on a single command line. Change the` --prefix` directory specification to the location where you want the libraries:
+ - **32-bit:**
+
+ <code>
+ CFLAGS="-m32" ./configure --prefix=/_desired-binary-location_/sqlite-binaries
+ </code>
+ - **64-bit:**
+
+ <code>
+ ./configure --prefix=/_desired-binary-location_/sqlite-binaries
+ </code>
+
+ 2. Run `gmake install` as described in the build instructions. The libraries will be available in the `sqlite-binaries` directory specified.
+
+4. Copy <code>/_desired-binary-location_/sqlite-binaries/lib/libsqlite3.so</code> file to <code>_product-dir_/lib</code>.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/sqlite-persistence/linux_install.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/sqlite-persistence/linux_install.html.md.erb b/docs/geode-native-docs/sqlite-persistence/linux_install.html.md.erb
deleted file mode 100644
index 99364c1..0000000
--- a/docs/geode-native-docs/sqlite-persistence/linux_install.html.md.erb
+++ /dev/null
@@ -1,60 +0,0 @@
----
-title: Linux Installation
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-This topic describes how to install the SQLite Persistence Manager on Linux.
-
-The <code>_product-dir_</code> directory refers to the path to the directory
-that contains the built library.
-
-The following libraries must be present in the runtime linking path:
-
-- `libSqLiteImpl.so` is provided in <code>_product-dir_/lib</code>, so it is already present in the runtime linking path.
-- `libsqlite3.so` is the SQLite Library. You need to create this library and make available in the runtime linking path, or copied to <code>_product-dir_/lib</code>, as described below.
-
-The library has been tested with SQLite v3.7.14.1.
-
-## <a id="concept_CC9BD47B46DE4281BBB789FABE6ABEA9__section_FAB703D706D54311963399A714D466F9" class="no-quick-link"></a>Downloading, Building and Installing the Library
-
-Create the SQLite database library by downloading the latest .zip file and compiling the source code.
-
-1. Download the source code `sqlite-autoconf-NNNNNNN.tar.gz` file (where *NNNNNNN* corresponds to the version) for SQLite v3.7.14.1 or later from [http://www.sqlite.org/download.html](http://www.sqlite.org/download.html).
-2. Extract the source code from the .tar.gz file. For example:
-
- ``` pre
- tar -xvf sqlite-autoconf-3071401.tar.gz
- ```
-
-3. Change directories to the extracted source files, and follow the install instructions located in the "INSTALL" file.
- 1. Run the `configure` command for 32-bit or 64-bit with the following options, all entered on a single command line. Change the` --prefix` directory specification to the location where you want the libraries:
- - **32-bit:**
-
- <code>
- CFLAGS="-m32" ./configure --prefix=/_desired-binary-location_/sqlite-binaries
- </code>
- - **64-bit:**
-
- <code>
- ./configure --prefix=/_desired-binary-location_/sqlite-binaries
- </code>
-
- 2. Run `gmake install` as described in the build instructions. The libraries will be available in the `sqlite-binaries` directory specified.
-
-4. Copy <code>/_desired-binary-location_/sqlite-binaries/lib/libsqlite3.so</code> file to <code>_product-dir_/lib</code>.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/sqlite-persistence/solaris-install.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/sqlite-persistence/solaris-install.html.md.erb b/docs/geode-native-docs/sqlite-persistence/solaris-install.html.md.erb
new file mode 100644
index 0000000..7260030
--- /dev/null
+++ b/docs/geode-native-docs/sqlite-persistence/solaris-install.html.md.erb
@@ -0,0 +1,72 @@
+---
+title: Solaris Installation
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+This topic describes how to install the SQLite Persistence Manager on Solaris.
+
+The *`product-dir`* directory refers to the path to the directory
+that contains the built library.
+
+The following libraries must be present in the runtime linking path:
+
+- `libSqLiteImpl.so` is provided in <code><i>product-dir</i>/lib</code>, so it is already present in the runtime linking path.
+- `libsqlite3.so` is the SQLite Library. You need to create this library and make available in the runtime linking path, or copied to <code><i>product-dir</i>/lib</code>, as described below.
+
+The library has been tested with SQLite v3.7.14.1.
+
+## <a id="concept_613BCAD15D9C4B3C94BBA3C1A26B6166__section_FAB703D706D54311963399A714D466F9" class="no-quick-link"></a>Downloading, Building, and Installing the Library
+
+Create the SQLite database library by downloading the latest .zip file and compiling the source code.
+
+1. Download the source code `sqlite-autoconf-NNNNNNN.tar.gz` file (where *NNNNNNN* corresponds to the version) for SQLite v3.7.14.1 or later from [http://www.sqlite.org/download.html](http://www.sqlite.org/download.html).
+2. Update your PATH environment variable to include the location of the Solaris `ar` command.
+
+ ``` pre
+ export PATH=/usr/css/bin:$PATH
+ ```
+
+3. Extract the source code from the .tar.gz file. First unzip:
+
+ ``` pre
+ gzip -d sqlite-autoconf-3071401.tar.gz
+ ```
+
+ Then untar the file:
+
+ ``` pre
+ tar -xvf sqlite-autoconf-3071401.tar
+ ```
+
+4. Change directories to the extracted source files, and follow the install instructions located in the "INSTALL" file.
+ 1. Run the `configure` command for 32-bit or 64-bit Solaris systems with the following options, all entered on a single command line. Change the` --prefix` directory specification to the location where you want the libraries:
+ - **32-bit:**
+
+ <code>
+ CC=cc CFLAGS="-xarch=v8plus -code=pic32" ./configure --prefix=/_desired-binary-location_/sqlite-binaries
+ </code>
+ - **64-bit:**
+
+ <code>
+ CC=cc CFLAGS="-xarch=v9 -code=pic32" ./configure --prefix=/_desired-binary-location_/sqlite-binaries CFLAGS="-m64"
+ </code>
+
+ 2. Run `gmake install`. The libraries will be available in the `sqlite-binaries` directory specified.
+
+5. Copy <code>/_desired-binary-location_/sqlite-binaries/lib/libsqlite3.so</code> file to <code><i>product-dir</i>/lib</code>.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/sqlite-persistence/solaris_install.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/sqlite-persistence/solaris_install.html.md.erb b/docs/geode-native-docs/sqlite-persistence/solaris_install.html.md.erb
deleted file mode 100644
index 7260030..0000000
--- a/docs/geode-native-docs/sqlite-persistence/solaris_install.html.md.erb
+++ /dev/null
@@ -1,72 +0,0 @@
----
-title: Solaris Installation
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-This topic describes how to install the SQLite Persistence Manager on Solaris.
-
-The *`product-dir`* directory refers to the path to the directory
-that contains the built library.
-
-The following libraries must be present in the runtime linking path:
-
-- `libSqLiteImpl.so` is provided in <code><i>product-dir</i>/lib</code>, so it is already present in the runtime linking path.
-- `libsqlite3.so` is the SQLite Library. You need to create this library and make available in the runtime linking path, or copied to <code><i>product-dir</i>/lib</code>, as described below.
-
-The library has been tested with SQLite v3.7.14.1.
-
-## <a id="concept_613BCAD15D9C4B3C94BBA3C1A26B6166__section_FAB703D706D54311963399A714D466F9" class="no-quick-link"></a>Downloading, Building, and Installing the Library
-
-Create the SQLite database library by downloading the latest .zip file and compiling the source code.
-
-1. Download the source code `sqlite-autoconf-NNNNNNN.tar.gz` file (where *NNNNNNN* corresponds to the version) for SQLite v3.7.14.1 or later from [http://www.sqlite.org/download.html](http://www.sqlite.org/download.html).
-2. Update your PATH environment variable to include the location of the Solaris `ar` command.
-
- ``` pre
- export PATH=/usr/css/bin:$PATH
- ```
-
-3. Extract the source code from the .tar.gz file. First unzip:
-
- ``` pre
- gzip -d sqlite-autoconf-3071401.tar.gz
- ```
-
- Then untar the file:
-
- ``` pre
- tar -xvf sqlite-autoconf-3071401.tar
- ```
-
-4. Change directories to the extracted source files, and follow the install instructions located in the "INSTALL" file.
- 1. Run the `configure` command for 32-bit or 64-bit Solaris systems with the following options, all entered on a single command line. Change the` --prefix` directory specification to the location where you want the libraries:
- - **32-bit:**
-
- <code>
- CC=cc CFLAGS="-xarch=v8plus -code=pic32" ./configure --prefix=/_desired-binary-location_/sqlite-binaries
- </code>
- - **64-bit:**
-
- <code>
- CC=cc CFLAGS="-xarch=v9 -code=pic32" ./configure --prefix=/_desired-binary-location_/sqlite-binaries CFLAGS="-m64"
- </code>
-
- 2. Run `gmake install`. The libraries will be available in the `sqlite-binaries` directory specified.
-
-5. Copy <code>/_desired-binary-location_/sqlite-binaries/lib/libsqlite3.so</code> file to <code><i>product-dir</i>/lib</code>.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/sqlite-persistence/windows-install.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/sqlite-persistence/windows-install.html.md.erb b/docs/geode-native-docs/sqlite-persistence/windows-install.html.md.erb
new file mode 100644
index 0000000..02b86ff
--- /dev/null
+++ b/docs/geode-native-docs/sqlite-persistence/windows-install.html.md.erb
@@ -0,0 +1,55 @@
+---
+title: Windows Installation
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+This topic describes how to install the SQLite Persistence Manager on Windows.
+
+The library has been tested with SQLite v3.7.14.1.
+
+The *`product-dir`* directory refers to the path to the directory
+that contains the built library.
+
+The following libraries are required. The <code><i>product-dir</i>/bin</code> directory containing these libraries must be present in the Windows `PATH` environment variable, and that directory is added to `PATH` during the Geode product installation.
+
+- The `sqliteimpl.dll` and `Apache.Geode.Plugins.SQLite.dll` files are provided in <code><i>product-dir</i>/bin</code>.
+- For .NET C\# native client application development, you need to obtain the `System.Data.SQLite.dll` SQLite library, as described below. The library can be copied to <code><i>product-dir</i>/bin</code>.
+- For C++ native client application development, you need the `SqLite3.dll` SQLite Library. You create this library and make it available in the runtime linking path, or copied to <code><i>product-dir</i>/bin</code>, as described below.
+
+## <a id="concept_E097592856274EFABE81426FF7312294__section_270FDD34D5D1460DAF0FD2DD4E8FB31A" class="no-quick-link"></a>Downloading Pre-built System.Data.SQLite.dll Binaries
+
+If you are writing native client applications using the .NET caching API, obtain the SQLite library (version 3.12.2 or later) for Windows as follows:
+
+1. Access the System.Data.SQLite Download Page at the following URL: [http://system.data.sqlite.org/index.html/doc/trunk/www/downloads.wiki](http://system.data.sqlite.org/index.html/doc/trunk/www/downloads.wiki).
+2. Download the appropriate setup file for your .NET Framework installation and hardware architecture.
+ - For 64-bit Windows, under **Precompiled Binaries for 64-bit Windows (.NET Framework 4.5.1)** download `sqlite-netFx451-binary-bundle-x64-2013-1.0.101.0.zip`.
+
+3. Execute the setup .exe file, and follow the prompts in the installation wizard. Accept all default installation options.
+4. Copy the `C:\Program Files\System.Data.SQLite\2010\bin\System.Data.SQLite.dll` file to your distribution at <code>_product-dir_\bin</code>.
+
+## <a id="concept_E097592856274EFABE81426FF7312294__section_FAB703D706D54311963399A714D466F9" class="no-quick-link"></a>Downloading, Building, and Installing the Library
+
+If you are writing native client applications using the C++ caching API, you need to build the SQLite solution for your Windows platform architecture.
+
+1. Download the source code `sqlite-autoconf-NNNNNNN.tar.gz` file (where *NNNNNNN* corresponds to the version) for SQLite version 3.12.2 or later from [http://www.sqlite.org/download.html](http://www.sqlite.org/download.html).
+2. Extract the source code from the .tar.gz file. You may need to use CygWin or a Windows-compatible tar extraction tool.
+3. Using Visual Studio, build the version-specific SqLite solution either as a release or debug build:
+ - If you are using 64-bit Windows, use the x64 configuration.
+
+4. From the built files, copy the `SqLite3.dll` file to your distribution at <code><i>product-dir</i>/bin</code>.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/sqlite-persistence/windows_install.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/sqlite-persistence/windows_install.html.md.erb b/docs/geode-native-docs/sqlite-persistence/windows_install.html.md.erb
deleted file mode 100644
index 02b86ff..0000000
--- a/docs/geode-native-docs/sqlite-persistence/windows_install.html.md.erb
+++ /dev/null
@@ -1,55 +0,0 @@
----
-title: Windows Installation
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-This topic describes how to install the SQLite Persistence Manager on Windows.
-
-The library has been tested with SQLite v3.7.14.1.
-
-The *`product-dir`* directory refers to the path to the directory
-that contains the built library.
-
-The following libraries are required. The <code><i>product-dir</i>/bin</code> directory containing these libraries must be present in the Windows `PATH` environment variable, and that directory is added to `PATH` during the Geode product installation.
-
-- The `sqliteimpl.dll` and `Apache.Geode.Plugins.SQLite.dll` files are provided in <code><i>product-dir</i>/bin</code>.
-- For .NET C\# native client application development, you need to obtain the `System.Data.SQLite.dll` SQLite library, as described below. The library can be copied to <code><i>product-dir</i>/bin</code>.
-- For C++ native client application development, you need the `SqLite3.dll` SQLite Library. You create this library and make it available in the runtime linking path, or copied to <code><i>product-dir</i>/bin</code>, as described below.
-
-## <a id="concept_E097592856274EFABE81426FF7312294__section_270FDD34D5D1460DAF0FD2DD4E8FB31A" class="no-quick-link"></a>Downloading Pre-built System.Data.SQLite.dll Binaries
-
-If you are writing native client applications using the .NET caching API, obtain the SQLite library (version 3.12.2 or later) for Windows as follows:
-
-1. Access the System.Data.SQLite Download Page at the following URL: [http://system.data.sqlite.org/index.html/doc/trunk/www/downloads.wiki](http://system.data.sqlite.org/index.html/doc/trunk/www/downloads.wiki).
-2. Download the appropriate setup file for your .NET Framework installation and hardware architecture.
- - For 64-bit Windows, under **Precompiled Binaries for 64-bit Windows (.NET Framework 4.5.1)** download `sqlite-netFx451-binary-bundle-x64-2013-1.0.101.0.zip`.
-
-3. Execute the setup .exe file, and follow the prompts in the installation wizard. Accept all default installation options.
-4. Copy the `C:\Program Files\System.Data.SQLite\2010\bin\System.Data.SQLite.dll` file to your distribution at <code>_product-dir_\bin</code>.
-
-## <a id="concept_E097592856274EFABE81426FF7312294__section_FAB703D706D54311963399A714D466F9" class="no-quick-link"></a>Downloading, Building, and Installing the Library
-
-If you are writing native client applications using the C++ caching API, you need to build the SQLite solution for your Windows platform architecture.
-
-1. Download the source code `sqlite-autoconf-NNNNNNN.tar.gz` file (where *NNNNNNN* corresponds to the version) for SQLite version 3.12.2 or later from [http://www.sqlite.org/download.html](http://www.sqlite.org/download.html).
-2. Extract the source code from the .tar.gz file. You may need to use CygWin or a Windows-compatible tar extraction tool.
-3. Using Visual Studio, build the version-specific SqLite solution either as a release or debug build:
- - If you are using 64-bit Windows, use the x64 configuration.
-
-4. From the built files, copy the `SqLite3.dll` file to your distribution at <code><i>product-dir</i>/bin</code>.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/cache-performance-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/cache-performance-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/cache-performance-statistics.html.md.erb
new file mode 100644
index 0000000..099bbfb
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/cache-performance-statistics.html.md.erb
@@ -0,0 +1,47 @@
+---
+title: Cache Performance Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Use cache performance statistics to determine the type and number of cache operations being performed and how much time they consume.
+
+These statistics are available if the member creates a cache.
+
+| | |
+|----------------------------------|----------------------------------------------------------------------------------------------|
+| `creates` | Total number of cache creates. |
+| `puts` | Total number of cache puts. |
+| `gets` | Total number of cache gets. |
+| `entries` | Current number of cache entries. |
+| `hits` | Total number of cache hits. |
+| `misses` | Total number of cache misses. |
+| `destroys` | Total number of cache destroys. |
+| `overflows` | Total number of cache overflows to persistence backup. |
+| `cacheListenerCallsCompleted` | Total number of times a cache listener call has completed. |
+| `pdxInstanceDeserializations` | Total number of times getObject has been called on a PdxInstance. |
+| `pdxInstanceDeserializationTime` | Total amount of time, in nanoseconds, spent deserializing PdxInstances by calling getObject. |
+| `pdxInstanceCreations` | Total number of times a deserialization created a PdxInstance. |
+| `pdxSerializations` | Total number of PDX serializations. |
+| `pdxSerializedBytes` | Total number of bytes produced by PDX serialization. |
+| `pdxDeserializations` | Total number of PDX deserializations. |
+| `pdxDeserializedBytes` | Total number of bytes read by PDX deserialization. |
+| `tombstoneCount` | Total number of tombstone entries created for performing concurrency checks. |
+| `nonReplicatedTombstoneSize` | Approximate total size (in bytes) of tombstones present in the client cache. |
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/cache_performance_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/cache_performance_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/cache_performance_statistics.html.md.erb
deleted file mode 100644
index 099bbfb..0000000
--- a/docs/geode-native-docs/system-statistics/cache_performance_statistics.html.md.erb
+++ /dev/null
@@ -1,47 +0,0 @@
----
-title: Cache Performance Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Use cache performance statistics to determine the type and number of cache operations being performed and how much time they consume.
-
-These statistics are available if the member creates a cache.
-
-| | |
-|----------------------------------|----------------------------------------------------------------------------------------------|
-| `creates` | Total number of cache creates. |
-| `puts` | Total number of cache puts. |
-| `gets` | Total number of cache gets. |
-| `entries` | Current number of cache entries. |
-| `hits` | Total number of cache hits. |
-| `misses` | Total number of cache misses. |
-| `destroys` | Total number of cache destroys. |
-| `overflows` | Total number of cache overflows to persistence backup. |
-| `cacheListenerCallsCompleted` | Total number of times a cache listener call has completed. |
-| `pdxInstanceDeserializations` | Total number of times getObject has been called on a PdxInstance. |
-| `pdxInstanceDeserializationTime` | Total amount of time, in nanoseconds, spent deserializing PdxInstances by calling getObject. |
-| `pdxInstanceCreations` | Total number of times a deserialization created a PdxInstance. |
-| `pdxSerializations` | Total number of PDX serializations. |
-| `pdxSerializedBytes` | Total number of bytes produced by PDX serialization. |
-| `pdxDeserializations` | Total number of PDX deserializations. |
-| `pdxDeserializedBytes` | Total number of bytes read by PDX deserialization. |
-| `tombstoneCount` | Total number of tombstone entries created for performing concurrency checks. |
-| `nonReplicatedTombstoneSize` | Approximate total size (in bytes) of tombstones present in the client cache. |
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/chapter-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/chapter-overview.html.md.erb b/docs/geode-native-docs/system-statistics/chapter-overview.html.md.erb
new file mode 100644
index 0000000..5f433ea
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/chapter-overview.html.md.erb
@@ -0,0 +1,41 @@
+---
+title: System Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+This section discusses statistics for caching and distribution activities.
+Statistics that end with "time" are time-based statistics.
+For performance reasons, the system does not collect these by default.
+To enable time-based statistics gathering,
+set the system property `enable-time-statistics`
+as described in [Attributes in geode.properties\u2014Statistics Archiving Properties](../setting-properties/propfile-attributes.html#attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723).
+
+- **[Sampling Statistics](sampling-statistics.html)**
+
+ When applications and cache servers join a distributed system, they indicate whether to enable statistics sampling and whether to archive the statistics that are gathered.
+
+- **[System Performance Statistics](system-performance-statistics.html)**
+
+ Performance statistics are collected for each application or cache server that connects to a distributed system.
+
+- **[Operating System Statistics](operating-system-statistics.html)**
+
+ Use operating system statistics to determine a member\u2019s CPU, memory, and disk usage.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/chapter_overview.html.md.erb b/docs/geode-native-docs/system-statistics/chapter_overview.html.md.erb
deleted file mode 100644
index 1e0de45..0000000
--- a/docs/geode-native-docs/system-statistics/chapter_overview.html.md.erb
+++ /dev/null
@@ -1,41 +0,0 @@
----
-title: System Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-This section discusses statistics for caching and distribution activities.
-Statistics that end with "time" are time-based statistics.
-For performance reasons, the system does not collect these by default.
-To enable time-based statistics gathering,
-set the system property `enable-time-statistics`
-as described in [Attributes in geode.properties\u2014Statistics Archiving Properties](../setting-properties/propfile_attributes.html#attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723).
-
-- **[Sampling Statistics](sampling_statistics.html)**
-
- When applications and cache servers join a distributed system, they indicate whether to enable statistics sampling and whether to archive the statistics that are gathered.
-
-- **[System Performance Statistics](system_performance_statistics.html)**
-
- Performance statistics are collected for each application or cache server that connects to a distributed system.
-
-- **[Operating System Statistics](operating_system_statistics.html)**
-
- Use operating system statistics to determine a member\u2019s CPU, memory, and disk usage.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/continuous-query-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/continuous-query-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/continuous-query-statistics.html.md.erb
new file mode 100644
index 0000000..25ca685
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/continuous-query-statistics.html.md.erb
@@ -0,0 +1,31 @@
+---
+title: Continuous Query Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Continuous query statistics give information about a registered Continuous Query (CQ) represented by the CqQuery object.
+
+| | |
+|------------|--------------------------------------------|
+| `inserts` | Total number of inserts for this CQ query. |
+| `updates ` | Total number of updates for this CQ query. |
+| `deletes` | Total number of deletes for this CQ query. |
+| `events` | Total number of events for this CQ query. |
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/continuous_query_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/continuous_query_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/continuous_query_statistics.html.md.erb
deleted file mode 100644
index 25ca685..0000000
--- a/docs/geode-native-docs/system-statistics/continuous_query_statistics.html.md.erb
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Continuous Query Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Continuous query statistics give information about a registered Continuous Query (CQ) represented by the CqQuery object.
-
-| | |
-|------------|--------------------------------------------|
-| `inserts` | Total number of inserts for this CQ query. |
-| `updates ` | Total number of updates for this CQ query. |
-| `deletes` | Total number of deletes for this CQ query. |
-| `events` | Total number of events for this CQ query. |
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/cq-service-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/cq-service-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/cq-service-statistics.html.md.erb
new file mode 100644
index 0000000..a83680f
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/cq-service-statistics.html.md.erb
@@ -0,0 +1,32 @@
+---
+title: CQ Service Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Use CQ service methods to get aggregate statistical information about the continuous queries of a client.
+
+| | |
+|----------------|--------------------------------------------------------|
+| `CqsActive` | Total number of CQs active for this CQ service. |
+| `CqsCreated ` | Total number of CQs created for this CQ service. |
+| `CqsClosed ` | Total number of CQs closed for this CQ service. |
+| `CqsStopped` | Total number of CQs stopped for this CQ service. |
+| `CqsOnClient ` | Total number of CQs on the client for this CQ service. |
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/cq_service_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/cq_service_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/cq_service_statistics.html.md.erb
deleted file mode 100644
index a83680f..0000000
--- a/docs/geode-native-docs/system-statistics/cq_service_statistics.html.md.erb
+++ /dev/null
@@ -1,32 +0,0 @@
----
-title: CQ Service Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Use CQ service methods to get aggregate statistical information about the continuous queries of a client.
-
-| | |
-|----------------|--------------------------------------------------------|
-| `CqsActive` | Total number of CQs active for this CQ service. |
-| `CqsCreated ` | Total number of CQs created for this CQ service. |
-| `CqsClosed ` | Total number of CQs closed for this CQ service. |
-| `CqsStopped` | Total number of CQs stopped for this CQ service. |
-| `CqsOnClient ` | Total number of CQs on the client for this CQ service. |
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/delta-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/delta-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/delta-statistics.html.md.erb
new file mode 100644
index 0000000..c7e4384
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/delta-statistics.html.md.erb
@@ -0,0 +1,31 @@
+---
+title: Delta Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Delta statistics provide information about updates to data.
+
+| | |
+|------------------------------|--------------------------------------------------------------------------------------------------------------|
+| `deltaMessageFailures` | Total number of messages containing delta (received from server) but could not be processed after reception. |
+| `deltaPuts` | Total number of puts containing delta that have been sent from client to server. |
+| `processedDeltaMessages` | Total number of messages containing delta received from server and processed after reception. |
+| `processedDeltaMessagesTime` | Total time spent applying delta (received from server) on existing values at client. |
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/delta_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/delta_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/delta_statistics.html.md.erb
deleted file mode 100644
index c7e4384..0000000
--- a/docs/geode-native-docs/system-statistics/delta_statistics.html.md.erb
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Delta Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Delta statistics provide information about updates to data.
-
-| | |
-|------------------------------|--------------------------------------------------------------------------------------------------------------|
-| `deltaMessageFailures` | Total number of messages containing delta (received from server) but could not be processed after reception. |
-| `deltaPuts` | Total number of puts containing delta that have been sent from client to server. |
-| `processedDeltaMessages` | Total number of messages containing delta received from server and processed after reception. |
-| `processedDeltaMessagesTime` | Total time spent applying delta (received from server) on existing values at client. |
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/linux-os-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/linux-os-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/linux-os-statistics.html.md.erb
new file mode 100644
index 0000000..85c0e21
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/linux-os-statistics.html.md.erb
@@ -0,0 +1,34 @@
+---
+title: Linux Process Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Use these methods to get information about a Linux operating system process.
+
+| | |
+|---------------------|--------------------------------------------------------------------------|
+| `imageSize` | The size of the process's image in megabytes. |
+| `rssSize` | The size of the process's resident set size in megabytes. |
+| `userTime` | The operating system statistic for the process CPU usage in user time |
+| `systemTime` | The operating system statistic for the process CPU usage in system time. |
+| `hostCpuUsage` | The operating system statistic for the host CPU usage. |
+| `threads` | Number of threads currently active in this process. |
+| `LinuxProcessStats` | Statistics for a Linux process. |
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/linux_os_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/linux_os_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/linux_os_statistics.html.md.erb
deleted file mode 100644
index 85c0e21..0000000
--- a/docs/geode-native-docs/system-statistics/linux_os_statistics.html.md.erb
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: Linux Process Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Use these methods to get information about a Linux operating system process.
-
-| | |
-|---------------------|--------------------------------------------------------------------------|
-| `imageSize` | The size of the process's image in megabytes. |
-| `rssSize` | The size of the process's resident set size in megabytes. |
-| `userTime` | The operating system statistic for the process CPU usage in user time |
-| `systemTime` | The operating system statistic for the process CPU usage in system time. |
-| `hostCpuUsage` | The operating system statistic for the host CPU usage. |
-| `threads` | Number of threads currently active in this process. |
-| `LinuxProcessStats` | Statistics for a Linux process. |
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/operating-system-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/operating-system-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/operating-system-statistics.html.md.erb
new file mode 100644
index 0000000..4d3e0dc
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/operating-system-statistics.html.md.erb
@@ -0,0 +1,36 @@
+---
+title: Operating System Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Use operating system statistics to determine a member\u2019s CPU, memory, and disk usage.
+
+- **[Linux Process Statistics](linux-os-statistics.html)**
+
+ Use these methods to get information about a Linux operating system process.
+
+- **[Solaris Process Statistics](solaris-os-statistics.html)**
+
+ Use these methods to get information about a Solaris operating system process.
+
+- **[Windows Process Statistics](windows-os-statistics.html)**
+
+ Use these methods to get information about a Windows operating system process.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/operating_system_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/operating_system_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/operating_system_statistics.html.md.erb
deleted file mode 100644
index 6f33720..0000000
--- a/docs/geode-native-docs/system-statistics/operating_system_statistics.html.md.erb
+++ /dev/null
@@ -1,36 +0,0 @@
----
-title: Operating System Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Use operating system statistics to determine a member\u2019s CPU, memory, and disk usage.
-
-- **[Linux Process Statistics](linux_os_statistics.html)**
-
- Use these methods to get information about a Linux operating system process.
-
-- **[Solaris Process Statistics](solaris_os_statistics.html)**
-
- Use these methods to get information about a Solaris operating system process.
-
-- **[Windows Process Statistics](windows_os_statistics.html)**
-
- Use these methods to get information about a Windows operating system process.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/pool-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/pool-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/pool-statistics.html.md.erb
new file mode 100644
index 0000000..7f03466
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/pool-statistics.html.md.erb
@@ -0,0 +1,47 @@
+---
+title: Pool Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Use the pool object to get statistics on connection pools.
+
+| | |
+|-------------------------------|---------------------------------------------------------------------------------------------------------------|
+| `locators` | Current number of locators discovered. |
+| `servers` | Current number of servers discovered. |
+| `locatorRequests` | Number of requests from this connection pool to a locator. |
+| `locatorResponses` | Number of responses from the locator to this connection pool. |
+| `poolConnections` | Current number of pool connections. |
+| `connects` | Total number of times a connection has been created. |
+| `ConnectionWaitTime` | Total time (nanoseconds) spent waiting for a connection. |
+| `disconnects` | Total number of times a connection has been destroyed. |
+| `minPoolSizeConnect` | Total number of connects done to maintain minimum pool size. |
+| `loadConditioningConnects` | Total number of connects done due to load conditioning. |
+| `idleDisconnects` | Total number of disconnects done due to idle expiration. |
+| `loadConditioningDisconnects` | Total number of disconnects done due to load conditioning expiration. |
+| `connectionWaitsInProgress` | Current number of threads waiting for a connection. |
+| `connectionWaits` | Total number of times a thread completed waiting for a connection (by timing out or by getting a connection). |
+| `clientOpsInProgress` | Current number of clientOps being executed. |
+| `clientOps` | Total number of clientOps completed successfully. |
+| `clientOpFailures` | Total number of clientOp attempts that have failed. |
+| `clientOpTimeouts` | Total number of clientOp attempts that have timed out. |
+| `QueryExecutions` | Total number of queryExecutions. |
+| `QueryExecutionTime` | Total time spent while processing queryExecution. |
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/pool_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/pool_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/pool_statistics.html.md.erb
deleted file mode 100644
index 7f03466..0000000
--- a/docs/geode-native-docs/system-statistics/pool_statistics.html.md.erb
+++ /dev/null
@@ -1,47 +0,0 @@
----
-title: Pool Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Use the pool object to get statistics on connection pools.
-
-| | |
-|-------------------------------|---------------------------------------------------------------------------------------------------------------|
-| `locators` | Current number of locators discovered. |
-| `servers` | Current number of servers discovered. |
-| `locatorRequests` | Number of requests from this connection pool to a locator. |
-| `locatorResponses` | Number of responses from the locator to this connection pool. |
-| `poolConnections` | Current number of pool connections. |
-| `connects` | Total number of times a connection has been created. |
-| `ConnectionWaitTime` | Total time (nanoseconds) spent waiting for a connection. |
-| `disconnects` | Total number of times a connection has been destroyed. |
-| `minPoolSizeConnect` | Total number of connects done to maintain minimum pool size. |
-| `loadConditioningConnects` | Total number of connects done due to load conditioning. |
-| `idleDisconnects` | Total number of disconnects done due to idle expiration. |
-| `loadConditioningDisconnects` | Total number of disconnects done due to load conditioning expiration. |
-| `connectionWaitsInProgress` | Current number of threads waiting for a connection. |
-| `connectionWaits` | Total number of times a thread completed waiting for a connection (by timing out or by getting a connection). |
-| `clientOpsInProgress` | Current number of clientOps being executed. |
-| `clientOps` | Total number of clientOps completed successfully. |
-| `clientOpFailures` | Total number of clientOp attempts that have failed. |
-| `clientOpTimeouts` | Total number of clientOp attempts that have timed out. |
-| `QueryExecutions` | Total number of queryExecutions. |
-| `QueryExecutionTime` | Total time spent while processing queryExecution. |
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/region-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/region-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/region-statistics.html.md.erb
new file mode 100644
index 0000000..be9a343
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/region-statistics.html.md.erb
@@ -0,0 +1,130 @@
+---
+title: Region Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+These methods help to get the statistics of a region.
+
+<a id="concept_7AA863080074439286F4F51048BC2159__section_8A343C8D6425469DA314D9A96E543A24"></a>
+<table>
+<colgroup>
+<col width="50%" />
+<col width="50%" />
+</colgroup>
+<tbody>
+<tr class="odd">
+<td><code class="ph codeph">creates</code></td>
+<td>Total number of cache creates for this region.</td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">puts</code></td>
+<td>Total number of cache put operations for this region.</td>
+</tr>
+<tr class="odd">
+<td><code class="ph codeph">putTime</code></td>
+<td>Total time spent doing put operations for this region.</td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">putAll</code></td>
+<td>Total number of cache putAlls for this region.</td>
+</tr>
+<tr class="odd">
+<td><code class="ph codeph">putAllTime</code></td>
+<td>Total time spent doing putAll operations for this region.</td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">gets</code></td>
+<td>Total number of cache gets for this region.</td>
+</tr>
+<tr class="odd">
+<td><code class="ph codeph">getTime</code></td>
+<td><p>Total time spent doing get operations for this region.</p></td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">getAll</code></td>
+<td>Total number of cache getAlls for this region.</td>
+</tr>
+<tr class="odd">
+<td><code class="ph codeph">getAllTime</code></td>
+<td>Total time spent doing getAll operations for this region.</td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">hits</code></td>
+<td>Total number of cache hits for this region.</td>
+</tr>
+<tr class="odd">
+<td><code class="ph codeph">misses</code></td>
+<td>Total number of cache misses for this region.</td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">entries</code></td>
+<td>Current number of cache entries for this region.</td>
+</tr>
+<tr class="odd">
+<td><code class="ph codeph">destroys</code></td>
+<td>Total number of cache destroys for this region.</td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">clears</code></td>
+<td>Total number of cache clears for this region.</td>
+</tr>
+<tr class="odd">
+<td><code class="ph codeph">overflows</code></td>
+<td>Total number of cache overflows to disk for this region.</td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">retrieves</code></td>
+<td>Total number of cache entries fetched from disk into the cache region.</td>
+</tr>
+<tr class="odd">
+<td><code class="ph codeph">nonSingleHopCount</code></td>
+<td>Total number of times client request required multiple hops.</td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">metaDataRefreshCount</code></td>
+<td>Total number of times metadata was refreshed due to the observation of multiple hops.</td>
+</tr>
+<tr class="odd">
+<td><code class="ph codeph">cacheLoaderCallCompleted</code></td>
+<td>Total number of times a load has completed for this region.</td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">cacheLoaderCallTime</code></td>
+<td>Total time spent invoking the loaders for this region.</td>
+</tr>
+<tr class="odd">
+<td><code class="ph codeph">CacheWriterCallsCompleted</code></td>
+<td>Total number of times a cache writer call has completed for this region.</td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">CacheWriterCallTime</code></td>
+<td>Total time spent doing cache writer calls.</td>
+</tr>
+<tr class="odd">
+<td><code class="ph codeph">CacheListenerCallsCompleted</code></td>
+<td>Total number of times a cache listener call has completed for this region.</td>
+</tr>
+<tr class="even">
+<td><code class="ph codeph">CacheListenerCallTime</code></td>
+<td>Total time spent doing cache listener calls for this region.</td>
+</tr>
+</tbody>
+</table>
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/region_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/region_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/region_statistics.html.md.erb
deleted file mode 100644
index be9a343..0000000
--- a/docs/geode-native-docs/system-statistics/region_statistics.html.md.erb
+++ /dev/null
@@ -1,130 +0,0 @@
----
-title: Region Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-These methods help to get the statistics of a region.
-
-<a id="concept_7AA863080074439286F4F51048BC2159__section_8A343C8D6425469DA314D9A96E543A24"></a>
-<table>
-<colgroup>
-<col width="50%" />
-<col width="50%" />
-</colgroup>
-<tbody>
-<tr class="odd">
-<td><code class="ph codeph">creates</code></td>
-<td>Total number of cache creates for this region.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">puts</code></td>
-<td>Total number of cache put operations for this region.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">putTime</code></td>
-<td>Total time spent doing put operations for this region.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">putAll</code></td>
-<td>Total number of cache putAlls for this region.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">putAllTime</code></td>
-<td>Total time spent doing putAll operations for this region.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">gets</code></td>
-<td>Total number of cache gets for this region.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">getTime</code></td>
-<td><p>Total time spent doing get operations for this region.</p></td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">getAll</code></td>
-<td>Total number of cache getAlls for this region.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">getAllTime</code></td>
-<td>Total time spent doing getAll operations for this region.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">hits</code></td>
-<td>Total number of cache hits for this region.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">misses</code></td>
-<td>Total number of cache misses for this region.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">entries</code></td>
-<td>Current number of cache entries for this region.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">destroys</code></td>
-<td>Total number of cache destroys for this region.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">clears</code></td>
-<td>Total number of cache clears for this region.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">overflows</code></td>
-<td>Total number of cache overflows to disk for this region.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">retrieves</code></td>
-<td>Total number of cache entries fetched from disk into the cache region.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">nonSingleHopCount</code></td>
-<td>Total number of times client request required multiple hops.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">metaDataRefreshCount</code></td>
-<td>Total number of times metadata was refreshed due to the observation of multiple hops.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">cacheLoaderCallCompleted</code></td>
-<td>Total number of times a load has completed for this region.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">cacheLoaderCallTime</code></td>
-<td>Total time spent invoking the loaders for this region.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">CacheWriterCallsCompleted</code></td>
-<td>Total number of times a cache writer call has completed for this region.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">CacheWriterCallTime</code></td>
-<td>Total time spent doing cache writer calls.</td>
-</tr>
-<tr class="odd">
-<td><code class="ph codeph">CacheListenerCallsCompleted</code></td>
-<td>Total number of times a cache listener call has completed for this region.</td>
-</tr>
-<tr class="even">
-<td><code class="ph codeph">CacheListenerCallTime</code></td>
-<td>Total time spent doing cache listener calls for this region.</td>
-</tr>
-</tbody>
-</table>
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/sampling-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/sampling-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/sampling-statistics.html.md.erb
new file mode 100644
index 0000000..4a3f2a6
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/sampling-statistics.html.md.erb
@@ -0,0 +1,34 @@
+---
+title: Sampling Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+When applications and cache servers join a distributed system, they indicate whether to enable statistics sampling and whether to archive the statistics that are gathered.
+
+The following statistics are related to the statistic sampler.
+
+| | |
+|---------------|------------------------------------------------|
+| `sampleCount` | Total number of samples taken by this sampler. |
+| `sampleTime` | Total amount of time spent taking samples. |
+| `StatSampler` | Statistics on the statistic sampler. |
+
+For more information about configuring statistics, see [Attributes in geode.properties](../setting-properties/propfile-attributes.html#attributes-gfcpp).
+
+
[5/7] geode-native git commit: GEODE-2513: Rename and reorganize
client doc sources This closes #85
Posted by db...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
deleted file mode 100644
index 9b95e77..0000000
--- a/docs/geode-native-docs/cpp-caching-api/serialization_using_serializable.html.md.erb
+++ /dev/null
@@ -1,256 +0,0 @@
----
-title: Serializing Data with the Serializable Interface
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-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
-
-When your application puts an object into the cache for subsequent distribution, Geode serializes the data by taking these steps:
-
-1. Calls the appropriate `classId` function.
-2. Writes the full `typeId` using the `classId` for the instance.
-3. Invokes the instance\u2019s `toData` function.
-
-When your application subsequently receives a byte array, Geode takes the following steps:
-
-1. Decodes the `typeId`, extracts the `classId` from the `typeId`, then creates an object of the designated type using the registered factory functions.
-
-2. Invokes the `fromData` function with input from the data stream.
-3. Decodes the data, then populates the data fields.
-
-## <a id="concept_696AB5206C3E45898CC1A24CDD93D003__section_786CF85FD80E4FE391135460E04D46CC" class="no-quick-link"></a>Implementing the Serializable Interface
-
-To store your own data types in the cache, you need to derive a new subclass from the `Serializable` interface. In practical terms, this means that you need to implement a small set of helper functions:
-
-1. Write a `toData` function that serializes your data.
-
- ``` pre
- void toData (DataOutput& output)
- ```
-
- The `toData` function is responsible for copying all of the object\u2019s 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.
-
-2. Write a `fromData` function that consumes a data input stream and repopulates the object\u2019s data fields.
-
- ``` pre
- 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`.
-
-## Example 1. The Simple Class BankAccount
-
-This example demonstrates a simple `BankAccount` class that encapsulates two `ints`, `ownerId` and `accountId`:
-
-``` pre
-class BankAccount
-{
- private:
-�
- int m_ownerId;
- int m_accountId;
-�
- public:
-�
- BankAccount( int owner, int account ): m_ownerId( owner ),
- m_accountId( account ) {}
-�
- int getOwner( )
- {
- return m_ownerId;
- }
-�
- int getAccount( )
- {
- return m_accountId;
- }
-�
-};
-```
-
-To make `BankAccount` serializable, you would need to derive the class from `Serializable` and implement the following:
-
-- `toData`\u2014a function to serialize the data.
-- `fromData`\u2014a function to deserialize the data.
-- `classId`\u2014a function to provide a unique integer for the class.
-- `TypeFactoryMethod`\u2014a pointer to a function that returns a `Serializable*` to an uninitialized instance of the type.
-
-## Example 2. Implementing a Serializable Class
-
-This example shows a code sample that demonstrates how to implement a serializable class.
-
-``` pre
-class BankAccount : public Serializable
-{
- private:
- int m_ownerId;
- int m_accountId;
- public:
- BankAccount( int owner, int account ) : m_ownerId( owner ),
- m_accountId( account ) {}
-
-int getOwner( )
-{
- return m_ownerId;
-}
-
-int getAccount( )
-{
- return m_accountId;
-}
-
-// Add the following for the Serializable interface
-// Our TypeFactoryMethod
-static Serializable* createInstance( )
-{
- return new BankAccount( 0, 0 );
-}
-
-int32_t classId( )
-{
- return 10; // must be unique per class.
-}
-
-virtual uint32_t objectSize() const
-{
- return 10;
-}
-
-void toData( DataOutput& output )
-{
- output.writeInt( m_ownerId );
- output.writeInt( m_accountId );
-}
-
-Serializable* fromData( DataInput& input )
-{
- input.readInt( &m_ownerId );
- input.readInt( &m_accountId );
- return this;
-}
-};
-```
-
-## <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`.
-
-``` pre
-Serializable::registerType( BankAccount::createInstance );
-```
-
-Typically, you would register the type before calling the function `DistributedSystem::connect`.
-
-**Note:**
-Type IDs must be unique to only one class.
-
-## <a id="concept_696AB5206C3E45898CC1A24CDD93D003__section_311C3661023C46328B406F26F4F16808" class="no-quick-link"></a>Custom Key Types
-
-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 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:
-
-- Change the class so that it derives from `CacheableKey` rather than `Serializable`.
-
-- Implement `operator==` and `hashcode` functions.
-
-## Example 3. Extending a Serializable Class To Be a CacheableKey
-
-This example shows how to extend a serializable class to be a cacheable key.
-
-``` pre
-class BankAccount
-: public CacheableKey
-{
- private:
- int m_ownerId;
- int m_accountId;
- public:
- BankAccount( int owner, int account ) : m_ownerId( owner ),
- m_accountId( account ) {}
-
-int getOwner( )
-{
- return m_ownerId;
-}
-
-int getAccount( )
-{
- return m_accountId;
-}
-
-// Our TypeFactoryMethod
-static Serializable* createInstance( )
-{
- return new BankAccount( 0, 0 );
-}
-
-int32_t typeId( )
-{
- return 1000; // must be unique per class.
-}
-
-void toData( DataOutput& output )
-{
- output.writeInt( m_ownerId );
- output.writeInt( m_accountId );
-}
-
-Serializable* fromData( DataInput& input )
-{
- input.readInt( &m_ownerId );
- input.readInt( &m_accountId );
- return this;
-}
-
-// Add the following for the CacheableKey interface
-bool operator == ( const CacheableKey& other ) const
-{
- const BankAccount& otherBA =
- static_cast<const BankAccount&>( other );
- return (m_ownerId == otherBA.m_ownerId) && (m_accountId == otherBA.m_accountId);
-}
-
-uint32_t hashcode( ) const
-{
- return m_ownerId;
-}
-
-virtual int32_t classId( )const
-{
- return 10; // must be unique per class.
-}
-�
-virtual uint32_t objectSize() const
-{
- return 10;
-}
-};
-```
-
-## <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++ 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.
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/type-interoperability.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/type-interoperability.html.md.erb b/docs/geode-native-docs/cpp-caching-api/type-interoperability.html.md.erb
new file mode 100644
index 0000000..57746f8
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/type-interoperability.html.md.erb
@@ -0,0 +1,63 @@
+---
+title: Interoperability of C++ Types When Using PDX Serialization
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+This topic table lists the mapping between C++ types and other language types when using PDX serialization.
+
+In addition, the table lists which PdxReader and PdxWriter C++ APIs to use when serializing and deserializing the types.
+
+| C++ Type | .NET Type | Java Type | PdxReader/PdxWriter API |
+|-----------------------------------|------------------------------------------------------------------|-------------------------|----------------------------------------------|
+| CacheableHashTable | System::Collections::Hashtable | java.util.Hashtable | readObject/writeObject |
+| CacheableHashMap | System::Collections ::Generic::IDictionary<Object, Object> | java.util.HashMap | readObject/writeObject |
+| CacheableVector | System::Collections::ArrayList | java.util.Vector | readObject/writeObject |
+| CacheableArrayList | System::Collections::�Generic::IList<Object> | java.util.ArrayList | readObject/writeObject |
+| bool | bool | boolean | readBoolean/writeBoolean |
+| int8\_t | sbyte | Byte | readByte/writeByte |
+| wchar\_t/char<sup>1</sup> | Char | Char | readChar/writeChar |
+| wchar\_t\*/char\*<sup>1</sup> | string | string | readString/writeString |
+| double | Double | double | readDouble/writeDouble |
+| float | float | float | readFloat/writeFloat |
+| int16\_t | short | short | readShort/writeShort |
+| int32\_t | Int32/int | int | readInt/writeInt |
+| int64\_t | Int64/long | long | readLong/writeLong |
+| int8\_t\* | System.Byte\[ \]/System.SByte\[ \] | Byte\[ \]<sup>2</sup> | readByteArray/writeByteArray |
+| double\* | System.Double\[ \] | Double\[ \] | readDoubleArray/writeDoubleArray |
+| float\* | System.float\[ \] | Float\[ \] | readFloatArray/writeFloatArray |
+| CacheableHashSet | CacheableHashSet | java.util.HashSet | readObject/writeObject |
+| CacheableLinkedHashSet | CacheableLinkedHashSet | java.util.LinkedHashSet | readObject/writeObject |
+| int16\_t\* | System.Int16\[ \] | Short\[ \] | readShortArray/writeShortArray |
+| int32\_t\* | System.Int32\[ \] | Int\[ \] | readIntArray/writeIntArray |
+| int64\_t\* | System.Int64\[ \] | Long\[ \] | readLongArray/writeLongArray |
+| bool\* | System.Boolean\[ \] | Boolean\[ \] | readBooleanArray/writeBooleanArray |
+| wchar\_t\*/char\*<sup>1</sup> | System.Char\[ \] | char\[ \] | readCharArray/writeCharArray |
+| enum<sup>3</sup> | enum | Enum | readObject/writeObject |
+| int8\_t\*\* | byte\[ \]\[ \]/Sbyte\[ \]\[ \] | Byte\[ \]\[ \] | readArrayOfByteArrays/writeArrayOfByteArrays |
+| wchar\_t\*\*/char\*\*<sup>1</sup> | System.String\[ \] | String\[ \] | readStringArray/writeStringArray |
+| CacheableDate | System.DateTime (UTC) | Java.util.date | readDate/writeDate |
+| CacheableObjectArray | object\[ \]/System.Object\[ \] | Object\[ \] | readObjectArray/writeObjectArray |
+| Cacheable/Serializable | object/System.Object | Object | readObject/writeObject |
+
+<sup>1</sup>C++ allows unicode and non-unicode characters, so C++ PDX will support both wchar\_t/char and wchar\_t\*/char\*.
+
+<sup>2</sup> For Pdx, only SByte is used, as Java Byte is signed. But for DataSerializable, Byte\[ \] array is used as a data container.
+
+<sup>3</sup>C++ allows explicit setting of ordinal numbers, but it is up to the developer to map the Java enumNames with C++ enumNames. See [Using C++ Enum Type with PDX Serialization](using-enum-type-with-pdx.html#concept_F38FDBC327204B4EB1E0BC74B4C95409).
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/type_interoperability.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/type_interoperability.html.md.erb b/docs/geode-native-docs/cpp-caching-api/type_interoperability.html.md.erb
deleted file mode 100644
index bb5f6d2..0000000
--- a/docs/geode-native-docs/cpp-caching-api/type_interoperability.html.md.erb
+++ /dev/null
@@ -1,63 +0,0 @@
----
-title: Interoperability of C++ Types When Using PDX Serialization
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-This topic table lists the mapping between C++ types and other language types when using PDX serialization.
-
-In addition, the table lists which PdxReader and PdxWriter C++ APIs to use when serializing and deserializing the types.
-
-| C++ Type | .NET Type | Java Type | PdxReader/PdxWriter API |
-|-----------------------------------|------------------------------------------------------------------|-------------------------|----------------------------------------------|
-| CacheableHashTable | System::Collections::Hashtable | java.util.Hashtable | readObject/writeObject |
-| CacheableHashMap | System::Collections ::Generic::IDictionary<Object, Object> | java.util.HashMap | readObject/writeObject |
-| CacheableVector | System::Collections::ArrayList | java.util.Vector | readObject/writeObject |
-| CacheableArrayList | System::Collections::�Generic::IList<Object> | java.util.ArrayList | readObject/writeObject |
-| bool | bool | boolean | readBoolean/writeBoolean |
-| int8\_t | sbyte | Byte | readByte/writeByte |
-| wchar\_t/char<sup>1</sup> | Char | Char | readChar/writeChar |
-| wchar\_t\*/char\*<sup>1</sup> | string | string | readString/writeString |
-| double | Double | double | readDouble/writeDouble |
-| float | float | float | readFloat/writeFloat |
-| int16\_t | short | short | readShort/writeShort |
-| int32\_t | Int32/int | int | readInt/writeInt |
-| int64\_t | Int64/long | long | readLong/writeLong |
-| int8\_t\* | System.Byte\[ \]/System.SByte\[ \] | Byte\[ \]<sup>2</sup> | readByteArray/writeByteArray |
-| double\* | System.Double\[ \] | Double\[ \] | readDoubleArray/writeDoubleArray |
-| float\* | System.float\[ \] | Float\[ \] | readFloatArray/writeFloatArray |
-| CacheableHashSet | CacheableHashSet | java.util.HashSet | readObject/writeObject |
-| CacheableLinkedHashSet | CacheableLinkedHashSet | java.util.LinkedHashSet | readObject/writeObject |
-| int16\_t\* | System.Int16\[ \] | Short\[ \] | readShortArray/writeShortArray |
-| int32\_t\* | System.Int32\[ \] | Int\[ \] | readIntArray/writeIntArray |
-| int64\_t\* | System.Int64\[ \] | Long\[ \] | readLongArray/writeLongArray |
-| bool\* | System.Boolean\[ \] | Boolean\[ \] | readBooleanArray/writeBooleanArray |
-| wchar\_t\*/char\*<sup>1</sup> | System.Char\[ \] | char\[ \] | readCharArray/writeCharArray |
-| enum<sup>3</sup> | enum | Enum | readObject/writeObject |
-| int8\_t\*\* | byte\[ \]\[ \]/Sbyte\[ \]\[ \] | Byte\[ \]\[ \] | readArrayOfByteArrays/writeArrayOfByteArrays |
-| wchar\_t\*\*/char\*\*<sup>1</sup> | System.String\[ \] | String\[ \] | readStringArray/writeStringArray |
-| CacheableDate | System.DateTime (UTC) | Java.util.date | readDate/writeDate |
-| CacheableObjectArray | object\[ \]/System.Object\[ \] | Object\[ \] | readObjectArray/writeObjectArray |
-| Cacheable/Serializable | object/System.Object | Object | readObject/writeObject |
-
-<sup>1</sup>C++ allows unicode and non-unicode characters, so C++ PDX will support both wchar\_t/char and wchar\_t\*/char\*.
-
-<sup>2</sup> For Pdx, only SByte is used, as Java Byte is signed. But for DataSerializable, Byte\[ \] array is used as a data container.
-
-<sup>3</sup>C++ allows explicit setting of ordinal numbers, but it is up to the developer to map the Java enumNames with C++ enumNames. See [Using C++ Enum Type with PDX Serialization](using_enum_type_with_pdx.html#concept_F38FDBC327204B4EB1E0BC74B4C95409).
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
new file mode 100644
index 0000000..b8d520e
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/using-enum-type-with-pdx.html.md.erb
@@ -0,0 +1,130 @@
+---
+title: Using C++ Enum Type with PDX Serialization
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Because there is no "object" base type in C++, enums cannot be directly passed as parameters to the `writeObject` and `readObject` API.
+
+To use the C++ enum type with PDX serialization, you have to wrap the `enum` in the `CacheableEnum` class type by specifying classname, enumname and ordinal.
+
+``` pre
+enum enumQuerytest { id1, id2, id3 };
+ class TESTOBJECT_EXPORT PdxEnumTestClass :public PdxSerializable
+ {
+ private:
+ int m_id;
+ CacheableEnumPtr m_enumid;
+
+ public:
+ int getID(){
+ return m_id;
+ }
+
+ CacheableEnumPtr getEnumID() {
+ return m_enumid;
+ }
+
+ PdxEnumTestClass(int id)
+ {
+ m_id = id;
+ switch (m_id) {
+ case 0:
+ m_enumid = CacheableEnum::create("enumQuerytest", "id1", id1);
+ break;
+ case 1:
+ m_enumid = CacheableEnum::create("enumQuerytest", "id2", id2);
+ break;
+ case 2:
+ m_enumid = CacheableEnum::create("enumQuerytest", "id3", id3);
+ break;
+ default:
+ m_enumid = CacheableEnum::create("enumQuerytest", "id1", id1);
+ break;
+ }
+ }
+
+ PdxEnumTestClass() { }
+
+ void toData(PdxWriterPtr pw) {
+ pw->writeInt("m_id", m_id);
+ pw->writeObject("m_enumid", m_enumid);
+ }
+
+ void fromData(PdxReaderPtr pr) {
+ m_id = pr->readInt("m_id");
+ m_enumid = pr->readObject("m_enumid");
+ }
+
+ CacheableStringPtr toString() const {
+ return CacheableString::create("PdxEnumTestClass");
+ }
+
+ char* GetClassName() const {
+ return "com.example.PdxEnumTestClass";
+ }
+
+ static PdxSerializable* createDeserializable() {
+ return new PdxEnumTestClass();
+ }
+ };
+```
+
+## <a id="concept_F38FDBC327204B4EB1E0BC74B4C95409__section_3491F76DB8C0464D89418B89372BBAEA" class="no-quick-link"></a>How Puts and Queries Work on Enums
+
+The following code sample demonstrates how put and query operations work when using the C++ enum Type with PDX serialization:
+
+``` pre
+//Creating objects of type PdxEnumTestClass
+PdxEnumTestClassPtr pdxobj1(new PdxEnumTestClass(0));
+PdxEnumTestClassPtr pdxobj2(new PdxEnumTestClass(1));
+PdxEnumTestClassPtr pdxobj3(new PdxEnumTestClass(2));
+
+RegionPtr rptr = getHelper()->getRegion( "DistRegionAck" );
+
+//PUT Operations
+rptr->put( CacheableInt32::create(0), pdxobj1 );
+LOG( "pdxPut 1 completed " );
+
+rptr->put( CacheableInt32::create(1), pdxobj2 );
+LOG( "pdxPut 2 completed " );
+
+rptr->put( CacheableInt32::create(2), pdxobj3 );
+LOG( "pdxPut 3 completed " );
+
+
+//Query
+try {
+ Serializable::registerPdxType(PdxEnumTestClass::createDeserializable);
+ LOG("PdxEnumTestClass Registered Successfully....");
+} catch (geode::IllegalStateException&/* ex*/) {
+ LOG("PdxEnumTestClass IllegalStateException");
+}
+
+RegionPtr rptr = getHelper()->getRegion( "DistRegionAck" );
+SelectResultsPtr results = rptr->query("m_enumid.name = 'id2'");
+ASSERT(results->size()== 1 , "query result should have one item");
+ResultSetPtr rsptr = dynCast<ResultSetPtr>(results);
+SelectResultsIterator iter = rsptr->getIterator();
+while (iter.moveNext()) {
+ PdxEnumTestClassPtr re = dynCast<PdxEnumTestClassPtr>(iter.current());
+ ASSERT(re->getID()== 1 , "query should have returned id 1");
+}
+```
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/using-pdxinstance.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/using-pdxinstance.html.md.erb b/docs/geode-native-docs/cpp-caching-api/using-pdxinstance.html.md.erb
new file mode 100644
index 0000000..847f32a
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/using-pdxinstance.html.md.erb
@@ -0,0 +1,59 @@
+---
+title: Programming Your Application to Use PdxInstances
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+A `PdxInstance` is a lightweight wrapper around the raw bytes of the PDX serialized objects kept in the cache. It provides applications with run-time access to files of a PDX serialized object. Geode provides the implementation of the `PdxInstance` class.
+
+You can configure your cache to return a `PdxInstance` when a PDX serialized object is deserialized instead of deserializing the object to a domain class. Preventing deserialization saves both time and memory and does not require you deserialize the object to the domain class.
+
+This configuration can be done in cache.xml by setting the attribute `read-serialized` to `true` on the <pdx>element. Or it can be done programmatically using the `CacheFactory::setPdxReadSerialized(bool)` method.
+
+After this preference is configured, any time a PDX object is deserialized, it is deserialized into a `PdxInstance`.
+
+The following is a code sample of using the setField API of PdxInstance to modify fields:
+
+``` pre
+RegionPtr rptr = getHelper()->getRegion( regionNames[0] );
+CacheableKeyPtr keyport = CacheableKey::create("pdxput");
+CacheableKeyPtr keyport1 = CacheableKey::create("pdxput2");
+
+PdxInstancePtr pIPtr = dynCast<PdxInstancePtr>(rptr->get(keyport));
+LOG( "modifyPdxInstance get complete." );
+
+WritablePdxInstancePtr wpiPtr( pIPtr->createWriter());
+
+ASSERT(pIPtr != NULLPTR, "pIPtr != NULLPTR expected");
+int val = 0;
+int newVal = 0;
+ASSERT(pIPtr->hasField("m_int32") == true, "m_id1 = true expected");
+pIPtr->getField("m_int32", val);
+wpiPtr->setField("m_int32", val + 1);
+rptr->put(keyport, wpiPtr);
+PdxInstancePtr newPiPtr = dynCast<PdxInstancePtr>(rptr->get(keyport));
+ASSERT(newPiPtr->hasField("m_int32") == true, "m_int32 = true expected");
+newPiPtr->getField("m_int32", newVal);
+ASSERT(val + 1 == newVal, "val + 1 == newVal expected");
+ASSERT((*pIPtr.ptr() == *newPiPtr.ptr()) == false,
+ "PdxInstance should not be equal");
+```
+
+In addition to field access, `PdxInstance` also supports field modification using the `setField(fieldName)` method. The `setField` method has copy-on-write semantics. So for the modifications to be stored in the cache, the `PdxInstance` must be put into a region after `setField` has been called one or more times.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
new file mode 100644
index 0000000..940f67a
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/using-pdxinstancefactory.html.md.erb
@@ -0,0 +1,134 @@
+---
+title: Using PdxInstanceFactory to Create PdxInstances
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+You can use the `PdxInstanceFactory` API to create a `PdxInstance` from raw data when the domain class is not available on the server.
+
+Creating a `PdxInstance` can be particularly useful when you need an instance of a domain class for plug-in code such as a function or a loader. If you have raw data for the domain object (the class name and each field's type and data), then you can explicitly create a `PdxInstance`. The `PdxInstanceFactory` API is very similar to the `PdxWriter` API except that after writing each field, you need to call the create method which returns the created `PdxInstance`.
+
+## PdxInstance Example
+
+The following is a code example of creating a `PdxInstance`.
+
+``` pre
+class Person
+{
+private:
+ char* m_name;
+ int m_id;
+ int m_age;
+
+public:
+ Person() { }
+
+ Person(char* name, int id, int age)
+ {
+ m_name = name;
+ m_id = id;
+ m_age = age;
+ }
+
+ char* getName() const
+ {
+ return m_name;
+ }
+ int getID()
+ {
+ return m_id;
+ }
+ int getAge()
+ {
+ return m_age;
+ }
+};
+
+int main(int argc, char ** argv)
+{
+ try
+ {
+ // Create a Cache.
+ CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
+
+ CachePtr cachePtr = cacheFactory->set("cache-xml-file",
+ "XMLs/clientPdxInstance.xml")->create();
+
+ LOGINFO("Created the Geode Cache");
+
+ // Get the example Region from the Cache which is declared in the
+ // Cache XML file.
+ RegionPtr regionPtr = cachePtr->getRegion("Person");
+
+ LOGINFO("Obtained the Region from the Cache.");
+
+ Person* p = new Person("Jack", 7, 21);
+
+ //PdxInstanceFactory for Person class
+ PdxInstanceFactoryPtr pif = cachePtr->createPdxInstanceFactory("Person");
+ LOGINFO("Created PdxInstanceFactory for Person class");
+
+ pif->writeString("m_name", p->getName());
+ pif->writeInt("m_id", p->getID());
+ pif->markIdentityField("m_id");
+ pif->writeInt("m_age", p->getAge());
+
+ PdxInstancePtr pdxInstance = pif->create();
+
+ LOGINFO("Created PdxInstance for Person class");
+
+ regionPtr->put("Key1", pdxInstance);
+
+ LOGINFO("Populated PdxInstance Object");
+
+ PdxInstancePtr retPdxInstance = regionPtr->get("Key1");
+
+ LOGINFO("Got PdxInstance Object");
+
+ int id = 0;
+ retPdxInstance->getField("m_id", id);
+
+ int age = 0;
+ retPdxInstance->getField("m_age", age);
+
+ char* name = NULL;
+ retPdxInstance->getField("m_name", &name);
+
+ if (id == p->getID()&& age == p->getAge() && strcmp(name, p->getName()) == 0
+ && retPdxInstance->isIdentityField("m_id") == true)
+ LOGINFO("PdxInstance returns all fields value expected");
+ else
+ LOGINFO("PdxInstance doesn't returns all fields value expected");
+
+ delete p;
+
+ // Close the Cache.
+ cachePtr->close();
+
+ LOGINFO("Closed the Cache");
+
+ }
+ // An exception should not occur
+ catch(const Exception & geodeExcp)
+ {
+ LOGERROR("PdxInstance Exception: %s", geodeExcp.getMessage());
+ }
+}
+```
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/using-pdxserializer.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/using-pdxserializer.html.md.erb b/docs/geode-native-docs/cpp-caching-api/using-pdxserializer.html.md.erb
new file mode 100644
index 0000000..7df9135
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/using-pdxserializer.html.md.erb
@@ -0,0 +1,119 @@
+---
+title: Serialize Your Domain Objects with PdxSerializer and PdxWrapper
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+For domain objects that you cannot or do not want to modify, use the `PdxSerializer` and the `PdxWrapper` classes to serialize and deserialize the object's fields.
+
+You register a `PdxSerializer` implementation for the entire cache, programming it for all of the domain objects that you handle in this way. This way you do not have to implement the `PdxSerializable` interface for each domain class.
+
+The `PdxSerializer` allows domain classes to be serialized and deserialized as PDXs without modification of the domain class. It requires only that the domain class have a constructor accessible to the `PdxSerializer` to create an instance. The domain class will be held in a wrapper class, `PdxWrapper`.
+
+`PdxSerializer` has the following methods:
+
+- The `toData` method returns true if the PdxSerializer was able to serialize the user object, false if not.
+- If the PdxSerializer was able to deserialize the object, the `fromData` method returns a void pointer to the user object to be wrapped in a `PdxWrapper`.
+
+When you later reference the user object, use the `PdxWrapper` class. `PdxWrapper` holds a shared reference to the object in the local cache and is used during serialization and deserialization. `PdxWrapper` acts as a container for the user domain object and needs to wrap every instance of the object that uses a registered `PdxSerializer`. The object instance will not be modified. In addition, when using `PdxWrapper`, you will need to provide a function pointer to a "de-allocator", which will delete the user object when the reference is no longer held.
+
+The following code example defines a user object and a `PdxSerializer`. It then registers the new `PdxSerializer` and then uses `PdxWrapper` to put the object in a region and retrieve the object from a region.
+
+``` pre
+class UserClass
+{
+public:
+
+ int m_int;
+ string m_string;
+
+ UserClass(int intVal, string stringVal)
+ {
+ m_int = intVal;
+ m_string = stringVal;
+ }
+
+ static void deallocate(void * object, char * className)
+ {
+ if (strcmp(className, "com.example.UserClass") == 0) {
+ UserClass * userObject = reinterpret_cast<UserClass*>(object);
+ delete userObject;
+ }
+ }
+};
+
+class UserPdxSerializer : public PdxSerializer
+{
+public:
+
+ void* fromData(char * className, PdxReaderPtr pdxReader)
+ {
+ if (strcmp(className, "com.example.UserClass") != 0) {
+ return NULL;
+ }
+
+ int intVal = pdxReader->readInt("m_int");
+ string stringVal = pdxReader->readString("m_string");
+
+ UserClass * userObject = new UserClass(intVal, stringVal);
+
+ return (void*) userObject;
+ }
+
+ bool toData(void * object, char * className, PdxWriterPtr pdxWriter)
+ {
+ if (strcmp(className, "com.example.UserClass") != 0) {
+ return false;
+ }
+
+ UserClass * userObject = reinterpret_cast<UserClass*>(object);
+
+ pdxWriter->writeInt("m_int", userObject->m_int);
+ pdxWriter->writeString("m_string", userObject->m_string);
+
+ return true;
+ }
+
+ UserDeallocator getDeallocator(char * className)
+ {
+ if (strcmp(className, "com.example.UserClass") == 0) {
+ return UserClass::deallocate;
+ } else {
+ return NULL;
+ }
+ }
+};
+
+// Register a user PDX serializer
+
+Serializable::registerPdxSerializer(new UserPdxSerializer);
+
+// Put a user object into a region.
+
+UserClass * userObject = new UserClass(123, "someValue");
+PdxWrapperPtr pdxWrapper = new PdxWrapper(userObject, "com.example.UserClass",
+ UserClass::deallocate);
+region->put("key", pdxWrapper);
+
+// Get a user object from a region.
+
+pdxWrapper = dynCast<PdxWrapperPtr>(region->get("key"));
+UserClass * userObject = reinterpret_cast<UserClass*>(pdxWrapper->getObject());
+```
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
deleted file mode 100644
index b8d520e..0000000
--- a/docs/geode-native-docs/cpp-caching-api/using_enum_type_with_pdx.html.md.erb
+++ /dev/null
@@ -1,130 +0,0 @@
----
-title: Using C++ Enum Type with PDX Serialization
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Because there is no "object" base type in C++, enums cannot be directly passed as parameters to the `writeObject` and `readObject` API.
-
-To use the C++ enum type with PDX serialization, you have to wrap the `enum` in the `CacheableEnum` class type by specifying classname, enumname and ordinal.
-
-``` pre
-enum enumQuerytest { id1, id2, id3 };
- class TESTOBJECT_EXPORT PdxEnumTestClass :public PdxSerializable
- {
- private:
- int m_id;
- CacheableEnumPtr m_enumid;
-
- public:
- int getID(){
- return m_id;
- }
-
- CacheableEnumPtr getEnumID() {
- return m_enumid;
- }
-
- PdxEnumTestClass(int id)
- {
- m_id = id;
- switch (m_id) {
- case 0:
- m_enumid = CacheableEnum::create("enumQuerytest", "id1", id1);
- break;
- case 1:
- m_enumid = CacheableEnum::create("enumQuerytest", "id2", id2);
- break;
- case 2:
- m_enumid = CacheableEnum::create("enumQuerytest", "id3", id3);
- break;
- default:
- m_enumid = CacheableEnum::create("enumQuerytest", "id1", id1);
- break;
- }
- }
-
- PdxEnumTestClass() { }
-
- void toData(PdxWriterPtr pw) {
- pw->writeInt("m_id", m_id);
- pw->writeObject("m_enumid", m_enumid);
- }
-
- void fromData(PdxReaderPtr pr) {
- m_id = pr->readInt("m_id");
- m_enumid = pr->readObject("m_enumid");
- }
-
- CacheableStringPtr toString() const {
- return CacheableString::create("PdxEnumTestClass");
- }
-
- char* GetClassName() const {
- return "com.example.PdxEnumTestClass";
- }
-
- static PdxSerializable* createDeserializable() {
- return new PdxEnumTestClass();
- }
- };
-```
-
-## <a id="concept_F38FDBC327204B4EB1E0BC74B4C95409__section_3491F76DB8C0464D89418B89372BBAEA" class="no-quick-link"></a>How Puts and Queries Work on Enums
-
-The following code sample demonstrates how put and query operations work when using the C++ enum Type with PDX serialization:
-
-``` pre
-//Creating objects of type PdxEnumTestClass
-PdxEnumTestClassPtr pdxobj1(new PdxEnumTestClass(0));
-PdxEnumTestClassPtr pdxobj2(new PdxEnumTestClass(1));
-PdxEnumTestClassPtr pdxobj3(new PdxEnumTestClass(2));
-
-RegionPtr rptr = getHelper()->getRegion( "DistRegionAck" );
-
-//PUT Operations
-rptr->put( CacheableInt32::create(0), pdxobj1 );
-LOG( "pdxPut 1 completed " );
-
-rptr->put( CacheableInt32::create(1), pdxobj2 );
-LOG( "pdxPut 2 completed " );
-
-rptr->put( CacheableInt32::create(2), pdxobj3 );
-LOG( "pdxPut 3 completed " );
-
-
-//Query
-try {
- Serializable::registerPdxType(PdxEnumTestClass::createDeserializable);
- LOG("PdxEnumTestClass Registered Successfully....");
-} catch (geode::IllegalStateException&/* ex*/) {
- LOG("PdxEnumTestClass IllegalStateException");
-}
-
-RegionPtr rptr = getHelper()->getRegion( "DistRegionAck" );
-SelectResultsPtr results = rptr->query("m_enumid.name = 'id2'");
-ASSERT(results->size()== 1 , "query result should have one item");
-ResultSetPtr rsptr = dynCast<ResultSetPtr>(results);
-SelectResultsIterator iter = rsptr->getIterator();
-while (iter.moveNext()) {
- PdxEnumTestClassPtr re = dynCast<PdxEnumTestClassPtr>(iter.current());
- ASSERT(re->getID()== 1 , "query should have returned id 1");
-}
-```
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/using_pdxinstance.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/using_pdxinstance.html.md.erb b/docs/geode-native-docs/cpp-caching-api/using_pdxinstance.html.md.erb
deleted file mode 100644
index 847f32a..0000000
--- a/docs/geode-native-docs/cpp-caching-api/using_pdxinstance.html.md.erb
+++ /dev/null
@@ -1,59 +0,0 @@
----
-title: Programming Your Application to Use PdxInstances
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-A `PdxInstance` is a lightweight wrapper around the raw bytes of the PDX serialized objects kept in the cache. It provides applications with run-time access to files of a PDX serialized object. Geode provides the implementation of the `PdxInstance` class.
-
-You can configure your cache to return a `PdxInstance` when a PDX serialized object is deserialized instead of deserializing the object to a domain class. Preventing deserialization saves both time and memory and does not require you deserialize the object to the domain class.
-
-This configuration can be done in cache.xml by setting the attribute `read-serialized` to `true` on the <pdx>element. Or it can be done programmatically using the `CacheFactory::setPdxReadSerialized(bool)` method.
-
-After this preference is configured, any time a PDX object is deserialized, it is deserialized into a `PdxInstance`.
-
-The following is a code sample of using the setField API of PdxInstance to modify fields:
-
-``` pre
-RegionPtr rptr = getHelper()->getRegion( regionNames[0] );
-CacheableKeyPtr keyport = CacheableKey::create("pdxput");
-CacheableKeyPtr keyport1 = CacheableKey::create("pdxput2");
-
-PdxInstancePtr pIPtr = dynCast<PdxInstancePtr>(rptr->get(keyport));
-LOG( "modifyPdxInstance get complete." );
-
-WritablePdxInstancePtr wpiPtr( pIPtr->createWriter());
-
-ASSERT(pIPtr != NULLPTR, "pIPtr != NULLPTR expected");
-int val = 0;
-int newVal = 0;
-ASSERT(pIPtr->hasField("m_int32") == true, "m_id1 = true expected");
-pIPtr->getField("m_int32", val);
-wpiPtr->setField("m_int32", val + 1);
-rptr->put(keyport, wpiPtr);
-PdxInstancePtr newPiPtr = dynCast<PdxInstancePtr>(rptr->get(keyport));
-ASSERT(newPiPtr->hasField("m_int32") == true, "m_int32 = true expected");
-newPiPtr->getField("m_int32", newVal);
-ASSERT(val + 1 == newVal, "val + 1 == newVal expected");
-ASSERT((*pIPtr.ptr() == *newPiPtr.ptr()) == false,
- "PdxInstance should not be equal");
-```
-
-In addition to field access, `PdxInstance` also supports field modification using the `setField(fieldName)` method. The `setField` method has copy-on-write semantics. So for the modifications to be stored in the cache, the `PdxInstance` must be put into a region after `setField` has been called one or more times.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
deleted file mode 100644
index 940f67a..0000000
--- a/docs/geode-native-docs/cpp-caching-api/using_pdxinstancefactory.html.md.erb
+++ /dev/null
@@ -1,134 +0,0 @@
----
-title: Using PdxInstanceFactory to Create PdxInstances
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-You can use the `PdxInstanceFactory` API to create a `PdxInstance` from raw data when the domain class is not available on the server.
-
-Creating a `PdxInstance` can be particularly useful when you need an instance of a domain class for plug-in code such as a function or a loader. If you have raw data for the domain object (the class name and each field's type and data), then you can explicitly create a `PdxInstance`. The `PdxInstanceFactory` API is very similar to the `PdxWriter` API except that after writing each field, you need to call the create method which returns the created `PdxInstance`.
-
-## PdxInstance Example
-
-The following is a code example of creating a `PdxInstance`.
-
-``` pre
-class Person
-{
-private:
- char* m_name;
- int m_id;
- int m_age;
-
-public:
- Person() { }
-
- Person(char* name, int id, int age)
- {
- m_name = name;
- m_id = id;
- m_age = age;
- }
-
- char* getName() const
- {
- return m_name;
- }
- int getID()
- {
- return m_id;
- }
- int getAge()
- {
- return m_age;
- }
-};
-
-int main(int argc, char ** argv)
-{
- try
- {
- // Create a Cache.
- CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
-
- CachePtr cachePtr = cacheFactory->set("cache-xml-file",
- "XMLs/clientPdxInstance.xml")->create();
-
- LOGINFO("Created the Geode Cache");
-
- // Get the example Region from the Cache which is declared in the
- // Cache XML file.
- RegionPtr regionPtr = cachePtr->getRegion("Person");
-
- LOGINFO("Obtained the Region from the Cache.");
-
- Person* p = new Person("Jack", 7, 21);
-
- //PdxInstanceFactory for Person class
- PdxInstanceFactoryPtr pif = cachePtr->createPdxInstanceFactory("Person");
- LOGINFO("Created PdxInstanceFactory for Person class");
-
- pif->writeString("m_name", p->getName());
- pif->writeInt("m_id", p->getID());
- pif->markIdentityField("m_id");
- pif->writeInt("m_age", p->getAge());
-
- PdxInstancePtr pdxInstance = pif->create();
-
- LOGINFO("Created PdxInstance for Person class");
-
- regionPtr->put("Key1", pdxInstance);
-
- LOGINFO("Populated PdxInstance Object");
-
- PdxInstancePtr retPdxInstance = regionPtr->get("Key1");
-
- LOGINFO("Got PdxInstance Object");
-
- int id = 0;
- retPdxInstance->getField("m_id", id);
-
- int age = 0;
- retPdxInstance->getField("m_age", age);
-
- char* name = NULL;
- retPdxInstance->getField("m_name", &name);
-
- if (id == p->getID()&& age == p->getAge() && strcmp(name, p->getName()) == 0
- && retPdxInstance->isIdentityField("m_id") == true)
- LOGINFO("PdxInstance returns all fields value expected");
- else
- LOGINFO("PdxInstance doesn't returns all fields value expected");
-
- delete p;
-
- // Close the Cache.
- cachePtr->close();
-
- LOGINFO("Closed the Cache");
-
- }
- // An exception should not occur
- catch(const Exception & geodeExcp)
- {
- LOGERROR("PdxInstance Exception: %s", geodeExcp.getMessage());
- }
-}
-```
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/using_pdxserializer.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/using_pdxserializer.html.md.erb b/docs/geode-native-docs/cpp-caching-api/using_pdxserializer.html.md.erb
deleted file mode 100644
index 7df9135..0000000
--- a/docs/geode-native-docs/cpp-caching-api/using_pdxserializer.html.md.erb
+++ /dev/null
@@ -1,119 +0,0 @@
----
-title: Serialize Your Domain Objects with PdxSerializer and PdxWrapper
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-For domain objects that you cannot or do not want to modify, use the `PdxSerializer` and the `PdxWrapper` classes to serialize and deserialize the object's fields.
-
-You register a `PdxSerializer` implementation for the entire cache, programming it for all of the domain objects that you handle in this way. This way you do not have to implement the `PdxSerializable` interface for each domain class.
-
-The `PdxSerializer` allows domain classes to be serialized and deserialized as PDXs without modification of the domain class. It requires only that the domain class have a constructor accessible to the `PdxSerializer` to create an instance. The domain class will be held in a wrapper class, `PdxWrapper`.
-
-`PdxSerializer` has the following methods:
-
-- The `toData` method returns true if the PdxSerializer was able to serialize the user object, false if not.
-- If the PdxSerializer was able to deserialize the object, the `fromData` method returns a void pointer to the user object to be wrapped in a `PdxWrapper`.
-
-When you later reference the user object, use the `PdxWrapper` class. `PdxWrapper` holds a shared reference to the object in the local cache and is used during serialization and deserialization. `PdxWrapper` acts as a container for the user domain object and needs to wrap every instance of the object that uses a registered `PdxSerializer`. The object instance will not be modified. In addition, when using `PdxWrapper`, you will need to provide a function pointer to a "de-allocator", which will delete the user object when the reference is no longer held.
-
-The following code example defines a user object and a `PdxSerializer`. It then registers the new `PdxSerializer` and then uses `PdxWrapper` to put the object in a region and retrieve the object from a region.
-
-``` pre
-class UserClass
-{
-public:
-
- int m_int;
- string m_string;
-
- UserClass(int intVal, string stringVal)
- {
- m_int = intVal;
- m_string = stringVal;
- }
-
- static void deallocate(void * object, char * className)
- {
- if (strcmp(className, "com.example.UserClass") == 0) {
- UserClass * userObject = reinterpret_cast<UserClass*>(object);
- delete userObject;
- }
- }
-};
-
-class UserPdxSerializer : public PdxSerializer
-{
-public:
-
- void* fromData(char * className, PdxReaderPtr pdxReader)
- {
- if (strcmp(className, "com.example.UserClass") != 0) {
- return NULL;
- }
-
- int intVal = pdxReader->readInt("m_int");
- string stringVal = pdxReader->readString("m_string");
-
- UserClass * userObject = new UserClass(intVal, stringVal);
-
- return (void*) userObject;
- }
-
- bool toData(void * object, char * className, PdxWriterPtr pdxWriter)
- {
- if (strcmp(className, "com.example.UserClass") != 0) {
- return false;
- }
-
- UserClass * userObject = reinterpret_cast<UserClass*>(object);
-
- pdxWriter->writeInt("m_int", userObject->m_int);
- pdxWriter->writeString("m_string", userObject->m_string);
-
- return true;
- }
-
- UserDeallocator getDeallocator(char * className)
- {
- if (strcmp(className, "com.example.UserClass") == 0) {
- return UserClass::deallocate;
- } else {
- return NULL;
- }
- }
-};
-
-// Register a user PDX serializer
-
-Serializable::registerPdxSerializer(new UserPdxSerializer);
-
-// Put a user object into a region.
-
-UserClass * userObject = new UserClass(123, "someValue");
-PdxWrapperPtr pdxWrapper = new PdxWrapper(userObject, "com.example.UserClass",
- UserClass::deallocate);
-region->put("key", pdxWrapper);
-
-// Get a user object from a region.
-
-pdxWrapper = dynCast<PdxWrapperPtr>(region->get("key"));
-UserClass * userObject = reinterpret_cast<UserClass*>(pdxWrapper->getObject());
-```
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
index 40613e5..ceb14dd 100644
--- a/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
@@ -21,7 +21,7 @@ limitations under the License.
This section describes the primary classes, usage conventions, and C++ to .NET class mappings of the .NET client API. It demonstrates how to use the API to create caches and perform data serialization.
-See the [.NET API](/releases/latest/api/dotnetdocs) documentation for API details.
+See the [.NET API](http://geode.apache.org/docs/) documentation for API details.
- **[About the .NET Client API](csharp-dotnet-api.html)**
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
index 018b4d6..a42f725 100644
--- a/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/registering-the-type.html.md.erb
@@ -39,6 +39,6 @@ A `DSFID` is an integer that returns the data serialization fixed ID type. `DSFI
If your application uses its own key types that are too complex to easily force into string, you can probably improve performance by using a custom type and implementing `HashCode` and `Equals` functions. For example, if you have hybrid data types such as floating point numbers, you can implement your own type that encapsulates the floating point number. Comparing floating point numbers in this way provides greater performance than comparing a string representation of the floating point numbers, with such noticeable improvements as faster cache access and smaller payloads.
-See [Serialization in Native Client Mode with a Java Server](../cpp-caching-api/serialization_using_serializable.html#concept_696AB5206C3E45898CC1A24CDD93D003__section_AFB685227E4048BF9FB4FD7C55AED274) for information about implementing key types for a client that is used with a Java cache server.
+See [Serialization in Native Client Mode with a Java Server](../cpp-caching-api/serialization-using-serializable.html#concept_696AB5206C3E45898CC1A24CDD93D003__section_AFB685227E4048BF9FB4FD7C55AED274) for information about implementing key types for a client that is used with a Java cache server.
To extend a type that implements `IPdxSerializable` or `IGeodeSerializable` for your key, override and implement the `HashCode` and `Equals` methods in the key as needed.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/getting_started/system_requirements/#client_requirements.html.md.erb#
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/getting_started/system_requirements/#client_requirements.html.md.erb# b/docs/geode-native-docs/getting_started/system_requirements/#client_requirements.html.md.erb#
deleted file mode 100644
index 37bade1..0000000
--- a/docs/geode-native-docs/getting_started/system_requirements/#client_requirements.html.md.erb#
+++ /dev/null
@@ -1,194 +0,0 @@
----
-title: Geode Client Requirements
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-The Apache Geode client provides access for C++ and Microsoft\ufffd\ufffd .NET\ufffd\ufffd\ufffd\ufffd clients to the Geode distributed system. It is known to operate on platforms running Microsoft Windows, Linux (Intel), and Sun Solaris.
-
-Operating system requirements are listed in the chart below:
-
-
-<table style="width:100%;">
-<colgroup>
-<col width="20%" />
-<col width="20%" />
-<col width="20%" />
-<col width="20%" />
-<col width="20%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>Operating System</th>
-<th>Processor and Architecture</th>
-<th>RAM</th>
-<th>Swap Space</th>
-<th>64-Bit Disk Space Required</th>
-</tr>
-</thead>
-<tbody>
-<tr class="even">
-<td>Solaris 11</td>
-<td>x86-64
-</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>90MB</td>
-</tr>
-<tr class="odd">
-<td>RHEL 6 (<b>deprecated</b>)</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>120MB</td>
-</tr>
-<tr class="odd">
-<td>RHEL 7</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>120MB</td>
-</tr>
-<tr class="even">
-<td>SLES 11** (<b>deprecated</b>)</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>120MB</td>
-</tr>
-<tr class="even">
-<td>SLES 12**</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>120MB</td>
-</tr>
-<tr class="odd">
-<td>Windows 2012 Server R2</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>125MB</td>
-</tr>
-<tr class="even">
-<td>Windows 8.1 (<b>deprecated</b>)</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>125MB</td>
-</tr>
-<tr class="odd">
-<td>Windows 10</td>
-<td>x86-64</td>
-<td>2GB</td>
-<td>256MB</td>
-<td>125MB</td>
-</tr>
-</tbody>
-</table>
-
-\*\*Indicates operating systems that have not been fully tested but are still supported.
-
-## Host Machine Requirements
-
-Each machine that runs a native client must meet the following requirements:
-
-- A system clock set to the correct time and a time synchronization
-service such as Network Time Protocol (NTP).
-Correct time stamps permit the following activities:
- - Logs that are useful for troubleshooting. Synchronized time stamps ensure that log messages from different hosts can be merged to reproduce an accurate chronological history of a distributed run.
- - Aggregate product-level and application-level time statistics.
- - Accurate monitoring of the system with scripts and other tools that read the system statistics and log files.
-- The host name and host files are properly configured for the machine.
-- Many default Linux installations use SYN cookies to protect the
-system against malicious attacks that flood TCP SYN packets.
-The use of SYN cookies dramatically reduces network bandwidth,
-and can be triggered by a running GemFire distributed system.
-
- To disable SYN cookies permanently:
- 1. Edit the `/etc/sysctl.conf` file to include the following line:
-
- ``` pre
- net.ipv4.tcp_syncookies = 0
- ```
- Setting this value to zero disables SYN cookies.
- 2. Reload `sysctl.conf`:
-
- ``` pre
- sysctl -p
- ```
-
-## <a id="concept_7AE0C1CB11244095A50CCB52A09A09A1__section_3A8A0684D68E467EBA498D939E91C5AA" class="no-quick-link"></a>Windows Support Details
-
-**Runtime Library Requirements**
-
-The GemFire native client also requires the Microsoft Visual C++ 2013 Redistributable Package. This package is installed for you when you use the native client .msi installer. If you do not use the .msi installer, you will need to install this package for your platform architecture manually ([x86-64](https://www.microsoft.com/en-us/download/details.aspx?id=40784)) on all machines that will run the GemFire native client. This package contains runtime libraries needed by the native client.
-
-**.NET Framework Version Support**
-
-The Pivotal GemFire native client is supported with Microsoft .NET Framework 4.5.2.
-
-A Microsoft .NET Framework must be installed to support the C++/CLI (Common Language Infrastructure) library for the native client.
-
-The Pivotal GemFire native client 9.0 supports .NET 4.5.2 and Visual Studio 2013 (for compiling C++ applications on Windows). For more information on the features of .NET and Visual Studio Community Edition 2013 Update 5, see [https://msdn.microsoft.com/en-us/library/dd831853(v=vs.120).aspx](https://msdn.microsoft.com/en-us/library/dd831853(v=vs.120).aspx) .
-
-## <a id="concept_7AE0C1CB11244095A50CCB52A09A09A1__section_C5848F353C504844BAFFD3EB2BE7DA23" class="no-quick-link"></a>Linux
-
-The following table lists the RPM package dependencies for the Linux distribution. The i386 or i686 after the package name indicates that you must install the package for that particular architecture regardless of the native operating system architecture. All of the packages listed are available with the default media for the distribution.
-
-<a id="concept_7AE0C1CB11244095A50CCB52A09A09A1__table_C809C11B1624423EAD4ABA21636C2F10"></a>
-
-| Linux Version | glibc | libgcc |
-|-----------------------------------------------------|--------------|---------------|
-| Red Hat Enterprise Linux Server release 7 (x86-64) | glibc (i686) | libgcc (i386) |
-
-
-For versions of Linux not listed in the table, you can verify that you meet the native client dependencies at the library level by using the `ldd` tool and entering this command:
-
-``` pre
-prompt> ldd $GFCPP/lib/libgfcppcache.so
-```
-
-This step assumes you have already installed the native client and have set the GFCPP environment variable to *productDir*, where *productDir* represents the location of the NativeClient\_*xxxx*\_b*nnnnn* directory (*xxxx* is the four-digit product version and b*nnnnn* is the product build number).
-
-The following libraries are external dependencies of the native library, `libgfcppcache.so`. Verify that the ldd tool output includes all of these:
-
-- libdl.so.2
-- libm.so.6
-- libpthread.so.0
-- libc.so.6
-- libz.so.1
-
-
-## <a id="concept_7AE0C1CB11244095A50CCB52A09A09A1__section_07CB50BE132D482B8F99154B81C6D2A4" class="no-quick-link"></a>Running Pivotal GemFire Native Client on vSphere
-
-Without tuning, the Pivotal GemFire native client can suffer a performance drop in virtual environments, including the VMware vSphere virtual platform. Without correct tuning, you can expect to see significant performance degradation when running the GemFire native client on vSphere versus running GemFire on dedicated hardware.
-
-We recommend that you tune your GemFire native client on vSphere deployments using the same guidelines published for Pivotal GemFire.
-
-See [Improving GemFire Performance on vSphere](geodeman/managing/monitor_tune/gemfire_performance_on_vsphere.html) for a list of guidelines and recommendations.
-
-## <a id="concept_7AE0C1CB11244095A50CCB52A09A09A1__ssl_requirements" class="no-quick-link"></a>Software Requirements for Using SSL
-
-If you plan on using SSL in your GemFire native client and server deployment, you will need to download and install OpenSSL.
-
-The GemFire native client requires OpenSSL 1.0.1t or later. For Windows platforms, you can use either the regular or the OpenSSL "Light" version.
-
-In addition, make sure that your system environment variables have been configured to include OpenSSL.
-
-See [SSL Client/Server Communication](../../security/overviewsslclientserver.html#security) for instructions.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/introduction/client-configurations.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/client-configurations.html.md.erb b/docs/geode-native-docs/introduction/client-configurations.html.md.erb
new file mode 100644
index 0000000..5c9c712
--- /dev/null
+++ b/docs/geode-native-docs/introduction/client-configurations.html.md.erb
@@ -0,0 +1,164 @@
+---
+title: Apache Geode Client Configurations
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+The Apache Geode client provides access for C++ and Microsoft� .NET\u2122 clients to the Geode distributed system.
+As an open source project, the client (at least theoretically) can be built on nearly any system.
+In practical terms, the client is known to have been successfully built and used on platforms running Microsoft Windows, Linux (Intel), and Sun Solaris.
+
+For your convenience, this table shows configuration guidelines for some familiar operating systems.
+
+
+<table style="width:100%;">
+<colgroup>
+<col width="20%" />
+<col width="20%" />
+<col width="20%" />
+<col width="20%" />
+<col width="20%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th>Operating System</th>
+<th>Processor and Architecture</th>
+<th>RAM</th>
+<th>Swap Space</th>
+<th>64-Bit Disk Space Required</th>
+</tr>
+</thead>
+<tbody>
+<tr class="even">
+<td>Solaris 11</td>
+<td>x86-64
+</td>
+<td>2GB</td>
+<td>256MB</td>
+<td>90MB</td>
+</tr>
+<tr class="odd">
+<td>RHEL 7</td>
+<td>x86-64</td>
+<td>2GB</td>
+<td>256MB</td>
+<td>120MB</td>
+</tr>
+<tr class="even">
+<td>SLES 12</td>
+<td>x86-64</td>
+<td>2GB</td>
+<td>256MB</td>
+<td>120MB</td>
+</tr>
+<tr class="odd">
+<td>Windows 2012 Server R2</td>
+<td>x86-64</td>
+<td>2GB</td>
+<td>256MB</td>
+<td>125MB</td>
+</tr>
+<tr class="odd">
+<td>Windows 10</td>
+<td>x86-64</td>
+<td>2GB</td>
+<td>256MB</td>
+<td>125MB</td>
+</tr>
+<tr class="odd">
+<td>macOS 10.12 (Sierra)</td>
+<td>x86-64</td>
+<td>2GB</td>
+<td>256MB</td>
+<td>125MB</td>
+</tr>
+</tbody>
+</table>
+
+## Host Machine Configuration Guidelines
+
+Each machine that runs a Geode client should meet the following guidelines:
+
+- A system clock set to the correct time and a time synchronization
+service such as Network Time Protocol (NTP).
+Correct time stamps permit the following activities:
+ - Logs that are useful for troubleshooting. Synchronized time stamps ensure that log messages from different hosts can be merged to reproduce an accurate chronological history of a distributed run.
+ - Aggregate product-level and application-level time statistics.
+ - Accurate monitoring of the system with scripts and other tools that read the system statistics and log files.
+- The host name and host files are properly configured for the machine.
+- Many default Linux installations use SYN cookies to protect the
+system against malicious attacks that flood TCP SYN packets.
+The use of SYN cookies dramatically reduces network bandwidth,
+and can be triggered by a running GemFire distributed system.
+
+ To disable SYN cookies permanently:
+ 1. Edit the `/etc/sysctl.conf` file to include the following line:
+
+ ``` pre
+ net.ipv4.tcp_syncookies = 0
+ ```
+ Setting this value to zero disables SYN cookies.
+ 2. Reload `sysctl.conf`:
+
+ ``` pre
+ sysctl -p
+ ```
+
+## <a id="concept_7AE0C1CB11244095A50CCB52A09A09A1__section_3A8A0684D68E467EBA498D939E91C5AA" class="no-quick-link"></a>Windows Guidelines
+
+**Runtime Library**
+
+The Geode client requires the [Microsoft Visual C++ 2013 Redistributable Package](https://www.microsoft.com/en-us/download/details.aspx?id=40784).
+This package contains runtime libraries needed by the client; install it for your platform architecture on all machines that will run the client.
+
+**.NET Framework Version Support**
+
+The Geode client is supported with Microsoft .NET Framework 4.5.2.
+
+A Microsoft .NET Framework must be installed to support the C++/CLI (Common Language Infrastructure) library for the client.
+
+The Geode supports .NET 4.5.2 and Visual Studio 2013 (for compiling C++ applications on Windows).
+For more information on the features of .NET and Visual Studio Community Edition 2013 Update 5, see the [Visual Studio 2013 web page](https://msdn.microsoft.com/en-us/library/dd831853(v=vs.120).aspx).
+
+## <a id="concept_7AE0C1CB11244095A50CCB52A09A09A1__section_C5848F353C504844BAFFD3EB2BE7DA23" class="no-quick-link"></a>Linux
+
+For Linux, you can verify that you meet the client dependencies at the library level by using the `ldd` tool and entering this command:
+
+``` pre
+prompt> ldd $client-installdir/lib/libgfcppcache.so
+```
+where _client-installdir_ is the location in which you have installed the Geode client.
+
+The following libraries are external dependencies of the client library, `libgfcppcache.so`. Verify that the ldd tool output includes all of these:
+
+- libdl.so.2
+- libm.so.6
+- libpthread.so.0
+- libc.so.6
+- libz.so.1
+
+
+## <a id="concept_7AE0C1CB11244095A50CCB52A09A09A1__ssl_requirements" class="no-quick-link"></a>Software Requirements for Using SSL
+
+If you plan on using SSL in your Geode client and server deployment, you will need to download and install OpenSSL.
+
+The client requires OpenSSL 1.0.1t or later. For Windows platforms, you can use either the regular or the OpenSSL "Light" version.
+
+In addition, make sure that your system environment variables have been configured to include OpenSSL.
+
+See [SSL Client/Server Communication](../security/sslclientserver.html) for instructions.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/introduction/client-intro.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/client-intro.html.md.erb b/docs/geode-native-docs/introduction/client-intro.html.md.erb
new file mode 100644
index 0000000..f926896
--- /dev/null
+++ b/docs/geode-native-docs/introduction/client-intro.html.md.erb
@@ -0,0 +1,38 @@
+---
+title: Getting Started with the Client
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+This section shows you how to build the product and run the quick start examples.
+
+The Geode client provides access for C++ and Microsoft<sup>�</sup> .NET\u2122 clients to a Geode distributed system.
+
+- **[System Configurations](client-configurations.html)**
+
+ Configuration guidelines for some familiar operating systems.
+
+- **[Installing the Client](install-overview.html)**
+
+ Procedures for building the client libraries from a source distribution.
+
+- **[QuickStart Examples](quickstart.html)**
+
+ Run the native client QuickStart examples to understand client functionality.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/introduction/client-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/client-overview.html.md.erb b/docs/geode-native-docs/introduction/client-overview.html.md.erb
new file mode 100644
index 0000000..0090cd2
--- /dev/null
+++ b/docs/geode-native-docs/introduction/client-overview.html.md.erb
@@ -0,0 +1,37 @@
+---
+title: About the Client
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+The Geode client delivers the full set of capabilities supplied by Java clients communicating with a Geode server.
+
+The Geode client is written entirely in C++, so its initialization process does not involve the creation of a Java virtual machine. The .NET client provides operations for the .NET Framework application developer who writes in .NET languages and needs to access the Geode server.
+
+Clients in C++, Java, and .NET languages communicate only with the cache server and do not communicate with each other. The clients interface with the server at the sockets level and implement the same wire protocol to the server. These capabilities produce extremely high performance and system scalability.
+
+C++ and .NET clients provide access to the full region API, including support for application plug-ins, managed connectivity, highly available data, and reliable failover to a specified server list. All of this is transparent to the end user.
+
+You can configure clients to cache data locally, or they can act in a cacheless mode where they retrieve data from a cache server and directly pass it to other system members without incurring the caching overhead. They can be configured as read only caches, or be configured to receive notifications from the server whenever a key of interest to the client changes on the server.
+
+This figure diagrams how .NET and C++ applications access the cache server. <a id="concept_BCE696D352144690ADF786A0E3D2BD98__fig_C19B4B30942D4F1BA59DBDCC6146241A"></a>
+
+
+<img src="../common/images/client-overview.gif" alt="Client Overview" id="concept_BCE696D352144690ADF786A0E3D2BD98__image_A0805B5079C64B0E8F2E9DA2A8A5A7A6" class="image" />
+
+
[6/7] geode-native git commit: GEODE-2513: Rename and reorganize
client doc sources This closes #85
Posted by db...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
new file mode 100644
index 0000000..1bcd19a
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/pdx-auto-serialization.html.md.erb
@@ -0,0 +1,366 @@
+---
+title: Using Automatic PDX Serialization
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+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 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
+
+The procedure below uses the following sample class:
+
+``` pre
+class PortfolioPdx
+{
+ private:
+ int32_t id;
+ char* pkid;
+ PositionPdxPtr position1;
+ PositionPdxPtr position2;
+ CacheableHashMapPtr positions;
+ char** names;
+ int8_t* newVal;
+ CacheableDatePtr creationDate;
+ int8_t* arrayNull;
+ int8_t* arrayZeroSize;
+ public:
+ // CTOR
+ // DTORS
+ // Other Methods declarations
+```
+
+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 `apache::geode::client::PdxSerializable`.
+
+ ``` pre
+ class PortfolioPdx : public PdxSerializable
+ ```
+
+2. Add the following method declarations in the public part of the class.
+
+ ``` pre
+ const char* getClassName() const;
+ virtual void toData(apache::geode::client::PdxWriterPtr pw);
+ virtual void fromData(apache::geode::client::PdxReaderPtr pr);
+ static PdxSerializable* createDeserializable();
+ ```
+
+3. In your pre-build environment (for example in your **makefiles**), call `pdxautoserializer` as follows:
+
+ ``` pre
+ <GFCPP>/bin/pdxautoserializer.exe --outDir=<location to generate files> <SOURCE_DIR>/PortfolioPdx.hpp
+ ```
+
+4. Include the generated file in your project and compile.
+
+The following is an example of a generated file:
+
+``` pre
+#include "PortfolioPdx.hpp"
+#include <geode/PdxWriter.hpp>
+#include <geode/PdxReader.hpp>
+#include <geode/PdxAutoSerializer.hpp>
+namespace testobject
+{
+ void PortfolioPdx::toData(apache::geode::client::PdxWriterPtr var)
+ {
+ 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)
+ {
+ 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
+ {
+ return "PortfolioPdx";
+ }
+}
+```
+
+## <a id="task_fs4_vkj_2l" class="no-quick-link"></a>Handling Arrays
+
+1. Define the following macro in your header file:
+
+ ``` pre
+ #define GFARRAYSIZE(x)
+ ```
+
+2. Assuming that the following is the class member of type array:
+
+ ``` pre
+ int8_t* newVal;
+ ```
+
+ Then define a new variable which sets the length of the array:
+
+ ``` pre
+ int32_t newValSize;
+ ```
+
+3. Tag the new variable with the `GFARRAYSIZE` macro as follows:
+
+ ``` pre
+ GFARRAYSIZE(newVal) int32_t newValSize;
+ ```
+
+## Using a Single Variable as Length for Multiple Arrays
+
+You can use the GFARRAYSIZES to have single length for multiple arrays.
+
+Define the GFARRAYSIZES macro as follows:
+
+``` pre
+#define GFARRAYSIZES(x)
+```
+
+The following is an example usage:
+
+``` pre
+class ArrayOfSizes?
+ {
+ public:
+ int32_t* array1;
+ int32_t* array2;
+ int32_t* array3;
+ int32_t* array4;
+ int32_t* array5;
+
+ GFARRAYSIZE(array1) int32_t singleSize;
+ GFARRAYSIZES("array2,array3,array4,array5") int32_t SingleSizeToMultipleArrays?;
+ };\u200b
+```
+
+## <a id="task_hph_mrw_dl" class="no-quick-link"></a>Excluding Member Variables from Serialization
+
+1. Define the following macro in your header file:
+
+ ``` pre
+ #define GFEXCLUDE
+ ```
+
+2. Tag your member variable with this macro:
+
+ ``` pre
+ GFEXCLUDE char* type;
+ ```
+
+## <a id="task_en2_4rw_dl" class="no-quick-link"></a>Marking Identity Fields
+
+Identity fields are used when comparing objects using the `hashCode` and `equals` methods.
+
+1. Define the following macro in your header file.
+
+ ``` pre
+ #define GFID(x)
+ ```
+
+2. Assuming that the following is the class member you want to use as IdentityField:
+
+ ``` pre
+ int8_t* newVal;
+ ```
+
+ Tag the member with the GFID macro as follows:
+
+ ``` pre
+ GFID(newVal)int8_t* newVal;
+ ```
+
+## Ignoring User Defined Keywords
+
+You might have certain user defined keywords after the class name. Current C++ grammar does not support this. If you have some keywords user will have to ignore them by using the `GFIGNORE` macro.
+
+For example, consider the following class definition:
+
+``` pre
+#ifdef _WIN32
+#ifdef BUILD_TESTOBJECT
+#define TESTOBJECT_EXPORT LIBEXP
+#else
+#define TESTOBJECT_EXPORT LIBIMP
+#endif
+#else
+#define TESTOBJECT_EXPORT
+#endif
+
+namespace PdxAutoTests {
+ class TESTOBJECT_EXPORT PdxAutoMegaType : public PdxSerializable {
+ }
+```
+
+Currently, the `pdxautoserializer` tool will fail to recognize `TESTOBJECT_EXPORT`. Change your class by adding the `GFIGNORE` macro as follows:
+
+``` pre
+#ifdef _WIN32
+#ifdef BUILD_TESTOBJECT
+#define TESTOBJECT_EXPORT LIBEXP
+#else
+#define TESTOBJECT_EXPORT LIBIMP
+#endif
+#else
+#define TESTOBJECT_EXPORT
+#endif
+
+using namespace apache::geode::client;
+
+#define GFIGNORE(X) X
+#define GFID
+
+namespace PdxAutoTests {
+ class GFIGNORE(TESTOBJECT_EXPORT) PdxAutoMegaType : public PdxSerializable {
+```
+
+## <a id="topic_d3q_v3c_2l" class="no-quick-link"></a>Additional Usage Information for the pdxautoserializer Tool
+
+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 `$GEODE/bin` where `$GEODE` corresponds to the installation location of the client.
+
+Some additional notes about using the `pdxautoserializer` tool:
+
+- Any const type in the class members are ignored by the `pdxserializer` tool.
+- Generated files will have namespace in the file name.
+
+To view the command-line help for the tool, type:
+
+``` pre
+prompt> pdxautoserializer.exe --help
+```
+
+Help returns the following syntax and usage information:
+
+``` pre
+Usage: pdxautoserializer.exe [OPTIONS] <resources e.g. header> ...
+
+Resource name should be the path to the header containing the classes to be
+auto-serialized.
+
+[OPTIONS] may be one of those given below.
+
+SINGLE denotes that the option should be specified only once.
+MULTIPLE denotes that the option can be specified more than once.
+OPTIONAL denotes that the option may be skipped in which case the default
+for that shall be chosen.
+
+--className=VALUE Name of the class for which to generate auto-serialization code (MULTIPLE,OPTIONAL)
+--classNameStr=VALUE Name of the class in string (MULTIPLE,OPTIONAL)
+--help This help message.
+--outDir The output directory of the generated files (SINGLE,OPTIONAL)
+--suffix The suffix of the generated filenames -- default is 'Serializable' (SINGLE,OPTIONAL)
+--usage This usage message.
+
+Examples:
+pdxautoserializer -outDir=<DIR NAME> <RESOURCE>
+pdxautoserializer -outDir=<DIR NAME> --className=<CLASSNAME1> --className=<CLASSNAME2> <RESOURCE>
+pdxautoserializer -outDir=<DIR NAME> --classNameStr=<CLASSNAME1:User defined String> --classNameStr=<CLASSNAME:User defined String> <RESOURCE>
+
+Helper Macros to be defined in Input Header File :
+GFINCLUDE for including a specific member for serialization
+GFEXCLUDE for excluding a specific member for serialization
+GFID for considering a member as Identify Field
+GFARRAYSIZE for specifying a array length member
+GFIGNORE for ignoring certain keywords
+For more details refer to documentation on this utility.
+```
+
+## Generating Automatic Code for a Single Class
+
+Many times there are multiple classes in a single header file. For example:
+
+``` pre
+#ifndef HEADER_HEADER
+#define HEADER_HEADER
+
+class class1{
+};
+class class2{
+};
+class class3 : public PdxSerializable{
+};
+#endif
+```
+
+If you want to generate code for only one of the classes, then use the `--className` option. For example, if you only want to generate code for class3, then you would use the following command:
+
+``` pre
+pdxautoserializer --outDir=<outDir> --className=class3
+```
+
+## Choosing Your Own Suffix to Identify the Generated Files.
+
+The `pdxserializer` tool also provides the option to choose your own suffix for the generated C++ files. This can help you write less code in your makefiles. Here's an example command:
+
+``` pre
+pdxautoserializer --outDir=<outDir> --className=CharTypes --suffix="generated"
+```
+
+## <a id="topic_f33_fsw_dl" class="no-quick-link"></a>Example of Using PDX Serialization in Your Application
+
+``` pre
+CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
+ // Create a cache with the "clientPdxRemoteQuery.xml" Cache XML file.
+ CachePtr cachePtr = cacheFactory->set("cache-xml-file", "XMLs\\clientPdxRemoteQuery.xml")
+ ->create();
+
+ LOGINFO("Created the Cache");
+
+ // Get the example Region from the Cache which is declared in the Cache XML file.
+ RegionPtr regionPtr = cachePtr->getRegion( "Portfolios");
+
+ LOGINFO( "Obtained the Region from the Cache");
+
+ // Register our Serializable/Cacheable Query objects, viz. PortfolioPdx and PositionPdx.
+ Serializable::registerPdxType(PortfolioPdx::createDeserializable);
+ PortfolioPdxPtr port1Ptr(new PortfolioPdx(1 /*ID*/, 10 /*size*/));
+ PortfolioPdxPtr port2Ptr(new PortfolioPdx(2 /*ID*/, 20 /*size*/));
+ PortfolioPdxPtr port3Ptr(new PortfolioPdx(3 /*ID*/, 30 /*size*/));
+ regionPtr->put("Key1", port1Ptr);
+ regionPtr->put("Key2", port2Ptr);
+ regionPtr->put("Key3", port3Ptr);
+
+ // Get the QueryService from the Cache.
+ QueryServicePtr qrySvcPtr = cachePtr->getQueryService( "examplePool");
+
+ LOGINFO( "Got the QueryService from the Cache");
+
+ // Execute a Query which returns a ResultSet.
+ QueryPtr qryPtr = qrySvcPtr->newQuery("SELECT DISTINCT * FROM /Portfolios");
+ SelectResultsPtr resultsPtr = qryPtr->execute();
+
+ LOGINFO( "ResultSet Query returned %d rows", resultsPtr->size());
+```
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/pdx-ignore-unread-fields.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/pdx-ignore-unread-fields.html.md.erb b/docs/geode-native-docs/cpp-caching-api/pdx-ignore-unread-fields.html.md.erb
new file mode 100644
index 0000000..1149494
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/pdx-ignore-unread-fields.html.md.erb
@@ -0,0 +1,37 @@
+---
+title: Configuring PDX to Ignore Unread Fields During Deserialization
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Use the `setPdxIgnoreUnreadFields` API to control whether PDX ignores fields that were unread during deserialization.
+
+The default is to preserve unread fields by including their data during serialization. However, if you configure the cache to ignore unread fields then their data will be lost during serialization.
+
+You should only set this attribute to `true` if you know this member will only be reading cache data. In this use case you do not need to pay the cost of preserving unread fields since you will never reserialize the PDX data.
+
+For example:
+
+``` pre
+CacheFactoryPtr cfPtr = CacheFactory::createCacheFactory(PropertiesObj);
+cfPtr->setPdxReadSerialized(tue);
+cfPtr->setPdxIgnoreUnreadFields(false);
+cachePtr = cfPtr->create();
+```
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
new file mode 100644
index 0000000..df656b9
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/pdx-serialization.html.md.erb
@@ -0,0 +1,60 @@
+---
+title: Serializing Data with PDX Serialization
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+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 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 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)**
+
+ For domain objects that you cannot or do not want to modify, use the `PdxSerializer` and the `PdxWrapper` classes to serialize and deserialize the object's fields.
+
+- **[Serialize Using the PdxSerializable Class](pdxserializable-interface.html)**
+
+ Domain classes need to inherit the `PdxSerializable` abstract class to serialize and de-serialize the object. When you write objects using PDX serialization, they are distributed to the server tier in PDX serialized form.
+
+- **[Using Automatic PDX Serialization](pdx-auto-serialization.html)**
+
+ 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)**
+
+ A `PdxInstance` is a lightweight wrapper around the raw bytes of the PDX serialized objects kept in the cache. It provides applications with run-time access to files of a PDX serialized object. Geode provides the implementation of the `PdxInstance` class.
+
+- **[Configuring PDX to Ignore Unread Fields During Deserialization](pdx-ignore-unread-fields.html)**
+
+ Use the `setPdxIgnoreUnreadFields` API to control whether PDX ignores fields that were unread during deserialization.
+
+- **[Using PdxInstanceFactory to Create PdxInstances](using-pdxinstancefactory.html)**
+
+ You can use the `PdxInstanceFactory` API to create a `PdxInstance` from raw data when the domain class is not available on the server.
+
+- **[Using C++ Enum Type with PDX Serialization](using-enum-type-with-pdx.html)**
+
+ Because there is no "object" base type in C++, enums cannot be directly passed as parameters to the `writeObject` and `readObject` API.
+
+- **[Using PDX Serialization with Delta Propagation](pdx-with-delta-propagation.html)**
+
+ To use delta propagation with PDX serialization, you must implement the `Delta` interface methods.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
new file mode 100644
index 0000000..4f9bbf4
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/pdx-with-delta-propagation.html.md.erb
@@ -0,0 +1,45 @@
+---
+title: Using PDX Serialization with Delta Propagation
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+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 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.
+
+The following code snippet is a sample implementation of the Delta interface methods for using with PDX serialization.
+
+``` pre
+class PdxWithDelta : public PdxSerializable, public Delta
+{
+public:
+
+ bool hasDelta();
+ void toDelta(DataOutput& output);
+ void fromDelta(DataInput& input);
+ DeltaPtr clone();
+
+// other PdxSerializable methods here...
+
+};
+```
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
deleted file mode 100644
index 1bcd19a..0000000
--- a/docs/geode-native-docs/cpp-caching-api/pdx_auto_serialization.html.md.erb
+++ /dev/null
@@ -1,366 +0,0 @@
----
-title: Using Automatic PDX Serialization
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-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 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
-
-The procedure below uses the following sample class:
-
-``` pre
-class PortfolioPdx
-{
- private:
- int32_t id;
- char* pkid;
- PositionPdxPtr position1;
- PositionPdxPtr position2;
- CacheableHashMapPtr positions;
- char** names;
- int8_t* newVal;
- CacheableDatePtr creationDate;
- int8_t* arrayNull;
- int8_t* arrayZeroSize;
- public:
- // CTOR
- // DTORS
- // Other Methods declarations
-```
-
-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 `apache::geode::client::PdxSerializable`.
-
- ``` pre
- class PortfolioPdx : public PdxSerializable
- ```
-
-2. Add the following method declarations in the public part of the class.
-
- ``` pre
- const char* getClassName() const;
- virtual void toData(apache::geode::client::PdxWriterPtr pw);
- virtual void fromData(apache::geode::client::PdxReaderPtr pr);
- static PdxSerializable* createDeserializable();
- ```
-
-3. In your pre-build environment (for example in your **makefiles**), call `pdxautoserializer` as follows:
-
- ``` pre
- <GFCPP>/bin/pdxautoserializer.exe --outDir=<location to generate files> <SOURCE_DIR>/PortfolioPdx.hpp
- ```
-
-4. Include the generated file in your project and compile.
-
-The following is an example of a generated file:
-
-``` pre
-#include "PortfolioPdx.hpp"
-#include <geode/PdxWriter.hpp>
-#include <geode/PdxReader.hpp>
-#include <geode/PdxAutoSerializer.hpp>
-namespace testobject
-{
- void PortfolioPdx::toData(apache::geode::client::PdxWriterPtr var)
- {
- 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)
- {
- 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
- {
- return "PortfolioPdx";
- }
-}
-```
-
-## <a id="task_fs4_vkj_2l" class="no-quick-link"></a>Handling Arrays
-
-1. Define the following macro in your header file:
-
- ``` pre
- #define GFARRAYSIZE(x)
- ```
-
-2. Assuming that the following is the class member of type array:
-
- ``` pre
- int8_t* newVal;
- ```
-
- Then define a new variable which sets the length of the array:
-
- ``` pre
- int32_t newValSize;
- ```
-
-3. Tag the new variable with the `GFARRAYSIZE` macro as follows:
-
- ``` pre
- GFARRAYSIZE(newVal) int32_t newValSize;
- ```
-
-## Using a Single Variable as Length for Multiple Arrays
-
-You can use the GFARRAYSIZES to have single length for multiple arrays.
-
-Define the GFARRAYSIZES macro as follows:
-
-``` pre
-#define GFARRAYSIZES(x)
-```
-
-The following is an example usage:
-
-``` pre
-class ArrayOfSizes?
- {
- public:
- int32_t* array1;
- int32_t* array2;
- int32_t* array3;
- int32_t* array4;
- int32_t* array5;
-
- GFARRAYSIZE(array1) int32_t singleSize;
- GFARRAYSIZES("array2,array3,array4,array5") int32_t SingleSizeToMultipleArrays?;
- };\u200b
-```
-
-## <a id="task_hph_mrw_dl" class="no-quick-link"></a>Excluding Member Variables from Serialization
-
-1. Define the following macro in your header file:
-
- ``` pre
- #define GFEXCLUDE
- ```
-
-2. Tag your member variable with this macro:
-
- ``` pre
- GFEXCLUDE char* type;
- ```
-
-## <a id="task_en2_4rw_dl" class="no-quick-link"></a>Marking Identity Fields
-
-Identity fields are used when comparing objects using the `hashCode` and `equals` methods.
-
-1. Define the following macro in your header file.
-
- ``` pre
- #define GFID(x)
- ```
-
-2. Assuming that the following is the class member you want to use as IdentityField:
-
- ``` pre
- int8_t* newVal;
- ```
-
- Tag the member with the GFID macro as follows:
-
- ``` pre
- GFID(newVal)int8_t* newVal;
- ```
-
-## Ignoring User Defined Keywords
-
-You might have certain user defined keywords after the class name. Current C++ grammar does not support this. If you have some keywords user will have to ignore them by using the `GFIGNORE` macro.
-
-For example, consider the following class definition:
-
-``` pre
-#ifdef _WIN32
-#ifdef BUILD_TESTOBJECT
-#define TESTOBJECT_EXPORT LIBEXP
-#else
-#define TESTOBJECT_EXPORT LIBIMP
-#endif
-#else
-#define TESTOBJECT_EXPORT
-#endif
-
-namespace PdxAutoTests {
- class TESTOBJECT_EXPORT PdxAutoMegaType : public PdxSerializable {
- }
-```
-
-Currently, the `pdxautoserializer` tool will fail to recognize `TESTOBJECT_EXPORT`. Change your class by adding the `GFIGNORE` macro as follows:
-
-``` pre
-#ifdef _WIN32
-#ifdef BUILD_TESTOBJECT
-#define TESTOBJECT_EXPORT LIBEXP
-#else
-#define TESTOBJECT_EXPORT LIBIMP
-#endif
-#else
-#define TESTOBJECT_EXPORT
-#endif
-
-using namespace apache::geode::client;
-
-#define GFIGNORE(X) X
-#define GFID
-
-namespace PdxAutoTests {
- class GFIGNORE(TESTOBJECT_EXPORT) PdxAutoMegaType : public PdxSerializable {
-```
-
-## <a id="topic_d3q_v3c_2l" class="no-quick-link"></a>Additional Usage Information for the pdxautoserializer Tool
-
-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 `$GEODE/bin` where `$GEODE` corresponds to the installation location of the client.
-
-Some additional notes about using the `pdxautoserializer` tool:
-
-- Any const type in the class members are ignored by the `pdxserializer` tool.
-- Generated files will have namespace in the file name.
-
-To view the command-line help for the tool, type:
-
-``` pre
-prompt> pdxautoserializer.exe --help
-```
-
-Help returns the following syntax and usage information:
-
-``` pre
-Usage: pdxautoserializer.exe [OPTIONS] <resources e.g. header> ...
-
-Resource name should be the path to the header containing the classes to be
-auto-serialized.
-
-[OPTIONS] may be one of those given below.
-
-SINGLE denotes that the option should be specified only once.
-MULTIPLE denotes that the option can be specified more than once.
-OPTIONAL denotes that the option may be skipped in which case the default
-for that shall be chosen.
-
---className=VALUE Name of the class for which to generate auto-serialization code (MULTIPLE,OPTIONAL)
---classNameStr=VALUE Name of the class in string (MULTIPLE,OPTIONAL)
---help This help message.
---outDir The output directory of the generated files (SINGLE,OPTIONAL)
---suffix The suffix of the generated filenames -- default is 'Serializable' (SINGLE,OPTIONAL)
---usage This usage message.
-
-Examples:
-pdxautoserializer -outDir=<DIR NAME> <RESOURCE>
-pdxautoserializer -outDir=<DIR NAME> --className=<CLASSNAME1> --className=<CLASSNAME2> <RESOURCE>
-pdxautoserializer -outDir=<DIR NAME> --classNameStr=<CLASSNAME1:User defined String> --classNameStr=<CLASSNAME:User defined String> <RESOURCE>
-
-Helper Macros to be defined in Input Header File :
-GFINCLUDE for including a specific member for serialization
-GFEXCLUDE for excluding a specific member for serialization
-GFID for considering a member as Identify Field
-GFARRAYSIZE for specifying a array length member
-GFIGNORE for ignoring certain keywords
-For more details refer to documentation on this utility.
-```
-
-## Generating Automatic Code for a Single Class
-
-Many times there are multiple classes in a single header file. For example:
-
-``` pre
-#ifndef HEADER_HEADER
-#define HEADER_HEADER
-
-class class1{
-};
-class class2{
-};
-class class3 : public PdxSerializable{
-};
-#endif
-```
-
-If you want to generate code for only one of the classes, then use the `--className` option. For example, if you only want to generate code for class3, then you would use the following command:
-
-``` pre
-pdxautoserializer --outDir=<outDir> --className=class3
-```
-
-## Choosing Your Own Suffix to Identify the Generated Files.
-
-The `pdxserializer` tool also provides the option to choose your own suffix for the generated C++ files. This can help you write less code in your makefiles. Here's an example command:
-
-``` pre
-pdxautoserializer --outDir=<outDir> --className=CharTypes --suffix="generated"
-```
-
-## <a id="topic_f33_fsw_dl" class="no-quick-link"></a>Example of Using PDX Serialization in Your Application
-
-``` pre
-CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
- // Create a cache with the "clientPdxRemoteQuery.xml" Cache XML file.
- CachePtr cachePtr = cacheFactory->set("cache-xml-file", "XMLs\\clientPdxRemoteQuery.xml")
- ->create();
-
- LOGINFO("Created the Cache");
-
- // Get the example Region from the Cache which is declared in the Cache XML file.
- RegionPtr regionPtr = cachePtr->getRegion( "Portfolios");
-
- LOGINFO( "Obtained the Region from the Cache");
-
- // Register our Serializable/Cacheable Query objects, viz. PortfolioPdx and PositionPdx.
- Serializable::registerPdxType(PortfolioPdx::createDeserializable);
- PortfolioPdxPtr port1Ptr(new PortfolioPdx(1 /*ID*/, 10 /*size*/));
- PortfolioPdxPtr port2Ptr(new PortfolioPdx(2 /*ID*/, 20 /*size*/));
- PortfolioPdxPtr port3Ptr(new PortfolioPdx(3 /*ID*/, 30 /*size*/));
- regionPtr->put("Key1", port1Ptr);
- regionPtr->put("Key2", port2Ptr);
- regionPtr->put("Key3", port3Ptr);
-
- // Get the QueryService from the Cache.
- QueryServicePtr qrySvcPtr = cachePtr->getQueryService( "examplePool");
-
- LOGINFO( "Got the QueryService from the Cache");
-
- // Execute a Query which returns a ResultSet.
- QueryPtr qryPtr = qrySvcPtr->newQuery("SELECT DISTINCT * FROM /Portfolios");
- SelectResultsPtr resultsPtr = qryPtr->execute();
-
- LOGINFO( "ResultSet Query returned %d rows", resultsPtr->size());
-```
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/pdx_ignore_unread_fields.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/pdx_ignore_unread_fields.html.md.erb b/docs/geode-native-docs/cpp-caching-api/pdx_ignore_unread_fields.html.md.erb
deleted file mode 100644
index 1149494..0000000
--- a/docs/geode-native-docs/cpp-caching-api/pdx_ignore_unread_fields.html.md.erb
+++ /dev/null
@@ -1,37 +0,0 @@
----
-title: Configuring PDX to Ignore Unread Fields During Deserialization
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Use the `setPdxIgnoreUnreadFields` API to control whether PDX ignores fields that were unread during deserialization.
-
-The default is to preserve unread fields by including their data during serialization. However, if you configure the cache to ignore unread fields then their data will be lost during serialization.
-
-You should only set this attribute to `true` if you know this member will only be reading cache data. In this use case you do not need to pay the cost of preserving unread fields since you will never reserialize the PDX data.
-
-For example:
-
-``` pre
-CacheFactoryPtr cfPtr = CacheFactory::createCacheFactory(PropertiesObj);
-cfPtr->setPdxReadSerialized(tue);
-cfPtr->setPdxIgnoreUnreadFields(false);
-cachePtr = cfPtr->create();
-```
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
deleted file mode 100644
index 58c0a3a..0000000
--- a/docs/geode-native-docs/cpp-caching-api/pdx_serialization.html.md.erb
+++ /dev/null
@@ -1,60 +0,0 @@
----
-title: Serializing Data with PDX Serialization
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-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 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 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)**
-
- For domain objects that you cannot or do not want to modify, use the `PdxSerializer` and the `PdxWrapper` classes to serialize and deserialize the object's fields.
-
-- **[Serialize Using the PdxSerializable Class](pdxserializable_interface.html)**
-
- Domain classes need to inherit the `PdxSerializable` abstract class to serialize and de-serialize the object. When you write objects using PDX serialization, they are distributed to the server tier in PDX serialized form.
-
-- **[Using Automatic PDX Serialization](pdx_auto_serialization.html)**
-
- 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)**
-
- A `PdxInstance` is a lightweight wrapper around the raw bytes of the PDX serialized objects kept in the cache. It provides applications with run-time access to files of a PDX serialized object. Geode provides the implementation of the `PdxInstance` class.
-
-- **[Configuring PDX to Ignore Unread Fields During Deserialization](pdx_ignore_unread_fields.html)**
-
- Use the `setPdxIgnoreUnreadFields` API to control whether PDX ignores fields that were unread during deserialization.
-
-- **[Using PdxInstanceFactory to Create PdxInstances](using_pdxinstancefactory.html)**
-
- You can use the `PdxInstanceFactory` API to create a `PdxInstance` from raw data when the domain class is not available on the server.
-
-- **[Using C++ Enum Type with PDX Serialization](using_enum_type_with_pdx.html)**
-
- Because there is no "object" base type in C++, enums cannot be directly passed as parameters to the `writeObject` and `readObject` API.
-
-- **[Using PDX Serialization with Delta Propagation](pdx_with_delta_propagation.html)**
-
- To use delta propagation with PDX serialization, you must implement the `Delta` interface methods.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
deleted file mode 100644
index 4f9bbf4..0000000
--- a/docs/geode-native-docs/cpp-caching-api/pdx_with_delta_propagation.html.md.erb
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: Using PDX Serialization with Delta Propagation
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-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 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.
-
-The following code snippet is a sample implementation of the Delta interface methods for using with PDX serialization.
-
-``` pre
-class PdxWithDelta : public PdxSerializable, public Delta
-{
-public:
-
- bool hasDelta();
- void toDelta(DataOutput& output);
- void fromDelta(DataInput& input);
- DeltaPtr clone();
-
-// other PdxSerializable methods here...
-
-};
-```
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
new file mode 100644
index 0000000..72dfbbf
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/pdxserializable-interface.html.md.erb
@@ -0,0 +1,112 @@
+---
+title: Serialize Using the PdxSerializable Class
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Domain classes need to inherit the `PdxSerializable` abstract class to serialize and de-serialize the object. When you write objects using PDX serialization, they are distributed to the server tier in PDX serialized form.
+
+When you run queries against the objects on the servers, only the fields you specify are deserialized. A domain class should serialize and de-serialize all its member fields in the same order in its `toData` and `fromData` method.
+
+Use this procedure to program your domain object for PDX serialization using the `PdxSerializable` abstract class.
+
+1. In your domain class, implement `PdxSerializable`. Example:
+
+ ``` pre
+ class PdxObject: public PdxSerializable
+ ```
+
+2. Program the `toData` function to serialize your object as required by your application.
+
+ If you also use PDX serialization in Java or .NET for the object, serialize the object in the same way for each language. Serialize the same fields in the same order and mark the same identity fields.
+
+3. Program the `fromData` method to read your data fields from the serialized form into the object's fields.
+
+ In your `fromData` implementation, use the same name as you did in `toData` and call the read operations in the same order as you called the write operations in your `toData` implementation.
+
+4. Optionally, program your domain object's hashCode and equality methods.
+
+ Use the `markIdentityField` method to indicate that the given field name should be included in hashCode and equality checks of this object on a server.
+
+ The fields that are marked as identity fields are used to generate the hashCode and equality methods of PdxInstance. Because of this, the identity fields should themselves either be primitives, or implement hashCode and equals.
+
+ If no fields are set as identity fields, then all fields will be used in hashCode and equality checks. The identity fields should make marked after they are written using a `write`\* method.
+
+## PdxSerializable Example
+
+``` pre
+class PdxObject: public PdxSerializable {
+
+private:
+ uint32_t m_id;
+ char* m_str;
+
+public:
+ PdxObject(){};
+ PdxObject(uint32_t id, char* str);
+ virtual ~PdxObject();
+
+ uint32_t getID() {
+ return m_id;
+ }
+
+ char* getStr(){
+ return m_str;
+ }
+
+ virtual void toData(PdxWriterPtr pw) const;
+ virtual void fromData(PdxReaderPtr pr);
+ CacheableStringPtr toString() const;
+ virtual char* getClassName() const;
+ static Cacheable* createDeserializable() {
+ return new PdxObject();
+ }
+};
+
+PdxObject::PdxObject(uint32_t i, char* str) {
+ m_id = i;
+ m_str = str;
+}
+
+PdxObject::~PdxObject() {
+}
+
+void PdxObject::toData( PdxWriterPtr pw ) const {
+ pw->writeInt("id", m_id);
+ pw->markIdentityField("id");
+ pw->writeString("str", m_str);
+}
+
+void PdxObject::fromData( PdxReaderPtr pr )
+{
+ m_id = pr->readInt("id");
+ m_str = pr->readString("str");
+}
+
+char* getClassName() const{
+{
+ return "com.example.PdxType";
+}
+
+CacheableStringPtr PdxObject::toString() const {
+ char idbuf[1024];
+ sprintf(idbuf,"PdxObject: [ ID=%d ]",m_id);
+ return CacheableString::create( idbuf );
+}
+```
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
deleted file mode 100644
index 72dfbbf..0000000
--- a/docs/geode-native-docs/cpp-caching-api/pdxserializable_interface.html.md.erb
+++ /dev/null
@@ -1,112 +0,0 @@
----
-title: Serialize Using the PdxSerializable Class
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Domain classes need to inherit the `PdxSerializable` abstract class to serialize and de-serialize the object. When you write objects using PDX serialization, they are distributed to the server tier in PDX serialized form.
-
-When you run queries against the objects on the servers, only the fields you specify are deserialized. A domain class should serialize and de-serialize all its member fields in the same order in its `toData` and `fromData` method.
-
-Use this procedure to program your domain object for PDX serialization using the `PdxSerializable` abstract class.
-
-1. In your domain class, implement `PdxSerializable`. Example:
-
- ``` pre
- class PdxObject: public PdxSerializable
- ```
-
-2. Program the `toData` function to serialize your object as required by your application.
-
- If you also use PDX serialization in Java or .NET for the object, serialize the object in the same way for each language. Serialize the same fields in the same order and mark the same identity fields.
-
-3. Program the `fromData` method to read your data fields from the serialized form into the object's fields.
-
- In your `fromData` implementation, use the same name as you did in `toData` and call the read operations in the same order as you called the write operations in your `toData` implementation.
-
-4. Optionally, program your domain object's hashCode and equality methods.
-
- Use the `markIdentityField` method to indicate that the given field name should be included in hashCode and equality checks of this object on a server.
-
- The fields that are marked as identity fields are used to generate the hashCode and equality methods of PdxInstance. Because of this, the identity fields should themselves either be primitives, or implement hashCode and equals.
-
- If no fields are set as identity fields, then all fields will be used in hashCode and equality checks. The identity fields should make marked after they are written using a `write`\* method.
-
-## PdxSerializable Example
-
-``` pre
-class PdxObject: public PdxSerializable {
-
-private:
- uint32_t m_id;
- char* m_str;
-
-public:
- PdxObject(){};
- PdxObject(uint32_t id, char* str);
- virtual ~PdxObject();
-
- uint32_t getID() {
- return m_id;
- }
-
- char* getStr(){
- return m_str;
- }
-
- virtual void toData(PdxWriterPtr pw) const;
- virtual void fromData(PdxReaderPtr pr);
- CacheableStringPtr toString() const;
- virtual char* getClassName() const;
- static Cacheable* createDeserializable() {
- return new PdxObject();
- }
-};
-
-PdxObject::PdxObject(uint32_t i, char* str) {
- m_id = i;
- m_str = str;
-}
-
-PdxObject::~PdxObject() {
-}
-
-void PdxObject::toData( PdxWriterPtr pw ) const {
- pw->writeInt("id", m_id);
- pw->markIdentityField("id");
- pw->writeString("str", m_str);
-}
-
-void PdxObject::fromData( PdxReaderPtr pr )
-{
- m_id = pr->readInt("id");
- m_str = pr->readString("str");
-}
-
-char* getClassName() const{
-{
- return "com.example.PdxType";
-}
-
-CacheableStringPtr PdxObject::toString() const {
- char idbuf[1024];
- sprintf(idbuf,"PdxObject: [ ID=%d ]",m_id);
- return CacheableString::create( idbuf );
-}
-```
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/performing-ops-with-pdx-object.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/performing-ops-with-pdx-object.html.md.erb b/docs/geode-native-docs/cpp-caching-api/performing-ops-with-pdx-object.html.md.erb
new file mode 100644
index 0000000..42e0d9f
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/performing-ops-with-pdx-object.html.md.erb
@@ -0,0 +1,60 @@
+---
+title: Performing put, get, and localDestroy Operations with a PDX Domain Object
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+This topic demonstrates how you can perform operations on a PDX domain object after you have implemented PDX serializable in your domain class.
+
+For example, you can perform operations like put, get, and localDestroy with the domain class you defined for PDX serialization in the [PdxSerializable Example](pdxserializable-interface.html#concept_79E4C10E5F634A7F84F96633694B3D69__example_70237026967A42898584AE644D437E69).
+
+To perform operations, you could write the following application code:
+
+1. Register the PDX domain class.
+
+ ``` pre
+ Serializable::registerPdxType(PdxObject::createDeserializable);
+ ```
+
+2. Create the PDX domain object `PdxObject`.
+
+ ``` pre
+ CacheablePtr pdxobj(new PdxObject(100, "Value-1"));
+ CacheableKeyPtr keyport = CacheableKey::create("ABC");
+ ```
+
+3. Here's an example of a put operation.
+
+ ``` pre
+ rptr->put(keyport, pdxobj);
+ ```
+
+4. Here's an example of locally destroying the entry.
+
+ ``` pre
+ rptr->localDestroy(keyport);
+ ```
+
+5. Here's an example of a get operation.
+
+ ``` pre
+ PdxObject *obj2 = dynamic_cast<PdxObject *> ((rptr->get(keyport)).ptr());
+ LOGINFO("Debug:Returned ID = %d", obj2->getID());
+ ```
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/performing_ops_with_pdx_object.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/performing_ops_with_pdx_object.html.md.erb b/docs/geode-native-docs/cpp-caching-api/performing_ops_with_pdx_object.html.md.erb
deleted file mode 100644
index 5962129..0000000
--- a/docs/geode-native-docs/cpp-caching-api/performing_ops_with_pdx_object.html.md.erb
+++ /dev/null
@@ -1,60 +0,0 @@
----
-title: Performing put, get, and localDestroy Operations with a PDX Domain Object
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-This topic demonstrates how you can perform operations on a PDX domain object after you have implemented PDX serializable in your domain class.
-
-For example, you can perform operations like put, get, and localDestroy with the domain class you defined for PDX serialization in the [PdxSerializable Example](pdxserializable_interface.html#concept_79E4C10E5F634A7F84F96633694B3D69__example_70237026967A42898584AE644D437E69).
-
-To perform operations, you could write the following application code:
-
-1. Register the PDX domain class.
-
- ``` pre
- Serializable::registerPdxType(PdxObject::createDeserializable);
- ```
-
-2. Create the PDX domain object `PdxObject`.
-
- ``` pre
- CacheablePtr pdxobj(new PdxObject(100, "Value-1"));
- CacheableKeyPtr keyport = CacheableKey::create("ABC");
- ```
-
-3. Here's an example of a put operation.
-
- ``` pre
- rptr->put(keyport, pdxobj);
- ```
-
-4. Here's an example of locally destroying the entry.
-
- ``` pre
- rptr->localDestroy(keyport);
- ```
-
-5. Here's an example of a get operation.
-
- ``` pre
- PdxObject *obj2 = dynamic_cast<PdxObject *> ((rptr->get(keyport)).ptr());
- LOGINFO("Debug:Returned ID = %d", obj2->getID());
- ```
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/region-data-requiring-serialization.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/region-data-requiring-serialization.html.md.erb b/docs/geode-native-docs/cpp-caching-api/region-data-requiring-serialization.html.md.erb
new file mode 100644
index 0000000..3a78e94
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/region-data-requiring-serialization.html.md.erb
@@ -0,0 +1,36 @@
+---
+title: Region Data Requiring Serialization
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Certain region types (including client regions) require serialization.
+
+Region data in the following types of regions must be serializable:
+
+- Partitioned regions (except functions that add data locally to a partitioned region use the deserialized form).
+- Distributed regions.
+- Regions that are persisted or overflowed to disk.
+- Server or client regions in a client/server installation.
+- Regions distributed between gateways in a multi-site installation.
+- Regions that receive events from remote caches.
+- Regions that provide function arguments and results.
+
+To minimize the cost of serialization and deserialization, Geode avoids changing the data format whenever possible. This means your data may be stored in the cache in serialized or deserialized form, depending on how you use it. For example, if a server acts only as a storage location for data distribution between clients, it makes sense to leave the data in serialized form, ready to be transmitted to clients that request it. Partitioned region data is always stored in serialized form with one exception\u2014functions that add data to a partitioned region locally use the deserialized form.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/cpp-caching-api/region_data_requiring_serialization.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cpp-caching-api/region_data_requiring_serialization.html.md.erb b/docs/geode-native-docs/cpp-caching-api/region_data_requiring_serialization.html.md.erb
deleted file mode 100644
index 3a78e94..0000000
--- a/docs/geode-native-docs/cpp-caching-api/region_data_requiring_serialization.html.md.erb
+++ /dev/null
@@ -1,36 +0,0 @@
----
-title: Region Data Requiring Serialization
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Certain region types (including client regions) require serialization.
-
-Region data in the following types of regions must be serializable:
-
-- Partitioned regions (except functions that add data locally to a partitioned region use the deserialized form).
-- Distributed regions.
-- Regions that are persisted or overflowed to disk.
-- Server or client regions in a client/server installation.
-- Regions distributed between gateways in a multi-site installation.
-- Regions that receive events from remote caches.
-- Regions that provide function arguments and results.
-
-To minimize the cost of serialization and deserialization, Geode avoids changing the data format whenever possible. This means your data may be stored in the cache in serialized or deserialized form, depending on how you use it. For example, if a server acts only as a storage location for data distribution between clients, it makes sense to leave the data in serialized form, ready to be transmitted to clients that request it. Partitioned region data is always stored in serialized form with one exception\u2014functions that add data to a partitioned region locally use the deserialized form.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
new file mode 100644
index 0000000..b640c3e
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/serialization-options.html.md.erb
@@ -0,0 +1,79 @@
+---
+title: Data Serialization Options
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+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.
+
+When using PDX serialization, you can use either `PdxSerializer` (for all your domain objects) or `PdxSerializable` (for a specific domain object).
+
+`PdxSerializer` is used when a user has registered a domain class for serialization in the cache using the `registerPdxSerializer` API.
+
+`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 `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>
+
+<table>
+<caption><span class="tablecap">Table 1. Serialization Options\u2014Comparison of Features</span></caption>
+<colgroup>
+<col width="50%" />
+<col width="25%" />
+<col width="25%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th>Capability</th>
+<th>Serializable</th>
+<th>PdxSerializable</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td><p>Handles multiple versions of domain objects*</p></td>
+<td></td>
+<td>X</td>
+</tr>
+<tr class="even">
+<td><p>Provides single field access on servers of serialized data, without full deserialization. Supported also for OQL queries.</p></td>
+<td></td>
+<td>X</td>
+</tr>
+<tr class="odd">
+<td><p>Automatically ported to other languages by Geode - no need to program Java-side implementation</p></td>
+<td></td>
+<td>X</td>
+</tr>
+<tr class="even">
+<td><p>Works with GemFire delta propagation</p></td>
+<td>X</td>
+<td>X**</td>
+</tr>
+</tbody>
+</table>
+
+<span class="tablecap">**Table 1.** Serialization Options\u2014Comparison of Features</span>
+
+\* You can mix domain object versions where the differences between versions are the addition and removal of object fields.
+
+\*\* See [Using PDX Serialization with Delta Propagation](pdx-with-delta-propagation.html#concept_F33AC930A8F14F0A9EE07AC31FFD8C8F) for requirements.
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
new file mode 100644
index 0000000..7b530b6
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/serialization-overview.html.md.erb
@@ -0,0 +1,48 @@
+---
+title: Serializing Data
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+All data moving out of the client cache must be serializable.
+
+- **[Region Data Requiring Serialization](region-data-requiring-serialization.html)**
+
+ Certain region types (including client regions) require serialization.
+
+- **[Data Serialization Options](serialization-options.html)**
+
+ 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 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 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)**
+
+ 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.
+
+- **[Serializing and Accessing Data as a Blob](data-as-blob.html)**
+
+ If you have data that is best handled as a blob, such as structs that do not contain pointers, use the serializable type `CacheableBytes` . `CacheableBytes` is a blob class that implements the serialization for you.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
new file mode 100644
index 0000000..9b95e77
--- /dev/null
+++ b/docs/geode-native-docs/cpp-caching-api/serialization-using-serializable.html.md.erb
@@ -0,0 +1,256 @@
+---
+title: Serializing Data with the Serializable Interface
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+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
+
+When your application puts an object into the cache for subsequent distribution, Geode serializes the data by taking these steps:
+
+1. Calls the appropriate `classId` function.
+2. Writes the full `typeId` using the `classId` for the instance.
+3. Invokes the instance\u2019s `toData` function.
+
+When your application subsequently receives a byte array, Geode takes the following steps:
+
+1. Decodes the `typeId`, extracts the `classId` from the `typeId`, then creates an object of the designated type using the registered factory functions.
+
+2. Invokes the `fromData` function with input from the data stream.
+3. Decodes the data, then populates the data fields.
+
+## <a id="concept_696AB5206C3E45898CC1A24CDD93D003__section_786CF85FD80E4FE391135460E04D46CC" class="no-quick-link"></a>Implementing the Serializable Interface
+
+To store your own data types in the cache, you need to derive a new subclass from the `Serializable` interface. In practical terms, this means that you need to implement a small set of helper functions:
+
+1. Write a `toData` function that serializes your data.
+
+ ``` pre
+ void toData (DataOutput& output)
+ ```
+
+ The `toData` function is responsible for copying all of the object\u2019s 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.
+
+2. Write a `fromData` function that consumes a data input stream and repopulates the object\u2019s data fields.
+
+ ``` pre
+ 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`.
+
+## Example 1. The Simple Class BankAccount
+
+This example demonstrates a simple `BankAccount` class that encapsulates two `ints`, `ownerId` and `accountId`:
+
+``` pre
+class BankAccount
+{
+ private:
+�
+ int m_ownerId;
+ int m_accountId;
+�
+ public:
+�
+ BankAccount( int owner, int account ): m_ownerId( owner ),
+ m_accountId( account ) {}
+�
+ int getOwner( )
+ {
+ return m_ownerId;
+ }
+�
+ int getAccount( )
+ {
+ return m_accountId;
+ }
+�
+};
+```
+
+To make `BankAccount` serializable, you would need to derive the class from `Serializable` and implement the following:
+
+- `toData`\u2014a function to serialize the data.
+- `fromData`\u2014a function to deserialize the data.
+- `classId`\u2014a function to provide a unique integer for the class.
+- `TypeFactoryMethod`\u2014a pointer to a function that returns a `Serializable*` to an uninitialized instance of the type.
+
+## Example 2. Implementing a Serializable Class
+
+This example shows a code sample that demonstrates how to implement a serializable class.
+
+``` pre
+class BankAccount : public Serializable
+{
+ private:
+ int m_ownerId;
+ int m_accountId;
+ public:
+ BankAccount( int owner, int account ) : m_ownerId( owner ),
+ m_accountId( account ) {}
+
+int getOwner( )
+{
+ return m_ownerId;
+}
+
+int getAccount( )
+{
+ return m_accountId;
+}
+
+// Add the following for the Serializable interface
+// Our TypeFactoryMethod
+static Serializable* createInstance( )
+{
+ return new BankAccount( 0, 0 );
+}
+
+int32_t classId( )
+{
+ return 10; // must be unique per class.
+}
+
+virtual uint32_t objectSize() const
+{
+ return 10;
+}
+
+void toData( DataOutput& output )
+{
+ output.writeInt( m_ownerId );
+ output.writeInt( m_accountId );
+}
+
+Serializable* fromData( DataInput& input )
+{
+ input.readInt( &m_ownerId );
+ input.readInt( &m_accountId );
+ return this;
+}
+};
+```
+
+## <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`.
+
+``` pre
+Serializable::registerType( BankAccount::createInstance );
+```
+
+Typically, you would register the type before calling the function `DistributedSystem::connect`.
+
+**Note:**
+Type IDs must be unique to only one class.
+
+## <a id="concept_696AB5206C3E45898CC1A24CDD93D003__section_311C3661023C46328B406F26F4F16808" class="no-quick-link"></a>Custom Key Types
+
+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 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:
+
+- Change the class so that it derives from `CacheableKey` rather than `Serializable`.
+
+- Implement `operator==` and `hashcode` functions.
+
+## Example 3. Extending a Serializable Class To Be a CacheableKey
+
+This example shows how to extend a serializable class to be a cacheable key.
+
+``` pre
+class BankAccount
+: public CacheableKey
+{
+ private:
+ int m_ownerId;
+ int m_accountId;
+ public:
+ BankAccount( int owner, int account ) : m_ownerId( owner ),
+ m_accountId( account ) {}
+
+int getOwner( )
+{
+ return m_ownerId;
+}
+
+int getAccount( )
+{
+ return m_accountId;
+}
+
+// Our TypeFactoryMethod
+static Serializable* createInstance( )
+{
+ return new BankAccount( 0, 0 );
+}
+
+int32_t typeId( )
+{
+ return 1000; // must be unique per class.
+}
+
+void toData( DataOutput& output )
+{
+ output.writeInt( m_ownerId );
+ output.writeInt( m_accountId );
+}
+
+Serializable* fromData( DataInput& input )
+{
+ input.readInt( &m_ownerId );
+ input.readInt( &m_accountId );
+ return this;
+}
+
+// Add the following for the CacheableKey interface
+bool operator == ( const CacheableKey& other ) const
+{
+ const BankAccount& otherBA =
+ static_cast<const BankAccount&>( other );
+ return (m_ownerId == otherBA.m_ownerId) && (m_accountId == otherBA.m_accountId);
+}
+
+uint32_t hashcode( ) const
+{
+ return m_ownerId;
+}
+
+virtual int32_t classId( )const
+{
+ return 10; // must be unique per class.
+}
+�
+virtual uint32_t objectSize() const
+{
+ return 10;
+}
+};
+```
+
+## <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++ 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.
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
deleted file mode 100644
index 9b4d546..0000000
--- a/docs/geode-native-docs/cpp-caching-api/serialization_options.html.md.erb
+++ /dev/null
@@ -1,79 +0,0 @@
----
-title: Data Serialization Options
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-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.
-
-When using PDX serialization, you can use either `PdxSerializer` (for all your domain objects) or `PdxSerializable` (for a specific domain object).
-
-`PdxSerializer` is used when a user has registered a domain class for serialization in the cache using the `registerPdxSerializer` API.
-
-`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 `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>
-
-<table>
-<caption><span class="tablecap">Table 1. Serialization Options\u2014Comparison of Features</span></caption>
-<colgroup>
-<col width="50%" />
-<col width="25%" />
-<col width="25%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>Capability</th>
-<th>Serializable</th>
-<th>PdxSerializable</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td><p>Handles multiple versions of domain objects*</p></td>
-<td></td>
-<td>X</td>
-</tr>
-<tr class="even">
-<td><p>Provides single field access on servers of serialized data, without full deserialization. Supported also for OQL queries.</p></td>
-<td></td>
-<td>X</td>
-</tr>
-<tr class="odd">
-<td><p>Automatically ported to other languages by Geode - no need to program Java-side implementation</p></td>
-<td></td>
-<td>X</td>
-</tr>
-<tr class="even">
-<td><p>Works with GemFire delta propagation</p></td>
-<td>X</td>
-<td>X**</td>
-</tr>
-</tbody>
-</table>
-
-<span class="tablecap">**Table 1.** Serialization Options\u2014Comparison of Features</span>
-
-\* You can mix domain object versions where the differences between versions are the addition and removal of object fields.
-
-\*\* See [Using PDX Serialization with Delta Propagation](pdx_with_delta_propagation.html#concept_F33AC930A8F14F0A9EE07AC31FFD8C8F) for requirements.
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/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
deleted file mode 100644
index e8fc4ca..0000000
--- a/docs/geode-native-docs/cpp-caching-api/serialization_overview.html.md.erb
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: Serializing Data
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-All data moving out of the client cache must be serializable.
-
-- **[Region Data Requiring Serialization](region_data_requiring_serialization.html)**
-
- Certain region types (including client regions) require serialization.
-
-- **[Data Serialization Options](serialization_options.html)**
-
- 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 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 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)**
-
- 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.
-
-- **[Serializing and Accessing Data as a Blob](data-as-blob.html)**
-
- If you have data that is best handled as a blob, such as structs that do not contain pointers, use the serializable type `CacheableBytes` . `CacheableBytes` is a blob class that implements the serialization for you.
-
-
[2/7] geode-native git commit: GEODE-2513: Rename and reorganize
client doc sources This closes #85
Posted by db...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/sampling_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/sampling_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/sampling_statistics.html.md.erb
deleted file mode 100644
index 63c0409..0000000
--- a/docs/geode-native-docs/system-statistics/sampling_statistics.html.md.erb
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: Sampling Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-When applications and cache servers join a distributed system, they indicate whether to enable statistics sampling and whether to archive the statistics that are gathered.
-
-The following statistics are related to the statistic sampler.
-
-| | |
-|---------------|------------------------------------------------|
-| `sampleCount` | Total number of samples taken by this sampler. |
-| `sampleTime` | Total amount of time spent taking samples. |
-| `StatSampler` | Statistics on the statistic sampler. |
-
-For more information about configuring statistics, see [Attributes in geode.properties](../setting-properties/propfile_attributes.html#attributes-gfcpp).
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/solaris-os-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/solaris-os-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/solaris-os-statistics.html.md.erb
new file mode 100644
index 0000000..4802c40
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/solaris-os-statistics.html.md.erb
@@ -0,0 +1,34 @@
+---
+title: Solaris Process Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Use these methods to get information about a Solaris operating system process.
+
+| | |
+|-------------------|----------------------------------------------------------------------|
+| `imageSize` | Size of the process image in megabytes. |
+| `rssSize` | Size of the process resident set in megabytes. |
+| `userTime` | Operating system statistic for the process CPU usage in user time. |
+| `systemTime` | Operating system statistic for the process CPU usage in system time. |
+| `processCpuUsage` | Operating system statistic for the CPU usage of this process. |
+| `hostCpuUsage` | Operating system statistic for the host CPU usage. |
+| `threads` | Number of threads currently active in this process. |
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/solaris_os_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/solaris_os_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/solaris_os_statistics.html.md.erb
deleted file mode 100644
index 4802c40..0000000
--- a/docs/geode-native-docs/system-statistics/solaris_os_statistics.html.md.erb
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: Solaris Process Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Use these methods to get information about a Solaris operating system process.
-
-| | |
-|-------------------|----------------------------------------------------------------------|
-| `imageSize` | Size of the process image in megabytes. |
-| `rssSize` | Size of the process resident set in megabytes. |
-| `userTime` | Operating system statistic for the process CPU usage in user time. |
-| `systemTime` | Operating system statistic for the process CPU usage in system time. |
-| `processCpuUsage` | Operating system statistic for the CPU usage of this process. |
-| `hostCpuUsage` | Operating system statistic for the host CPU usage. |
-| `threads` | Number of threads currently active in this process. |
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/system-performance-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/system-performance-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/system-performance-statistics.html.md.erb
new file mode 100644
index 0000000..93d6d4f
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/system-performance-statistics.html.md.erb
@@ -0,0 +1,48 @@
+---
+title: System Performance Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Performance statistics are collected for each application or cache server that connects to a distributed system.
+
+- **[Region Statistics](region-statistics.html)**
+
+ These methods help to get the statistics of a region.
+
+- **[Cache Performance Statistics](cache-performance-statistics.html)**
+
+ Use cache performance statistics to determine the type and number of cache operations being performed and how much time they consume.
+
+- **[Continuous Query Statistics](continuous-query-statistics.html)**
+
+ Continuous query statistics give information about a registered Continuous Query (CQ) represented by the CqQuery object.
+
+- **[CQ Service Statistics](cq-service-statistics.html)**
+
+ Use CQ service methods to get aggregate statistical information about the continuous queries of a client.
+
+- **[Pool Statistics](pool-statistics.html)**
+
+ Use the pool object to get statistics on connection pools.
+
+- **[Delta Statistics](delta-statistics.html)**
+
+ Delta statistics provide information about updates to data.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/system_performance_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/system_performance_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/system_performance_statistics.html.md.erb
deleted file mode 100644
index c8dc0f2..0000000
--- a/docs/geode-native-docs/system-statistics/system_performance_statistics.html.md.erb
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: System Performance Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Performance statistics are collected for each application or cache server that connects to a distributed system.
-
-- **[Region Statistics](region_statistics.html)**
-
- These methods help to get the statistics of a region.
-
-- **[Cache Performance Statistics](cache_performance_statistics.html)**
-
- Use cache performance statistics to determine the type and number of cache operations being performed and how much time they consume.
-
-- **[Continuous Query Statistics](continuous_query_statistics.html)**
-
- Continuous query statistics give information about a registered Continuous Query (CQ) represented by the CqQuery object.
-
-- **[CQ Service Statistics](cq_service_statistics.html)**
-
- Use CQ service methods to get aggregate statistical information about the continuous queries of a client.
-
-- **[Pool Statistics](pool_statistics.html)**
-
- Use the pool object to get statistics on connection pools.
-
-- **[Delta Statistics](delta_statistics.html)**
-
- Delta statistics provide information about updates to data.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/windows-os-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/windows-os-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/windows-os-statistics.html.md.erb
new file mode 100644
index 0000000..e175a69
--- /dev/null
+++ b/docs/geode-native-docs/system-statistics/windows-os-statistics.html.md.erb
@@ -0,0 +1,43 @@
+---
+title: Windows Process Statistics
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Use these methods to get information about a Windows operating system process.
+
+| | |
+|-----------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `handles` | Total number of handles currently open by this process. This number is the sum of the handles currently open by each thread in this process. |
+| `priorityBase` | Current base priority of the process. Threads within a process can raise and lower their own base priority relative to the process's base priority. |
+| `threads` | Number of threads currently active in this process. An instruction is the basic unit of execution in a processor, and a thread is the object that executes instructions. Every running process has at least one thread. |
+| `activeTime` | Elapsed time in milliseconds that all threads of this process used the processor to execute instructions. An instruction is the basic unit of execution in a computer, a thread is the object that executes instructions, and a process is the object created when a program is run. Code executed to handle some hardware interrupts and trap conditions are included in this count. |
+| `pageFaults` | Total number of page faults by the threads executing in this process. A page fault occurs when a thread refers to a virtual memory page that is not in its working set in main memory. This will not cause the page to be fetched from disk if it is on the standby list and hence already in main memory, or if it is in use by another process with whom the page is shared. |
+| `pageFileSize` | Current number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory. |
+| `pageFileSizePeak` | Maximum number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory. |
+| `privateSize` | Current number of bytes this process has allocated that cannot be shared with other processes. |
+| `systemTime` | Elapsed time in milliseconds that the threads of the process have spent executing code in privileged mode. When a Windows system service is called, the service often runs in Privileged Mode to gain access to system-private data. Such data is protected from access by threads executing in user mode. Calls to the system can be explicit or implicit, such as page faults or interrupts. Unlike some early operating systems, Windows uses process boundaries for subsystem protection in addition to the traditional protection of user and privileged modes. These subsystem processes provide additional protection. Therefore, some work done by Windows on behalf of your application might appear in other subsystem processes in addition to the privileged time in your process. |
+| `userTime` | Elapsed time in milliseconds that this process's threads have spent executing code in user mode. Applications, environment subsystems, and integral subsystems execute in user mode. Code executing in User Mode cannot damage the integrity of the Windows Executive, Kernel, and device drivers. Unlike some early operating systems, Windows uses process boundaries for subsystem protection in addition to the traditional protection of user and privileged modes. These subsystem processes provide additional protection. Therefore, some work done by Windows on behalf of your application might appear in other subsystem processes in addition to the privileged time in your process. |
+| `virtualSize` | Current size in bytes of the virtual address space the process is using. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite, and by using too much, the process can limit its ability to load libraries. |
+| `virtualSizePeak` | Maximum number of bytes of virtual address space the process has used at any one time. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is however finite, and by using too much, the process might limit its ability to load libraries. |
+| `workingSetSize` | Current number of bytes in the Working Set of this process. The Working Set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the Working Set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from Working Sets. If pages are needed, they are then soft-faulted back into the Working Set before they are paged out to disk. |
+| `workingSetSizePeak` | Maximum number of bytes in the Working Set of this process at any point in time. The Working Set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the Working Set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from Working Sets. If they are needed they will then be soft faulted back into the Working Set before they leave main memory. |
+| `cpuUsage` | Percentage CPU used by this process. |
+| `WindowsProcessStats` | Statistics for a Microsoft Windows process. |
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/system-statistics/windows_os_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/windows_os_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/windows_os_statistics.html.md.erb
deleted file mode 100644
index e175a69..0000000
--- a/docs/geode-native-docs/system-statistics/windows_os_statistics.html.md.erb
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: Windows Process Statistics
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Use these methods to get information about a Windows operating system process.
-
-| | |
-|-----------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `handles` | Total number of handles currently open by this process. This number is the sum of the handles currently open by each thread in this process. |
-| `priorityBase` | Current base priority of the process. Threads within a process can raise and lower their own base priority relative to the process's base priority. |
-| `threads` | Number of threads currently active in this process. An instruction is the basic unit of execution in a processor, and a thread is the object that executes instructions. Every running process has at least one thread. |
-| `activeTime` | Elapsed time in milliseconds that all threads of this process used the processor to execute instructions. An instruction is the basic unit of execution in a computer, a thread is the object that executes instructions, and a process is the object created when a program is run. Code executed to handle some hardware interrupts and trap conditions are included in this count. |
-| `pageFaults` | Total number of page faults by the threads executing in this process. A page fault occurs when a thread refers to a virtual memory page that is not in its working set in main memory. This will not cause the page to be fetched from disk if it is on the standby list and hence already in main memory, or if it is in use by another process with whom the page is shared. |
-| `pageFileSize` | Current number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory. |
-| `pageFileSizePeak` | Maximum number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory. |
-| `privateSize` | Current number of bytes this process has allocated that cannot be shared with other processes. |
-| `systemTime` | Elapsed time in milliseconds that the threads of the process have spent executing code in privileged mode. When a Windows system service is called, the service often runs in Privileged Mode to gain access to system-private data. Such data is protected from access by threads executing in user mode. Calls to the system can be explicit or implicit, such as page faults or interrupts. Unlike some early operating systems, Windows uses process boundaries for subsystem protection in addition to the traditional protection of user and privileged modes. These subsystem processes provide additional protection. Therefore, some work done by Windows on behalf of your application might appear in other subsystem processes in addition to the privileged time in your process. |
-| `userTime` | Elapsed time in milliseconds that this process's threads have spent executing code in user mode. Applications, environment subsystems, and integral subsystems execute in user mode. Code executing in User Mode cannot damage the integrity of the Windows Executive, Kernel, and device drivers. Unlike some early operating systems, Windows uses process boundaries for subsystem protection in addition to the traditional protection of user and privileged modes. These subsystem processes provide additional protection. Therefore, some work done by Windows on behalf of your application might appear in other subsystem processes in addition to the privileged time in your process. |
-| `virtualSize` | Current size in bytes of the virtual address space the process is using. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite, and by using too much, the process can limit its ability to load libraries. |
-| `virtualSizePeak` | Maximum number of bytes of virtual address space the process has used at any one time. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is however finite, and by using too much, the process might limit its ability to load libraries. |
-| `workingSetSize` | Current number of bytes in the Working Set of this process. The Working Set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the Working Set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from Working Sets. If pages are needed, they are then soft-faulted back into the Working Set before they are paged out to disk. |
-| `workingSetSizePeak` | Maximum number of bytes in the Working Set of this process at any point in time. The Working Set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the Working Set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from Working Sets. If they are needed they will then be soft faulted back into the Working Set before they leave main memory. |
-| `cpuUsage` | Percentage CPU used by this process. |
-| `WindowsProcessStats` | Statistics for a Microsoft Windows process. |
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/tools_modules/pulse/system_requirements.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/tools_modules/pulse/system_requirements.html.md.erb b/docs/geode-native-docs/tools_modules/pulse/system_requirements.html.md.erb
deleted file mode 100644
index 35a19bd..0000000
--- a/docs/geode-native-docs/tools_modules/pulse/system_requirements.html.md.erb
+++ /dev/null
@@ -1,35 +0,0 @@
----
-title: Pivotal GemFire Pulse System Requirements
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Verify that your system meets the installation and runtime requirements for GemFire Pulse.
-
-<a id="system_requirements__section_CBD5B04ACC554029B5C710CE8E244FEA"></a>
-The GemFire Pulse Web application has been tested for compatibility with the following Web browsers:
-
-- Internet Explorer 9.0.8112.16421
-- Safari 5.1.7 for Windows
-- Google Chrome 22.0.1229.79 m
-- Mozilla Firefox 16.0.1
-
-GemFire Pulse has been tested for standalone deployment on Tomcat and Jetty.
-GemFire Pulse may work with other operating systems and browsers upon which it has not been tested.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/tools_modules/vsd/vsd_system_requirements.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/tools_modules/vsd/vsd_system_requirements.html.md.erb b/docs/geode-native-docs/tools_modules/vsd/vsd_system_requirements.html.md.erb
deleted file mode 100644
index 2fc2bc3..0000000
--- a/docs/geode-native-docs/tools_modules/vsd/vsd_system_requirements.html.md.erb
+++ /dev/null
@@ -1,55 +0,0 @@
----
-title: VSD System Requirements
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-View a list of platforms that are known to work with VSD.
-
-<a id="concept_9D005BF78EB7465DB735DB0755EE8EF8__section_1C59400B735448B18C2DEA7FD6365D2C"></a>
-The following platforms are known to work with the current VSD release:
-
-- RedHat 6
-- SLES 8
-- SLES 9
-- SLES 10
-- Mac OSX
-- Windows Server 2008
-- Windows 7 (Note: Requires slight modification; see below.)
-
-**64-Bit Platform Support**
-
-VSD is a 32-bit application. If you are running VSD on a 64-bit operating system, you may need to install 32-bit OS libraries to run the application if they are not already installed. On Linux, to find out which libraries are missing you can try running the following:
-
-``` pre
-ldd <product_dir>/tools/vsd/bin/vsdwishLinux
-```
-
-For 64-bit Windows, you can modify the scripts and executables as described in the note below.
-
-**Windows 7 and Later Support**
-
-To use VSD on Windows 7, perform the following steps:
-
-1. Start Windows Explorer and navigate to the `GemFireProductDir\tools\vsd\bin\` directory (where *GemFireProductDir* corresponds to the location where you installed GemFire.)
-2. Right click and select properties for vsd.bat.
-3. Select the Compatibility tab.
-4. Click "Run this program in compatibility mode for" and then select Windows XP SP3.
-5. Repeat steps 2 and 3 for all the other executables in the `bin` directory.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/transactions/how-client-xacts-work.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/transactions/how-client-xacts-work.html.md.erb b/docs/geode-native-docs/transactions/how-client-xacts-work.html.md.erb
new file mode 100644
index 0000000..7a2737e
--- /dev/null
+++ b/docs/geode-native-docs/transactions/how-client-xacts-work.html.md.erb
@@ -0,0 +1,56 @@
+---
+title: How Client Transactions Work
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+The syntax for writing client transactions is the same as with server or peer transactions, but when a client performs a transaction, the transaction is delegated to a server that brokers the transaction.
+
+## <a id="how-native-client-xacts-work__section_C804F1FE5BDF49CEA037AA589BBF284E" class="no-quick-link"></a>Role of Server Delegates in Transactions
+
+The client can run transactions on the Java cache server, using a server delegate to actually run the transaction code.
+
+For information on transaction requirements and activities on the
+server side, see the server documentation at
+[Transactions](geodeman/developing/transactions/chapter_overview.html).
+
+**Note:**
+The client cache blocks until the transaction is successfully committed.
+However, the block is removed if the transaction is suspended.
+
+Depending on where the data resides, the server transaction delegate may or not be the same member that hosts the transaction. This is the same as for transactions run by the servers, but for server-run transactions, there is no delegate. There is just the member that is directly running its own transaction code.
+
+In this figure, the application code on the client makes changes to data entries Y and Z within a transaction. The server delegate that performs the transaction, M1, does not host the primary copy of the data being modified. The transaction takes place on server M2, where the data resides.
+
+<a id="how-native-client-xacts-work__fig_7E408D84E18C452683077528756E31C3"></a>
+<span class="figtitleprefix">Figure: </span>Transaction Run From a Client
+
+<img src="../common/images/xact-run-from-client.gif" id="how-native-client-xacts-work__image_E9ED33166A994014942ABAD9E6F61755" class="image" />
+
+To maintain cache consistency, the local client cache is not accessible during a transaction as it may reflect information inconsistent with the transaction in progress. When the transaction completes, the local cache is accessible again.
+
+In addition to the failure conditions common to all transactions, client transactions can also fail if the transaction delegate fails. If the delegate performing the transaction fails, the transaction code throws a `TransactionException`.
+
+## <a id="how-native-client-xacts-work__section_434BA87403C1449FADC3E7796E30F3C7" class="no-quick-link"></a>Client Transaction APIs
+
+The API for distributed transactions has the familiar relational database methods, `begin`, `commit`, and `rollback`. There are also APIs available to suspend and resume transactions.
+
+The .NET classes for executing transactions are:
+
+- Apache.Geode.Client.CacheTransactionManager
+- Apache.Geode.Client.TransactionId
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/transactions/how-native-client-xacts-work.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/transactions/how-native-client-xacts-work.html.md.erb b/docs/geode-native-docs/transactions/how-native-client-xacts-work.html.md.erb
deleted file mode 100644
index 7a2737e..0000000
--- a/docs/geode-native-docs/transactions/how-native-client-xacts-work.html.md.erb
+++ /dev/null
@@ -1,56 +0,0 @@
----
-title: How Client Transactions Work
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-The syntax for writing client transactions is the same as with server or peer transactions, but when a client performs a transaction, the transaction is delegated to a server that brokers the transaction.
-
-## <a id="how-native-client-xacts-work__section_C804F1FE5BDF49CEA037AA589BBF284E" class="no-quick-link"></a>Role of Server Delegates in Transactions
-
-The client can run transactions on the Java cache server, using a server delegate to actually run the transaction code.
-
-For information on transaction requirements and activities on the
-server side, see the server documentation at
-[Transactions](geodeman/developing/transactions/chapter_overview.html).
-
-**Note:**
-The client cache blocks until the transaction is successfully committed.
-However, the block is removed if the transaction is suspended.
-
-Depending on where the data resides, the server transaction delegate may or not be the same member that hosts the transaction. This is the same as for transactions run by the servers, but for server-run transactions, there is no delegate. There is just the member that is directly running its own transaction code.
-
-In this figure, the application code on the client makes changes to data entries Y and Z within a transaction. The server delegate that performs the transaction, M1, does not host the primary copy of the data being modified. The transaction takes place on server M2, where the data resides.
-
-<a id="how-native-client-xacts-work__fig_7E408D84E18C452683077528756E31C3"></a>
-<span class="figtitleprefix">Figure: </span>Transaction Run From a Client
-
-<img src="../common/images/xact-run-from-client.gif" id="how-native-client-xacts-work__image_E9ED33166A994014942ABAD9E6F61755" class="image" />
-
-To maintain cache consistency, the local client cache is not accessible during a transaction as it may reflect information inconsistent with the transaction in progress. When the transaction completes, the local cache is accessible again.
-
-In addition to the failure conditions common to all transactions, client transactions can also fail if the transaction delegate fails. If the delegate performing the transaction fails, the transaction code throws a `TransactionException`.
-
-## <a id="how-native-client-xacts-work__section_434BA87403C1449FADC3E7796E30F3C7" class="no-quick-link"></a>Client Transaction APIs
-
-The API for distributed transactions has the familiar relational database methods, `begin`, `commit`, and `rollback`. There are also APIs available to suspend and resume transactions.
-
-The .NET classes for executing transactions are:
-
-- Apache.Geode.Client.CacheTransactionManager
-- Apache.Geode.Client.TransactionId
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/transactions/running-client-xact.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/transactions/running-client-xact.html.md.erb b/docs/geode-native-docs/transactions/running-client-xact.html.md.erb
new file mode 100644
index 0000000..62759d8
--- /dev/null
+++ b/docs/geode-native-docs/transactions/running-client-xact.html.md.erb
@@ -0,0 +1,90 @@
+---
+title: Running a Transaction
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Before you can run a transaction, you must configure your clients and servers, define your server regions for your transactions, and define your client regions.
+
+1. Retrieve the transaction manager.
+
+ **C++ example**
+
+ ``` pre
+ CacheTransactionManagerPtr txManager =
+ cache->getCacheTransactionManager();
+ ```
+
+ **C\# .NET example**
+
+ ``` pre
+ CacheTransactionManager txManager =
+ cache.CacheTransactionManager;
+ ```
+
+2. Run the transaction. (Detailed steps follow the examples.)
+
+ **C++ example**
+
+ ``` pre
+ TransactionIdPtr tid;
+ txManager->begin();
+ // ..do work
+ tid = txManager->suspend();
+ // following code can be run from another
+ // thread that has access to tid
+ try {
+ txManager->resume(tid);
+ // ..do work
+ tid = txManager->commit();
+ } catch (const CommitConflictException& e) {
+ // ..on exception
+ }
+ ```
+
+ **C\# .NET example**
+
+ ``` pre
+ TransactionId tid;
+ txManager.Begin();
+ // ..do work
+ tid = txManager.Suspend();
+ // following code can be run from another
+ // thread that has access to tid
+ try {
+ txManager.Resume(tid);
+ // ..do work
+ txManager.Commit();
+ } catch (CommitConflictException e)
+ ```
+ - Start each transaction with a `begin` operation.
+ - If the transaction runs on server regions that are a mix of partitioned and replicated regions, perform the first transaction operation on a partitioned region. This sets the server data host for the entire transaction. If you are using PR single-hop, single-hop will be applied as usual to this first operation.
+ - Run the operations that you want included in the transaction.
+ - End the transaction with a `commit` or a `rollback`.
+ **Note:**
+ Do not leave any transaction in an uncommitted and unrolled back state unless you have suspended the transaction. Transactions that have not been explicitly suspended do not time out, so will remain in the system for the life of your application.
+
+3. Review all of your client code for compatibility with transactions.
+
+When you commit a transaction, while the commit is taking place, the changes are visible in the cache. This is also known as transition commits. This provides better performance than locking everything to do the transaction updates, but it means that another process accessing data used in the transaction might get some data in the pre-transaction state and some in the post-transaction state.
+
+For example, keys 1 and 2 are written to in a transaction so both of their values change from A to B. In another thread, it is possible to read key 1 with value B and key 2 with value A, while the transaction is being committed. This can happen because of how Geode performs reads. This choice sacrifices atomic visibility in favor of performance. Reads do not block writes. Writes do not block reads.
+
+Because the client cache waits during transaction execution, and client regions are not distributed, the only activities that interact with a client transaction are those that occur on the server.
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/transactions/running-native-client-xact.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/transactions/running-native-client-xact.html.md.erb b/docs/geode-native-docs/transactions/running-native-client-xact.html.md.erb
deleted file mode 100644
index 62759d8..0000000
--- a/docs/geode-native-docs/transactions/running-native-client-xact.html.md.erb
+++ /dev/null
@@ -1,90 +0,0 @@
----
-title: Running a Transaction
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Before you can run a transaction, you must configure your clients and servers, define your server regions for your transactions, and define your client regions.
-
-1. Retrieve the transaction manager.
-
- **C++ example**
-
- ``` pre
- CacheTransactionManagerPtr txManager =
- cache->getCacheTransactionManager();
- ```
-
- **C\# .NET example**
-
- ``` pre
- CacheTransactionManager txManager =
- cache.CacheTransactionManager;
- ```
-
-2. Run the transaction. (Detailed steps follow the examples.)
-
- **C++ example**
-
- ``` pre
- TransactionIdPtr tid;
- txManager->begin();
- // ..do work
- tid = txManager->suspend();
- // following code can be run from another
- // thread that has access to tid
- try {
- txManager->resume(tid);
- // ..do work
- tid = txManager->commit();
- } catch (const CommitConflictException& e) {
- // ..on exception
- }
- ```
-
- **C\# .NET example**
-
- ``` pre
- TransactionId tid;
- txManager.Begin();
- // ..do work
- tid = txManager.Suspend();
- // following code can be run from another
- // thread that has access to tid
- try {
- txManager.Resume(tid);
- // ..do work
- txManager.Commit();
- } catch (CommitConflictException e)
- ```
- - Start each transaction with a `begin` operation.
- - If the transaction runs on server regions that are a mix of partitioned and replicated regions, perform the first transaction operation on a partitioned region. This sets the server data host for the entire transaction. If you are using PR single-hop, single-hop will be applied as usual to this first operation.
- - Run the operations that you want included in the transaction.
- - End the transaction with a `commit` or a `rollback`.
- **Note:**
- Do not leave any transaction in an uncommitted and unrolled back state unless you have suspended the transaction. Transactions that have not been explicitly suspended do not time out, so will remain in the system for the life of your application.
-
-3. Review all of your client code for compatibility with transactions.
-
-When you commit a transaction, while the commit is taking place, the changes are visible in the cache. This is also known as transition commits. This provides better performance than locking everything to do the transaction updates, but it means that another process accessing data used in the transaction might get some data in the pre-transaction state and some in the post-transaction state.
-
-For example, keys 1 and 2 are written to in a transaction so both of their values change from A to B. In another thread, it is possible to read key 1 with value B and key 2 with value A, while the transaction is being committed. This can happen because of how Geode performs reads. This choice sacrifices atomic visibility in favor of performance. Reads do not block writes. Writes do not block reads.
-
-Because the client cache waits during transaction execution, and client regions are not distributed, the only activities that interact with a client transaction are those that occur on the server.
-
-
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb b/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
index 3dfeea0..e8f280b 100644
--- a/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
+++ b/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
@@ -29,6 +29,6 @@ If the member with the primary copy of the data crashes, the transactional view
If a suspended transaction is not touched for a period of time, Geode cleans it up automatically. By default, the timeout for a suspended transaction is 30 minutes and can be configured by using the `suspended-tx-timeout` property of the `geode.properties` file. The suspended transaction timeout value is specified in milliseconds.
-See [Running a Client Transaction](running-native-client-xact.html) for code examples that show a how to suspend and resume a transaction.
+See [Running a Client Transaction](running-client-xact.html) for code examples that show a how to suspend and resume a transaction.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/transactions/transactions.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/transactions/transactions.html.md.erb b/docs/geode-native-docs/transactions/transactions.html.md.erb
index d719f9b..dc56a4e 100644
--- a/docs/geode-native-docs/transactions/transactions.html.md.erb
+++ b/docs/geode-native-docs/transactions/transactions.html.md.erb
@@ -33,11 +33,11 @@ interactions of transactions with other operations running on the server tier,
server-side application plug-ins with transactions,
and querying with transactions.
-- **[How Client Transactions Work](how-native-client-xacts-work.html)**
+- **[How Client Transactions Work](how-client-xacts-work.html)**
The syntax for writing client transactions is the same as with server or peer transactions, but when a client performs a transaction, the transaction is delegated to a server that brokers the transaction.
-- **[Running a Client Transaction](running-native-client-xact.html)**
+- **[Running a Client Transaction](running-client-xact.html)**
Before you can run a client transaction, you must configure your clients and servers; define your server regions for your transactions; and define your client regions.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/type-mappings/chapter-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/type-mappings/chapter-overview.html.md.erb b/docs/geode-native-docs/type-mappings/chapter-overview.html.md.erb
new file mode 100644
index 0000000..45002c8
--- /dev/null
+++ b/docs/geode-native-docs/type-mappings/chapter-overview.html.md.erb
@@ -0,0 +1,30 @@
+---
+title: Interoperability of Language Classes and Types
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+This section provides a table that maps C++ class methods to corresponding .NET class methods and a table that maps Java types to .NET types.
+
+- **[C++ Class to .NET Class Mappings](cpp-class-to-dotnet-class-mappings.html)**
+
+- **[Java to .NET Type Mapping Table](java-to-dotnet-type-mapping.html)**
+
+
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/type-mappings/cpp-class-to-dotnet-class-mappings.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/type-mappings/cpp-class-to-dotnet-class-mappings.html.md.erb b/docs/geode-native-docs/type-mappings/cpp-class-to-dotnet-class-mappings.html.md.erb
new file mode 100644
index 0000000..cc843c0
--- /dev/null
+++ b/docs/geode-native-docs/type-mappings/cpp-class-to-dotnet-class-mappings.html.md.erb
@@ -0,0 +1,180 @@
+---
+title: C++ Class to .NET Class Mappings
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Wherever the native C++ class methods use pass-by-reference semantics to return data, the corresponding .NET methods shown in the following table return the object instead of using pass-by-reference semantics.
+
+<a id="concept_FD847E19497C4985ACB247C0FA2C2AD5__table_8D8D228E223E4E89A313A17DB5C38652"></a>
+
+<table>
+<colgroup>
+<col width="50%" />
+<col width="50%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th><p>C++ Class</p></th>
+<th><p>.NET Class</p></th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>class <code class="ph codeph">apache::geode::client::AttributesFactory</code></td>
+<td>Sealed class <code class="ph codeph">AttributesFactory</code></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::AttributesMutator</code></p></td>
+<td>Sealed class <code class="ph codeph">AttributesMutator</code></td>
+</tr>
+<tr class="odd">
+<td>class <code class="ph codeph">apache::geode::client::Cache</code></td>
+<td>Sealed class <code class="ph codeph">Cache</code></td>
+</tr>
+<tr class="even">
+<td><p>abstract class <code class="ph codeph">apache::geode::client::Cacheable</code></p></td>
+<td><p>Interface <code class="ph codeph">IPdxSerializable</code> or interface <code class="ph codeph">IGeodeSerializable</code></p></td>
+</tr>
+<tr class="odd">
+<td><p>class <code class="ph codeph">apache::geode::client::CacheableBytes</code></p></td>
+<td><p><code class="ph codeph">Byte[]</code> or <code class="ph codeph">ArrayList<Byte></code></p></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::Cacheableint32</code></p></td>
+<td><p><code class="ph codeph">Int32</code></p></td>
+</tr>
+<tr class="odd">
+<td><p>class <code class="ph codeph">apache::geode::client::CacheableString</code></p></td>
+<td><p><code class="ph codeph">String</code></p></td>
+</tr>
+<tr class="even">
+<td><p>abstract class <code class="ph codeph">apache::geode::client::CacheableKey</code></p></td>
+<td><p>You can use any type that implements <code class="ph codeph">hashcode</code> and <code class="ph codeph">equals</code>. The generic .NET built-in types are all suitable.</p></td>
+</tr>
+<tr class="odd">
+<td><p>abstract class <code class="ph codeph">apache::geode::client::CacheListener</code></p></td>
+<td><p>Interface <code class="ph codeph">ICacheListener</code></p></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::CacheLoader</code></p></td>
+<td><p>Interface <code class="ph codeph">ICacheLoader</code> plus static class <code class="ph codeph">CacheLoader</code></p></td>
+</tr>
+<tr class="odd">
+<td><p>class <code class="ph codeph">apache::geode::client::CacheWriter</code></p></td>
+<td><p>Interface class <code class="ph codeph">ICacheWriter</code></p></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::CacheFactory</code></p></td>
+<td><p>Sealed class <code class="ph codeph">CacheFactory</code></p></td>
+</tr>
+<tr class="odd">
+<td><p>class <code class="ph codeph">apache::geode::client::DataInput</code></p></td>
+<td><p>With <code class="ph codeph">IPdxSerializable</code>, <code class="ph codeph">IPdxReader.</code></p>
+<p>With <code class="ph codeph">IGeodeSerializable</code>, sealed class <code class="ph codeph">DataInput</code>.</p></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::DataOutput</code></p></td>
+<td><p>With <code class="ph codeph">IPdxSerializable</code>, <code class="ph codeph">IPdxWriter.</code></p>
+<p>With <code class="ph codeph">IGeodeSerializable</code>, sealed class <code class="ph codeph">DataOutput</code>.</p></td>
+</tr>
+<tr class="odd">
+<td><p>class <code class="ph codeph">apache::geode::client::DiskPolicyType</code></p></td>
+<td><p>enum <code class="ph codeph">DiskPolicyType</code> plus static class <code class="ph codeph">DiskPolicy</code> containing convenience methods for <code class="ph codeph">DiskPolicyType</code> enumeration</p></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::DistributedSystem</code></p></td>
+<td><p>Sealed class <code class="ph codeph">DistributedSystem</code></p></td>
+</tr>
+<tr class="odd">
+<td><p>class <code class="ph codeph">apache::geode::client::EntryEvent</code></p></td>
+<td><p>Sealed class <code class="ph codeph">EntryEvent</code></p></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::Exception</code></p></td>
+<td><p>Class <code class="ph codeph">GeodeException</code></p></td>
+</tr>
+<tr class="odd">
+<td><p>all other exceptions deriving from <code class="ph codeph">apache::geode::client::Exception</code></p></td>
+<td><p>Corresponding exceptions deriving from <code class="ph codeph">GeodeException</code></p></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::ExpirationAction</code></p></td>
+<td><p>enum <code class="ph codeph">ExpirationAction</code> plus static class <code class="ph codeph">Expiration</code> containing convenience methods for <code class="ph codeph">ExpirationAction</code> enumeration</p></td>
+</tr>
+<tr class="odd">
+<td><p>class <code class="ph codeph">apache::geode::client::Log</code></p></td>
+<td><p>Static class <code class="ph codeph">Log</code>. The native <code class="ph codeph">Log::log</code> method is mapped to <code class="ph codeph">Log.Write</code> to avoid the conflict with the class name which is reserved for the constructors of Log class. The various loglevel <code class="ph codeph">Throw</code> or <code class="ph codeph">Catch</code> methods are not implemented, since they are redundant to <code class="ph codeph">Log::Log</code> , <code class="ph codeph">Log::LogThrow</code>, and <code class="ph codeph">Log::LogCatch</code> methods that take <code class="ph codeph">LogLevel</code> as a parameter.</p></td>
+</tr>
+<tr class="even">
+<td><p>enum <code class="ph codeph">apache::geode::client::MemberType</code></p></td>
+<td><p>enum <code class="ph codeph">MemberType</code></p></td>
+</tr>
+<tr class="odd">
+<td><p>abstract class <code class="ph codeph">apache::geode::client::PersistanceManager</code></p></td>
+<td><p>Not provided. You can register a C++ implementation using <code class="ph codeph">AttributesFactory.SetPersistenceManager</code> but you cannot implement a new one in .NET</p></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::Properties</code></p></td>
+<td><p>Sealed class <code class="ph codeph">Properties</code></p></td>
+</tr>
+<tr class="odd">
+<td><p>class <code class="ph codeph">apache::geode::client::Properties::Visitor</code></p></td>
+<td><p>Delegate <code class="ph codeph">PropertiesVisitor</code></p></td>
+</tr>
+<tr class="even">
+<td><p>abstract class <code class="ph codeph">apache::geode::client::Region</code></p></td>
+<td><p>Class <code class="ph codeph">IRegion</code></p></td>
+</tr>
+<tr class="odd">
+<td><p>class <code class="ph codeph">apache::geode::client::RegionAttributes</code></p></td>
+<td><p>Sealed class <code class="ph codeph">RegionAttributes</code></p></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::ScopeType</code></p></td>
+<td><p>enum <code class="ph codeph">ScopeType</code> plus static class <code class="ph codeph">Scope</code> containing convenience methods for <code class="ph codeph">ScopeType</code> enumeration+</p></td>
+</tr>
+<tr class="odd">
+<td><p>abstract class <code class="ph codeph">apache::geode::client::Serializable</code></p></td>
+<td><p>Two options:</p>
+<ul>
+<li><p>Interface <code class="ph codeph">IPdxSerializable</code></p></li>
+<li><p>Interface <code class="ph codeph">IGeodeSerializable</code> plus wrapper <code class="ph codeph">Serializable</code> class for native <code class="ph codeph">Serializable</code> and <code class="ph codeph">UserData</code> objects. The native <code class="ph codeph">toString</code> method is not provided, since the <code class="ph codeph">ToString</code> method of the base object class provides the same functionality.</p></li>
+</ul></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::SystemProperties</code></p></td>
+<td><p>Sealed class <code class="ph codeph">SystemProperties</code></p></td>
+</tr>
+<tr class="odd">
+<td><p>class <code class="ph codeph">apache::geode::client::UserData</code></p></td>
+<td><p>Two options:</p>
+<ul>
+<li><p>Interface <code class="ph codeph">IPdxSerializable</code></p></li>
+<li><p>Interface <code class="ph codeph">IGeodeSerializable</code></p></li>
+</ul></td>
+</tr>
+<tr class="even">
+<td><p>class <code class="ph codeph">apache::geode::client::VectorT<T></code></p></td>
+<td><p>Array of the given type, such as T[]</p></td>
+</tr>
+</tbody>
+</table>
+
+<span class="tablecap">Table 1. C++ Class to .NET Class Mappings</span>
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/type-mappings/java-to-dotnet-type-mapping.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/type-mappings/java-to-dotnet-type-mapping.html.md.erb b/docs/geode-native-docs/type-mappings/java-to-dotnet-type-mapping.html.md.erb
new file mode 100644
index 0000000..faf90cf
--- /dev/null
+++ b/docs/geode-native-docs/type-mappings/java-to-dotnet-type-mapping.html.md.erb
@@ -0,0 +1,163 @@
+---
+title: Java to .NET Type Mapping Table
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+The following table provides a mapping between Java and .NET types.
+
+<a id="concept_24D0AAC71FF1483AB47A7772DA018966__table_F85EC7AA1E1140E9888B753E812E65E4"></a>
+
+<table>
+<colgroup>
+<col width="50%" />
+<col width="50%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th>Java Type</th>
+<th>.NET Type</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td><p>instances of <code class="ph codeph">PdxSerializable</code></p></td>
+<td><p>.NET class of same name</p></td>
+</tr>
+<tr class="even">
+<td><p>instances of <code class="ph codeph">PdxInstance</code></p></td>
+<td><p>.NET class of same name</p></td>
+</tr>
+<tr class="odd">
+<td><p>instances serialized by a <code class="ph codeph">PdxSerializer</code></p></td>
+<td><p>.NET class of same name</p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">java.lang.Byte </code></p></td>
+<td><p><code class="ph codeph">System.SByte </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">java.lang.Boolean </code></p></td>
+<td><p><code class="ph codeph">System.Boolean </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">java.lang.Character </code></p></td>
+<td><p><code class="ph codeph">System.Char </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">java.lang.Short </code></p></td>
+<td><p><code class="ph codeph">System.Int16 </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">java.lang.Integer </code></p></td>
+<td><p><code class="ph codeph">System.Int32 </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">java.lang.Long </code></p></td>
+<td><p><code class="ph codeph">System.Int64 </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">java.lang.Float </code></p></td>
+<td><p><code class="ph codeph">System.Float </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">java.lang.Double </code></p></td>
+<td><p><code class="ph codeph">System.Double </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">java.lang.String </code></p></td>
+<td><p><code class="ph codeph">System.String </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">java.util.Date </code></p></td>
+<td><p><code class="ph codeph">System.DateTime </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">byte[] </code></p></td>
+<td><p><code class="ph codeph">System.Byte[] </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">boolean[] </code></p></td>
+<td><p><code class="ph codeph">System.Boolean[] </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">char[] </code></p></td>
+<td><p><code class="ph codeph">System.Char[] </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">short[] </code></p></td>
+<td><p><code class="ph codeph">System.Int16[] </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">int[] </code></p></td>
+<td><p><code class="ph codeph">System.Int32[] </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">long[] </code></p></td>
+<td><p><code class="ph codeph">System.Int64[] </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">float[] </code></p></td>
+<td><p><code class="ph codeph">System.Float[] </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">double[] </code></p></td>
+<td><p><code class="ph codeph">System.Double[] </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">String[] </code></p></td>
+<td><p><code class="ph codeph">System.String[] </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">byte[][] </code></p></td>
+<td><p><code class="ph codeph">System.Byte[][] </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">Object[] </code></p></td>
+<td><p><code class="ph codeph">system.Collections.Generic.List<Object> </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">java.util.HashMap </code></p></td>
+<td><p><code class="ph codeph">System.Collections.Generics.IDictionary<Object, Object> </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">java.util.Hashtable </code></p></td>
+<td><p><code class="ph codeph">System.Collections.Hashtable </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">java.util.ArrayList </code></p></td>
+<td><p><code class="ph codeph">System.Collections.Generic.IList<Object> </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">java.util.Vector </code></p></td>
+<td><p><code class="ph codeph">Collections.ArrayList </code></p></td>
+</tr>
+<tr class="odd">
+<td><p><code class="ph codeph">java.util.HashSet </code></p></td>
+<td><p><code class="ph codeph">CacheableHashSet </code></p></td>
+</tr>
+<tr class="even">
+<td><p><code class="ph codeph">java.util.LinkedHashSet </code></p></td>
+<td><p><code class="ph codeph">CacheableLinkedHashSet </code></p></td>
+</tr>
+</tbody>
+</table>
+
+<span class="tablecap">**Table 1.** Java types and .NET types</span>
+
+
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1dbe9e61/docs/geode-native-docs/type_mappings/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/type_mappings/chapter_overview.html.md.erb b/docs/geode-native-docs/type_mappings/chapter_overview.html.md.erb
deleted file mode 100644
index 45002c8..0000000
--- a/docs/geode-native-docs/type_mappings/chapter_overview.html.md.erb
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: Interoperability of Language Classes and Types
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-This section provides a table that maps C++ class methods to corresponding .NET class methods and a table that maps Java types to .NET types.
-
-- **[C++ Class to .NET Class Mappings](cpp-class-to-dotnet-class-mappings.html)**
-
-- **[Java to .NET Type Mapping Table](java-to-dotnet-type-mapping.html)**
-
-
-
-