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/03/13 21:39:23 UTC

[1/2] geode-native git commit: GEODE-2513 Rename gfcpp.properties file to geode.properties - updated references, moved and renamed files This closes #52

Repository: geode-native
Updated Branches:
  refs/heads/develop 8ddafe94e -> 013b336aa


http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/propfile_overriding.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile_overriding.html.md.erb b/docs/geode-native-docs/setting-properties/propfile_overriding.html.md.erb
new file mode 100644
index 0000000..63a9eff
--- /dev/null
+++ b/docs/geode-native-docs/setting-properties/propfile_overriding.html.md.erb
@@ -0,0 +1,26 @@
+---
+title:  Overriding Properties File Settings
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Application developers have the option of configuring system attributes programmatically, rather than using the `geode.properties` file.
+
+Attributes set programmatically override any matching attribute settings in the `geode.properties` file, but additional attributes not set programmatically will be configured using the settings in `geode.properties`.
+
+

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/propfile_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile_overview.html.md.erb b/docs/geode-native-docs/setting-properties/propfile_overview.html.md.erb
new file mode 100644
index 0000000..dfbb8d2
--- /dev/null
+++ b/docs/geode-native-docs/setting-properties/propfile_overview.html.md.erb
@@ -0,0 +1,34 @@
+---
+title:  Properties File Example
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+Use the `geode.properties` file to configure distributed system connections for the client.
+
+The following example shows the format of a geode.properties file. The first two attributes in this example should be set by programmers during application development, while other attributes are set on-site during system integration. The properties and their default settings that can be set in this file are described in detail in [Attributes in the Properites File](../setting-properties/propfile_attributes.html#attributes-gfcpp).
+
+## geode.properties File Format
+
+``` pre
+#Tue Feb 14 17:24:02 PDT 2006
+log-level=info
+cache-xml-file=./cache.xml
+stacktrace-enabled=true
+```
+

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/propfile_sample.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile_sample.html.md.erb b/docs/geode-native-docs/setting-properties/propfile_sample.html.md.erb
new file mode 100644
index 0000000..9e39420
--- /dev/null
+++ b/docs/geode-native-docs/setting-properties/propfile_sample.html.md.erb
@@ -0,0 +1,121 @@
+---
+title:  Using the Default Sample File
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+A sample `geode.properties` file is included with the Apache Geode native client installation in the <code>_product-dir_/defaultSystem</code> directory.
+
+To use this file:
+
+1.  Copy the file to the directory where you start the application.
+2.  Uncomment the lines you need and edit the settings as shown in this example:
+
+    ``` pre
+    cache-xml-file=test.xml
+    ```
+
+3.  Start the application.
+
+## Default geode.properties File
+
+``` pre
+# Default C++ distributed system properties
+# Copy to current directory and uncomment to override defaults.
+#
+## Debugging support, enables stacktraces in gemfire::Exception.
+#
+# The default is false, uncomment to enable stacktraces in exceptions.
+#stacktrace-enabled=true
+#crash-dump-enabled=true
+#
+#
+## Cache region configurtion
+#
+#cache-xml-file=cache.xml
+#
+## Log file config
+#
+#log-file=gemfire_cpp.log
+#log-level=config
+# zero indicates use no limit.
+#log-file-size-limit=0
+# zero indicates use no limit. 
+#log-disk-space-limit=0 
+#
+## Statistics values
+#
+# the rate is in seconds.
+#statistic-sample-rate=1
+#statistic-sampling-enabled=true
+#statistic-archive-file=statArchive.gfs
+# zero indicates use no limit.
+#archive-file-size-limit=0
+# zero indicates use no limit.
+#archive-disk-space-limit=0
+#enable-time-statistics=false 
+#
+## Heap based eviction configuration
+#
+# maximum amount of memory used by the cache for all regions, 0 disables this feature
+#heap-lru-limit=0
+# percentage over heap-lru-limit when LRU will be called. 
+#heap-lru-delta=10
+#
+## Durable client support
+#
+#durable-client-id=
+#durable-timeout=300
+#
+## SSL socket support
+#
+#ssl-enabled=false
+#ssl-keystore=
+#ssl-truststore=
+#
+## .NET AppDomain support
+#
+#appdomain-enabled=false
+#
+## Misc
+#
+#conflate-events=server
+#disable-shuffling-of-endpoints=false
+#grid-client=false
+#max-fe-threads=
+#max-socket-buffer-size=66560
+# the units are in seconds.
+#connect-timeout=59
+#notify-ack-interval=10
+#notify-dupcheck-life=300
+#ping-interval=10 
+#redundancy-monitor-interval=10
+#auto-ready-for-events=true
+#
+## module name of the initializer pointing to sample
+## implementation from templates/security
+#security-client-auth-library=securityImpl
+## static method name of the library mentioned above
+#security-client-auth-factory=createUserPasswordAuthInitInstance
+## credential for Dummy Authenticator configured in server.
+## note: security-password property will be inserted by the initializer
+## mentioned in the above property.
+#security-username=root
+```
+
+

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/propfile_search_path.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile_search_path.html.md.erb b/docs/geode-native-docs/setting-properties/propfile_search_path.html.md.erb
new file mode 100644
index 0000000..cf1f60f
--- /dev/null
+++ b/docs/geode-native-docs/setting-properties/propfile_search_path.html.md.erb
@@ -0,0 +1,28 @@
+---
+title:  Search Path for Multiple Properties Files
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+The client and cache server processes first look for their properties file in the <code>_product-dir_/defaultSystem</code> directory, then in the working directory.
+
+Any properties set in the working directory override settings in the `defaultSystem/geode.properties` file.
+
+If you are running multiple processes on one machine, you can configure the `geode.properties` file in the `defaultSystem` directory as a shared file that all processes can find. If a few processes need a slightly different configuration, you can put individual `geode.properties` files in their home directories to override specific properties.
+
+

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/system-statistics/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/chapter_overview.html.md.erb b/docs/geode-native-docs/system-statistics/chapter_overview.html.md.erb
index 7b7737b..1e0de45 100644
--- a/docs/geode-native-docs/system-statistics/chapter_overview.html.md.erb
+++ b/docs/geode-native-docs/system-statistics/chapter_overview.html.md.erb
@@ -24,7 +24,7 @@ Statistics that end with "time" are time-based statistics.
 For performance reasons, the system does not collect these by default.
 To enable time-based statistics gathering,
 set the system property `enable-time-statistics` 
-as described in [Attributes in gfcpp.properties\u2014Statistics Archiving Properties](../setting-properties/attributes-gfcpp.html#attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723).
+as described in [Attributes in geode.properties\u2014Statistics Archiving Properties](../setting-properties/propfile_attributes.html#attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723).
 
 -   **[Sampling Statistics](sampling_statistics.html)**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/system-statistics/sampling_statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/sampling_statistics.html.md.erb b/docs/geode-native-docs/system-statistics/sampling_statistics.html.md.erb
index 1762d82..63c0409 100644
--- a/docs/geode-native-docs/system-statistics/sampling_statistics.html.md.erb
+++ b/docs/geode-native-docs/system-statistics/sampling_statistics.html.md.erb
@@ -29,6 +29,6 @@ The following statistics are related to the statistic sampler.
 | `sampleTime`  | Total amount of time spent taking samples.     |
 | `StatSampler` | Statistics on the statistic sampler.           |
 
-For more information about configuring statistics, see [Attributes in gfcpp.properties](../setting-properties/attributes-gfcpp.html#attributes-gfcpp).
+For more information about configuring statistics, see [Attributes in geode.properties](../setting-properties/propfile_attributes.html#attributes-gfcpp).
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb b/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
index d7c6cae..bae2194 100644
--- a/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
+++ b/docs/geode-native-docs/transactions/suspend-resume-xacts.html.md.erb
@@ -27,7 +27,7 @@ When a transaction is resumed, the resuming thread assumes the transactional vie
 
 If the member with the primary copy of the data crashes, the transactional view that applied to that data is lost. The secondary member for the data cannot resume transactions suspended on the crashed member. You need to take remedial steps to retry the transaction on a new primary copy of the data.
 
-If a suspended transaction is not touched for a period of time, Geode cleans it up automatically. By default, the timeout for a suspended transaction is 30 minutes and can be configured by using the `suspended-tx-timeout` property of the `gfcpp.properties` file. The suspended transaction timeout value is specified in milliseconds.
+If a suspended transaction is not touched for a period of time, Geode cleans it up automatically. By default, the timeout for a suspended transaction is 30 minutes and can be configured by using the `suspended-tx-timeout` property of the `geode.properties` file. The suspended transaction timeout value is specified in milliseconds.
 
 See [Running a Native Client Transaction](running-native-client-xact.html) for code examples of how to suspend and resume a transaction.
 


[2/2] geode-native git commit: GEODE-2513 Rename gfcpp.properties file to geode.properties - updated references, moved and renamed files This closes #52

Posted by db...@apache.org.
GEODE-2513 Rename gfcpp.properties file to geode.properties - updated references, moved and renamed files
This closes #52


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

Branch: refs/heads/develop
Commit: 013b336aa08abfbcb4a48f27e9601ff3b6ab37cd
Parents: 8ddafe9
Author: Dave Barnes <db...@pivotal.io>
Authored: Mon Mar 13 11:24:17 2017 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Mon Mar 13 14:38:39 2017 -0700

----------------------------------------------------------------------
 .../source/subnavs/geode-nc-nav.erb             |  10 +-
 .../chapter-overview.html.md.erb                |   2 +-
 .../cache-init-file/file-basics.html.md.erb     |   2 +-
 .../controlling-cache-size.html.md.erb          |   4 +-
 .../creating-a-cache.html.md.erb                |   4 +-
 .../dotnet-caching-api.html.md.erb              |   2 +-
 .../chapter_overview.html.md.erb                |  34 ---
 .../default_sample_file.html.md.erb             | 121 --------
 .../gfcpp.properties_search_path.html.md.erb    |  28 --
 .../overriding_gfcpp.properties.html.md.erb     |  26 --
 .../client-side-config.html.md.erb              |   2 +-
 .../configuring-durable-nc.html.md.erb          |   6 +-
 .../sending-periodic-ack.html.md.erb            |   2 +-
 .../using-queue-conflation.html.md.erb          |   2 +-
 .../security/LDAPserverauth.html.md.erb         |   2 +-
 .../geode-native-docs/security/PKCS.html.md.erb |   2 +-
 .../security/authforcacheserver.html.md.erb     |   2 +-
 .../security/overviewauthentication.html.md.erb |   2 +-
 .../security/overviewencryptcred.html.md.erb    |   4 +-
 .../security/overviewsecurity.html.md.erb       |   4 +-
 .../security/security-systemprops.html.md.erb   |   4 +-
 .../security/sslclientserver.html.md.erb        |   4 +-
 .../security/systempropsforauth.html.md.erb     |   2 +-
 .../attribute-def-priority.html.md.erb          |   6 +-
 .../attributes-gfcpp.html.md.erb                | 278 -------------------
 .../cache-server-config.html.md.erb             |   4 +-
 .../chapter-overview.html.md.erb                |   8 +-
 .../config-overview.html.md.erb                 |  10 +-
 .../define-programmatically.html.md.erb         |   2 +-
 .../native-client-config.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                |   2 +-
 .../sampling_statistics.html.md.erb             |   2 +-
 .../suspend-resume-xacts.html.md.erb            |   2 +-
 38 files changed, 550 insertions(+), 550 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/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 ef131ca..e61c9ea 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
@@ -101,10 +101,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/gfcpp.properties/gfcpp.properties_search_path.html">Search Path for Multiple gfcpp.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/gfcpp.properties/overriding_gfcpp.properties.html">Overriding gfcpp.properties 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>
@@ -112,13 +112,13 @@ limitations under the License.
                                 </ul>
                             </li>
                             <li>
-                                <a href="/docs/guide-native/11/setting-properties/attributes-gfcpp.html">Attributes in gfcpp.properties</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/gfcpp.properties/chapter_overview.html">gfcpp.properties Example File</a>
+                                <a href="/docs/guide-native/11/setting-properties/propfile_overview.html">Properties File Example</a>
                                 <ul>
                                     <li>
-                                        <a href="/docs/guide-native/11/gfcpp.properties/default_sample_file.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>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/cache-init-file/chapter-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cache-init-file/chapter-overview.html.md.erb b/docs/geode-native-docs/cache-init-file/chapter-overview.html.md.erb
index 700a629..7a086aa 100644
--- a/docs/geode-native-docs/cache-init-file/chapter-overview.html.md.erb
+++ b/docs/geode-native-docs/cache-init-file/chapter-overview.html.md.erb
@@ -34,7 +34,7 @@ The initialization file can have any name, but is generally referred to as `cach
 The contents of a declarative XML file correspond to APIs declared in the `Cache.hpp` and `Region.hpp` header files. The cache initialization file allows you to accomplish declaratively many of the cache management activities that you can program through the API.
 
 -   The contents of the cache initialization file must conform to the XML definition in <code>_product-dir_/dtd/gfcpp-cache8000.dtd</code>. The DTD file identifies the valid element tags that may be present in your XML file, the attributes that correspond to each element, and the valid values for the elements and attributes.
--   The name of the declarative XML file is specified when establishing a connection to the distributed system. You can define it by setting the `cache-xml-file` configuration attribute in the `gfcpp.properties` file for the native client. For details about the `gfcpp.properties` file, see [Setting System and Cache Properties](../setting-properties/chapter-overview.html).
+-   The name of the declarative XML file is specified when establishing a connection to the distributed system. You can define it by setting the `cache-xml-file` configuration attribute in the `geode.properties` file for the native client. For details about the `geode.properties` file, see [Setting System and Cache Properties](../setting-properties/chapter-overview.html).
 
 
 #  Example cache.xml File

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/cache-init-file/file-basics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/cache-init-file/file-basics.html.md.erb b/docs/geode-native-docs/cache-init-file/file-basics.html.md.erb
index d46ae70..d67d292 100644
--- a/docs/geode-native-docs/cache-init-file/file-basics.html.md.erb
+++ b/docs/geode-native-docs/cache-init-file/file-basics.html.md.erb
@@ -30,6 +30,6 @@ The initialization file can have any name, but is generally referred to as `cach
 The contents of a declarative XML file correspond to APIs declared in the `Cache.hpp` and `Region.hpp` header files. The cache initialization file allows you to accomplish declaratively many of the cache management activities that you can program through the API.
 
 -   The contents of the cache initialization file must conform to the XML definition in `productDir/dtd/gfcpp-cache8000.dtd` (see [Native Client Cache XML DTD](cache-dtd.html#cache-dtd)).
--   The name of the declarative XML file is specified when establishing a connection to the distributed system. You can define it by setting the `cache-xml-file` configuration attribute in the `gfcpp.properties` file for the native client. For details about the `gfcpp.properties` file, see [Setting System and Cache Properties](../setting-properties/chapter-overview.html#system_and_cache_properties).
+-   The name of the declarative XML file is specified when establishing a connection to the distributed system. You can define it by setting the `cache-xml-file` configuration attribute in the `geode.properties` file for the native client. For details about the `geode.properties` file, see [Setting System and Cache Properties](../setting-properties/chapter-overview.html#system_and_cache_properties).
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/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 3117b26..917088a 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/attributes-gfcpp.html#attributes-gfcpp), which is set in `gfcpp.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/attributes-gfcpp.html#attributes-gfcpp) property, also set in `gfcpp.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/013b336a/docs/geode-native-docs/dotnet-caching-api/creating-a-cache.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/creating-a-cache.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/creating-a-cache.html.md.erb
index 4ed588d..5c63bf1 100644
--- a/docs/geode-native-docs/dotnet-caching-api/creating-a-cache.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/creating-a-cache.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-You create a cache using the Geode `CacheFactory.Create` call. Cache creation initializes the distributed system and creates the cache using your `gfcpp.properties` and `cache.xml` file settings and any additional properties you provide to the call.
+You create a cache using the Geode `CacheFactory.Create` call. Cache creation initializes the distributed system and creates the cache using your `geode.properties` and `cache.xml` file settings and any additional properties you provide to the call.
 
 See [Setting System and Cache Properties](../setting-properties/chapter-overview.html#system_and_cache_properties) and see [Cache Initialization File](../cache-init-file/chapter-overview.html#chapter-overview).
 
@@ -36,7 +36,7 @@ Cache cache = cacheFactory.Create();
 
 ## Providing Properties to the Cache Creation
 
-You can also create a cache by referencing a `cache.xml` file, as shown in the following example. You can use the `Properties` object to change any of the `gfcpp.properties` settings.
+You can also create a cache by referencing a `cache.xml` file, as shown in the following example. You can use the `Properties` object to change any of the `geode.properties` settings.
 
 ``` pre
 Properties prop = Properties.Create();

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb b/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
index 249347a..470ac77 100644
--- a/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
+++ b/docs/geode-native-docs/dotnet-caching-api/dotnet-caching-api.html.md.erb
@@ -45,7 +45,7 @@ The .NET API documentation is available at [http://gemfire-apis.docs.pivotal.io]
 
 -   **[Creating a Cache](creating-a-cache.html)**
 
-    You create a cache using the Geode `CacheFactory.Create` call. Cache creation initializes the distributed system and creates the cache using your `gfcpp.properties` and `cache.xml` file settings and any additional properties you provide to the call.
+    You create a cache using the Geode `CacheFactory.Create` call. Cache creation initializes the distributed system and creates the cache using your `geode.properties` and `cache.xml` file settings and any additional properties you provide to the call.
 
 -   **[Creating a Region](creating-a-region.html)**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/gfcpp.properties/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/gfcpp.properties/chapter_overview.html.md.erb b/docs/geode-native-docs/gfcpp.properties/chapter_overview.html.md.erb
deleted file mode 100644
index 529c659..0000000
--- a/docs/geode-native-docs/gfcpp.properties/chapter_overview.html.md.erb
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title:  gfcpp.properties Example File
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Use the gfcpp.properties file to configure distributed system connections for the client.
-
-The following example shows the format of a gfcpp.properties file. The first two attributes in this example should be set by programmers during application development, while other attributes are set on-site during system integration. The properties and their default settings that can be set in this file are described in detail in [Attributes in gfcpp.properties](../setting-properties/attributes-gfcpp.html#attributes-gfcpp).
-
-## gfcpp.properties File Format
-
-``` pre
-#Tue Feb 14 17:24:02 PDT 2006
-log-level=info
-cache-xml-file=./cache.xml
-stacktrace-enabled=true
-```
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/gfcpp.properties/default_sample_file.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/gfcpp.properties/default_sample_file.html.md.erb b/docs/geode-native-docs/gfcpp.properties/default_sample_file.html.md.erb
deleted file mode 100644
index 4b09f64..0000000
--- a/docs/geode-native-docs/gfcpp.properties/default_sample_file.html.md.erb
+++ /dev/null
@@ -1,121 +0,0 @@
----
-title:  Using the Default Sample File
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-A sample gfcpp.properties file is included with the Apache Geode native client installation in the <code>_product-dir_/defaultSystem</code> directory.
-
-To use this file:
-
-1.  Copy the file to the directory where you start the application.
-2.  Uncomment the lines you need and edit the settings as shown in this example:
-
-    ``` pre
-    cache-xml-file=test.xml
-    ```
-
-3.  Start the application.
-
-## Default gfcpp.properties File
-
-``` pre
-# Default C++ distributed system properties
-# Copy to current directory and uncomment to override defaults.
-#
-## Debugging support, enables stacktraces in gemfire::Exception.
-#
-# The default is false, uncomment to enable stacktraces in exceptions.
-#stacktrace-enabled=true
-#crash-dump-enabled=true
-#
-#
-## Cache region configurtion
-#
-#cache-xml-file=cache.xml
-#
-## Log file config
-#
-#log-file=gemfire_cpp.log
-#log-level=config
-# zero indicates use no limit.
-#log-file-size-limit=0
-# zero indicates use no limit. 
-#log-disk-space-limit=0 
-#
-## Statistics values
-#
-# the rate is in seconds.
-#statistic-sample-rate=1
-#statistic-sampling-enabled=true
-#statistic-archive-file=statArchive.gfs
-# zero indicates use no limit.
-#archive-file-size-limit=0
-# zero indicates use no limit.
-#archive-disk-space-limit=0
-#enable-time-statistics=false 
-#
-## Heap based eviction configuration
-#
-# maximum amount of memory used by the cache for all regions, 0 disables this feature
-#heap-lru-limit=0
-# percentage over heap-lru-limit when LRU will be called. 
-#heap-lru-delta=10
-#
-## Durable client support
-#
-#durable-client-id=
-#durable-timeout=300
-#
-## SSL socket support
-#
-#ssl-enabled=false
-#ssl-keystore=
-#ssl-truststore=
-#
-## .NET AppDomain support
-#
-#appdomain-enabled=false
-#
-## Misc
-#
-#conflate-events=server
-#disable-shuffling-of-endpoints=false
-#grid-client=false
-#max-fe-threads=
-#max-socket-buffer-size=66560
-# the units are in seconds.
-#connect-timeout=59
-#notify-ack-interval=10
-#notify-dupcheck-life=300
-#ping-interval=10 
-#redundancy-monitor-interval=10
-#auto-ready-for-events=true
-#
-## module name of the initializer pointing to sample
-## implementation from templates/security
-#security-client-auth-library=securityImpl
-## static method name of the library mentioned above
-#security-client-auth-factory=createUserPasswordAuthInitInstance
-## credential for Dummy Authenticator configured in server.
-## note: security-password property will be inserted by the initializer
-## mentioned in the above property.
-#security-username=root
-```
-
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/gfcpp.properties/gfcpp.properties_search_path.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/gfcpp.properties/gfcpp.properties_search_path.html.md.erb b/docs/geode-native-docs/gfcpp.properties/gfcpp.properties_search_path.html.md.erb
deleted file mode 100644
index 99fce6e..0000000
--- a/docs/geode-native-docs/gfcpp.properties/gfcpp.properties_search_path.html.md.erb
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title:  Search Path for Multiple gfcpp.properties Files
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-The client and cache server processes first look for their properties file in the <code>_product-dir_/defaultSystem</code> directory, then in the working directory.
-
-Any properties set in the working directory override settings in the `defaultSystem/gfcpp.properties` file.
-
-If you are running multiple processes on one machine, you can configure the `gfcpp.properties` file in the `defaultSystem` directory as a shared file that all processes can find. If a few processes need a slightly different configuration, you can put individual `gfcpp.properties` files in their home directories to override specific properties.
-
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/gfcpp.properties/overriding_gfcpp.properties.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/gfcpp.properties/overriding_gfcpp.properties.html.md.erb b/docs/geode-native-docs/gfcpp.properties/overriding_gfcpp.properties.html.md.erb
deleted file mode 100644
index 7e4bae2..0000000
--- a/docs/geode-native-docs/gfcpp.properties/overriding_gfcpp.properties.html.md.erb
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title:  Overriding gfcpp.properties Settings
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-Application developers have the option of configuring system attributes programmatically, rather than using the `gfcpp.properties` file.
-
-Attributes set programmatically override any matching attribute settings in the `gfcpp.properties` file, but additional attributes not set programmatically will be configured using the settings in `gfcpp.properties`.
-
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/preserving-data/client-side-config.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/client-side-config.html.md.erb b/docs/geode-native-docs/preserving-data/client-side-config.html.md.erb
index 8617efd..e89fa93 100644
--- a/docs/geode-native-docs/preserving-data/client-side-config.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/client-side-config.html.md.erb
@@ -23,7 +23,7 @@ All durable messaging configurations are performed on the client.
 
 -   **[Configuring a Durable Client](configuring-durable-nc.html)**
 
-    The durable client can be configured in the `gfcpp.properties` file, or in the `CacheFactory::set(name,             value)` call.
+    The durable client can be configured in the `geode.properties` file, or in the `CacheFactory::set(name,             value)` call.
 
 -   **[Configuring Durable Interest in Keys](config-durable-interest-keys.html)**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/preserving-data/configuring-durable-nc.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/configuring-durable-nc.html.md.erb b/docs/geode-native-docs/preserving-data/configuring-durable-nc.html.md.erb
index a39897c..1000583 100644
--- a/docs/geode-native-docs/preserving-data/configuring-durable-nc.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/configuring-durable-nc.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-The durable client can be configured in the `gfcpp.properties` file, or in the `CacheFactory::set(name,             value)` call.
+The durable client can be configured in the `geode.properties` file, or in the `CacheFactory::set(name,             value)` call.
 
 -   **Durable client ID**\u2014Indicate that the client is durable by giving it a `durable-client-ID`. The servers use this ID to identify the client. For a non-durable client, the `durable-client-ID` is an empty string. The ID can be any number that is unique among the clients attached to servers in the same distributed system.
 
@@ -31,9 +31,9 @@ To assist with tuning, Geode statistics track message queues for durable clients
 
 When the queue is full, it blocks further operations that add messages until the queue size drops to an acceptable level. Server configuration sets the action to take. See details on server configuration of the queue in the server documentation section [Implementing Durable Client/Server Messaging](geodeman/developing/events/implementing_durable_client_server_messaging.html).
 
-## Configuring a Durable Client Using gfcpp.properties
+## Configuring a Durable Client Using geode.properties
 
-The following example shows `gfcpp.properties` settings to make the client durable and set the durable timeout to 200seconds.
+The following example shows `geode.properties` settings to make the client durable and set the durable timeout to 200seconds.
 
 ``` pre
 durable-client-id=31

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/preserving-data/sending-periodic-ack.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/sending-periodic-ack.html.md.erb b/docs/geode-native-docs/preserving-data/sending-periodic-ack.html.md.erb
index a3d2bd4..c3f2620 100644
--- a/docs/geode-native-docs/preserving-data/sending-periodic-ack.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/sending-periodic-ack.html.md.erb
@@ -24,7 +24,7 @@ Servers use periodic acknowledgment to reduce the likelihood of duplicate notifi
 <a id="concept_868B8082463846DE9F35BBEA56105C82__section_D4375BCCF8A2426BA58073B9549B6F04"></a>
 When redundancy is enabled for high availability and `redundancy-level` is set to 1 or higher, clients send (and servers expect) periodic acknowledgment messages at configurable intervals for notifications they have received. A periodic ack is not sent by the client if there are no unacknowledged notifications at the time.
 
-Use the following system properties in the `gfcpp.properties` file to configure periodic ack.
+Use the following system properties in the `geode.properties` file to configure periodic ack.
 
 <table>
 <colgroup>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/preserving-data/using-queue-conflation.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/preserving-data/using-queue-conflation.html.md.erb b/docs/geode-native-docs/preserving-data/using-queue-conflation.html.md.erb
index a8a42cc..9f45e52 100644
--- a/docs/geode-native-docs/preserving-data/using-queue-conflation.html.md.erb
+++ b/docs/geode-native-docs/preserving-data/using-queue-conflation.html.md.erb
@@ -31,7 +31,7 @@ For more information, see the server documentation at [Conflate the Server Subsc
 
 ## <a id="concept_AEFA04AF9ABD42C0A37ED31806596D24__section_BE506A32A8E44073B197B03AC5232C01" class="no-quick-link"></a>Overriding Queue Conflation Per-Client
 
-Override conflation on a per-client basis by setting the conflate-events property in the client\u2019s `gfcpp.properties` file.
+Override conflation on a per-client basis by setting the conflate-events property in the client\u2019s `geode.properties` file.
 
 Valid settings are:
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/security/LDAPserverauth.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/security/LDAPserverauth.html.md.erb b/docs/geode-native-docs/security/LDAPserverauth.html.md.erb
index 894b9b3..f98d815 100644
--- a/docs/geode-native-docs/security/LDAPserverauth.html.md.erb
+++ b/docs/geode-native-docs/security/LDAPserverauth.html.md.erb
@@ -30,7 +30,7 @@ When a client initiates a connection to a cache server, the client submits its c
 
 **Configuration Settings**
 
-In the `gfcpp.properties` file for the client, specify the `UserPasswordAuthInit` callback, the user name, and the password, like this:
+In the `geode.properties` file for the client, specify the `UserPasswordAuthInit` callback, the user name, and the password, like this:
 
 ``` pre
 security-client-auth-library=securityImpl

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/security/PKCS.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/security/PKCS.html.md.erb b/docs/geode-native-docs/security/PKCS.html.md.erb
index 821a154..ef43ae9 100644
--- a/docs/geode-native-docs/security/PKCS.html.md.erb
+++ b/docs/geode-native-docs/security/PKCS.html.md.erb
@@ -30,7 +30,7 @@ When clients require authentication to connect to a cache server, they use the `
 
 **Building the securityImpl Library**
 
-To use the PKCS sample implementation, you need to build OpenSSL and then build the securityImpl library. In the `gfcpp.properties `file for the client, specify the `PKCSAuthInit` callback, the keystore path, the security alias, and the keystore password, like this:
+To use the PKCS sample implementation, you need to build OpenSSL and then build the securityImpl library. In the `geode.properties `file for the client, specify the `PKCSAuthInit` callback, the keystore path, the security alias, and the keystore password, like this:
 
 ``` pre
 security-client-auth-library=securityImpl

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/security/authforcacheserver.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/security/authforcacheserver.html.md.erb b/docs/geode-native-docs/security/authforcacheserver.html.md.erb
index 384a111..43713de 100644
--- a/docs/geode-native-docs/security/authforcacheserver.html.md.erb
+++ b/docs/geode-native-docs/security/authforcacheserver.html.md.erb
@@ -21,7 +21,7 @@ limitations under the License.
 
 When the cache server receives client credentials during the handshake operation, the server authenticates the client with the callback configured in the `security-client-authenticator` system property. The handshake succeeds or fails depending on the results of the authentication process.
 
-Here is an example of how you could configure `security-client-authenticator` in the `gfcpp.properties` file:
+Here is an example of how you could configure `security-client-authenticator` in the `geode.properties` file:
 
 ``` pre
 security-client-authenticator=templates.security.PKCSAuthenticator.create

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/security/overviewauthentication.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/security/overviewauthentication.html.md.erb b/docs/geode-native-docs/security/overviewauthentication.html.md.erb
index 5bcd7d9..c1e7b3b 100644
--- a/docs/geode-native-docs/security/overviewauthentication.html.md.erb
+++ b/docs/geode-native-docs/security/overviewauthentication.html.md.erb
@@ -29,7 +29,7 @@ Once the client is authenticated, the server assigns the client a unique ID and
 
 -   **[Configuring Credentials for Authentication](systempropsforauth.html)**
 
-    The native client uses system properties to acquire valid credentials for authentication by the server. You define these properties in the `gfcpp.properties` file, which the native client accesses during startup.
+    The native client uses system properties to acquire valid credentials for authentication by the server. You define these properties in the `geode.properties` file, which the native client accesses during startup.
 
 -   **[Configuring Authentication by the Cache Server](authforcacheserver.html)**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/security/overviewencryptcred.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/security/overviewencryptcred.html.md.erb b/docs/geode-native-docs/security/overviewencryptcred.html.md.erb
index fa726b8..a119669 100644
--- a/docs/geode-native-docs/security/overviewencryptcred.html.md.erb
+++ b/docs/geode-native-docs/security/overviewencryptcred.html.md.erb
@@ -23,7 +23,7 @@ For secure transmission of sensitive credentials like passwords, encrypt credent
 
 ## <a id="security__section_1BB8F13C7ACB44668FF337F59A3BA5AE" class="no-quick-link"></a>Enabling Diffe-Hellman
 
-Set the `security-client-dhalgo` system property in the `gfcpp.properties` file to the password for the public key file store on the client (the name of a valid symmetric key cipher supported by the JDK).
+Set the `security-client-dhalgo` system property in the `geode.properties` file to the password for the public key file store on the client (the name of a valid symmetric key cipher supported by the JDK).
 
 Valid `security-client-dhalgo` property values are `DESede`, `AES`, and `Blowfish`, which enable the Diffie-Hellman algorithm with the specified cipher to encrypt the credentials.
 
@@ -51,7 +51,7 @@ With Diffie-Hellman enabled, you can have your client authenticate its servers.
 
     2.  Concatenate the generated .pem files into a single .pem file. You will use this file name in the next step.
 
-2.  In the `gfcpp.properties` file:
+2.  In the `geode.properties` file:
 
     1.  Set `security-client-kspath` to the file name of the `.pem` file password for the public key file store on the client.
     2.  Set `security-client-kspasswd` to the password for the public key file store on the client.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/security/overviewsecurity.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/security/overviewsecurity.html.md.erb b/docs/geode-native-docs/security/overviewsecurity.html.md.erb
index ec4ea25..ad243a7 100644
--- a/docs/geode-native-docs/security/overviewsecurity.html.md.erb
+++ b/docs/geode-native-docs/security/overviewsecurity.html.md.erb
@@ -35,9 +35,9 @@ The security framework authenticates clients that attempt to connect to a Geode
 
     Using a provided callback that implements the `AccessControl` interface, you can configure each server to authorize some or all cache operations.
 
--   **[Security-Related System Properties (gfcpp.properties)](security-systemprops.html)**
+-   **[Security-Related System Properties (geode.properties)](security-systemprops.html)**
 
-    The table describes the security-related system properties in the `gfcpp.properties` file for native client authentication and authorization.
+    The table describes the security-related system properties in the `geode.properties` file for native client authentication and authorization.
 
 -   **[SSL Client/Server Communication](sslclientserver.html)**
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/security/security-systemprops.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/security/security-systemprops.html.md.erb b/docs/geode-native-docs/security/security-systemprops.html.md.erb
index d987a90..c580aad 100644
--- a/docs/geode-native-docs/security/security-systemprops.html.md.erb
+++ b/docs/geode-native-docs/security/security-systemprops.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  Security-Related System Properties (gfcpp.properties)
+title:  Security-Related System Properties (geode.properties)
 ---
 
 <!--
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-The table describes the security-related system properties in the `gfcpp.properties` file for native client authentication and authorization.
+The table describes the security-related system properties in the `geode.properties` file for native client authentication and authorization.
 
 <a id="security__section_6DC4C72A2EEB432AA40DE97D438FD1E7"></a><a id="security__table_92A6A66523764199A19BCD66BA189921"></a>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/security/sslclientserver.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/security/sslclientserver.html.md.erb b/docs/geode-native-docs/security/sslclientserver.html.md.erb
index 89bb284..b0ff092 100644
--- a/docs/geode-native-docs/security/sslclientserver.html.md.erb
+++ b/docs/geode-native-docs/security/sslclientserver.html.md.erb
@@ -92,11 +92,11 @@ Configure your system environment to build and run OpenSSL. Follow the environme
 
 where <code>_path-to-installed-openssl_</code> is typically `C:\OpenSSL>`.
 
-## Step 4. Configure SSL properties in gfcpp.properties and gemfire.properties
+## Step 4. Configure SSL properties in geode.properties and gemfire.properties
 
 Configure SSL properties.
 
-1.  In `gfcpp.properties`, set `ssl-enabled` to true and set `ssl-keystore` and `ssl-truststore` to point to your keystore files. See [Security-Related System Properties (gfcpp.properties)](security-systemprops.html#security) for a description of these properties.
+1.  In `geode.properties`, set `ssl-enabled` to true and set `ssl-keystore` and `ssl-truststore` to point to your keystore files. See [Security-Related System Properties (geode.properties)](security-systemprops.html#security) for a description of these properties.
 2.  On each locator, enable SSL and set the following SSL properties in the locator\u2019s `gemfire.properties` file:
 
     ```

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/security/systempropsforauth.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/security/systempropsforauth.html.md.erb b/docs/geode-native-docs/security/systempropsforauth.html.md.erb
index 8c0252d..1101146 100644
--- a/docs/geode-native-docs/security/systempropsforauth.html.md.erb
+++ b/docs/geode-native-docs/security/systempropsforauth.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-The native client uses system properties to acquire valid credentials for authentication by the server. You define these properties in the `gfcpp.properties` file, which the native client accesses during startup.
+The native client uses system properties to acquire valid credentials for authentication by the server. You define these properties in the `geode.properties` file, which the native client accesses during startup.
 
 ## <a id="security__section_E1835A3B22D44D47A4C9DB54A3590B71" class="no-quick-link"></a>security-client-auth-factory
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/attribute-def-priority.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/attribute-def-priority.html.md.erb b/docs/geode-native-docs/setting-properties/attribute-def-priority.html.md.erb
index c9614d1..f484f32 100644
--- a/docs/geode-native-docs/setting-properties/attribute-def-priority.html.md.erb
+++ b/docs/geode-native-docs/setting-properties/attribute-def-priority.html.md.erb
@@ -25,10 +25,10 @@ In case an attribute is defined in more than one place, the first source in this
 
 -   Programmatic configuration
 -   Properties set at the command line
--   <code>_current-working-directory_/gfcpp.properties</code> file
--   <code>_product-dir_/defaultSystem/gfcpp.properties</code> file
+-   <code>_current-working-directory_/geode.properties</code> file
+-   <code>_product-dir_/defaultSystem/geode.properties</code> file
 -   defaults
 
 
-The `gfcpp.properties` files and programmatic configuration are optional. If they are not present, no warnings or errors occur. For details on programmatic configuration through the `Properties` object, see [Defining Properties Programmatically](define-programmatically.html#define-programmatically).
+The `geode.properties` files and programmatic configuration are optional. If they are not present, no warnings or errors occur. For details on programmatic configuration through the `Properties` object, see [Defining Properties Programmatically](define-programmatically.html#define-programmatically).
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/attributes-gfcpp.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/attributes-gfcpp.html.md.erb b/docs/geode-native-docs/setting-properties/attributes-gfcpp.html.md.erb
deleted file mode 100644
index 58f0822..0000000
--- a/docs/geode-native-docs/setting-properties/attributes-gfcpp.html.md.erb
+++ /dev/null
@@ -1,278 +0,0 @@
----
-title:  Attributes in gfcpp.properties
----
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-A variety of `gfcpp.properties` settings can be used when a client connects to a distributed system.
-
-The following settings can be configured:
-
--   **[General Properties](attributes-gfcpp.html#attributes-gfcpp__table_21004C9E93294F03BE3469C13EA33262)** Basic information for the process, such as cache creation parameters.
--   **[Logging Properties](attributes-gfcpp.html#attributes-gfcpp__table_D42627049FD6432494BDE5170AF1BCCF)** How and where to log system messages.
--   **[Statistics Archiving Properties](attributes-gfcpp.html#attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723)** How to collect and archive statistics information.
--   **[Durable Client Properties](attributes-gfcpp.html#attributes-gfcpp__table_BA6DAF27947B4A9488787E6BDCFC15B9)** Information about the durable clients connected to the system.
--   **[Security Properties](attributes-gfcpp.html#attributes-gfcpp__table_B3A8E9EB44A94557A97BB700E2BA1EF1)** Information about various security parameters.
-
-## <a id="attributes-gfcpp__section_655789BCC46642789F91CDA8AE03CD9B" class="no-quick-link"></a>Attribute Definitions
-
-The following tables list attributes that can be stored in the `gfcpp.properties` file to be read by a client.
-
-For the system properties that relate to high availability, see [Sending Periodic Acknowledgement](../preserving-data/sending-periodic-ack.html#concept_868B8082463846DE9F35BBEA56105C82). For a list of security-related system properties and their descriptions, see the table [System Properties for Client Authentication and Authorization](../security/security-systemprops.html#security__table_92A6A66523764199A19BCD66BA189921).
-
-<a id="attributes-gfcpp__table_21004C9E93294F03BE3469C13EA33262"></a>
-
-<table>
-<caption><span class="tablecap">Table 1. Attributes in gfcpp.properties\u2014General Properties</span></caption>
-<colgroup>
-<col width="33%" />
-<col width="33%" />
-<col width="34%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>gfcpp.properties Attribute</th>
-<th>Description</th>
-<th>Default</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td>appdomain-enabled</td>
-<td>If <code class="ph codeph">true</code>, allows client to work when multiple .NET appdomains are in use.</td>
-<td>false</td>
-</tr>
-<tr class="even">
-<td>cache-xml-file</td>
-<td>Name and path of the file whose contents are used by default to initialize a cache if one is created. If not specified, the client starts with an empty cache, which is populated at run time.
-<p>See <a href="../cache-init-file/chapter-overview.html#chapter-overview">Cache Initialization File</a> for more information on the cache initialization file.</p></td>
-<td>no default</td>
-</tr>
-<tr class="odd">
-<td>heap-lru-delta</td>
-<td>When heap LRU is triggered, this is the amount that gets added to the percentage that is above the <code class="ph codeph">heap-lru-limit</code> amount. LRU continues until the memory usage is below <code class="ph codeph">heap-lru-limit</code> minus this percentage. This property is only used if <code class="ph codeph">heap-lru-limit</code> is greater than 0 .</td>
-<td>10</td>
-</tr>
-<tr class="even">
-<td>heap-lru-limit</td>
-<td>Maximum amount of memory, in megabytes, used by the cache for all regions. If this limit is exceeded by <code class="ph codeph">heap-lru-delta</code> percent, LRU reduces the memory footprint as necessary. If not specified, or set to 0, memory usage is governed by each region's LRU entries limit, if any.</td>
-<td>0</td>
-</tr>
-<tr class="odd">
-<td>conflate-events</td>
-<td>Client side conflation setting, which is sent to the server.</td>
-<td>server</td>
-</tr>
-<tr class="even">
-<td>connect-timeout</td>
-<td>Amount of time (in seconds) to wait for a response after a socket connection attempt.</td>
-<td>59</td>
-</tr>
-<tr class="odd">
-<td>connection-pool-size</td>
-<td>Number of connections per endpoint</td>
-<td>5</td>
-</tr>
-<tr class="even">
-<td>crash-dump-enabled</td>
-<td>Whether crash dump generation for unhandled fatal errors is enabled. True is enabled, false otherwise.</td>
-<td>true</td>
-</tr>
-<tr class="odd">
-<td>disable-chunk-handler-thread</td>
-<td>When set to false, each application thread processes its own response. If set to true, the chunk-handler-thread processes the response for each application thread.</td>
-<td>false</td>
-</tr>
-<tr class="even">
-<td>disable-shuffling-of-endpoints</td>
-<td>If true, prevents server endpoints that are configured in pools from being shuffled before use.</td>
-<td>false</td>
-</tr>
-<tr class="odd">
-<td>grid-client</td>
-<td>If true, the client does not start various internal threads, so that startup and shutdown time is reduced.</td>
-<td>false</td>
-</tr>
-<tr class="even">
-<td>max-fe-threads</td>
-<td>Thread pool size for parallel function execution. An example of this is the GetAll operations.</td>
-<td>2 * number of CPU cores</td>
-</tr>
-<tr class="odd">
-<td>max-socket-buffer-size</td>
-<td>Maximum size of the socket buffers, in bytes, that the client will try to set for client-server connections.</td>
-<td>65 * 1024</td>
-</tr>
-<tr class="even">
-<td>notify-ack-interval</td>
-<td>Interval, in seconds, in which client sends acknowledgments for subscription notifications.</td>
-<td>1</td>
-</tr>
-<tr class="odd">
-<td>notify-dupcheck-life</td>
-<td>Amount of time, in seconds, the client tracks subscription notifications before dropping the duplicates.</td>
-<td>300</td>
-</tr>
-<tr class="even">
-<td>ping-interval</td>
-<td>Interval, in seconds, between communication attempts with the server to show the client is alive. Pings are only sent when the <code class="ph codeph">ping-interval</code> elapses between normal client messages. This must be set lower than the server's <code class="ph codeph">maximum-time-between-pings</code>.</td>
-<td>10</td>
-</tr>
-<tr class="odd">
-<td>redundancy-monitor-interval</td>
-<td>Interval, in seconds, at which the subscription HA maintenance thread checks for the configured redundancy of subscription servers.</td>
-<td>10</td>
-</tr>
-<tr class="even">
-<td>stacktrace-enabled</td>
-<td>If <code class="ph codeph">true</code>, the exception classes capture a stack trace that can be printed with their <code class="ph codeph">printStackTrace</code> function. If false, the function prints a message that the trace is unavailable.</td>
-<td>false</td>
-</tr>
-<tr class="odd">
-<td>tombstone-timeout</td>
-<td>Time in milliseconds used to timeout tombstone entries when region consistency checking is enabled.
-</td>
-<td>480000</td>
-</tr>
-</tbody>
-</table>
-
-
-<a id="attributes-gfcpp__table_D42627049FD6432494BDE5170AF1BCCF"></a>
-
-<table>
-<caption><span class="tablecap">Table 2. Attributes in gfcpp.properties\u2014Logging Properties</span></caption>
-<colgroup>
-<col width="34%" />
-<col width="33%" />
-<col width="33%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>gfcpp.properties Attribute</th>
-<th>Description</th>
-<th>Default</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td>log-disk-space-limit</td>
-<td>Maximum amount of disk space, in megabytes, allowed for all log files, current, and rolled. If set to 0, the space is unlimited.</td>
-<td>0</td>
-</tr>
-<tr class="even">
-<td>log-file</td>
-<td>Name and full path of the file where a running client writes log messages. If not specified, logging goes to <code class="ph codeph">stdout</code>.</td>
-<td>no default file</td>
-</tr>
-<tr class="odd">
-<td>log-file-size-limit</td>
-<td>Maximum size, in megabytes, of a single log file. Once this limit is exceeded, a new log file is created and the current log file becomes inactive. If set to 0, the file size is unlimited.</td>
-<td>0</td>
-</tr>
-<tr class="even">
-<td>log-level</td>
-<td>Controls the types of messages that are written to the application's log. These are the levels, in descending order of severity and the types of message they provide:
-<ul>
-<li><strong>Error</strong> (highest severity) is a serious failure that will probably prevent program execution.</li>
-<li><strong>Warning</strong> is a potential problem in the system.</li>
-<li><strong>Info</strong> is an informational message of interest to the end user and system administrator.</li>
-<li><strong>Config</strong> is a static configuration message, often used to debug problems with particular configurations.</li>
-<li><strong>Fine, Finer, Finest, and Debug</strong> provide tracing information. Only use these with guidance from technical support.</li>
-</ul>
-<p>Enabling logging at any level enables logging for all higher levels.</p></td>
-<td>config</td>
-</tr>
-</tbody>
-</table>
-
-
-<a id="attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723"></a>
-
-<table>
-<caption><span class="tablecap">Table 3. Attributes in gfcpp.properties\u2014Statistics Archiving Properties</span></caption>
-<colgroup>
-<col width="33%" />
-<col width="33%" />
-<col width="34%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th>gfcpp.properties Attribute</th>
-<th>Description</th>
-<th>Default</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td>statistic-sampling-enabled</td>
-<td>Controls whether the process creates a statistic archive file.</td>
-<td>true</td>
-</tr>
-<tr class="even">
-<td>statistic-archive-file</td>
-<td>Name and full path of the file where a running system member writes archives statistics. If <code class="ph codeph">archive-disk-space-limit</code> is not set, the client appends the process ID to the configured file name, like <code class="ph codeph">statArchive-PID.gfs</code>. If the space limit is set, the process ID is not appended but each rolled file name is renamed to statArchive-ID.gfs, where ID is the rolled number of the file.</td>
-<td>./statArchive.gfs</td>
-</tr>
-<tr class="odd">
-<td>archive-disk-space-limit</td>
-<td>Maximum amount of disk space, in megabytes, allowed for all archive files, current, and rolled. If set to 0, the space is unlimited.</td>
-<td>0</td>
-</tr>
-<tr class="even">
-<td>archive-file-size-limit</td>
-<td>Maximum size, in bytes, of a single statistic archive file. Once this limit is exceeded, a new statistic archive file is created and the current archive file becomes inactive. If set to 0, the file size is unlimited.</td>
-<td>0</td>
-</tr>
-<tr class="odd">
-<td>statistic-sample-rate</td>
-<td>Rate, in seconds, that statistics are sampled. Operating system statistics are updated only when a sample is taken. If statistic archival is enabled, then these samples are written to the archive.
-<p>Lowering the sample rate for statistics reduces system resource use while still providing some statistics for system tuning and failure analysis.</p>
-</td>
-<td>1</td>
-</tr>
-<tr class="even">
-<td>enable-time-statistics</td>
-<td>Enables time-based statistics for the distributed system and caching. For performance reasons, time-based statistics are disabled by default. See <a href="../system-statistics/chapter_overview.html#concept_3BE5237AF2D34371883453E6A9474A79">System Statistics</a>. </td>
-<td>false</td>
-</tr>
-</tbody>
-</table>
-
-
-### <a id="attributes-gfcpp__table_BA6DAF27947B4A9488787E6BDCFC15B9" class="no-quick-link"></a>Table 4. Attributes in gfcpp.properties\u2014Durable Client Properties
-
-| gfcpp.properties Attribute | Description                                                                                                                                                                                                                                                                    | Default |
-|----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
-| auto-ready-for-events      | Whether client subscriptions automatically receive events when declaratively configured via XML. If set to `false`, event startup is not automatic and you need to call the `Cache.ReadyForEvents()` method API after subscriptions for the server to start delivering events. | true    |
-| durable-client-id          | Identifier to specify if you want the client to be durable.                                                                                                                                                                                                                    | empty   |
-| durable-timeout            | Time, in seconds, a durable client's subscription is maintained when it is not connected to the server before being dropped.                                                                                                                                                   | 300     |
-
-
-### <a id="attributes-gfcpp__table_B3A8E9EB44A94557A97BB700E2BA1EF1" class="no-quick-link"></a>Table 5. Attributes in gfcpp.properties\u2014Security Properties
-
-| gfcpp.properties Attribute   | Description                                                          | Default |
-|------------------------------|----------------------------------------------------------------------|---------|
-| security-client-dhalgo       | Diffie-Hellman secret key algorithm.                                 | null    |
-| security-client-kspath       | keystore (.pem file ) path.                                          | null    |
-| security-client-auth-factory | Factory method for the security `AuthInitialize` module.             | empty   |
-| security-client-auth-library | Path to the client security library for the `AuthInitialize` module. | empty   |
-| ssl-keystore-password        | Keystore password.                                                   | null    |
-
-
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/cache-server-config.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/cache-server-config.html.md.erb b/docs/geode-native-docs/setting-properties/cache-server-config.html.md.erb
index 95c34e1..e7c2f5a 100644
--- a/docs/geode-native-docs/setting-properties/cache-server-config.html.md.erb
+++ b/docs/geode-native-docs/setting-properties/cache-server-config.html.md.erb
@@ -21,13 +21,13 @@ limitations under the License.
 
 You configure the cache server in two files: `gemfire.properties` for server system-level configuration and `cache.xml` for cache-level configuration.
 
-The configuration of the caches is part of the application development process. See [Cache Initialization File](../cache-init-file/chapter-overview.html#chapter-overview). The cache-level configuration file is generally referred to as `cache.xml`, but you can use any name.
+The configuration of the caches is part of the application development process. See [Cache Initialization File (cache.xml)](../cache-init-file/chapter-overview.html#chapter-overview). The cache-level configuration file is generally referred to as `cache.xml`, but you can use any name.
 
 ## <a id="cache-server-config__section_FED30097F6C246DE843EBD8B5292D86C" class="no-quick-link"></a>Configuration File Locations
 
 For the cache server, the `gemfire.properties` file is usually stored in the current working directory.
 
-For the `cache.xml` configuration file, a client looks for the path specified by the `cache-xml-file` attribute in `gfcpp.properties` (see [Attributes in gfcpp.properties](attributes-gfcpp.html#attributes-gfcpp)). If the `cache.xml` is not found, the process starts with an unconfigured cache.
+For the `cache.xml` configuration file, a client looks for the path specified by the `cache-xml-file` attribute in `geode.properties` (see [Attributes in the Properties File](propfile_attributes.html#attributes-gfcpp)). If the `cache.xml` is not found, the process starts with an unconfigured cache.
 
 ## <a id="cache-server-config__section_F47DE4D858B04244956B91360AD8967E" class="no-quick-link"></a>Modifying Attributes Outside the gemfire.properties File
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/chapter-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/chapter-overview.html.md.erb b/docs/geode-native-docs/setting-properties/chapter-overview.html.md.erb
index 390a8ab..2ea38cc 100644
--- a/docs/geode-native-docs/setting-properties/chapter-overview.html.md.erb
+++ b/docs/geode-native-docs/setting-properties/chapter-overview.html.md.erb
@@ -25,12 +25,12 @@ This section describes how to configure clients and cache servers to participate
 
     You can configure clients through files and API calls. The servers are configured through command-line input and configuration files.
 
--   **[Attributes in gfcpp.properties](attributes-gfcpp.html)**
+-   **[Attributes in the Properties File](propfile_attributes.html)**
 
-    A variety of `gfcpp.properties` settings can be used when a client connects to a distributed system.
+    A variety of `geode.properties` settings can be used when a client connects to a distributed system.
 
--   **[gfcpp.properties Example File](../gfcpp.properties/chapter_overview.html)**
+-   **[Properties File Example](propfile_overview.html)**
 
-    Use the gfcpp.properties file to configure distributed system connections for the client.
+    Use the geode.properties file to configure distributed system connections for the client.
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/config-overview.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/config-overview.html.md.erb b/docs/geode-native-docs/setting-properties/config-overview.html.md.erb
index 6df0843..5354a71 100644
--- a/docs/geode-native-docs/setting-properties/config-overview.html.md.erb
+++ b/docs/geode-native-docs/setting-properties/config-overview.html.md.erb
@@ -23,7 +23,7 @@ You can configure clients through files and API calls. The servers are configure
 
 -   **[Client Configuration](native-client-config.html)**
 
-    You configure the client in two files: `gfcpp.properties` for system-level configuration and `cache.xml` for cache-level configuration.
+    You configure the client in two files: `geode.properties` for system-level configuration and `cache.xml` for cache-level configuration.
 
 -   **[Cache Server Configuration](cache-server-config.html)**
 
@@ -33,16 +33,16 @@ You can configure clients through files and API calls. The servers are configure
 
     You can specify attributes in different ways, which can cause conflicting definitions. Applications can be configured programmatically, and that has priority over other settings.
 
--   **[Search Path for Multiple gfcpp.properties Files](../gfcpp.properties/gfcpp.properties_search_path.html)**
+-   **[Search Path for Multiple Properties Files](propfile_search_path.html)**
 
     The client and server processes first look for their properties file in the <code>_product-dir_/defaultSystem</code> directory, then in the working directory.
 
--   **[Overriding gfcpp.properties Settings](../gfcpp.properties/overriding_gfcpp.properties.html)**
+-   **[Overriding Properties File Settings](propfile_overriding.html)**
 
-    Application developers have the option of configuring system attributes programmatically, rather than using the `gfcpp.properties` file.
+    Application developers have the option of configuring system attributes programmatically, rather than using the `geode.properties` file.
 
 -   **[Defining Properties Programmatically](define-programmatically.html)**
 
-    You can pass in specific gfcpp properties programmatically by using a `Properties` object to define the non-default properties.
+    You can pass in specific properties programmatically by using a `Properties` object to define the non-default properties.
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/define-programmatically.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/define-programmatically.html.md.erb b/docs/geode-native-docs/setting-properties/define-programmatically.html.md.erb
index 4650086..af02b5a 100644
--- a/docs/geode-native-docs/setting-properties/define-programmatically.html.md.erb
+++ b/docs/geode-native-docs/setting-properties/define-programmatically.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-You can pass in specific gfcpp properties programmatically by using a `Properties` object to define the non-default properties.
+You can pass in specific properties programmatically by using a `Properties` object to define the non-default properties.
 
 Example:
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/native-client-config.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/native-client-config.html.md.erb b/docs/geode-native-docs/setting-properties/native-client-config.html.md.erb
index 9513eb1..9076f6f 100644
--- a/docs/geode-native-docs/setting-properties/native-client-config.html.md.erb
+++ b/docs/geode-native-docs/setting-properties/native-client-config.html.md.erb
@@ -19,34 +19,34 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-You configure the client in two files: `gfcpp.properties` for system-level configuration and `cache.xml` for cache-level configuration.
+You configure the client in two files: `geode.properties` for system-level configuration and `cache.xml` for cache-level configuration.
 
-The configuration of the caches is part of the application development process. See [Cache Initialization File](../cache-init-file/chapter-overview.html#chapter-overview). (The cache-level configuration file is generally referred to as `cache.xml`, but you can use any name.)
+The configuration of the caches is part of the application development process. See [Cache Initialization File (cache.xml)](../cache-init-file/chapter-overview.html#chapter-overview). (The cache-level configuration file is generally referred to as `cache.xml`, but you can use any name.)
 
-## <a id="native-client-config__section_67D24B8F8C6C46CDA3474E6E42963D04" class="no-quick-link"></a>About gfcpp.properties Configuration File
+## <a id="native-client-config__section_67D24B8F8C6C46CDA3474E6E42963D04" class="no-quick-link"></a>About the geode.properties Configuration File
 
-The `gfcpp.properties` file provides local settings required to connect a client to a distributed system, along with settings for licensing, logging, and statistics. See [Attributes in gfcpp.properties](attributes-gfcpp.html#attributes-gfcpp).
+The `geode.properties` file provides local settings required to connect a client to a distributed system, along with settings for licensing, logging, and statistics. See [Attributes in the Properties File](propfile_attributes.html#attributes-gfcpp).
 
-The application software may include a set of `gfcpp.properties` files. You set any attributes needed for the application design in these files, then you can add any attributes needed for the local site.
+The application software may include a set of `geode.properties` files. You set any attributes needed for the application design in these files, then you can add any attributes needed for the local site.
 
-If you do not have `gfcpp.properties` files, use any text editor to create them. See [gfcpp.properties Example File](../gfcpp.properties/chapter_overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format and contents.
+If you do not have `geode.properties` files, use any text editor to create them. See [Properties File Example](propfile_overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format and contents.
 
 ## <a id="native-client-config__section_88780874FD6C4BBD9B1B993758A985BB" class="no-quick-link"></a>Configuration File Locations
 
-A client looks for a `gfcpp.properties` file first in the working directory where the process runs, then in <code>_product-dir_/defaultSystem</code>.
-Use the `defaultSystem` directory to group configuration files or to share them among processes for more convenient administration. If `gfcpp.properties` is not found, the process starts up with the default settings.
+A client looks for a `geode.properties` file first in the working directory where the process runs, then in <code>_product-dir_/defaultSystem</code>.
+Use the `defaultSystem` directory to group configuration files or to share them among processes for more convenient administration. If `geode.properties` is not found, the process starts up with the default settings.
 
-For the `cache.xml` cache configuration file, a client looks for the path specified by the `cache-xml-file` attribute in `gfcpp.properties` (see [Attributes in gfcpp.properties](attributes-gfcpp.html#attributes-gfcpp)). If the `cache.xml` is not found, the process starts with an unconfigured cache.
+For the `cache.xml` cache configuration file, a client looks for the path specified by the `cache-xml-file` attribute in `geode.properties` (see [Attributes in the Properties File](propfile_attributes.html#attributes-gfcpp)). If the `cache.xml` is not found, the process starts with an unconfigured cache.
 
 ## <a id="native-client-config__section_6EBE269F15A1497BB4ABBF659F978DA1" class="no-quick-link"></a>Configuring System Properties for the Client
 
 The typical configuration procedure for a client includes the high-level steps listed below. The rest of this chapter provides the details.
 
-1.  Place the `gfcpp.properties` file for the application in the working directory or in <code>_product-dir_/defaultSystem</code>.
-Use the configuration file that came with the application software if there is one, or create your own. See [gfcpp.properties Example File](../gfcpp.properties/chapter_overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format and contents.
-2.  Place the `cache.xml` file for the application in the desired location and specify its path in the `gfcpp.properties` file.
-3.  Add other attributes to the `gfcpp.properties` file as needed for the local system architecture. See [Attributes in gfcpp.properties](attributes-gfcpp.html#attributes-gfcpp) for the configurable attributes, and [gfcpp.properties Example File](../gfcpp.properties/chapter_overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format.
+1.  Place the `geode.properties` file for the application in the working directory or in <code>_product-dir_/defaultSystem</code>.
+Use the configuration file that came with the application software if there is one, or create your own. See [Properties File Example](propfile_overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format and contents.
+2.  Place the `cache.xml` file for the application in the desired location and specify its path in the `geode.properties` file.
+3.  Add other attributes to the `geode.properties` file as needed for the local system architecture. See [Attributes in the Properties File](propfile_attributes.html#attributes-gfcpp) for the configurable attributes, and [Properties File Example](propfile_overview.html#concept_41DADD6F4E41495A89CCBB8A790ED9DF) for a sample of the file format.
 
 ## <a id="native-client-config__section_7F09E85DD0144972AAA7028D81780129" class="no-quick-link"></a>Running a Client Out of the Box
 
-If you start a client without any configuration, it uses any attributes set programmatically plus any hard-coded defaults (listed in [Attributes in gfcpp.properties](attributes-gfcpp.html#attributes-gfcpp)). Running with the defaults is a convenient way to learn the operation of the distributed system and to test which attributes need to be reconfigured for your environment.
+If you start a client without any configuration, it uses any attributes set programmatically plus any hard-coded defaults (listed in [Attributes in the Properties File](propfile_attributes.html#attributes-gfcpp)). Running with the defaults is a convenient way to learn the operation of the distributed system and to test which attributes need to be reconfigured for your environment.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/013b336a/docs/geode-native-docs/setting-properties/propfile_attributes.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/setting-properties/propfile_attributes.html.md.erb b/docs/geode-native-docs/setting-properties/propfile_attributes.html.md.erb
new file mode 100644
index 0000000..6e2d5d3
--- /dev/null
+++ b/docs/geode-native-docs/setting-properties/propfile_attributes.html.md.erb
@@ -0,0 +1,278 @@
+---
+title:  Attributes in the Properties File
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+A variety of `geode.properties` settings can be used when a client connects to a distributed system.
+
+The following settings can be configured:
+
+-   **[General Properties](#attributes-gfcpp__table_21004C9E93294F03BE3469C13EA33262)** Basic information for the process, such as cache creation parameters.
+-   **[Logging Properties](#attributes-gfcpp__table_D42627049FD6432494BDE5170AF1BCCF)** How and where to log system messages.
+-   **[Statistics Archiving Properties](#attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723)** How to collect and archive statistics information.
+-   **[Durable Client Properties](#attributes-gfcpp__table_BA6DAF27947B4A9488787E6BDCFC15B9)** Information about the durable clients connected to the system.
+-   **[Security Properties](#attributes-gfcpp__table_B3A8E9EB44A94557A97BB700E2BA1EF1)** Information about various security parameters.
+
+## <a id="attributes-gfcpp__section_655789BCC46642789F91CDA8AE03CD9B" class="no-quick-link"></a>Attribute Definitions
+
+The following tables list attributes that can be stored in the `geode.properties` file to be read by a client.
+
+For the system properties that relate to high availability, see [Sending Periodic Acknowledgement](../preserving-data/sending-periodic-ack.html#concept_868B8082463846DE9F35BBEA56105C82). For a list of security-related system properties and their descriptions, see the table [System Properties for Client Authentication and Authorization](../security/security-systemprops.html#security__table_92A6A66523764199A19BCD66BA189921).
+
+<a id="attributes-gfcpp__table_21004C9E93294F03BE3469C13EA33262" class="no-quick-link"></a>
+
+<table>
+<caption><span class="tablecap">Table 1. Attributes in geode.properties\u2014General Properties</span></caption>
+<colgroup>
+<col width="33%" />
+<col width="33%" />
+<col width="34%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th>geode.properties Attribute</th>
+<th>Description</th>
+<th>Default</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>appdomain-enabled</td>
+<td>If <code class="ph codeph">true</code>, allows client to work when multiple .NET appdomains are in use.</td>
+<td>false</td>
+</tr>
+<tr class="even">
+<td>cache-xml-file</td>
+<td>Name and path of the file whose contents are used by default to initialize a cache if one is created. If not specified, the client starts with an empty cache, which is populated at run time.
+<p>See <a href="../cache-init-file/chapter-overview.html#chapter-overview">Cache Initialization File</a> for more information on the cache initialization file.</p></td>
+<td>no default</td>
+</tr>
+<tr class="odd">
+<td>heap-lru-delta</td>
+<td>When heap LRU is triggered, this is the amount that gets added to the percentage that is above the <code class="ph codeph">heap-lru-limit</code> amount. LRU continues until the memory usage is below <code class="ph codeph">heap-lru-limit</code> minus this percentage. This property is only used if <code class="ph codeph">heap-lru-limit</code> is greater than 0 .</td>
+<td>10</td>
+</tr>
+<tr class="even">
+<td>heap-lru-limit</td>
+<td>Maximum amount of memory, in megabytes, used by the cache for all regions. If this limit is exceeded by <code class="ph codeph">heap-lru-delta</code> percent, LRU reduces the memory footprint as necessary. If not specified, or set to 0, memory usage is governed by each region's LRU entries limit, if any.</td>
+<td>0</td>
+</tr>
+<tr class="odd">
+<td>conflate-events</td>
+<td>Client side conflation setting, which is sent to the server.</td>
+<td>server</td>
+</tr>
+<tr class="even">
+<td>connect-timeout</td>
+<td>Amount of time (in seconds) to wait for a response after a socket connection attempt.</td>
+<td>59</td>
+</tr>
+<tr class="odd">
+<td>connection-pool-size</td>
+<td>Number of connections per endpoint</td>
+<td>5</td>
+</tr>
+<tr class="even">
+<td>crash-dump-enabled</td>
+<td>Whether crash dump generation for unhandled fatal errors is enabled. True is enabled, false otherwise.</td>
+<td>true</td>
+</tr>
+<tr class="odd">
+<td>disable-chunk-handler-thread</td>
+<td>When set to false, each application thread processes its own response. If set to true, the chunk-handler-thread processes the response for each application thread.</td>
+<td>false</td>
+</tr>
+<tr class="even">
+<td>disable-shuffling-of-endpoints</td>
+<td>If true, prevents server endpoints that are configured in pools from being shuffled before use.</td>
+<td>false</td>
+</tr>
+<tr class="odd">
+<td>grid-client</td>
+<td>If true, the client does not start various internal threads, so that startup and shutdown time is reduced.</td>
+<td>false</td>
+</tr>
+<tr class="even">
+<td>max-fe-threads</td>
+<td>Thread pool size for parallel function execution. An example of this is the GetAll operations.</td>
+<td>2 * number of CPU cores</td>
+</tr>
+<tr class="odd">
+<td>max-socket-buffer-size</td>
+<td>Maximum size of the socket buffers, in bytes, that the client will try to set for client-server connections.</td>
+<td>65 * 1024</td>
+</tr>
+<tr class="even">
+<td>notify-ack-interval</td>
+<td>Interval, in seconds, in which client sends acknowledgments for subscription notifications.</td>
+<td>1</td>
+</tr>
+<tr class="odd">
+<td>notify-dupcheck-life</td>
+<td>Amount of time, in seconds, the client tracks subscription notifications before dropping the duplicates.</td>
+<td>300</td>
+</tr>
+<tr class="even">
+<td>ping-interval</td>
+<td>Interval, in seconds, between communication attempts with the server to show the client is alive. Pings are only sent when the <code class="ph codeph">ping-interval</code> elapses between normal client messages. This must be set lower than the server's <code class="ph codeph">maximum-time-between-pings</code>.</td>
+<td>10</td>
+</tr>
+<tr class="odd">
+<td>redundancy-monitor-interval</td>
+<td>Interval, in seconds, at which the subscription HA maintenance thread checks for the configured redundancy of subscription servers.</td>
+<td>10</td>
+</tr>
+<tr class="even">
+<td>stacktrace-enabled</td>
+<td>If <code class="ph codeph">true</code>, the exception classes capture a stack trace that can be printed with their <code class="ph codeph">printStackTrace</code> function. If false, the function prints a message that the trace is unavailable.</td>
+<td>false</td>
+</tr>
+<tr class="odd">
+<td>tombstone-timeout</td>
+<td>Time in milliseconds used to timeout tombstone entries when region consistency checking is enabled.
+</td>
+<td>480000</td>
+</tr>
+</tbody>
+</table>
+
+
+<a id="attributes-gfcpp__table_D42627049FD6432494BDE5170AF1BCCF" class="no-quick-link"></a>
+
+<table>
+<caption><span class="tablecap">Table 2. Attributes in geode.properties\u2014Logging Properties</span></caption>
+<colgroup>
+<col width="34%" />
+<col width="33%" />
+<col width="33%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th>geode.properties Attribute</th>
+<th>Description</th>
+<th>Default</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>log-disk-space-limit</td>
+<td>Maximum amount of disk space, in megabytes, allowed for all log files, current, and rolled. If set to 0, the space is unlimited.</td>
+<td>0</td>
+</tr>
+<tr class="even">
+<td>log-file</td>
+<td>Name and full path of the file where a running client writes log messages. If not specified, logging goes to <code class="ph codeph">stdout</code>.</td>
+<td>no default file</td>
+</tr>
+<tr class="odd">
+<td>log-file-size-limit</td>
+<td>Maximum size, in megabytes, of a single log file. Once this limit is exceeded, a new log file is created and the current log file becomes inactive. If set to 0, the file size is unlimited.</td>
+<td>0</td>
+</tr>
+<tr class="even">
+<td>log-level</td>
+<td>Controls the types of messages that are written to the application's log. These are the levels, in descending order of severity and the types of message they provide:
+<ul>
+<li><strong>Error</strong> (highest severity) is a serious failure that will probably prevent program execution.</li>
+<li><strong>Warning</strong> is a potential problem in the system.</li>
+<li><strong>Info</strong> is an informational message of interest to the end user and system administrator.</li>
+<li><strong>Config</strong> is a static configuration message, often used to debug problems with particular configurations.</li>
+<li><strong>Fine, Finer, Finest, and Debug</strong> provide tracing information. Only use these with guidance from technical support.</li>
+</ul>
+<p>Enabling logging at any level enables logging for all higher levels.</p></td>
+<td>config</td>
+</tr>
+</tbody>
+</table>
+
+
+<a id="attributes-gfcpp__table_E1A0EDBA67CD41319E1E5FD0A0BB2723" class="no-quick-link"></a>
+
+<table>
+<caption><span class="tablecap">Table 3. Attributes in geode.properties\u2014Statistics Archiving Properties</span></caption>
+<colgroup>
+<col width="33%" />
+<col width="33%" />
+<col width="34%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th>geode.properties Attribute</th>
+<th>Description</th>
+<th>Default</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>statistic-sampling-enabled</td>
+<td>Controls whether the process creates a statistic archive file.</td>
+<td>true</td>
+</tr>
+<tr class="even">
+<td>statistic-archive-file</td>
+<td>Name and full path of the file where a running system member writes archives statistics. If <code class="ph codeph">archive-disk-space-limit</code> is not set, the client appends the process ID to the configured file name, like <code class="ph codeph">statArchive-PID.gfs</code>. If the space limit is set, the process ID is not appended but each rolled file name is renamed to statArchive-ID.gfs, where ID is the rolled number of the file.</td>
+<td>./statArchive.gfs</td>
+</tr>
+<tr class="odd">
+<td>archive-disk-space-limit</td>
+<td>Maximum amount of disk space, in megabytes, allowed for all archive files, current, and rolled. If set to 0, the space is unlimited.</td>
+<td>0</td>
+</tr>
+<tr class="even">
+<td>archive-file-size-limit</td>
+<td>Maximum size, in bytes, of a single statistic archive file. Once this limit is exceeded, a new statistic archive file is created and the current archive file becomes inactive. If set to 0, the file size is unlimited.</td>
+<td>0</td>
+</tr>
+<tr class="odd">
+<td>statistic-sample-rate</td>
+<td>Rate, in seconds, that statistics are sampled. Operating system statistics are updated only when a sample is taken. If statistic archival is enabled, then these samples are written to the archive.
+<p>Lowering the sample rate for statistics reduces system resource use while still providing some statistics for system tuning and failure analysis.</p>
+</td>
+<td>1</td>
+</tr>
+<tr class="even">
+<td>enable-time-statistics</td>
+<td>Enables time-based statistics for the distributed system and caching. For performance reasons, time-based statistics are disabled by default. See <a href="../system-statistics/chapter_overview.html#concept_3BE5237AF2D34371883453E6A9474A79">System Statistics</a>. </td>
+<td>false</td>
+</tr>
+</tbody>
+</table>
+
+
+### <a id="attributes-gfcpp__table_BA6DAF27947B4A9488787E6BDCFC15B9" class="no-quick-link"></a>Table 4. Attributes in geode.properties\u2014Durable Client Properties
+
+| geode.properties Attribute | Description                                                                                                                                                                                                                                                                    | Default |
+|----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
+| auto-ready-for-events      | Whether client subscriptions automatically receive events when declaratively configured via XML. If set to `false`, event startup is not automatic and you need to call the `Cache.ReadyForEvents()` method API after subscriptions for the server to start delivering events. | true    |
+| durable-client-id          | Identifier to specify if you want the client to be durable.                                                                                                                                                                                                                    | empty   |
+| durable-timeout            | Time, in seconds, a durable client's subscription is maintained when it is not connected to the server before being dropped.                                                                                                                                                   | 300     |
+
+
+### <a id="attributes-gfcpp__table_B3A8E9EB44A94557A97BB700E2BA1EF1" class="no-quick-link"></a>Table 5. Attributes in geode.properties\u2014Security Properties
+
+| geode.properties Attribute   | Description                                                          | Default |
+|------------------------------|----------------------------------------------------------------------|---------|
+| security-client-dhalgo       | Diffie-Hellman secret key algorithm.                                 | null    |
+| security-client-kspath       | keystore (.pem file ) path.                                          | null    |
+| security-client-auth-factory | Factory method for the security `AuthInitialize` module.             | empty   |
+| security-client-auth-library | Path to the client security library for the `AuthInitialize` module. | empty   |
+| ssl-keystore-password        | Keystore password.                                                   | null    |
+
+
+