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:38 UTC

[7/7] geode-native git commit: GEODE-2513: Rename and reorganize client doc sources This closes #85

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.