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/08/24 00:30:00 UTC
geode git commit: GEODE-3395 Variable-ize product version and name in
user guide - Basic config
Repository: geode
Updated Branches:
refs/heads/develop d83ba36e8 -> a5469147d
GEODE-3395 Variable-ize product version and name in user guide - Basic config
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a5469147
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a5469147
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a5469147
Branch: refs/heads/develop
Commit: a5469147da1d4cc45e93e44762c025b25092bc40
Parents: d83ba36
Author: Dave Barnes <db...@pivotal.io>
Authored: Wed Aug 23 17:29:07 2017 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Wed Aug 23 17:29:46 2017 -0700
----------------------------------------------------------------------
geode-docs/basic_config/book_intro.html.md.erb | 18 ++++++++--------
.../chapter_overview.html.md.erb | 18 ++++++++--------
...uted_system_member_configuration.html.md.erb | 8 +++----
.../config_concepts/local_vs_remote.html.md.erb | 4 ++--
.../chapter_overview.html.md.erb | 6 +++---
.../managing_data_entries.html.md.erb | 6 +++---
.../using_custom_classes.html.md.erb | 4 ++--
.../data_regions/chapter_overview.html.md.erb | 22 ++++++++++----------
.../create_a_region_with_gfsh.html.md.erb | 2 +-
.../managing_data_regions.html.md.erb | 8 +++----
.../data_regions/region_shortcuts.html.md.erb | 12 +++++------
.../store_retrieve_region_shortcuts.html.md.erb | 6 +++---
.../setting_distributed_properties.html.md.erb | 8 +++----
.../the_cache/chapter_overview.html.md.erb | 16 +++++++-------
.../intro_cache_management.html.md.erb | 12 +++++------
.../managing_a_client_cache.html.md.erb | 6 +++---
.../managing_a_multiuser_cache.html.md.erb | 2 +-
.../managing_a_peer_server_cache.html.md.erb | 4 ++--
.../setting_cache_properties.html.md.erb | 4 ++--
19 files changed, 83 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/book_intro.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/book_intro.html.md.erb b/geode-docs/basic_config/book_intro.html.md.erb
index 757195d..cfd9516 100644
--- a/geode-docs/basic_config/book_intro.html.md.erb
+++ b/geode-docs/basic_config/book_intro.html.md.erb
@@ -19,22 +19,22 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-*Basic Configuration and Programming* describes how to configure distributed system and cache properties for your Apache Geode installation. For your applications, it provides guidance for writing code to manage your cache and distributed system connection, data regions, and data entries, including custom classes.
+*Basic Configuration and Programming* describes how to configure distributed system and cache properties for your <%=vars.product_name_long%> installation. For your applications, it provides guidance for writing code to manage your cache and distributed system connection, data regions, and data entries, including custom classes.
-- **[Distributed System and Cache Configuration](../basic_config/config_concepts/chapter_overview.html)**
+- **[Distributed System and Cache Configuration](config_concepts/chapter_overview.html)**
- To work with your Apache Geode applications, you use a combination of configuration files and application code.
+ To work with your <%=vars.product_name_long%> applications, you use a combination of configuration files and application code.
-- **[Cache Management](../basic_config/the_cache/chapter_overview.html)**
+- **[Cache Management](the_cache/chapter_overview.html)**
- The Geode cache is the entry point to Geode caching management. Geode provides different APIs and XML configuration models to support the behaviors of different members.
+ The <%=vars.product_name%> cache is the entry point to <%=vars.product_name%> caching management. <%=vars.product_name%> provides different APIs and XML configuration models to support the behaviors of different members.
-- **[Data Regions](../basic_config/data_regions/chapter_overview.html)**
+- **[Data Regions](data_regions/chapter_overview.html)**
- The region is the core building block of the Apache Geode distributed system. All cached data is organized into data regions and you do all of your data puts, gets, and querying activities against them.
+ The region is the core building block of the <%=vars.product_name_long%> distributed system. All cached data is organized into data regions and you do all of your data puts, gets, and querying activities against them.
-- **[Data Entries](../basic_config/data_entries_custom_classes/chapter_overview.html)**
+- **[Data Entries](data_entries_custom_classes/chapter_overview.html)**
- The data entry is the key/value pair where you store your data. You can manage your entries individually and in batches. To use domain objects for your entry values and keys, you need to follow Apache Geode requirements for data storage and distribution.
+ The data entry is the key/value pair where you store your data. You can manage your entries individually and in batches. To use domain objects for your entry values and keys, you need to follow <%=vars.product_name_long%> requirements for data storage and distribution.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/config_concepts/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/config_concepts/chapter_overview.html.md.erb b/geode-docs/basic_config/config_concepts/chapter_overview.html.md.erb
index a5df468..8006f79 100644
--- a/geode-docs/basic_config/config_concepts/chapter_overview.html.md.erb
+++ b/geode-docs/basic_config/config_concepts/chapter_overview.html.md.erb
@@ -19,22 +19,22 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-To work with your Apache Geode applications, you use a combination of configuration files and application code.
+To work with your <%=vars.product_name_long%> applications, you use a combination of configuration files and application code.
-- **[Distributed System Members](../../basic_config/config_concepts/distributed_system_member_configuration.html)**
+- **[Distributed System Members](distributed_system_member_configuration.html)**
- Distributed system members are programs that connect to a Geode distributed system. You configure members to belong to a single distributed system, and you can optionally configure them to be clients or servers to members in other distributed systems, and to communicate with other distributed systems.
+ Distributed system members are programs that connect to a <%=vars.product_name%> distributed system. You configure members to belong to a single distributed system, and you can optionally configure them to be clients or servers to members in other distributed systems, and to communicate with other distributed systems.
-- **[Setting Properties](../../basic_config/gemfire_properties/setting_distributed_properties.html)**
+- **[Setting Properties](../gemfire_properties/setting_distributed_properties.html)**
- Geode provides a default distributed system configuration for out-of-the-box systems. To use non-default configurations and to fine-tune your member communication, you can use a mix of various options to customize your distributed system configuration.
+ <%=vars.product_name%> provides a default distributed system configuration for out-of-the-box systems. To use non-default configurations and to fine-tune your member communication, you can use a mix of various options to customize your distributed system configuration.
-- **[Options for Configuring the Cache and Data Regions](../../basic_config/the_cache/setting_cache_properties.html)**
+- **[Options for Configuring the Cache and Data Regions](../the_cache/setting_cache_properties.html)**
- To populate your Apache Geode cache and fine-tune its storage and distribution behavior, you need to define cached data regions and provide custom configuration for the cache and regions.
+ To populate your <%=vars.product_name_long%> cache and fine-tune its storage and distribution behavior, you need to define cached data regions and provide custom configuration for the cache and regions.
-- **[Local and Remote Membership and Caching](../../basic_config/config_concepts/local_vs_remote.html)**
+- **[Local and Remote Membership and Caching](local_vs_remote.html)**
- For many Apache Geode discussions, you need to understand the difference between local and remote membership and caching.
+ For many <%=vars.product_name_long%> discussions, you need to understand the difference between local and remote membership and caching.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/config_concepts/distributed_system_member_configuration.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/config_concepts/distributed_system_member_configuration.html.md.erb b/geode-docs/basic_config/config_concepts/distributed_system_member_configuration.html.md.erb
index 2ed2a8b..39f1e3a 100644
--- a/geode-docs/basic_config/config_concepts/distributed_system_member_configuration.html.md.erb
+++ b/geode-docs/basic_config/config_concepts/distributed_system_member_configuration.html.md.erb
@@ -19,11 +19,11 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Distributed system members are programs that connect to a Geode distributed system. You configure members to belong to a single distributed system, and you can optionally configure them to be clients or servers to members in other distributed systems, and to communicate with other distributed systems.
+Distributed system members are programs that connect to a <%=vars.product_name%> distributed system. You configure members to belong to a single distributed system, and you can optionally configure them to be clients or servers to members in other distributed systems, and to communicate with other distributed systems.
## <a id="distributed_system_member_configuration__section_326B2609B67E4FBE9BF2074C3B211E50" class="no-quick-link"></a>Member Overview
-Distributed system members (or simply "members") connect to the Geode system when they create the Geode data cache. The members' distributed system is configured through Geode properties. See [gemfire.properties and gfsecurity.properties (Geode Properties)](../../reference/topics/gemfire_properties.html). Geode properties specify all necessary information for system member startup, initialization, and communication.
+Distributed system members (or simply "members") connect to the <%=vars.product_name%> system when they create the <%=vars.product_name%> data cache. The members' distributed system is configured through <%=vars.product_name%> properties. See [gemfire.properties and gfsecurity.properties (<%=vars.product_name%> Properties)](../../reference/topics/gemfire_properties.html). <%=vars.product_name%> properties specify all necessary information for system member startup, initialization, and communication.
**Note:**
You cannot change a member's properties while the member is connected to the distributed system.
@@ -37,10 +37,10 @@ Use the properties to define:
## <a id="distributed_system_member_configuration__section_E755E9E4A31149C980561D617A99A002" class="no-quick-link"></a>Distributed System Membership and System Topologies
-Every Geode process is a member of a distributed system, even if the distributed system is defined as standalone, with just one member. You can run an individual distributed system in isolation or you can combine systems for vertical and horizontal scaling. See [Topology and Communication General Concepts](../../topologies_and_comm/topology_concepts/chapter_overview.html).
+Every <%=vars.product_name%> process is a member of a distributed system, even if the distributed system is defined as standalone, with just one member. You can run an individual distributed system in isolation or you can combine systems for vertical and horizontal scaling. See [Topology and Communication General Concepts](../../topologies_and_comm/topology_concepts/chapter_overview.html).
- **Peer-to-Peer Distributed Systems**. Members that define the same member discovery properties belong to the same distributed system and are peers to one another.
-- **Client/Server Installations**. The client/server topology uses relationships that you configure between members of multiple distributed systems. You configure some or all of the peers in one distributed system to act as cache servers to clients connecting from outside the system. Each server can host many client processes, managing cache access for all in an efficient, vertically hierarchical cache configuration. You configure the client applications to connect to the servers, using a client cache configuration. Clients run as members of standalone Geode distributed systems, with no peers, so all data updates and requests go to the servers.
+- **Client/Server Installations**. The client/server topology uses relationships that you configure between members of multiple distributed systems. You configure some or all of the peers in one distributed system to act as cache servers to clients connecting from outside the system. Each server can host many client processes, managing cache access for all in an efficient, vertically hierarchical cache configuration. You configure the client applications to connect to the servers, using a client cache configuration. Clients run as members of standalone <%=vars.product_name%> distributed systems, with no peers, so all data updates and requests go to the servers.
## **Multi-site Installations**
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/config_concepts/local_vs_remote.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/config_concepts/local_vs_remote.html.md.erb b/geode-docs/basic_config/config_concepts/local_vs_remote.html.md.erb
index 535f2fd..6e7ef67 100644
--- a/geode-docs/basic_config/config_concepts/local_vs_remote.html.md.erb
+++ b/geode-docs/basic_config/config_concepts/local_vs_remote.html.md.erb
@@ -19,10 +19,10 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-For many Apache Geode discussions, you need to understand the difference between local and remote membership and caching.
+For many <%=vars.product_name_long%> discussions, you need to understand the difference between local and remote membership and caching.
<a id="local_vs_remote_member_and_cache__section_5535DC4C94494B6A9B106DA39F63A439"></a>
-Discussions of Geode membership and caching activities often differentiate between local and remote. Local caching always refers to the central member under discussion, if there is one such obvious member, and remote refers to other members. If there is no clear, single local member, the discussion assigns names to the members to differentiate. Operations, data, configuration, and so forth that are "local to member Q" are running or resident inside the member Q process. Operations, data, configuration, and so on, that are "remote to member Q" are running or resident inside some other member.
+Discussions of <%=vars.product_name%> membership and caching activities often differentiate between local and remote. Local caching always refers to the central member under discussion, if there is one such obvious member, and remote refers to other members. If there is no clear, single local member, the discussion assigns names to the members to differentiate. Operations, data, configuration, and so forth that are "local to member Q" are running or resident inside the member Q process. Operations, data, configuration, and so on, that are "remote to member Q" are running or resident inside some other member.
The local cache is the cache belonging to the local member. All other caches are remote, whether in other members of the same distributed system or in different distributed systems.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_entries_custom_classes/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_entries_custom_classes/chapter_overview.html.md.erb b/geode-docs/basic_config/data_entries_custom_classes/chapter_overview.html.md.erb
index 0dd9f68..69988d6 100644
--- a/geode-docs/basic_config/data_entries_custom_classes/chapter_overview.html.md.erb
+++ b/geode-docs/basic_config/data_entries_custom_classes/chapter_overview.html.md.erb
@@ -19,13 +19,13 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The data entry is the key/value pair where you store your data. You can manage your entries individually and in batches. To use domain objects for your entry values and keys, you need to follow Apache Geode requirements for data storage and distribution.
+The data entry is the key/value pair where you store your data. You can manage your entries individually and in batches. To use domain objects for your entry values and keys, you need to follow <%=vars.product_name_long%> requirements for data storage and distribution.
-- **[Managing Data Entries](../../basic_config/data_entries_custom_classes/managing_data_entries.html)**
+- **[Managing Data Entries](managing_data_entries.html)**
Program your applications to create, modify, and manage your cached data entries.
-- **[Requirements for Using Custom Classes in Data Caching](../../basic_config/data_entries_custom_classes/using_custom_classes.html)**
+- **[Requirements for Using Custom Classes in Data Caching](using_custom_classes.html)**
Follow these guidelines to use custom domain classes for your cached entry keys and values.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb b/geode-docs/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
index 3b3f62f..a81696d 100644
--- a/geode-docs/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
+++ b/geode-docs/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
@@ -23,7 +23,7 @@ Program your applications to create, modify, and manage your cached data entries
<a id="managing_data_entries__section_AACC36127F17411F86D1E409B86C6E5C"></a>
**Note:**
-If you do not have the cache's `copy-on-read` attribute set to true, do not change the objects returned from the Java entry access methods. Instead, create a copy of the object, then modify the copy and pass it to the Java `put` method. Modifying a value in place bypasses the entire distribution framework provided by Geode, including cache listeners and expiration activities, and can produce undesired results.
+If you do not have the cache's `copy-on-read` attribute set to true, do not change the objects returned from the Java entry access methods. Instead, create a copy of the object, then modify the copy and pass it to the Java `put` method. Modifying a value in place bypasses the entire distribution framework provided by <%=vars.product_name%>, including cache listeners and expiration activities, and can produce undesired results.
## <a id="managing_data_entries__section_B095A4073EFB4A3C91AF7C03632EEBFB" class="no-quick-link"></a>Basic Create and Update
@@ -42,7 +42,7 @@ If you want only to create the entry (with a null value and with method failure
## <a id="managing_data_entries__section_7578349EA26A4621B732FE851D71A84F" class="no-quick-link"></a>Batch Operations (getAll, putAll, removeAll)
-Geode provides three APIs to perform batch operations on multiple region entries:
+<%=vars.product_name%> provides three APIs to perform batch operations on multiple region entries:
- `Region.getAll`
- `Region.putAll`
@@ -78,7 +78,7 @@ The `removeAll` method takes a collection of keys and removes all of the entries
When you get an entry value from the cache, by default, the retrieval methods return a direct reference to the cached object. This provides the value as quickly as possible, but also opens the cache to direct, in-place changes.
**Note:**
-Do not directly modify cached values. Modifying a value in place bypasses the Geode distribution framework, including cache writers and listeners, expiration activities, and transaction management, and can produce undesired results.
+Do not directly modify cached values. Modifying a value in place bypasses the <%=vars.product_name%> distribution framework, including cache writers and listeners, expiration activities, and transaction management, and can produce undesired results.
Always change your entries using copies of the retrieved objects—never directly modify the returned objects. You can do this in one of two ways:
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_entries_custom_classes/using_custom_classes.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_entries_custom_classes/using_custom_classes.html.md.erb b/geode-docs/basic_config/data_entries_custom_classes/using_custom_classes.html.md.erb
index 698c04f..e66825a 100644
--- a/geode-docs/basic_config/data_entries_custom_classes/using_custom_classes.html.md.erb
+++ b/geode-docs/basic_config/data_entries_custom_classes/using_custom_classes.html.md.erb
@@ -26,7 +26,7 @@ Follow these guidelines to use custom domain classes for your cached entry keys
Each member’s `CLASSPATH` must include classes for all objects the member accesses.
- For Java applications, use the standard Java `CLASSPATH`.
-- For the cache server process, use the `CLASSPATH` environment variable or the `gfsh start server`'s `--classpath` parameter. See [Running Geode Server Processes](../../configuring/running/running_the_cacheserver.html).
+- For the cache server process, use the `CLASSPATH` environment variable or the `gfsh start server`'s `--classpath` parameter. See [Running <%=vars.product_name%> Server Processes](../../configuring/running/running_the_cacheserver.html).
Data is sent between clients and servers in serialized form and the server stores client data in serialized form. The server does not need to deserialize data to send it to another client or to access it through a `PDXInstance`, but it does need to deserialize it to access it in other ways. The server `CLASSPATH` must include the classes for:
@@ -38,7 +38,7 @@ For information on `PdxInstance`s, see [Data Serialization](../../developing/dat
## <a id="using_custom_classes__section_57EB5D02C06947B4BDE75A49286D581D" class="no-quick-link"></a>Data Serialization
-Geode serializes data entry keys and values for distribution, so all data that Geode moves out of the local cache for any reason must be serializable. Additionally, partitioned regions store data in serialized form. Almost every configuration requires serialization.
+<%=vars.product_name%> serializes data entry keys and values for distribution, so all data that <%=vars.product_name%> moves out of the local cache for any reason must be serializable. Additionally, partitioned regions store data in serialized form. Almost every configuration requires serialization.
For information on the requirements and options for data serialization, see [Data Serialization](../../developing/data_serialization/chapter_overview.html#data_serialization).
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_regions/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_regions/chapter_overview.html.md.erb b/geode-docs/basic_config/data_regions/chapter_overview.html.md.erb
index 25407af..ffe0eff 100644
--- a/geode-docs/basic_config/data_regions/chapter_overview.html.md.erb
+++ b/geode-docs/basic_config/data_regions/chapter_overview.html.md.erb
@@ -19,34 +19,34 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The region is the core building block of the Apache Geode distributed system. All cached data is organized into data regions and you do all of your data puts, gets, and querying activities against them.
+The region is the core building block of the <%=vars.product_name_long%> distributed system. All cached data is organized into data regions and you do all of your data puts, gets, and querying activities against them.
-- **[Region Management](../../basic_config/data_regions/managing_data_regions.html)**
+- **[Region Management](managing_data_regions.html)**
- Apache Geode provides `gfsh` commands, APIs, and XML configuration models to support the configuration and management of data regions.
+ <%=vars.product_name_long%> provides `gfsh` commands, APIs, and XML configuration models to support the configuration and management of data regions.
-- **[Region Naming](../../basic_config/data_regions/region_naming.html)**
+- **[Region Naming](region_naming.html)**
To be able to perform all available operations on your data regions,
follow these region naming guidelines.
-- **[Region Shortcuts and Custom Named Region Attributes](../../basic_config/data_regions/region_shortcuts.html)**
+- **[Region Shortcuts and Custom Named Region Attributes](region_shortcuts.html)**
- Geode provides region shortcut settings, with preset region configurations for the most common region types. For the easiest configuration, start with a shortcut setting and customize as needed. You can also store your own custom configurations in the cache for use by multiple regions.
+ <%=vars.product_name%> provides region shortcut settings, with preset region configurations for the most common region types. For the easiest configuration, start with a shortcut setting and customize as needed. You can also store your own custom configurations in the cache for use by multiple regions.
-- **[Storing and Retrieving Region Shortcuts and Custom Named Region Attributes](../../basic_config/data_regions/store_retrieve_region_shortcuts.html)**
+- **[Storing and Retrieving Region Shortcuts and Custom Named Region Attributes](store_retrieve_region_shortcuts.html)**
- Use these examples to get started with Geode region shortcuts.
+ Use these examples to get started with <%=vars.product_name%> region shortcuts.
-- **[Managing Region Attributes](../../basic_config/data_regions/managing_region_attributes.html)**
+- **[Managing Region Attributes](managing_region_attributes.html)**
Use region attributes to fine-tune the region configuration provided by the region shortcut settings.
-- **[Creating Custom Attributes for Regions and Entries](../../basic_config/data_regions/creating_custom_attributes.html)**
+- **[Creating Custom Attributes for Regions and Entries](creating_custom_attributes.html)**
Use custom attributes to store information related to your region or its entries in your cache. These attributes are only visible to the local application and are not distributed.
-- **[Building a New Region with Existing Content](../../basic_config/data_regions/new_region_existing_data.html)**
+- **[Building a New Region with Existing Content](new_region_existing_data.html)**
A new region or distributed system may need to be loaded with the data of an existing system. There are two approaches to accomplish this task. The approach used depends upon the organization of both the new and the existing distributed system.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_regions/create_a_region_with_gfsh.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_regions/create_a_region_with_gfsh.html.md.erb b/geode-docs/basic_config/data_regions/create_a_region_with_gfsh.html.md.erb
index 2b40e45..d408b89 100644
--- a/geode-docs/basic_config/data_regions/create_a_region_with_gfsh.html.md.erb
+++ b/geode-docs/basic_config/data_regions/create_a_region_with_gfsh.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-A simple and fast way to create a data region in the Apache Geode cache is to use the `gfsh` command-line tool.
+A simple and fast way to create a data region in the <%=vars.product_name_long%> cache is to use the `gfsh` command-line tool.
Before you start, configure your `Cache` or `ClientCache` and determine the region shortcut and other attributes settings your region needs.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_regions/managing_data_regions.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_regions/managing_data_regions.html.md.erb b/geode-docs/basic_config/data_regions/managing_data_regions.html.md.erb
index 34b4c77..7097860 100644
--- a/geode-docs/basic_config/data_regions/managing_data_regions.html.md.erb
+++ b/geode-docs/basic_config/data_regions/managing_data_regions.html.md.erb
@@ -40,7 +40,7 @@ If you change attributes that define a region, you must restart the member for t
### Creating a Region with gfsh
-A simple and fast way to create a data region in the Apache Geode cache is to use the `gfsh` command-line tool.
+A simple and fast way to create a data region in the <%=vars.product_name_long%> cache is to use the `gfsh` command-line tool.
Region creation is subject to attribute consistency checks, both internal to the cache and, if the region is not local, between all caches where the region is defined.
@@ -61,7 +61,7 @@ The cluster configuration service, which is enabled by default, automatically sa
### Creating a Region Through the cache.xml File
-A common way to create a data region in the Apache Geode cache is through `cache.xml` declarations.
+A common way to create a data region in the <%=vars.product_name_long%> cache is through `cache.xml` declarations.
When starting the member with the `cache.xml` file,
the region will be created.
@@ -121,7 +121,7 @@ an event listener in which entries expire:
### <a id="data_regions__section_028F2602395646818680C906F205526B" class="no-quick-link"></a>Creating a Region Through the API
-Geode's regions APIs provide specialized behavior for different system member types.
+<%=vars.product_name%>'s regions APIs provide specialized behavior for different system member types.
- **Peer/Server Region APIs**.
Use these methods, interfaces, and classes for peer/server region creation.
@@ -324,7 +324,7 @@ Event notification occurs for a destroy region operation.
A region can be destroyed by removing the region's specification from the `cache.xml` file.
-Destroying the region by an API invocation or by using the `gfsh destroy` command while all members are online is the best way to remove a region, as Geode handles all aspects of the removal, including removing the region's persistent disk stores across the online members hosting the region. Destroying the region by removing its specification from the `cache.xml` file does not remove the region's existing persistent disk stores.
+Destroying the region by an API invocation or by using the `gfsh destroy` command while all members are online is the best way to remove a region, as <%=vars.product_name%> handles all aspects of the removal, including removing the region's persistent disk stores across the online members hosting the region. Destroying the region by removing its specification from the `cache.xml` file does not remove the region's existing persistent disk stores.
The destroy operation can be propagated only to online members. The system will encounter restart issues if a region is destroyed while some members are online and others are offline. As those members that were offline restart, they will block indefinitely, waiting for persistent region data that no longer exists. To fix this issue, shut down all members that are blocked waiting for the removed region. Once those members are in the offline state, use the `gfsh alter disk-store` command with the `--remove` option on each offline member to remove the region. Then, restart each member.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_regions/region_shortcuts.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_regions/region_shortcuts.html.md.erb b/geode-docs/basic_config/data_regions/region_shortcuts.html.md.erb
index f221247..4d7f6e3 100644
--- a/geode-docs/basic_config/data_regions/region_shortcuts.html.md.erb
+++ b/geode-docs/basic_config/data_regions/region_shortcuts.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Geode provides region shortcut settings, with preset region configurations for the most common region types. For the easiest configuration, start with a shortcut setting and customize as needed. You can also store your own custom configurations in the cache for use by multiple regions.
+<%=vars.product_name%> provides region shortcut settings, with preset region configurations for the most common region types. For the easiest configuration, start with a shortcut setting and customize as needed. You can also store your own custom configurations in the cache for use by multiple regions.
<a id="region_shortcuts__section_D9E58754D2B0435FA2986DBBF3063D4C"></a>
You configure automated management of data regions and their entries through region shortcuts and region attributes. These region configuration settings determine such things as where the data resides, how the region is managed in memory, reliability behavior, and the automatic loading, distribution, and expiration of data entries.
@@ -27,7 +27,7 @@ You configure automated management of data regions and their entries through reg
**Note:**
Whenever possible, use region shortcuts to configure your region, and further customize behavior using region attributes. The shortcut settings are preset with the most common region configurations.
-Geode provides a number of predefined, shortcut region attributes settings for your use. You can also define your own custom region attributes and store them with an identifier for later retrieval. Both types of stored attributes are referred to as named region attributes. You can create and store your attribute settings in the `cache.xml` file and through the API.
+<%=vars.product_name%> provides a number of predefined, shortcut region attributes settings for your use. You can also define your own custom region attributes and store them with an identifier for later retrieval. Both types of stored attributes are referred to as named region attributes. You can create and store your attribute settings in the `cache.xml` file and through the API.
Retrieve region shortcuts and custom named attributes by providing the ID to the region creation, in the `refid` attribute setting. This example uses the shortcut REPLICATE attributes to create a region:
@@ -57,12 +57,12 @@ You can create your own named attributes as needed, by providing an `id` in your
## <a id="region_shortcuts__section_20548383511141B19EBC053E36877B1A" class="no-quick-link"></a>Shortcut Attribute Options
-You can select the most common region attributes settings from Geode’s predefined named region attributes in these classes:
+You can select the most common region attributes settings from <%=vars.product_name%>’s predefined named region attributes in these classes:
- **`org.apache.geode.cache.RegionShortcut`**. For peers and servers.
- **`org.apache.geode.cache.client.ClientRegionShortcut`**. For clients.
-Shortcut attributes are a convenience only. They are just named attributes that Geode has already stored for you. You can override their settings by storing new attributes with the same id as the predefined attributes.
+Shortcut attributes are a convenience only. They are just named attributes that <%=vars.product_name%> has already stored for you. You can override their settings by storing new attributes with the same id as the predefined attributes.
For a full list of all available region shortcuts, see [Region Shortcuts Quick Reference](../../reference/topics/region_shortcuts_table.html#reference_ufj_5kz_4k).
@@ -83,7 +83,7 @@ These are the primary options available in the region shortcut settings. The nam
**Data Eviction**
-- **`HEAP_LRU`**. Causes least recently used data to be evicted from memory when the Geode resource manager determines that the cache has reached configured storage limits.
+- **`HEAP_LRU`**. Causes least recently used data to be evicted from memory when the <%=vars.product_name%> resource manager determines that the cache has reached configured storage limits.
**Disk Storage**
@@ -104,7 +104,7 @@ These are the primary options available in the client region shortcut settings.
**Data Eviction**
-- **`HEAP_LRU`**. Causes least recently used data to be evicted from memory when the Geode resource manager determines that the cache has reached configured storage limits.
+- **`HEAP_LRU`**. Causes least recently used data to be evicted from memory when the <%=vars.product_name%> resource manager determines that the cache has reached configured storage limits.
**Disk Storage**
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb b/geode-docs/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
index d2711cf..2184fc3 100644
--- a/geode-docs/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
+++ b/geode-docs/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
@@ -19,12 +19,12 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Use these examples to get started with Geode region shortcuts.
+Use these examples to get started with <%=vars.product_name%> region shortcuts.
<a id="region_shortcuts__section_D9E58754D2B0435FA2986DBBF3063D4C"></a>
-Geode region shortcuts, in `org.apache.geode.cache.RegionShortcut` for peers and servers and `org.apache.geode.cache.client.ClientRegionShortcut` for clients, are available wherever you create a region in the `cache.xml` or through the API. Custom named attributes, stored by you, are available from the moment you store them on.
+<%=vars.product_name%> region shortcuts, in `org.apache.geode.cache.RegionShortcut` for peers and servers and `org.apache.geode.cache.client.ClientRegionShortcut` for clients, are available wherever you create a region in the `cache.xml` or through the API. Custom named attributes, stored by you, are available from the moment you store them on.
-The region shortcuts are special Geode named region attributes, with identifying names. Create custom named region attributes by setting the attributes and storing them with a unique identifier in the region attribute `id`. Retrieve named attributes by providing the shortcut enum value or the name you assigned in the `id` to the region creation:
+The region shortcuts are special <%=vars.product_name%> named region attributes, with identifying names. Create custom named region attributes by setting the attributes and storing them with a unique identifier in the region attribute `id`. Retrieve named attributes by providing the shortcut enum value or the name you assigned in the `id` to the region creation:
- In the API, use the identifier in the region factory creation
- In the `cache.xml`, use the identifier in the `<region>` or `<region-attribute>` `refid` setting. The `refid` is available in both elements for convenience
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb b/geode-docs/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
index faf2241..0362c4a 100644
--- a/geode-docs/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
+++ b/geode-docs/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
@@ -19,13 +19,13 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Geode provides a default distributed system configuration for out-of-the-box systems. To use non-default configurations and to fine-tune your member communication, you can use a mix of various options to customize your distributed system configuration.
+<%=vars.product_name%> provides a default distributed system configuration for out-of-the-box systems. To use non-default configurations and to fine-tune your member communication, you can use a mix of various options to customize your distributed system configuration.
<a id="setting_distributed_properties__section_67EBCC53EB174B108DA7271E2CD2B76C"></a>
-Geode properties are used to join a distributed system and configure system member behavior. Configure your Geode properties through the `gemfire.properties` file, the Java API, or command-line input. Generally, you store all your properties in the `gemfire.properties` file, but you may need to provide properties through other means, for example, to pass in security properties for a username and password that you have received from keyboard input.
+<%=vars.product_name%> properties are used to join a distributed system and configure system member behavior. Configure your <%=vars.product_name%> properties through the `gemfire.properties` file, the Java API, or command-line input. Generally, you store all your properties in the `gemfire.properties` file, but you may need to provide properties through other means, for example, to pass in security properties for a username and password that you have received from keyboard input.
**Note:**
-Check with your Geode system administrator before changing properties through the API, including the `gemfire.properties` and `gfsecurity.properties` settings. The system administrator may need to set properties at the command line or in configuration files. Any change made through the API overrides those other settings.
+Check with your <%=vars.product_name%> system administrator before changing properties through the API, including the `gemfire.properties` and `gfsecurity.properties` settings. The system administrator may need to set properties at the command line or in configuration files. Any change made through the API overrides those other settings.
**Note:**
The product `defaultConfigs` directory has a sample `gemfire.properties` file with all default settings.
@@ -66,7 +66,7 @@ Set distributed system properties by any combination of the following. The syste
gfsh>start server --name=server_name --mcast-port=10338 --properties-file=serverConfig/gemfire.properties --security-properties-file=gfsecurity.properties
```
- See [Running Geode Server Processes](../../configuring/running/running_the_cacheserver.html) for more information on running cache servers.
+ See [Running <%=vars.product_name%> Server Processes](../../configuring/running/running_the_cacheserver.html) for more information on running cache servers.
3. Entry in a `gemfire.properties` file. See [Deploying Configuration Files without the Cluster Configuration Service](../../configuring/running/deploying_config_files.html). Example:
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/chapter_overview.html.md.erb b/geode-docs/basic_config/the_cache/chapter_overview.html.md.erb
index 180f9f6..209034d 100644
--- a/geode-docs/basic_config/the_cache/chapter_overview.html.md.erb
+++ b/geode-docs/basic_config/the_cache/chapter_overview.html.md.erb
@@ -19,29 +19,29 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The Geode cache is the entry point to Geode caching management. Geode provides different APIs and XML configuration models to support the behaviors of different members.
+The <%=vars.product_name%> cache is the entry point to <%=vars.product_name%> caching management. <%=vars.product_name%> provides different APIs and XML configuration models to support the behaviors of different members.
-- **[Introduction to Cache Management](../../basic_config/the_cache/intro_cache_management.html)**
+- **[Introduction to Cache Management](intro_cache_management.html)**
The cache provides in-memory storage and management for your data.
-- **[Managing a Peer or Server Cache](../../basic_config/the_cache/managing_a_peer_server_cache.html)**
+- **[Managing a Peer or Server Cache](managing_a_peer_server_cache.html)**
You start your peer or server cache using a combination of XML declarations and API calls. Close the cache when you are done.
-- **[Managing a Client Cache](../../basic_config/the_cache/managing_a_client_cache.html)**
+- **[Managing a Client Cache](managing_a_client_cache.html)**
You have several options for client cache configuration. Start your client cache using a combination of XML declarations and API calls. Close the client cache when you are done.
-- **[Managing a Cache in a Secure System](../../basic_config/the_cache/managing_a_secure_cache.html)**
+- **[Managing a Cache in a Secure System](managing_a_secure_cache.html)**
When you create your cache in a secure system, you provide credentials to the connection process for authentication by already-running, secure members. Clients connect to secure servers. Peers are authenticated by secure locators or peer members.
-- **[Managing RegionServices for Multiple Secure Users](../../basic_config/the_cache/managing_a_multiuser_cache.html)**
+- **[Managing RegionServices for Multiple Secure Users](managing_a_multiuser_cache.html)**
- In a secure system, you can create clients with multiple, secure connections to the servers from each client. The most common use case is a Geode client embedded in an application server that supports data requests from many users. Each user may be authorized to access a subset of data on the servers. For example, customer users may be allowed to see and update only their own orders and shipments.
+ In a secure system, you can create clients with multiple, secure connections to the servers from each client. The most common use case is a <%=vars.product_name%> client embedded in an application server that supports data requests from many users. Each user may be authorized to access a subset of data on the servers. For example, customer users may be allowed to see and update only their own orders and shipments.
-- **[Launching an Application after Initializing the Cache](../../basic_config/the_cache/setting_cache_initializer.html)**
+- **[Launching an Application after Initializing the Cache](setting_cache_initializer.html)**
You can specify a callback application that is launched after the cache initialization.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/intro_cache_management.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/intro_cache_management.html.md.erb b/geode-docs/basic_config/the_cache/intro_cache_management.html.md.erb
index 2427bd5..1a74022 100644
--- a/geode-docs/basic_config/the_cache/intro_cache_management.html.md.erb
+++ b/geode-docs/basic_config/the_cache/intro_cache_management.html.md.erb
@@ -24,13 +24,13 @@ The cache provides in-memory storage and management for your data.
<a id="concept_F8BA7F2D3B5A40D78461E78BC5FB31FA__section_B364B076EB5843DAAC28EE2805686453"></a>
You organize your data in the cache into *data regions*, each with its own configurable behavior. You store your data into your regions in key/value pairs called *data entries*. The cache also provides features like transactions, data querying, disk storage management, and logging. See the Javadocs for `org.apache.geode.cache.Cache`.
-You generally configure caches using the `gfsh` command-line utility or a combination of XML declarations and API calls. Geode loads and processes your XML declarations when you first create the cache.
+You generally configure caches using the `gfsh` command-line utility or a combination of XML declarations and API calls. <%=vars.product_name%> loads and processes your XML declarations when you first create the cache.
-Geode has one cache type for managing server and peer caches and one for managing client caches. The cache server process automatically creates its server cache at startup. In your application process, the cache creation returns an instance of the server/peer or client cache. From that point on, you manage the cache through API calls in your application.
+<%=vars.product_name%> has one cache type for managing server and peer caches and one for managing client caches. The cache server process automatically creates its server cache at startup. In your application process, the cache creation returns an instance of the server/peer or client cache. From that point on, you manage the cache through API calls in your application.
## <a id="concept_F8BA7F2D3B5A40D78461E78BC5FB31FA__section_20973C59F1C94E35A02CE6582503205A" class="no-quick-link"></a>The Caching APIs
-Geode's caching APIs provide specialized behavior for different system member types and security settings.
+<%=vars.product_name%>'s caching APIs provide specialized behavior for different system member types and security settings.
- **`org.apache.geode.cache.RegionService`**. Generally, you use the `RegionService` functionality through instances of `Cache` and `ClientCache`. You only specifically use instances of `RegionService` for limited-access users in secure client applications that service many users. The `RegionService` API provides access to existing cache data regions and to the standard query service for the cache. For client caches, queries are sent to the server tier. For server and peer caches, queries are run in the current cache and any available peers. `RegionService` is implemented by `GemFireCache`.
- **`org.apache.geode.cache.GemFireCache`**. You do not specifically use instances of `GemFireCache`, but you use `GemFireCache` functionality in your instances of `Cache` and `ClientCache`. `GemFireCache` extends `RegionService` and adds general caching features like region attributes, disk stores for region persistence and overflow, and access to the underlying distributed system. `GemFireCache` is implemented by `Cache` and `ClientCache`.
@@ -73,16 +73,16 @@ For more information on the `cache.xml` file, see [cache.xml](../../reference/to
## <a id="concept_F8BA7F2D3B5A40D78461E78BC5FB31FA__section_B113BC6921DA434C947D4326DDB4526E" class="no-quick-link"></a>Create and Close a Cache
-Your system configuration and cache configuration are initialized when you start your member processes and create each member’s Geode cache. If you are using the cluster configuration service, member processes can pick up its cache configuration from the cluster or group's current configuration. See [Overview of the Cluster Configuration Service](../../configuring/cluster_config/gfsh_persist.html).
+Your system configuration and cache configuration are initialized when you start your member processes and create each member’s <%=vars.product_name%> cache. If you are using the cluster configuration service, member processes can pick up its cache configuration from the cluster or group's current configuration. See [Overview of the Cluster Configuration Service](../../configuring/cluster_config/gfsh_persist.html).
The steps in this section use `gemfire.properties` and `cache.xml` file examples, except where API is required. You can configure your distributed system properties and cache through the API as well, and you can use a combination of file configuration and API configuration.
The XML examples may not include the full `cache.xml` file listing. All of your declarative cache configuration must conform to the cache XSD at
[http://geode.apache.org/schema/cache/cache-1.0.xsd](http://geode.apache.org/schema/cache/cache-1.0.xsd).
-For all of your Geode applications:
+For all of your <%=vars.product_name%> applications:
-1. Create your `Cache`, for peer/server applications, or `ClientCache`, for client applications. This connects to the Geode system you have configured and initializes any configured data regions. Use your cache instance to access your regions and perform your application work.
+1. Create your `Cache`, for peer/server applications, or `ClientCache`, for client applications. This connects to the <%=vars.product_name%> system you have configured and initializes any configured data regions. Use your cache instance to access your regions and perform your application work.
2. Close your cache when you are done. This frees up resources and disconnects your application from the distributed system in an orderly manner.
Follow the instructions in the subtopics under [Cache Management](chapter_overview.html#the_cache) to customize your cache creation and closure for your application needs. You may need to combine more than one of the sets of instructions. For example, to create a client cache in a system with security, you would follow the instructions for creating and closing a client cache and for creating and closing a cache in a secure system.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/managing_a_client_cache.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/managing_a_client_cache.html.md.erb b/geode-docs/basic_config/the_cache/managing_a_client_cache.html.md.erb
index dbd5112..bcb82cd 100644
--- a/geode-docs/basic_config/the_cache/managing_a_client_cache.html.md.erb
+++ b/geode-docs/basic_config/the_cache/managing_a_client_cache.html.md.erb
@@ -22,10 +22,10 @@ limitations under the License.
You have several options for client cache configuration. Start your client cache using a combination of XML declarations and API calls. Close the client cache when you are done.
<a id="managing_a_client_cache__section_566044C44C434926A7A9FBAB2BF463BF"></a>
-Geode clients are processes that send most or all of their data requests and updates to a Geode server system. Clients run as standalone processes, without peers of their own.
+<%=vars.product_name%> clients are processes that send most or all of their data requests and updates to a <%=vars.product_name%> server system. Clients run as standalone processes, without peers of their own.
**Note:**
-Geode automatically configures the distributed system for your `ClientCache` as standalone, which means the client has no peers. Do not try to set the `gemfire.properties` `mcast-port` or `locators` for a client application or the system will throw an exception.
+<%=vars.product_name%> automatically configures the distributed system for your `ClientCache` as standalone, which means the client has no peers. Do not try to set the `gemfire.properties` `mcast-port` or `locators` for a client application or the system will throw an exception.
1. Create your client cache:
1. In your `cache.xml`, use the `client-cache` DOCTYPE and configure your cache inside a `<client-cache>` element. Configure your server connection pool and your regions as needed. Example:
@@ -45,7 +45,7 @@ Geode automatically configures the distributed system for your `ClientCache` as
```
**Note:**
- Applications that use a `client-cache` may want to set `concurrency-checks-enabled` to false for a region in order to see all events for that region. Geode server members can continue using concurrency checks, but they will pass all events to the client cache. This configuration ensures that the client sees all region events, but it does not prevent the client cache region from becoming out-of-sync with the server cache. See [Consistency for Region Updates](../../developing/distributed_regions/region_entry_versions.html#topic_CF2798D3E12647F182C2CEC4A46E2045).
+ Applications that use a `client-cache` may want to set `concurrency-checks-enabled` to false for a region in order to see all events for that region. <%=vars.product_name%> server members can continue using concurrency checks, but they will pass all events to the client cache. This configuration ensures that the client sees all region events, but it does not prevent the client cache region from becoming out-of-sync with the server cache. See [Consistency for Region Updates](../../developing/distributed_regions/region_entry_versions.html#topic_CF2798D3E12647F182C2CEC4A46E2045).
2. If you use multiple server pools, configure the pool name explicitly for each client region. Example:
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/managing_a_multiuser_cache.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/managing_a_multiuser_cache.html.md.erb b/geode-docs/basic_config/the_cache/managing_a_multiuser_cache.html.md.erb
index 293c12e..798a845 100644
--- a/geode-docs/basic_config/the_cache/managing_a_multiuser_cache.html.md.erb
+++ b/geode-docs/basic_config/the_cache/managing_a_multiuser_cache.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-In a secure system, you can create clients with multiple, secure connections to the servers from each client. The most common use case is a Geode client embedded in an application server that supports data requests from many users. Each user may be authorized to access a subset of data on the servers. For example, customer users may be allowed to see and update only their own orders and shipments.
+In a secure system, you can create clients with multiple, secure connections to the servers from each client. The most common use case is a <%=vars.product_name%> client embedded in an application server that supports data requests from many users. Each user may be authorized to access a subset of data on the servers. For example, customer users may be allowed to see and update only their own orders and shipments.
<a id="managing_a_multiuser_cache__section_A2A0F835DF35450E8E4B5304F4BC07E2"></a>
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/managing_a_peer_server_cache.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/managing_a_peer_server_cache.html.md.erb b/geode-docs/basic_config/the_cache/managing_a_peer_server_cache.html.md.erb
index e7d48d8..059b277 100644
--- a/geode-docs/basic_config/the_cache/managing_a_peer_server_cache.html.md.erb
+++ b/geode-docs/basic_config/the_cache/managing_a_peer_server_cache.html.md.erb
@@ -22,7 +22,7 @@ limitations under the License.
You start your peer or server cache using a combination of XML declarations and API calls. Close the cache when you are done.
<a id="creating_and_closing_a_peer_cache__section_1633A80F0DB04794BB6C3A7F05EED97E"></a>
-Geode peers are members of a Geode distributed system that do not act as clients to another Geode distributed system. Geode servers are peers that also listen for and process client requests.
+<%=vars.product_name%> peers are members of a <%=vars.product_name%> distributed system that do not act as clients to another <%=vars.product_name%> distributed system. <%=vars.product_name%> servers are peers that also listen for and process client requests.
1. Create your cache:
1. Start up a cluster and the cluster configuration service:
@@ -68,7 +68,7 @@ Geode peers are members of a Geode distributed system that do not act as clients
``` pre
Cache cache = new CacheFactory().create();
```
- - If you are running a server using the Geode `cacheserver` process, it automatically creates the cache and connection at startup and closes both when it exits.
+ - If you are running a server using the <%=vars.product_name%> `cacheserver` process, it automatically creates the cache and connection at startup and closes both when it exits.
The system creates the distributed system connection and initializes the cache according to your `gemfire.properties` and `cache.xml` specifications.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/setting_cache_properties.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/setting_cache_properties.html.md.erb b/geode-docs/basic_config/the_cache/setting_cache_properties.html.md.erb
index cf5133a..d51a66a 100644
--- a/geode-docs/basic_config/the_cache/setting_cache_properties.html.md.erb
+++ b/geode-docs/basic_config/the_cache/setting_cache_properties.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-To populate your Apache Geode cache and fine-tune its storage and distribution behavior, you need to define cached data regions and provide custom configuration for the cache and regions.
+To populate your <%=vars.product_name_long%> cache and fine-tune its storage and distribution behavior, you need to define cached data regions and provide custom configuration for the cache and regions.
<a id="setting_cache_properties__section_FB536C90C219432D93E872CBD49D66B1"></a>
Cache configuration properties define:
@@ -29,7 +29,7 @@ Cache configuration properties define:
Configure the cache and its data regions through one or more of these methods:
-- Through a persistent configuration that you define when issuing commands that use the gfsh command line utility. The gfsh utility supports the administration, debugging, and deployment of Apache Geode processes and applications. You can use gfsh to configure regions, locators, servers, disk stores, event queues, and other objects.
+- Through a persistent configuration that you define when issuing commands that use the gfsh command line utility. The gfsh utility supports the administration, debugging, and deployment of <%=vars.product_name_long%> processes and applications. You can use gfsh to configure regions, locators, servers, disk stores, event queues, and other objects.
As you issue commands, gfsh saves a set of configurations that apply to the entire cluster and also saves configurations that only apply to defined groups of members within the cluster. You can re-use these configurations to create a distributed system. See [Overview of the Cluster Configuration Service](../../configuring/cluster_config/gfsh_persist.html).