geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbar...@apache.org
Subject [1/2] geode-native git commit: GEODE-2513 Unbrand C++ API docs: Getting Started section This closes #73
Date Mon, 27 Mar 2017 17:52:25 GMT
Repository: geode-native
Updated Branches:
  refs/heads/develop 8b67c1306 -> 273a1f291


GEODE-2513 Unbrand C++ API docs: Getting Started section
This closes #73


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

Branch: refs/heads/develop
Commit: da49cbaa0fd98dfff73aec6df30a93dc734ee2dd
Parents: 43a724a
Author: Dave Barnes <dbarnes@pivotal.io>
Authored: Thu Mar 23 16:26:05 2017 -0700
Committer: Dave Barnes <dbarnes@pivotal.io>
Committed: Mon Mar 27 10:48:55 2017 -0700

----------------------------------------------------------------------
 .../source/subnavs/geode-nc-nav.erb             |  78 +++-----
 .../about_native_client_users_guide.html.md.erb |   2 -
 .../#client_requirements.html.md.erb#           | 194 ++++++++++++++++++
 .../client_requirements.html.md.erb             | 196 -------------------
 .../client_configurations.html.md.erb           | 164 ++++++++++++++++
 .../introduction/developing-linux.html.md.erb   |  46 ++---
 .../introduction/developing-solaris.html.md.erb |  24 +--
 .../introduction/developing-windows.html.md.erb |  24 +--
 .../examples-quickstart.html.md.erb             |  32 ---
 .../introduction/install-overview.html.md.erb   |  31 ++-
 .../native-client-intro.html.md.erb             |  20 +-
 .../native-client-overview.html.md.erb          |  14 +-
 .../introduction/product-examples.html.md.erb   |  36 ----
 .../introduction/quickstart.html.md.erb         | 110 +++++------
 .../running-client-apps.html.md.erb             |   8 +-
 15 files changed, 524 insertions(+), 455 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/da49cbaa/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 063461f..73144d9 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,57 +20,43 @@ limitations under the License.
     <div class="nav-content">
         <ul>
             <li>
-                <a href="/docs/guide-native/11/about_native_client_users_guide.html">Pivotal GemFire Native Client 9.0 Documentation</a>
+                <a href="/docs/guide-native/11/about_native_client_users_guide.html">Apache Geode Client Documentation</a>
             </li>
         </ul>
         <ul>
-            <li>
-                <a href="/docs/guide-native/11/getting_started/system_requirements/client_requirements.html">Supported Configurations and System Requirements</a>
-            </li>
+        <li>
+            <a href="/docs/guide-native/11/introduction/native-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 a Native Client</a>
-                        <ul>
-                            <li>
-                                <a href="/docs/guide-native/11/introduction/native-client-overview.html">About the Native Client</a>
-                            </li>
-                            <li>
-                                <a href="/docs/guide-native/11/introduction/install-overview.html">Installing the Native Client</a>
-                            </li>
-                            <li class="has_submenu">
-                                <a href="/docs/guide-native/11/introduction/running-client-apps.html">Running Native Client Applications</a>
-                                <ul>
-                                    <li>
-                                        <a href="/docs/guide-native/11/introduction/developing-linux.html">Developing C++ Programs on Linux</a>
-                                    </li>
-                                    <li>
-                                        <a href="/docs/guide-native/11/introduction/developing-solaris.html">Developing C++ Programs on Solaris</a>
-                                    </li>
-                                    <li>
-                                        <a href="/docs/guide-native/11/introduction/developing-windows.html">Developing C++ Programs on Windows</a>
-                                    </li>
-                                </ul>
-                            </li>
-                            <li class="has_submenu">
-                                <a href="/docs/guide-native/11/introduction/quickstart.html">QuickStart Examples</a>
-                                <ul>
-                                    <li>
-                                        <a href="/docs/guide-native/11/introduction/quickstart.html#ConfiguringQSE">Configuring the QuickStart Environment</a>
-                                    </li>
-                                    <li>
-                                        <a href="/docs/guide-native/11/introduction/quickstart.html#AboutQSE">About the QuickStart Examples</a>
-                                    </li>
-                                    <li>
-                                        <a href="/docs/guide-native/11/introduction/quickstart.html#RunningQSE">Running the Examples</a>
-                                    </li>
-                                    <li>
-                                        <a href="/docs/guide-native/11/introduction/quickstart.html#BuildingQSE">Building the Examples</a>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </li>
+        <li class="has_submenu">
+            <a href="/docs/guide-native/11/introduction/native-client-intro.html">Getting Started with the Client</a>
+            <ul>
+                <li>
+                    <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>
+                </li>
+                <li class="has_submenu">
+                    <a href="/docs/guide-native/11/introduction/quickstart.html">QuickStart Examples</a>
+                    <ul>
+                        <li>
+                            <a href="/docs/guide-native/11/introduction/quickstart.html#ConfiguringQSE">Configuring the QuickStart Environment</a>
+                        </li>
+                        <li>
+                            <a href="/docs/guide-native/11/introduction/quickstart.html#AboutQSE">About the QuickStart Examples</a>
+                        </li>
+                        <li>
+                            <a href="/docs/guide-native/11/introduction/quickstart.html#RunningQSE">Running the Examples</a>
+                        </li>
+                        <li>
+                            <a href="/docs/guide-native/11/introduction/quickstart.html#BuildingQSE">Building the Examples</a>
+                        </li>
+                    </ul>
+                </li>
+            </ul>
+        </li>
                     <li class="has_submenu">
                         <a href="/docs/guide-native/11/setting-properties/chapter-overview.html">Setting System Properties</a>
                         <ul>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da49cbaa/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/about_native_client_users_guide.html.md.erb b/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
index 538c284..b04421b 100644
--- a/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
+++ b/docs/geode-native-docs/about_native_client_users_guide.html.md.erb
@@ -23,8 +23,6 @@ Published April 1, 2017
 
 This documentation provides step-by-step procedures for installation, configuration, and development of clients.
 
--   **[Supported Configurations and System Requirements](getting_started/system_requirements/client_requirements.html)**
-
 -   **[C++ and .NET API](http://geode.apache.org/docs/)**
 
 -   **[Getting Started with a Client](introduction/native-client-intro.html)**

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da49cbaa/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#
new file mode 100644
index 0000000..37bade1
--- /dev/null
+++ b/docs/geode-native-docs/getting_started/system_requirements/#client_requirements.html.md.erb#
@@ -0,0 +1,194 @@
+---
+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�� .NET���� 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/da49cbaa/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 0df91cd..0000000
--- a/docs/geode-native-docs/getting_started/system_requirements/client_requirements.html.md.erb
+++ /dev/null
@@ -1,196 +0,0 @@
----
-title:  GemFire Native Client Supported 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 Pivotal GemFire native client provides access for C++ and Microsoft® .NET™ clients to the GemFire distributed system. It operates on platforms running Microsoft Windows, Linux (Intel), and Sun Solaris.
-
-Native Client version 9.0 works with Pivotal GemFire versions 8.2.1 and later.
-
-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/da49cbaa/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™ 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/da49cbaa/docs/geode-native-docs/introduction/developing-linux.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/developing-linux.html.md.erb b/docs/geode-native-docs/introduction/developing-linux.html.md.erb
index 9341daf..aad075e 100644
--- a/docs/geode-native-docs/introduction/developing-linux.html.md.erb
+++ b/docs/geode-native-docs/introduction/developing-linux.html.md.erb
@@ -19,25 +19,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-This section describes how to build and run a native client application on Linux.
+This section describes how to build and run a client application on Linux.
 
-**Note:** When compiling external projects or applications that are used or referenced by the Geode native client, make sure that you compile them for the same target architecture as your native client installation. For example, if you installed the 64-bit (x86) version of the native client, compile your external projects for 64-bit (x86) architecture.
+**Note:** When compiling external projects or applications that are used or referenced by the Geode client, make sure that you compile them for the same target architecture as your client installation. For example, if you installed the 64-bit (x86) version of the client, compile your external projects for 64-bit (x86) architecture.
 
 ## <a id="developing-linux__section_4AD6E18611AE42E9942C77DF91347768" class="no-quick-link"></a>Step 1. Set Environment Variables
 
-Set the native client environment variables on each Linux host. For each case, *product-dir* is the path to the native client product directory.
+Set the client environment variables on each Linux host. For each case, *product-dir* is the path to the client product directory.
 
 **For Bourne and Korn shells (sh, ksh, bash)**
 
 <code>
-GFCPP=_product-dir_;export GFCPP<br />
-PATH=$GFCPP/bin:$PATH;export PATH<br />
-LD\_LIBRARY\_PATH=$GFCPP/lib:$LD\_LIBRARY\_PATH;export LD\_LIBRARY\_PATH
+GEODE=_product-dir_;export GEODE<br />
+PATH=$GEODE/bin:$PATH;export PATH<br />
+LD\_LIBRARY\_PATH=$GEODE/lib:$LD\_LIBRARY\_PATH;export LD\_LIBRARY\_PATH
 </code>
 
-## <a id="developing-linux__section_EFE9D42B05B44F2F958054224BCC5F76" class="no-quick-link"></a>Step 2. Compile C++ Clients and Dynamically Link Them to the GemFire Library
+## <a id="developing-linux__section_EFE9D42B05B44F2F958054224BCC5F76" class="no-quick-link"></a>Step 2. Compile C++ Clients and Dynamically Link Them to the Geode Library
 
-On Linux, the `g++` compiler is supported. To build and link a C++ client to GemFire on Linux, the compilation command line must include the arguments listed in the following table.
+On Linux, the `g++` compiler is supported. To build and link a C++ client to Geode on Linux, the compilation command line must include the arguments listed in the following table.
 
 <a id="developing-linux__compiler-arguments-linux"></a>
 
@@ -45,22 +45,22 @@ On Linux, the `g++` compiler is supported. To build and link a C++ client to Gem
 |--------------------|----------------------------------------------------------|
 | `-D_REENTRANT`     | Required to compile Linux programs in a thread-safe way. |
 | `-m32` or `-m64`   | Enables 32-bit or 64-bit compilation.                    |
-| `-I$GFCPP/include` | Specifies the native client `include` directory.         |
+| `-I$GEODE/include` | Specifies the client `include` directory.         |
 
 
-The following table lists the linker switches that must be present on the command line when dynamically linking to the GemFire library.
+The following table lists the linker switches that must be present on the command line when dynamically linking to the Geode library.
 
 <a id="developing-linux__table_216E9E87FBB44E39BE26388317F3ACE4"></a>
 
 | Argument            | Explanation                                                                                        |
 |---------------------|----------------------------------------------------------------------------------------------------|
-| `-rpath $GFCPP/lib` | Tells the linker to look in `$GFCPP/lib` for libraries on which the native client library depends. |
-| `-L$GFCPP/lib`      | Tells the linker where to find the named libraries.                                                |
+| `-rpath $GEODE/lib` | Tells the linker to look in `$GEODE/lib` for libraries on which the client library depends. |
+| `-L$GEODE/lib`      | Tells the linker where to find the named libraries.                                                |
 | `-o durableclient`  | Tells the linker to output an object file named 'durableclient'.                                   |
-| `-lgfcppcache`      | Links the native client C++ cache library to the compiled executable.                              |
+| `-lgfcppcache`      | Links the client C++ cache library to the compiled executable.                              |
 
 
-The following examples compile and link the `$GFCPP/SampleCode/quickstart/cpp/DurableClient.cpp` client to the `durableclient` output file.
+The following examples compile and link the `$GEODE/SampleCode/quickstart/cpp/DurableClient.cpp` client to the `durableclient` output file.
 
 **Compiling and Dynamically Linking on Linux for 32-bit**
 
@@ -70,12 +70,12 @@ g++ \
 -03 \
 -Wall \
 -m32 \
--I$GFCPP/include \
+-I$GEODE/include \
 cpp/DurableClient.cpp \
 cpp/plugins/DurableCacheListener.cpp \
 -o cpp/DurableClient \
--L$GFCPP/lib \
--Wl,-rpath,$GFCPP/lib \
+-L$GEODE/lib \
+-Wl,-rpath,$GEODE/lib \
 -lgfcppcache
 ```
 
@@ -87,17 +87,17 @@ g++ \
 -03 \
 -Wall \
 -m64 \
--I$GFCPP/include \
+-I$GEODE/include \
 cpp/DurableClient.cpp \
 cpp/plugins/DurableCacheListener.cpp \
 -o cpp/DurableClient \
--L$GFCPP/lib \
--Wl,-rpath,$GFCPP/lib \
+-L$GEODE/lib \
+-Wl,-rpath,$GEODE/lib \
 -lgfcppcache
 ```
 
-## <a id="developing-linux__section_60711FB51F0546D48C0BE84C1EB1D379" class="no-quick-link"></a>Step 3. Make Sure the Native Client Library Can Be Loaded
+## <a id="developing-linux__section_60711FB51F0546D48C0BE84C1EB1D379" class="no-quick-link"></a>Step 3. Make Sure the Client Library Can Be Loaded
 
-When the C++ application is dynamically linked to the native client library, the library must be dynamically loadable.
+When the C++ application is dynamically linked to the client library, the library must be dynamically loadable.
 
-To ensure that the native client library is available for loading, make sure you have added the path *product-dir*`/lib` to the LD\_LIBRARY\_PATH environment variable, where *product-dir* is the path to the Geode product directory.
+To ensure that the client library is available for loading, make sure you have added the path *product-dir*`/lib` to the LD\_LIBRARY\_PATH environment variable, where *product-dir* is the path to the Geode product directory.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da49cbaa/docs/geode-native-docs/introduction/developing-solaris.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/developing-solaris.html.md.erb b/docs/geode-native-docs/introduction/developing-solaris.html.md.erb
index a8ffabf..e4da54f 100644
--- a/docs/geode-native-docs/introduction/developing-solaris.html.md.erb
+++ b/docs/geode-native-docs/introduction/developing-solaris.html.md.erb
@@ -19,25 +19,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-This section describes how to build and run a native client application on Solaris.
+This section describes how to build and run a client application on Solaris.
 
 ## <a id="developing-solaris__section_B518757C7D7A405F9E43C1232C2D6B56" class="no-quick-link"></a>Step 1. Set Environment Variables
 
-**Note:** When compiling external projects or applications that are used or referenced by the native client, make sure that you compile them for the same target architecture as your native client installation. For example, if you installed the 32-bit (x86) version of the native client, compile your external projects for 32-bit (x86) architecture.
+**Note:** When compiling external projects or applications that are used or referenced by the client, make sure that you compile them for the same target architecture as your client installation. For example, if you installed the 32-bit (x86) version of the client, compile your external projects for 32-bit (x86) architecture.
 
-Set the native client environment variables on each Solaris host. For each case, *product-dir* is the path to the native client product directory.
+Set the client environment variables on each Solaris host. For each case, *product-dir* is the path to the client product directory.
 
 **For Bourne and Korn shells (sh, ksh, bash)**
 
 <code>
-GFCPP=_product-dir_; export GFCPP<br />
-PATH=$GFCPP/bin:$PATH;export PATH<br />
-LD\_LIBRARY\_PATH=$GFCPP/lib:$LD\_LIBRARY\_PATH;export LD\_LIBRARY\_PATH
+GEODE=_product-dir_; export GEODE<br />
+PATH=$GEODE/bin:$PATH;export PATH<br />
+LD\_LIBRARY\_PATH=$GEODE/lib:$LD\_LIBRARY\_PATH;export LD\_LIBRARY\_PATH
 </code>
 
-## <a id="developing-solaris__section_15D24DFEFE024690A2652A4DC17EFFFB" class="no-quick-link"></a>Step 2. Compile C++ Clients and Dynamically Link to Them to Native Client Library
+## <a id="developing-solaris__section_15D24DFEFE024690A2652A4DC17EFFFB" class="no-quick-link"></a>Step 2. Compile C++ Clients and Dynamically Link to Them to Client Library
 
-Version 5.9 of the *SUNpro* compiler is supported on Solaris. The linker switches vary according to whether you are statically linking to the native client library.
+Version 5.9 of the *SUNpro* compiler is supported on Solaris. The linker switches vary according to whether you are statically linking to the client library.
 
 To build and link a C++ client on Solaris, the compilation command line must include the appropriate arguments from this table.
 
@@ -50,12 +50,12 @@ To build and link a C++ client on Solaris, the compilation command line must inc
 | `-xarch=v9`                                                                                    | Enables 64-bit compilation.                                |
 | `-ldl`; `-lpthread`; `-lc`; `-lm`; `-lsocket`; `-lrt`; `-lnsl`; `-ldemangle`; `-lkstat`; `-lz` | Additional libraries.                                      |
 | `-library=stlport4`                                                                            | Solaris library compilation.                               |
-| `-I$ GFCPP /include`                                                                           | Specifies the GemFire include directory.                   |
+| `-I$ GEODE /include`                                                                           | Specifies the Geode include directory.                   |
 
 
 
-## <a id="developing-solaris__section_81557A11797047A7941B47D44D1566AA" class="no-quick-link"></a>Step 3. Make Sure the Native Client Library Can Be Loaded
+## <a id="developing-solaris__section_81557A11797047A7941B47D44D1566AA" class="no-quick-link"></a>Step 3. Make Sure the Client Library Can Be Loaded
 
-When a C++ application is not statically linked to the native client library, the library must be dynamically loadable.
+When a C++ application is not statically linked to the client library, the library must be dynamically loadable.
 
-To verify that the native client library is available for loading, make sure you have added the path *product-dir*`/lib` to the LD\_LIBRARY\_PATH environment variable, where *product-dir* is the path to the Geode product directory.
+To verify that the client library is available for loading, make sure you have added the path *product-dir*`/lib` to the LD\_LIBRARY\_PATH environment variable, where *product-dir* is the path to the Geode product directory.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da49cbaa/docs/geode-native-docs/introduction/developing-windows.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/developing-windows.html.md.erb b/docs/geode-native-docs/introduction/developing-windows.html.md.erb
index 36ef924..5dc4820 100644
--- a/docs/geode-native-docs/introduction/developing-windows.html.md.erb
+++ b/docs/geode-native-docs/introduction/developing-windows.html.md.erb
@@ -21,18 +21,18 @@ limitations under the License.
 
 Geode uses the Visual Studio 2010 Service Pack 1 compiler for C++ programs on Windows, which invokes Microsoft<sup>®</sup> `cl.exe` from the command line at compile time.
 
-The Geode native client supports .NET 4.0 and Visual Studio 2010. For advantages and more information on the features of .NET 4.0 and Visual Studio 2010 SP1, see [http://msdn.microsoft.com/en-us/library/dd831853(v=vs.100).aspx](http://msdn.microsoft.com/en-us/library/dd831853(v=vs.100).aspx) and [http://msdn.microsoft.com/en-us/library/vstudio/w0x726c2(v=vs.100).aspx](http://msdn.microsoft.com/en-us/library/vstudio/w0x726c2(v=vs.100).aspx).
+The Geode client supports .NET 4.0 and Visual Studio 2010. For advantages and more information on the features of .NET 4.0 and Visual Studio 2010 SP1, see [http://msdn.microsoft.com/en-us/library/dd831853(v=vs.100).aspx](http://msdn.microsoft.com/en-us/library/dd831853(v=vs.100).aspx) and [http://msdn.microsoft.com/en-us/library/vstudio/w0x726c2(v=vs.100).aspx](http://msdn.microsoft.com/en-us/library/vstudio/w0x726c2(v=vs.100).aspx).
 
 Visual Studio 2010 SP1 is the recommended compiler. If you are using any other compiler, contact technical support for assistance.
 
-**Note:** When compiling external projects or applications that are used or referenced by the native client, make sure that you compile them for the same target architecture as your native client installation. For example, if you installed the 32-bit (x86) version of the native client, compile your external projects for 32-bit (x86) architecture.
+**Note:** When compiling external projects or applications that are used or referenced by the client, make sure that you compile them for the same target architecture as your client installation. For example, if you installed the 32-bit (x86) version of the client, compile your external projects for 32-bit (x86) architecture.
 
-## <a id="developing-windows__section_6BFD4982A7144301A03F948CFF953AFD" class="no-quick-link"></a>Step 1. Installer Sets Up Environment Variables
+## <a id="developing-windows__section_6BFD4982A7144301A03F948CFF953AFD" class="no-quick-link"></a>Step 1. Set Up Environment Variables
 
-When you install on Windows, the installer performs these tasks:
+After you have built the client libraries on  Windows, perform these tasks:
 
--   Sets the *GFCPP* environment variable to *product-dir*, where *product-dir* is the path to the native client product directory.
--   Adds the *%GFCPP%\\bin* executable directory to the Windows PATH environment variable.
+-   Set the *GEODE* environment variable to *product-dir*, where *product-dir* is the path to the client product directory.
+-   Add the *%GEODE%\\bin* executable directory to the Windows PATH environment variable.
 
 ## <a id="developing-windows__section_0BF2BE9A38BC40D1B9FAD2AC8DBFAB0E" class="no-quick-link"></a>Step 2. Choose 32-bit or 64-bit Command-line Prompt
 
@@ -46,7 +46,7 @@ Start &gt; Programs &gt; Microsoft Visual Studio 2010 &gt; Visual Studio Tools &
 
 To build using the Microsoft Visual Studio Interface, from the Solutions Platform, choose **Win32** or **x86** from the Build menu for 32-bit builds or x64 for a 64-bit build.
 
-## <a id="developing-windows__section_597B20DBE5FD4F66A6BCB2A09C04C9C9" class="no-quick-link"></a>Step 3. Compile C++ Clients and Dynamically Link Them to Native Client Library
+## <a id="developing-windows__section_597B20DBE5FD4F66A6BCB2A09C04C9C9" class="no-quick-link"></a>Step 3. Compile C++ Clients and Dynamically Link Them to Client Library
 
 The following table lists the compiler and linker switches that must be present on the `cl.exe` command line.
 
@@ -60,14 +60,14 @@ If you want to use the Visual Studio user interface instead of invoking `cl.exe`
 | `/MD`                             | Memory model.                                                                                                         |
 | `/EHsc`                           | Catches C++ exceptions only and tells the compiler to assume that \*extern\* C functions never throw a C++ exception. |
 | `/GR`                             | Runtime type information.                                                                                             |
-| `-I%GFCPP%\include`               | Specifies the Geode `include` directory.                                                 |
-| `%GFCPP%\lib\gfcppcache.lib`      | Specifies the library file for the shared library.                                                                    |
+| `-I%GEODE%\include`               | Specifies the Geode `include` directory.                                                 |
+| `%GEODE%\lib\gfcppcache.lib`      | Specifies the library file for the shared library.                                                                    |
 | `/D_CRT_SECURE_NO_DEPRECATE`      | Suppresses warnings. Required for Visual Studio 2010.                                                                 |
 | `/D_CRT_NON_CONFORMING_SWPRINTFS` | Suppresses warnings. Required for Visual Studio 2010.                                                                 |
 
 
-## <a id="developing-windows__section_B66588EC7C6F4D9BA772406CFD5F3EAE" class="no-quick-link"></a>Step 4. Verify that You Can Load the Native Client Library
+## <a id="developing-windows__section_B66588EC7C6F4D9BA772406CFD5F3EAE" class="no-quick-link"></a>Step 4. Verify that You Can Load the Client Library
 
-Because Geode does not provide a library that can be linked statically into an application on Windows, you must dynamically link to the native client library.
+Because Geode does not provide a library that can be linked statically into an application on Windows, you must dynamically link to the client library.
 
-To make the native client library available for loading, verify that the directory <code>_product-dir_/bin</code> is included in the PATH environment variable, where *product-dir* is the path to the Geode product directory.
+To make the client library available for loading, verify that the directory <code>_product-dir_/bin</code> is included in the PATH environment variable, where *product-dir* is the path to the Geode product directory.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da49cbaa/docs/geode-native-docs/introduction/examples-quickstart.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/examples-quickstart.html.md.erb b/docs/geode-native-docs/introduction/examples-quickstart.html.md.erb
deleted file mode 100644
index 3899f15..0000000
--- a/docs/geode-native-docs/introduction/examples-quickstart.html.md.erb
+++ /dev/null
@@ -1,32 +0,0 @@
----
-title:  QuickStart Examples and Guide
----
-
-<!--
-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.
--->
-
-Run the native client QuickStart examples and read the QuickStart Guide to understand native client functionality.
-
--   **[Running the QuickStart Examples](product-examples.html)**
-
-    The QuickStart examples demonstrate the capabilities of the native client, and they provide source code so you can examine how each example is designed. C++ and C\# examples demonstrate how the native client performs as a C++ or C\# client.
-
--   **[Accessing the QuickStart Guide](quickstart.html)**
-
-    The QuickStart Guide for the native client consists of a set of compact programming samples that demonstrate both C++ and C\# client operations.
-
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da49cbaa/docs/geode-native-docs/introduction/install-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/install-overview.html.md.erb b/docs/geode-native-docs/introduction/install-overview.html.md.erb
index f04c80d..3ffaafc 100644
--- a/docs/geode-native-docs/introduction/install-overview.html.md.erb
+++ b/docs/geode-native-docs/introduction/install-overview.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  Installing the Native Client
+title:  Installing the Client
 ---
 
 <!--
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-To install the Geode Native Client, you build the client libraries from a source distribution.
+To install the Geode Client, you build the client libraries from a source distribution.
 To build the client libraries:
 
   1. Download the source distribution.
@@ -28,13 +28,13 @@ To build the client libraries:
 
 # Download the Source Distribution
 
-Download Geode Native Client sources from the [Releases page of the Apache Geode
+Download Geode Client sources from the [Releases page of the Apache Geode
 website](http://geode.apache.org/releases/) and unpack the archive in a location of your choice.
 For example, if your downloaded archive is named `apache-geode-src-1.1.0.tar.gz` and your target
-directory is represented by _geode-native-installdir_:
+directory is represented by _geode-client-installdir_:
 
   ```
-  $ cd geode-native-installdir
+  $ cd geode-client-installdir
   $ tar xvzf ~/Downloads/apache-geode-src-1.1.0.tar.gz
   x ./
   x ./geode-native
@@ -49,7 +49,7 @@ information and `README.md` for general information.
 
 # Prerequisites
 
-In order to build the Geode Native Client libraries, your system must provide certain prerequisites:
+In order to build the Geode Client libraries, your system must provide certain prerequisites:
 
   - Compatible operating system
   - Apache Geode
@@ -62,23 +62,18 @@ See the following sections for details.
 
 ## Operating Systems
 
-The following operating systems are known to be compatible with the Apache Geode Native Client. 
+The following operating systems are known to be compatible with the Apache Geode Client. 
 The list is not exhaustive, others may also work.
 
 | Operating System | Version |
 |------------------|---------|
-| Linux            | RHEL/CentOS 6 |
-|                  | RHEL/CentOS 7 |
-|                  | SLES 11 |
+| Linux            | RHEL/CentOS 7 |
 |                  | SLES 12 |
-| Windows          | Windows 8.1 64-bit |
 |                  | Windows 10 64-bit |
 |                  | Windows Server 2012 64-bit |
 |                  | Windows Server 2012 R2 64-bit |
 | macOS            | MacOS 10.12 (Sierra) |
-| Solaris          | Solaris 10 SPARC |
-|                  | Solaris 10 x86 |
-|                  | Solaris 11 SPARC |
+| Solaris          | Solaris 11 SPARC |
 |                  | Solaris 11 x86 |
 
 
@@ -93,7 +88,7 @@ is installed, define `GEODE_ROOT=/path/to/geode` in your initial `cmake` configu
 
 ## CMake
 
-CMake version 3.4 or newer is required to build the native client and its QuickStart examples. To download and install
+CMake version 3.4 or newer is required to build the Geode client and its QuickStart examples. To download and install
 CMake, follow the instructions on [cmake.org] (https://cmake.org).
 
 CMake uses a "generator" to produce configuration files for use by a variety of build tools, such as
@@ -144,12 +139,12 @@ You may find some optional tools to be helpful in certain environments. Here are
 
 # Build and Install
 
-The Geode Native source distribution comes with CMake files for building and installing the client libraries.
+The Geode source distribution comes with CMake files for building and installing the client libraries.
 
 CMake uses a default system-specific location as the destination of the `install` target, for
 example, `/usr/local` on Unix systems. (On Unix systems, you may need to execute your `cmake`
 commands using `sudo` to allow CMake to write output files to protected locations, such as
-`/usr/local`.) To explicitly specify the location in which the Native Client will be installed,
+`/usr/local`.) To explicitly specify the location in which the Geode Client will be installed,
 define `CMAKE_INSTALL_PREFIX=/install-destination` in the initial `cmake` configuration command.
 
 To build and install the client libraries:
@@ -157,7 +152,7 @@ To build and install the client libraries:
   1. Create a build directory and set it as the current working directory.
 
     ```
-    $ cd geode-native-installdir
+    $ cd geode-client-installdir
     $ mkdir build
     $ cd build
     ```

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da49cbaa/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
index bf00249..1327727 100644
--- a/docs/geode-native-docs/introduction/native-client-intro.html.md.erb
+++ b/docs/geode-native-docs/introduction/native-client-intro.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  Getting Started with a Native Client
+title:  Getting Started with the Client
 ---
 
 <!--
@@ -19,24 +19,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-This section gives you a conceptual overview of the native client. It shows you how to install the product, build native client applications on various platforms, and run the product examples.
+This section shows you how to build the product and run the quick start examples.
 
-The native client provides access for C++ and Microsoft<sup>®</sup> .NET™ clients to a Geode distributed system.
+The Geode client provides access for C++ and Microsoft<sup>®</sup> .NET™ clients to a Geode distributed system.
 
--   **[About the Native Client](native-client-overview.html)**
+-   **[System Configurations](client_configurations.html)**
 
-    The native client delivers the full set of capabilities supplied by Java clients communicating with a Geode server.
+    Configuration guidelines for some familiar operating systems.
 
--   **[Installing the Native Client](install-overview.html)**
+-   **[Installing the Client](install-overview.html)**
 
-    Procedures for installing the native client will be here, once they are written. They will vary according to your operating system.
-
--   **[Running Native Client Applications](running-client-apps.html)**
-
-    Set up the environment for the native client on multiple platforms. Compile and run client programs.
+    Procedures for building the client libraries from a source distribution.
 
 -   **[QuickStart Examples](quickstart.html)**
 
-    Run the native client QuickStart examples to understand native client functionality.
+    Run the native client QuickStart examples to understand client functionality.
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da49cbaa/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
index af74680..e8253c0 100644
--- a/docs/geode-native-docs/introduction/native-client-overview.html.md.erb
+++ b/docs/geode-native-docs/introduction/native-client-overview.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  About the Native Client
+title:  About the Client
 ---
 
 <!--
@@ -19,19 +19,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-The native client delivers the full set of capabilities supplied by Java clients communicating with a Geode server.
+The Geode client delivers the full set of capabilities supplied by Java clients communicating with a Geode server.
 
-The native client is written entirely in C++, so its initialization process does not involve the creation of a Java virtual machine. The .NET native client provides native operations for the .NET Framework application developer who writes in .NET languages and needs to access the 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.
 
-Native clients in C++, Java, and .NET languages communicate only with the cache server and do not communicate with each other. The native 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.
+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 native 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.
+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 native 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.
+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="Native Client Overview" id="concept_BCE696D352144690ADF786A0E3D2BD98__image_A0805B5079C64B0E8F2E9DA2A8A5A7A6" class="image" />
+<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/da49cbaa/docs/geode-native-docs/introduction/product-examples.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/product-examples.html.md.erb b/docs/geode-native-docs/introduction/product-examples.html.md.erb
deleted file mode 100644
index 62c6609..0000000
--- a/docs/geode-native-docs/introduction/product-examples.html.md.erb
+++ /dev/null
@@ -1,36 +0,0 @@
----
-title:  Running the QuickStart Examples
----
-
-<!--
-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 QuickStart examples demonstrate the capabilities of the native client, and they provide source code so you can examine how each example is designed. C++ and C\# examples demonstrate how the native client performs as a C++ or C\# client.
-
-Read the QuickStart Guide first (the `README.HTML` file included with the QuickStart examples) to learn more about running the QuickStart examples.
-
-QuickStart examples are packaged as part of the native client product download. Product examples are installed into the following directory when you install the Geode native client:
-
-``` pre
-<native_client_installdir>/SampleCode/quickstart
-```
-
-where *native\_client\_installdir* is the location where you installed the Geode native client.
-
-**Note:** The C\# examples have a `.config` file that should not be modified or deleted. The file provides references to support files for running the example.
-
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da49cbaa/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 081b121..1fe03f7 100644
--- a/docs/geode-native-docs/introduction/quickstart.html.md.erb
+++ b/docs/geode-native-docs/introduction/quickstart.html.md.erb
@@ -19,14 +19,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-The QuickStart examples demonstrate the capabilities of the native client, and they provide source
+The QuickStart examples demonstrate the capabilities of the client, and they provide source
 code so you can examine how each example is designed. C++ and C\# examples demonstrate how the
-native client performs as a C++ or C\# client.
+client performs as a C++ or C\# client.
 
 The examples can be invoked individually from the command line or by using the QuickStart menu.
 
-The examples and their source files are located in the <code>_nc-dir_/SampleCode/quickstart</code> directory, 
-where *nc-dir* is the location in which you installed the native client.
+The examples and their source files are located in the <code>_client-installdir_/SampleCode/quickstart</code> directory, 
+where *client-installdir* is the location in which you installed the client.
 
 The C++ examples are in the `cpp` directory, and the C# examples are in the `csharp` directory.
 Note that the C# examples are available only for Windows.
@@ -44,13 +44,13 @@ The following components must be in place to run the QuickStart examples on any
 
 **For all systems:**
 
-- **GemFire**: Install and configure GemFire. See the GemFire User's Guide for instructions.
+- **Geode**: Install and configure Geode. See the Geode User's Guide for instructions.
 
 - **Cmake** is required to build the quickstart examples. If you have not already done so, download and install cmake, following the instructions on [cmake.org] (https://cmake.org).
 
 - **Java**: You must have a compatible JRE or JDK installed. See the [Sun Java website](http://java.sun.com)
 for the latest Java version for your operating system. See the installation information in the
-GemFire User's Guide for the versions of Java that are compatible with GemFire. 
+Geode User's Guide for the versions of Java that are compatible with Geode. 
 
 - **Security Toolkit** (optional): The QuickStart security examples rely on a security plugin, `securityImpl`, which is based on the OpenSSL toolkit.
 If you plan to run the security examples, download the latest version of release 1.0.1 (must be 1.0.1) from the [OpenSSL website] (http://www.openssl.org/source/).
@@ -60,14 +60,14 @@ Follow the instructions in the README and INSTALL files to install OpenSSL on yo
 
 Follow these steps to prepare your Linux or Solaris environment to run the QuickStart examples.
 
-1. Start a terminal session. Set the `GEMFIRE` environment variable to point to your GemFire product
-installation directory. Add the GemFire libraries shown here to your `CLASSPATH`:
+1. Start a terminal session. Set the `GEODE_ROOT` environment variable to point to your Geode product
+installation directory. Add the Geode libraries shown here to your `CLASSPATH`:
 
     <code>
-    % GEMFIRE=_gemfire-install-dir_; export GEMFIRE <br />
-    %&nbsp;CLASSPATH=$GEMFIRE/lib/gemfire.jar:$GEMFIRE/lib/antlr.jar:$GEMFIRE/lib/gfSecurityImpl.jar:$CLASSPATH<br />
+    % GEODE\_ROOT=_geode-install-dir_; export GEODE\_ROOT <br />
+    %&nbsp;CLASSPATH=$GEODE\_ROOT/lib/geode.jar:$GEODE\_ROOT/lib/antlr.jar:$GEODE\_ROOT/lib/gfSecurityImpl.jar:$CLASSPATH<br />
     %  export CLASSPATH <br />
-    %&nbsp;CLASSPATH=$GEMFIRE/lib/geode-dependencies.jar:$GEMFIRE/lib/antlr-2.7.7.jar:$CLASSPATH<br />
+    %&nbsp;CLASSPATH=$GEODE\_ROOT/lib/geode-dependencies.jar:$GEODE\_ROOT/lib/antlr-2.7.7.jar:$CLASSPATH<br />
     %  export CLASSPATH <br />
     </code>
 
@@ -76,13 +76,13 @@ JDK. Add `$JAVA_HOME/bin` to the start of your `PATH`.
 
     <code>
     % JAVA\_HOME=_installed-jre-path_; export JAVA\_HOME<br />
-    % PATH=$JAVA\_HOME/bin:$GEMFIRE/bin:$PATH; export PATH<br />
+    % PATH=$JAVA\_HOME/bin:$GEODE_ROOT/bin:$PATH; export PATH<br />
     </code>
 
-3. Set the `GFCPP` environment variable to point to the directory in which you installed the native client, denoted here by  _nc-dir_. Add `$GFCPP/lib` to `LD_LIBRARY_PATH`.
+3. Set the `GEODE` environment variable to point to the directory in which you installed the client, denoted here by  _client-installdir_. Add `$GEODE/lib` to `LD_LIBRARY_PATH`.
     <code>
-    % GFCPP=_nc-dir_; export GFCPP<br />
-    % LD\_LIBRARY\_PATH=$GFCPP/lib:${LD\_LIBRARY\_PATH}<br />
+    % GEODE=_client-installdir_; export GEODE<br />
+    % LD\_LIBRARY\_PATH=$GEODE/lib:${LD\_LIBRARY\_PATH}<br />
     % export LD\_LIBRARY\_PATH<br />
     </code>
 
@@ -95,7 +95,7 @@ JDK. Add `$JAVA_HOME/bin` to the start of your `PATH`.
     </code>
 
 5. Create a directory in which to build the `securityImpl` plug-in. This directory (shown here as
-`/home/user/build-sec`) should be created outside the native client directory
+`/home/user/build-sec`) should be created outside the client directory
 hierarchy. After creating the directory, set it as your current working directory:
 
     <code>
@@ -104,22 +104,22 @@ hierarchy. After creating the directory, set it as your current working director
     </code>
 
 6. Run `cmake` three times, once to configure the build, specifying the path to the `cmake`
-instructions in the native client security template directory, a second time to perform the build,
-and a third time to install the resulting library into the native client installation directory
+instructions in the client security template directory, a second time to perform the build,
+and a third time to install the resulting library into the client installation directory
 tree:
 
     <code>
-    % cmake ~/nc/templates/security -DGFCPP=~/nc<br />
+    % cmake _client-installdir_/templates/security -DGEODE=_client-installdir_<br />
     ... creates a makefile and other supporting files<br />
     % cmake --build .<br />
     ... builds  securityImpl plug-in<br />
     % cmake --build . --target install<br />
-    ... installs securityImpl in the nc installation directory tree ($GFCPP)
+    ... installs securityImpl in the client installation directory tree ($GEODE)
     </code>
 
 
 7. Create a directory to hold the quickstart examples. This directory (shown here as
-`/home/user/quickstart-examples`) should be created outside the native client directory
+`/home/user/quickstart-examples`) should be created outside the client directory
 hierarchy. After creating the directory, set it as your current working directory:
 
     <code>
@@ -131,7 +131,7 @@ hierarchy. After creating the directory, set it as your current working director
 path to the `cmake` instructions located in the quickstart example directory (in this case, we're building the the `cpp` examples):
 
     <code>
-    % cmake $GFCPP/SampleCode/quickstart/cpp<br />
+    % cmake $GEODE/SampleCode/quickstart/cpp<br />
     ... creates a makefile and other supporting files<br />
     % cmake --build .<br />
     ... builds the examples
@@ -146,13 +146,13 @@ See <a href="#AboutQSE">About the QuickStart Examples</a> for instructions on ru
 Follow these steps to prepare your Windows environment to run the QuickStart examples.
 
 1. Run the Visual Studio Command Prompt to create a session with preset compiler environment
-configurations. Set the GEMFIRE environment variable to your GemFire installation directory. 
-Add the %GEMFIRE%\bin directory to your `PATH`. Add the GemFire libraries shown here to your `CLASSPATH`:
+configurations. Set the `GEODE_ROOT` environment variable to your Geode installation directory. 
+Add the `%GEODE_ROOT%\bin` directory to your `PATH`. Add the Geode libraries shown here to your `CLASSPATH`:
 
     <code>
-    \>&nbsp;GEMFIRE=_gemfire-install-dir_<br />
-    \> set PATH=%GEMFIRE%\bin;%PATH%<br />
-    \>&nbsp;set&nbsp;CLASSPATH=%GEMFIRE%\lib\gemfire.jar;%GEMFIRE%\lib\antlr.jar;%GEMFIRE%\lib\gfSecurityImpl.jar;%CLASSPATH%<br />
+    \>&nbsp;GEODE\_ROOT=_geode-install-dir_<br />
+    \> set PATH=%GEODE\_ROOT%\bin;%PATH%<br />
+    \>&nbsp;set&nbsp;CLASSPATH=%GEODE\_ROOT%\lib\geode.jar;%GEODE\_ROOT%\lib\antlr.jar;%GEODE\_ROOT%\lib\gfSecurityImpl.jar;%CLASSPATH%<br />
     </code>
 
 2. Set the `JAVA_HOME` environment variable to point to your installed JRE or
@@ -163,14 +163,14 @@ JDK. Add `%JAVA_HOME%\bin` to the start of your `PATH`.
     \> set PATH=%JAVA\_HOME%\bin;%PATH%
     </code>
 
-3. Set the `GFCPP` environment variable to point to the directory in which you installed the native
-client, denoted here by _nc-dir_. 
-Add `%GFCPP%\bin` to `PATH`. Add `%GFCPP%\lib` to `LD_LIBRARY_PATH`.
+3. Set the `GEODE` environment variable to point to the directory in which you installed the native
+client, denoted here by _client-installdir_. 
+Add `%GEODE%\bin` to `PATH`. Add `%GEODE%\lib` to `LD_LIBRARY_PATH`.
 
     <code>
-    \> set GFCPP=_nc-dir_<br />
-    \> set PATH=%GFCPP%\bin;%PATH%<br />
-    \> set LD\_LIBRARY\_PATH=%GFCPP%\lib;%LD\_LIBRARY\_PATH%
+    \> set GEODE=_client-installdir_<br />
+    \> set PATH=%GEODE%\bin;%PATH%<br />
+    \> set LD\_LIBRARY\_PATH=%GEODE%\lib;%LD\_LIBRARY\_PATH%
     </code>
 
 4. Set the `OPENSSL_ROOT_DIR` environment variable, pointing it to the parent folder for the OpenSSL
@@ -183,7 +183,7 @@ binaries created from the tarball. Add  `%OPENSSL_ROOT_DIR%\bin` to `PATH` and `
     </code>
 
 5. Create a directory in which to build the `securityImpl` plug-in. This directory (shown here as
-`c:\build-sec`) should be created outside the native client directory
+`c:\build-sec`) should be created outside the client directory
 hierarchy. After creating the directory, set it as your current working directory:
 
     <code>
@@ -192,22 +192,22 @@ hierarchy. After creating the directory, set it as your current working director
     </code>
 
 6. Run `cmake` three times, once to configure the build, specifying the path to the `cmake`
-instructions in the native client security template directory, a second time to perform the build,
-and a third time to install the resulting library into the native client installation directory
+instructions in the client security template directory, a second time to perform the build,
+and a third time to install the resulting library into the client installation directory
 tree:
 
     <code>
-    \> cmake c:\nc\templates\security -DGFCPP=c:\nc<br />
+    \> cmake c:\nc\templates\security -DGEODE=c:\nc<br />
     ... creates a makefile and other supporting files<br />
     \> cmake --build .<br />
     ... builds  securityImpl plug-in<br />
     \> cmake --build . --target install<br />
-    ... installs securityImpl in the nc installation directory tree ($GFCPP)
+    ... installs securityImpl in the client installation directory tree ($GEODE)
     </code>
 
 
 7. Create a directory to hold the quickstart examples. This directory (shown here as
-`c:\quickstart-examples-csharp`) should be created outside the native client directory
+`c:\quickstart-examples-csharp`) should be created outside the client directory
 hierarchy. After creating the directory, set it as your current working directory:
 
     <code>
@@ -219,7 +219,7 @@ hierarchy. After creating the directory, set it as your current working director
 path to the `cmake` instructions located in the quickstart example directory (in this case, we're building the the `csharp` examples):
 
     <code>
-    \> cmake %GFCPP%\SampleCode\quickstart\csharp<br />
+    \> cmake %GEODE%\SampleCode\quickstart\csharp<br />
     ... creates a makefile and other supporting files<br />
     \> cmake --build .<br />
     ... builds the examples
@@ -233,11 +233,11 @@ The examples are briefly described in this section. Each example performs the fo
 
 1. Starts the cache server with the example's server XML.
 
-2. Creates a GemFire cache.
+2. Creates a Geode cache.
 
 3. Performs operations specific to the example.
 
-4. Closes the GemFire cache.
+4. Closes the Geode cache.
 
 5. Shuts down the cache server.
 
@@ -271,7 +271,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 native client.
+refer to [Serializing Data](../cpp-caching-api/serialization_overview.html) and the online API documentation for the client.
  
 ## Data Expiration
 
@@ -332,7 +332,7 @@ The HA Cache example uses client and server XMLs configured to provide high avai
  
 ## Exceptions
 
-The Exceptions example performs some operations in incorrect ways, then logs the exceptions thrown by GemFire to demonstrate error handling.
+The Exceptions example performs some operations in incorrect ways, then logs the exceptions thrown by Geode to demonstrate error handling.
 
  
 ## Durable Client
@@ -347,7 +347,7 @@ The DurableClient example demonstrates durable client messaging. If the client l
 
 ## Security
 
-The Security example demonstrates how native client credentials are authenticated when the client connects to a cache server. Authorization for client cache operations is also shown.
+The Security example demonstrates how client credentials are authenticated when the client connects to a cache server. Authorization for client cache operations is also shown.
 
  
 ## PutAll And GetAll Operations
@@ -412,7 +412,7 @@ The Transactions example shows the use of the client-server transactions API.
  
 ## PdxRemoteQuery
 
-The PdxRemoteQuery example shows the use of PDX serialized objects with GemFire querying.
+The PdxRemoteQuery example shows the use of PDX serialized objects with Geode querying.
 
  
 ## PdxSerializer
@@ -454,7 +454,7 @@ Start the C++ menu.
 
 ``` pre
 > runcpp
-Please select a GemFire C++ QuickStart example to run.
+Please select a Geode C++ QuickStart example to run.
 
 1. BasicOperations
 2. DataExpiration
@@ -475,7 +475,7 @@ Start the C++ menu.
 
 ``` pre
 $ ./runcpp.sh
-Please select a GemFire C++ QuickStart example to run.
+Please select a Geode C++ QuickStart example to run.
 
 1. BasicOperations
 2. DataExpiration
@@ -496,7 +496,7 @@ Start the C# menu.
 
 ``` pre
 > runcs
-Please select a GemFire C# QuickStart example to run.
+Please select a Geode C# QuickStart example to run.
 
 1. BasicOperations
 2. DataExpiration
@@ -519,7 +519,7 @@ This section discusses problems you might encounter when you run the examples, a
  
 ## Error Messages
 
-`Exception ... Region:put not connected to GemFire`
+`Exception ... Region:put not connected to Geode`
 
 Verify that the cache server has successfully started by reviewing the cacheserver.log file in the gfecs directory. The log may indicate why the cache server failed to start.
 
@@ -540,7 +540,7 @@ script so the example can find its XML files.
  
 ## Connection Problems
 
-GemFire is a network-centric distributed system, so if you have a firewall running it could cause
+Geode is a network-centric distributed system, so if you have a firewall running it could cause
 connection problems. For example, your connections may fail if your firewall places restrictions on
 inbound or outbound permissions for sockets. You may need to modify your firewall configuration to
 permit traffic to applications running on your machine. The specific configuration depends on the
@@ -549,7 +549,7 @@ firewall you're using.
 If you experience port conflicts with other distributed systems, change the `localhost` and
 `bridge-server` port numbers for each of the XML files in the `quickstart/XMLs` directory. If you need
 to specify a non-default multicast port setting for the Java cache server, place a copy of the
-GemFire `gemfire.properties` file in the `quickstart/gfecs` directory, then change the `mcast-port=`
+Geode `geode.properties` file in the `quickstart/gfecs` directory, then change the `mcast-port=`
 setting to a unique value for your network.
 
 
@@ -561,10 +561,10 @@ If you want to build the QuickStart examples yourself from the source files prov
 2. In the command shell, enter the following environment configurations:
 
 <code>
-set GEMFIRE=_full-path-to-gemfire-directory_<br />
-set GFCPP=_nc-dir_<br />
+set GEODE_ROOT=_full-path-to-geode-directory_<br />
+set GEODE=_client-installdir_<br />
 set JAVA\_HOME=_installed-jdk-path_<br />
-set PATH=%PATH%;%JAVA\_HOME%/bin;%GFCPP%\bin<br />
+set PATH=%PATH%;%JAVA\_HOME%/bin;%GEODE%\bin<br />
 </code>
 
 3. In the command shell, change to the quickstart directory:

http://git-wip-us.apache.org/repos/asf/geode-native/blob/da49cbaa/docs/geode-native-docs/introduction/running-client-apps.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/introduction/running-client-apps.html.md.erb b/docs/geode-native-docs/introduction/running-client-apps.html.md.erb
index dd66d11..64c8e0b 100644
--- a/docs/geode-native-docs/introduction/running-client-apps.html.md.erb
+++ b/docs/geode-native-docs/introduction/running-client-apps.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  Running Native Client Applications
+title:  Running Client Applications
 ---
 
 <!--
@@ -19,15 +19,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-Set up the environment for the native client on multiple platforms. Compile and run client programs.
+Set up the environment for the Geode client on multiple platforms. Compile and run client programs.
 
 -   **[Developing C++ Programs on Linux](developing-linux.html)**
 
-    This section describes how to build and run a native client application on Linux.
+    This section describes how to build and run a client application on Linux.
 
 -   **[Developing C++ Programs on Solaris](developing-solaris.html)**
 
-    This section describes how to build and run a native client application on Solaris.
+    This section describes how to build and run a client application on Solaris.
 
 -   **[Developing C++ Programs on Windows](developing-windows.html)**
 


Mime
View raw message