Repository: geode
Updated Branches:
  refs/heads/develop 6f7667d90 -> 1b84ecbe4


http://git-wip-us.apache.org/repos/asf/geode/blob/1b84ecbe/geode-docs/managing/troubleshooting/diagnosing_system_probs.html.md.erb
----------------------------------------------------------------------
diff --git 
a/geode-docs/managing/troubleshooting/diagnosing_system_probs.html.md.erb 
b/geode-docs/managing/troubleshooting/diagnosing_system_probs.html.md.erb
index 9b34a3b..6f8b9f8 100644
--- a/geode-docs/managing/troubleshooting/diagnosing_system_probs.html.md.erb
+++ b/geode-docs/managing/troubleshooting/diagnosing_system_probs.html.md.erb
@@ -102,13 +102,13 @@ Response:
 Response: Check these possible causes.
 
 -   Network problem—the most common cause. First, try to ping the other 
hosts.
--   Firewall problems. If members of your distributed Geode system are located 
outside the LAN, check whether the firewall is blocking communication. Geode is 
a network-centric distributed system, so if you have a firewall running on your 
machine, it could cause connection problems. For example, your connections may 
fail if your firewall places restrictions on inbound or outbound permissions 
for Java-based sockets. You may need to modify your firewall configuration to 
permit traffic to Java applications running on your machine. The specific 
configuration depends on the firewall you are using.
+-   Firewall problems. If members of your distributed <%=vars.product_name%> 
system are located outside the LAN, check whether the firewall is blocking 
communication. <%=vars.product_name%> is a network-centric distributed system, 
so if you have a firewall running on your machine, it could cause connection 
problems. For example, your connections may fail if your firewall places 
restrictions on inbound or outbound permissions for Java-based sockets. You may 
need to modify your firewall configuration to permit traffic to Java 
applications running on your machine. The specific configuration depends on the 
firewall you are using.
 -   Wrong multicast port when using multicast for membership. Check the 
`gemfire.properties` file of this application or cache server to see that the 
mcast-port is configured correctly. If you are running multiple distributed 
systems at your site, each distributed system must use a unique multicast port.
 -   Can not connect to locator (when using TCP for discovery).
     -   Check that the locators attribute in this process’s 
`gemfire.properties` has the correct IP address for the locator.
     -   Check that the locator process is running. If not, see instructions 
for related problem, [Data distribution has stopped, although member processes 
are 
running](diagnosing_system_probs.html#diagnosing_system_probs__section_04CEF27475924E5D9860BEE6D64C49E2).
     -   Bind address set incorrectly on a multi-homed host. When you specify 
the bind address, use the IP address rather than the host name. Sometimes 
multiple network adapters are configured with the same hostname. See [Topology 
and Communication General 
Concepts](../../topologies_and_comm/topology_concepts/chapter_overview.html#concept_7628F498DB534A2D8A99748F5DA5DC94)
 for more information about using bind addresses.
--   Wrong version of Geode . A version mismatch can cause the process to hang 
or crash. Check the software version with the gemfire version command.
+-   Wrong version of <%=vars.product_name%> . A version mismatch can cause the 
process to hang or crash. Check the software version with the gemfire version 
command.
 
 ## <a id="diagnosing_system_probs__section_D607C96A6CBE42FD880F1463A20A8BEF" 
class="no-quick-link"></a>Member process seems to hang
 
@@ -124,7 +124,7 @@ Either the process can’t find the configuration file or, 
if it is an applicati
 Response:
 
 -   Check that the `gemfire.properties` file is in the right directory.
--   Make sure the process is not picking up settings from another 
`gemfire.properties` file earlier in the search path. Geode looks for a 
`gemfire.properties` file in the current working directory, the home directory, 
and the CLASSPATH, in that order.
+-   Make sure the process is not picking up settings from another 
`gemfire.properties` file earlier in the search path. <%=vars.product_name%> 
looks for a `gemfire.properties` file in the current working directory, the 
home directory, and the CLASSPATH, in that order.
 -   For an application, check the documentation to see whether it does 
programmatic configuration. If so, the properties that are set programmatically 
cannot be reset in a `gemfire.properties` file. See your application’s 
customer support group for configuration changes.
 
 ## <a id="diagnosing_system_probs__section_B0698527A4DF4D84877B1AF66291ABFD" 
class="no-quick-link"></a>Cache creation fails - must match schema definition 
root
@@ -145,7 +145,7 @@ Error while parsing XML, caused by 
org.xml.sax.SAXParseException:
 Document root element "cache", must match DOCTYPE root "client-cache".
 ```
 
-Geode declarative cache creation uses one of two root element pairs: `cache` 
or `client-cache`. The name must be the same in both places.
+<%=vars.product_name%> declarative cache creation uses one of two root element 
pairs: `cache` or `client-cache`. The name must be the same in both places.
 
 Response:
 
@@ -264,17 +264,17 @@ The process may be hitting its virtual address space 
limits. The virtual address
 
 ## <a id="diagnosing_system_probs__section_B49BD03F4CA241C7BED4A2C4D5936A7A" 
class="no-quick-link"></a>PartitionedRegionDistributionException
 
-The org.apache.geode.cache.PartitionedRegionDistributionException appears when 
Geode fails after many attempts to complete a distributed operation. This 
exception indicates that no data store member can be found to perform a 
destroy, invalidate, or get operation.
+The org.apache.geode.cache.PartitionedRegionDistributionException appears when 
<%=vars.product_name%> fails after many attempts to complete a distributed 
operation. This exception indicates that no data store member can be found to 
perform a destroy, invalidate, or get operation.
 
 Response:
 
 -   Check the network for traffic congestion or a broken connection to a 
member.
--   Look at the overall installation for problems, such as operations at the 
application level set to a higher priority than the Geode processes.
+-   Look at the overall installation for problems, such as operations at the 
application level set to a higher priority than the <%=vars.product_name%> 
processes.
 -   If you keep seeing PartitionedRegionDistributionException, you should 
evaluate whether you need to start more members.
 
 ## <a id="diagnosing_system_probs__section_7DE15A6C99974821B6CA418BC2AF98F1" 
class="no-quick-link"></a>PartitionedRegionStorageException
 
-The org.apache.geode.cache.PartitionedRegionStorageException appears when 
Geode can’t create a new entry. This exception arises from a lack of storage 
space for put and create operations or for get operations with a loader. 
PartitionedRegionStorageException often indicates data loss or impending data 
loss.
+The org.apache.geode.cache.PartitionedRegionStorageException appears when 
<%=vars.product_name%> can’t create a new entry. This exception arises from a 
lack of storage space for put and create operations or for get operations with 
a loader. PartitionedRegionStorageException often indicates data loss or 
impending data loss.
 
 The text string indicates the cause of the exception, as in these examples:
 
@@ -289,7 +289,7 @@ Ran out of retries attempting to allocate a bucket in the 
partitioned region....
 Response:
 
 -   Check the network for traffic congestion or a broken connection to a 
member.
--   Look at the overall installation for problems, such as operations at the 
application level set to a higher priority than the Geode processes.
+-   Look at the overall installation for problems, such as operations at the 
application level set to a higher priority than the <%=vars.product_name%> 
processes.
 -   If you keep seeing PartitionedRegionStorageException, you should evaluate 
whether you need to start more members.
 
 ## <a id="diagnosing_system_probs__section_AFA1D06BC3AA44A4AB0593FD1EF0B0B7" 
class="no-quick-link"></a>Application crashes without producing an exception
@@ -320,7 +320,7 @@ Increase the default socket timeout setting for the member. 
This timeout is set
 
 ## <a id="diagnosing_system_probs__section_8C7CB2EA0A274DAF90083FECE0BF3B1F" 
class="no-quick-link"></a>Member logs ForcedDisconnectException, Cache and 
DistributedSystem forcibly closed
 
-A distributed system member’s Cache and DistributedSystem are forcibly 
closed by the system membership coordinator if it becomes sick or too slow to 
respond to heartbeat requests. When this happens, listeners receive 
RegionDestroyed notification with an opcode of FORCED\_DISCONNECT. The Geode 
log file for the member shows a ForcedDisconnectException with the message
+A distributed system member’s Cache and DistributedSystem are forcibly 
closed by the system membership coordinator if it becomes sick or too slow to 
respond to heartbeat requests. When this happens, listeners receive 
RegionDestroyed notification with an opcode of FORCED\_DISCONNECT. The 
<%=vars.product_name%> log file for the member shows a 
ForcedDisconnectException with the message
 
 ``` pre
 This member has been forced out of the distributed system because it did not 
respond
@@ -397,7 +397,7 @@ If you are experiencing slow performance and are sending 
large objects (multiple
 
 ## <a id="diagnosing_system_probs__section_F93DD765FF2A43439D3FF7936F8883DE" 
class="no-quick-link"></a>Can’t get Windows performance data
 
-Attempting to run performance measurements for Geode on Windows can produce 
this error message:
+Attempting to run performance measurements for <%=vars.product_name%> on 
Windows can produce this error message:
 
 ``` pre
 Can't get Windows performance data. RegQueryValueEx returned 5
@@ -407,7 +407,7 @@ This error can occur because incorrect information is 
returned when a Win32 appl
 
 Response:
 
-To successfully acquire Windows performance data, you need to verify that you 
have the proper registry key access permissions in the system registry. In 
particular, make sure that Perflib in the following registry path is readable 
(KEY\_READ access) by the Geode process:
+To successfully acquire Windows performance data, you need to verify that you 
have the proper registry key access permissions in the system registry. In 
particular, make sure that Perflib in the following registry path is readable 
(KEY\_READ access) by the <%=vars.product_name%> process:
 
 ``` pre
 HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Perflib
@@ -415,7 +415,7 @@ HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows 
NT\CurrentVersion\Perflib
 
 An example of reasonable security on the performance data would be to grant 
administrators KEY\_ALL\_ACCESS access and interactive users KEY\_READ access. 
This particular configuration would prevent non-administrator remote users from 
querying performance data.
 
-See 
[http://support.microsoft.com/kb/310426](http://support.microsoft.com/kb/310426)
 and 
[http://support.microsoft.com/kb/146906](http://support.microsoft.com/kb/146906)
 for instructions about how to ensure that Geode processes have access to the 
registry keys associated with performance.
+See 
[http://support.microsoft.com/kb/310426](http://support.microsoft.com/kb/310426)
 and 
[http://support.microsoft.com/kb/146906](http://support.microsoft.com/kb/146906)
 for instructions about how to ensure that <%=vars.product_name%> processes 
have access to the registry keys associated with performance.
 
 ## <a id="diagnosing_system_probs__section_E70C332303A242BEAE9D2C0A2EE70E0A" 
class="no-quick-link"></a>Java applications on 64-bit platforms hang or use 
100% CPU
 

http://git-wip-us.apache.org/repos/asf/geode/blob/1b84ecbe/geode-docs/managing/troubleshooting/prevent_and_recover_disk_full_errors.html.md.erb
----------------------------------------------------------------------
diff --git 
a/geode-docs/managing/troubleshooting/prevent_and_recover_disk_full_errors.html.md.erb
 
b/geode-docs/managing/troubleshooting/prevent_and_recover_disk_full_errors.html.md.erb
index ca1e64d..8f8bc18 100644
--- 
a/geode-docs/managing/troubleshooting/prevent_and_recover_disk_full_errors.html.md.erb
+++ 
b/geode-docs/managing/troubleshooting/prevent_and_recover_disk_full_errors.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 -->
 
-It is important to monitor the disk usage of Geode members. If a member lacks 
sufficient disk space for a disk store, the member attempts to shut down the 
disk store and its associated cache, and logs an error message. A shutdown due 
to a member running out of disk space can cause loss of data, data file 
corruption, log file corruption and other error conditions that can negatively 
impact your applications.
+It is important to monitor the disk usage of <%=vars.product_name%> members. 
If a member lacks sufficient disk space for a disk store, the member attempts 
to shut down the disk store and its associated cache, and logs an error 
message. A shutdown due to a member running out of disk space can cause loss of 
data, data file corruption, log file corruption and other error conditions that 
can negatively impact your applications.
 
 After you make sufficient disk space available to the member, you can restart 
the member.
 
@@ -33,7 +33,7 @@ When a disk write fails due to disk full conditions, the 
member is shutdown and
 
 ## Recovering from Disk Full Errors
 
-If a member of your Geode distributed system fails due to a disk full error 
condition, add or make additional disk capacity available and attempt to 
restart the member normally. If the member does not restart and there is a 
redundant copy of its regions in a disk store on another member, you can 
restore the member using the following steps:
+If a member of your <%=vars.product_name%> distributed system fails due to a 
disk full error condition, add or make additional disk capacity available and 
attempt to restart the member normally. If the member does not restart and 
there is a redundant copy of its regions in a disk store on another member, you 
can restore the member using the following steps:
 
 1.  Delete or move the disk store files from the failed member.
 2.  Use the gfsh `show missing-disk-stores` command to identify any missing 
data. You may need to manually restore this data.

http://git-wip-us.apache.org/repos/asf/geode/blob/1b84ecbe/geode-docs/managing/troubleshooting/recovering_conflicting_data_exceptions.html.md.erb
----------------------------------------------------------------------
diff --git 
a/geode-docs/managing/troubleshooting/recovering_conflicting_data_exceptions.html.md.erb
 
b/geode-docs/managing/troubleshooting/recovering_conflicting_data_exceptions.html.md.erb
index 4eade62..0f51dcf 100644
--- 
a/geode-docs/managing/troubleshooting/recovering_conflicting_data_exceptions.html.md.erb
+++ 
b/geode-docs/managing/troubleshooting/recovering_conflicting_data_exceptions.html.md.erb
@@ -19,11 +19,11 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 -->
 
-A `ConflictingPersistentDataException` while starting up persistent members 
indicates that you have multiple copies of some persistent data, and Geode 
cannot determine which copy to use.
+A `ConflictingPersistentDataException` while starting up persistent members 
indicates that you have multiple copies of some persistent data, and 
<%=vars.product_name%> cannot determine which copy to use.
 
-Normally Geode uses metadata to determine automatically which copy of 
persistent data to use. Along with the region data, each member persists a list 
of other members that are hosting the region and whether their data is up to 
date. A `ConflictingPersistentDataException` happens when two members compare 
their metadata and find that it is inconsistent. The members either don’t 
know about each other, or they both think the other member has stale data.
+Normally <%=vars.product_name%> uses metadata to determine automatically which 
copy of persistent data to use. Along with the region data, each member 
persists a list of other members that are hosting the region and whether their 
data is up to date. A `ConflictingPersistentDataException` happens when two 
members compare their metadata and find that it is inconsistent. The members 
either don’t know about each other, or they both think the other member has 
stale data.
 
-The following sections describe scenarios that can cause 
`ConflictingPersistentDataException`s in Geode and how to resolve the conflict.
+The following sections describe scenarios that can cause 
`ConflictingPersistentDataException`s in <%=vars.product_name%> and how to 
resolve the conflict.
 
 ## <a id="topic_ghw_z2m_jq__section_sj3_lpm_jq" 
class="no-quick-link"></a>Independently Created Copies
 
@@ -34,21 +34,21 @@ There are a few ways to end up with independently created 
systems.
 -   Create two different distributed systems by having members connect to 
different locators that are not aware of each other.
 -   Shut down all persistent members and then start up a different set of 
brand new persistent members.
 
-Geode will not automatically merge independently created data for the same 
region. Instead, you need to export the data from one of the systems and import 
it into the other system. See the section [Cache and Region 
Snapshots](../cache_snapshots/chapter_overview.html#concept_E6AC3E25404D4D7788F2D52D83EE3071)
 for instructions on how to export data from one system and import it into 
another.
+<%=vars.product_name%> will not automatically merge independently created data 
for the same region. Instead, you need to export the data from one of the 
systems and import it into the other system. See the section [Cache and Region 
Snapshots](../cache_snapshots/chapter_overview.html#concept_E6AC3E25404D4D7788F2D52D83EE3071)
 for instructions on how to export data from one system and import it into 
another.
 
 ## <a id="topic_ghw_z2m_jq__section_op5_hpm_jq" 
class="no-quick-link"></a>Starting New Members First
 
 Starting a brand new member that has no persistent data before starting older 
members with persistent data can cause a `ConflictingPersistentDataException`.
 
-One accidental way this can happen is to shut the system down, add a new 
member to the startup scripts, and start all members in parallel. By chance, 
the new member may start first. The issue is that the new member will create an 
empty, independent copy of the data before the older members start up. Geode 
will be treat this situation like the [Independently Created 
Copies](#topic_ghw_z2m_jq__section_sj3_lpm_jq) case.
+One accidental way this can happen is to shut the system down, add a new 
member to the startup scripts, and start all members in parallel. By chance, 
the new member may start first. The issue is that the new member will create an 
empty, independent copy of the data before the older members start up. 
<%=vars.product_name%> will be treat this situation like the [Independently 
Created Copies](#topic_ghw_z2m_jq__section_sj3_lpm_jq) case.
 
 In this case the fix is simply to move aside or delete the persistent files 
for the new member, shut down the new member and then restart the older 
members. When the older members have fully recovered, then restart the new 
member.
 
 ## A Network Failure Occurs and Network Partitioning Detection is Disabled
 
-When `enable-network-partition-detection` is set to the default value of true, 
Geode will detect a network partition and shut down unreachable members to 
prevent a network partition ("split brain") from occurring. No conflicts should 
occur when the system is healed.
+When `enable-network-partition-detection` is set to the default value of true, 
<%=vars.product_name%> will detect a network partition and shut down 
unreachable members to prevent a network partition ("split brain") from 
occurring. No conflicts should occur when the system is healed.
 
-However if `enable-network-partition-detection` is false, Geode will not 
detect the network partition. Instead, each side of the network partition will 
end up recording that the other side of the partition has stale data. When the 
partition is healed and persistent members are restarted, the members will 
report a conflict because both sides of the partition think the other members 
are stale.
+However if `enable-network-partition-detection` is false, 
<%=vars.product_name%> will not detect the network partition. Instead, each 
side of the network partition will end up recording that the other side of the 
partition has stale data. When the partition is healed and persistent members 
are restarted, the members will report a conflict because both sides of the 
partition think the other members are stale.
 
 In some cases it may be possible to choose between sides of the network 
partition and just keep the data from one side of the partition. Otherwise you 
may need to salvage data and import it into a fresh system.
 

http://git-wip-us.apache.org/repos/asf/geode/blob/1b84ecbe/geode-docs/managing/troubleshooting/recovering_from_app_crashes.html.md.erb
----------------------------------------------------------------------
diff --git 
a/geode-docs/managing/troubleshooting/recovering_from_app_crashes.html.md.erb 
b/geode-docs/managing/troubleshooting/recovering_from_app_crashes.html.md.erb
index 01397af..2f168ca 100644
--- 
a/geode-docs/managing/troubleshooting/recovering_from_app_crashes.html.md.erb
+++ 
b/geode-docs/managing/troubleshooting/recovering_from_app_crashes.html.md.erb
@@ -21,11 +21,11 @@ limitations under the License.
 
 When the application or cache server crashes, its local cache is lost, and any 
resources it owned (for example, distributed locks) are released. The member 
must recreate its local cache upon recovery.
 
--   **[Recovering from Crashes with a Peer-to-Peer 
Configuration](../../managing/troubleshooting/recovering_from_p2p_crashes.html)**
+-   **[Recovering from Crashes with a Peer-to-Peer 
Configuration](recovering_from_p2p_crashes.html)**
 
     When a member crashes, the remaining members continue operation as though 
the missing application or cache server had never existed. The recovery process 
differs according to region type and scope, as well as data redundancy 
configuration.
 
--   **[Recovering from Crashes with a Client/Server 
Configuration](../../managing/troubleshooting/recovering_from_cs_crashes.html)**
+-   **[Recovering from Crashes with a Client/Server 
Configuration](recovering_from_cs_crashes.html)**
 
     In a client/server configuration, you first make the server available as a 
member of a distributed system again, and then restart clients as quickly as 
possible. The client recovers its data from its servers through normal 
operation.
 

http://git-wip-us.apache.org/repos/asf/geode/blob/1b84ecbe/geode-docs/managing/troubleshooting/recovering_from_cs_crashes.html.md.erb
----------------------------------------------------------------------
diff --git 
a/geode-docs/managing/troubleshooting/recovering_from_cs_crashes.html.md.erb 
b/geode-docs/managing/troubleshooting/recovering_from_cs_crashes.html.md.erb
index 3475556..ad9f483 100644
--- a/geode-docs/managing/troubleshooting/recovering_from_cs_crashes.html.md.erb
+++ b/geode-docs/managing/troubleshooting/recovering_from_cs_crashes.html.md.erb
@@ -51,4 +51,4 @@ When a client crashes, restart it as quickly as possible in 
the usual way. The c
 -   **Entries sent lazily to the client**—Entries are sent lazily to the 
client for entries that the client registers interest in that are not initially 
available in the server cache.
 -   **Events sent immediately to the client**—If the server has been saving 
events for the client, these are immediately replayed when the client 
reconnects. Cache modification events for entries in which the client has 
registered durable interest are saved.
 
-If you have a durable client configured to connect to multiple servers, keep 
in mind that Geode does not maintain server redundancy while the client is 
disconnected. If you lose all of its primary and secondary servers, you lose 
the client’s queued messages. Even if the servers fail one at a time, so that 
running clients have time to fail over and pick new secondary servers, an 
off-line durable client cannot do that and thus loses its queued messages.
+If you have a durable client configured to connect to multiple servers, keep 
in mind that <%=vars.product_name%> does not maintain server redundancy while 
the client is disconnected. If you lose all of its primary and secondary 
servers, you lose the client’s queued messages. Even if the servers fail one 
at a time, so that running clients have time to fail over and pick new 
secondary servers, an off-line durable client cannot do that and thus loses its 
queued messages.

http://git-wip-us.apache.org/repos/asf/geode/blob/1b84ecbe/geode-docs/managing/troubleshooting/recovering_from_machine_crashes.html.md.erb
----------------------------------------------------------------------
diff --git 
a/geode-docs/managing/troubleshooting/recovering_from_machine_crashes.html.md.erb
 
b/geode-docs/managing/troubleshooting/recovering_from_machine_crashes.html.md.erb
index cacb935..82705ea 100644
--- 
a/geode-docs/managing/troubleshooting/recovering_from_machine_crashes.html.md.erb
+++ 
b/geode-docs/managing/troubleshooting/recovering_from_machine_crashes.html.md.erb
@@ -29,7 +29,7 @@ To recover from a machine crash:
 
 1.  Determine which processes run on this machine.
 2.  Reboot the machine.
-3.  If a Geode locator runs here, start it first.
+3.  If a <%=vars.product_name%> locator runs here, start it first.
     **Note:**
     At least one locator must be running before you start any applications or 
cache servers.
 
@@ -41,9 +41,9 @@ If you have to move a locator process to a different machine, 
the locator isn’
 
 The partitioned region initializes itself correctly regardless of the order in 
which the data stores rejoin. The applications and cache servers recreate their 
data automatically as they return to active work.
 
-If the partitioned region is configured for data redundancy, Geode may be able 
to handle a machine crash automatically with no data loss, depending on how 
many redundant copies there are and how many members have to be restarted. See 
also [Recovery for Partitioned 
Regions](recovering_from_p2p_crashes.html#rec_app_p2p_crash__section_0E7D482DD8E84250A10070431B29AAC5).
+If the partitioned region is configured for data redundancy, 
<%=vars.product_name%> may be able to handle a machine crash automatically with 
no data loss, depending on how many redundant copies there are and how many 
members have to be restarted. See also [Recovery for Partitioned 
Regions](recovering_from_p2p_crashes.html#rec_app_p2p_crash__section_0E7D482DD8E84250A10070431B29AAC5).
 
-If the partitioned region does not have redundant copies, the system members 
recreate the data through normal operation. If the member that crashed was an 
application, check whether it was designed to write its data to an external 
data source. If so, decide whether data recovery is possible and preferable to 
starting with new data generated through the Geode distributed system.
+If the partitioned region does not have redundant copies, the system members 
recreate the data through normal operation. If the member that crashed was an 
application, check whether it was designed to write its data to an external 
data source. If so, decide whether data recovery is possible and preferable to 
starting with new data generated through the <%=vars.product_name%> distributed 
system.
 
 ## <a id="rec_system_crash__section_D3E3002D6C864853B1517A310BD05BDF" 
class="no-quick-link"></a>Data Recovery for Distributed Regions
 

http://git-wip-us.apache.org/repos/asf/geode/blob/1b84ecbe/geode-docs/managing/troubleshooting/recovering_from_network_outages.html.md.erb
----------------------------------------------------------------------
diff --git 
a/geode-docs/managing/troubleshooting/recovering_from_network_outages.html.md.erb
 
b/geode-docs/managing/troubleshooting/recovering_from_network_outages.html.md.erb
index f798b2b..cbeef24 100644
--- 
a/geode-docs/managing/troubleshooting/recovering_from_network_outages.html.md.erb
+++ 
b/geode-docs/managing/troubleshooting/recovering_from_network_outages.html.md.erb
@@ -27,7 +27,7 @@ However, if you know the architecture of your system well, 
and you are sure you
 
 When the network connecting members of a distributed system goes down, system 
members treat this like a machine crash. Members on each side of the network 
failure respond by removing the members on the other side from the membership 
list. If network partitioning detection is enabled (the default), the partition 
that contains sufficient quorum (&gt; 51% based on member weight) will continue 
to operate, while the other partition with insufficient quorum will shut down. 
See [Network 
Partitioning](../network_partitioning/chapter_overview.html#network_partitioning)
 for a detailed explanation on how this detection system operates.
 
-In addition, members that have been disconnected either via network partition 
or due to unresponsiveness will automatically try to reconnect to the 
distributed system unless configured otherwise. See [Handling Forced Cache 
Disconnection Using Autoreconnect](../autoreconnect/member-reconnect.html).
+In addition, members that have been disconnected either via network partition 
or due to unresponsiveness will automatically try to reconnect to the 
distributed system unless configured otherwise. See [Handling Forced Cache 
Disconnection Using Autoreconnect](../member-reconnect.html).
 
 ## <a id="rec_network_crash__section_F9A0C31AE25C4E7185DF3B1A8486BDFA" 
class="no-quick-link"></a>Recovery Procedure
 

http://git-wip-us.apache.org/repos/asf/geode/blob/1b84ecbe/geode-docs/managing/troubleshooting/recovering_from_p2p_crashes.html.md.erb
----------------------------------------------------------------------
diff --git 
a/geode-docs/managing/troubleshooting/recovering_from_p2p_crashes.html.md.erb 
b/geode-docs/managing/troubleshooting/recovering_from_p2p_crashes.html.md.erb
index 332bdc5..c3e1199 100644
--- 
a/geode-docs/managing/troubleshooting/recovering_from_p2p_crashes.html.md.erb
+++ 
b/geode-docs/managing/troubleshooting/recovering_from_p2p_crashes.html.md.erb
@@ -63,7 +63,7 @@ When an application or cache server crashes, any data in 
local memory is lost, i
 
 If the partitioned region is configured for redundancy and a member crashes, 
the system continues to operate with the remaining copies of the data. You may 
need to perform recovery actions depending on how many members you have lost 
and how you have configured redundancy in your system.
 
-By default, Geode does not make new copies of the data until a new member is 
brought online to replace the member that crashed. You can control this 
behavior using the recovery delay attributes. For more information, see 
[Configure High Availability for a Partitioned 
Region](../../developing/partitioned_regions/configuring_ha_for_pr.html).
+By default, <%=vars.product_name%> does not make new copies of the data until 
a new member is brought online to replace the member that crashed. You can 
control this behavior using the recovery delay attributes. For more 
information, see [Configure High Availability for a Partitioned 
Region](../../developing/partitioned_regions/configuring_ha_for_pr.html).
 
 To recover, start a replacement member. The new member regenerates the lost 
copies and returns them to the configured redundancy level.
 
@@ -78,7 +78,7 @@ You can also lose access to all copies of your data through 
network failure. See
 
 **Recovery Without Data Redundancy**
 
-If a member crashes and there are no redundant copies, any logic that tries to 
interact with the bucket data is *blocked* until the primary buckets are 
restored from disk. (If you do not have persistence enabled, Geode will 
reallocate the buckets on any available remaining nodes, however you will need 
to recover any lost data using external mechanisms.)
+If a member crashes and there are no redundant copies, any logic that tries to 
interact with the bucket data is *blocked* until the primary buckets are 
restored from disk. (If you do not have persistence enabled, 
<%=vars.product_name%> will reallocate the buckets on any available remaining 
nodes, however you will need to recover any lost data using external 
mechanisms.)
 
 To recover, restart the member. The application returns to active work and 
automatically begins to create new data.
 

http://git-wip-us.apache.org/repos/asf/geode/blob/1b84ecbe/geode-docs/reference/topics/gemfire_properties.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/reference/topics/gemfire_properties.html.md.erb 
b/geode-docs/reference/topics/gemfire_properties.html.md.erb
index a226618..1616759 100644
--- a/geode-docs/reference/topics/gemfire_properties.html.md.erb
+++ b/geode-docs/reference/topics/gemfire_properties.html.md.erb
@@ -149,7 +149,7 @@ See <a 
href="../../configuring/cluster_config/deploying_application_jars.html">D
 <tr class="even">
 <td>disable-auto-reconnect</td>
 <td>By default, a <%=vars.product_name%> member (both locators and servers) 
will attempt to reconnect and reinitialize the cache after it has been forced 
out of the distributed system by a network partition event or has otherwise 
been shunned by other members. Use this property to turn off the autoreconnect 
behavior. 
-See <a href="../../managing/autoreconnect/member-reconnect.html">Handling 
Forced Cache Disconnection Using Autoreconnect</a> for more details.</td>
+See <a href="../../managing/member-reconnect.html">Handling Forced Cache 
Disconnection Using Autoreconnect</a> for more details.</td>
 <td>S, L</td>
 <td>false</td>
 </tr>

http://git-wip-us.apache.org/repos/asf/geode/blob/1b84ecbe/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb 
b/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
index 5d20794..858a007 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
@@ -942,7 +942,7 @@ See [Region Data Storage and 
Distribution](../../../developing/region_options/ch
 </tr>
 <tr class="even">
 <td><span class="keyword parmname">\-\-compressor</span></td>
-<td>Java class name that implements compression for the region. You can write 
a custom compressor that implements <code class="ph 
codeph">org.apache.geode.compression.Compressor</code> or you can specify the 
Snappy compressor (<code class="ph 
codeph">org.apache.geode.compression.SnappyCompressor</code>), which is bundled 
with <%=vars.product_name%>. See <a 
href="../../../managing/region_compression/region_compression.html#topic_r43_wgc_gl">Region
 Compression</a>.</td>
+<td>Java class name that implements compression for the region. You can write 
a custom compressor that implements <code class="ph 
codeph">org.apache.geode.compression.Compressor</code> or you can specify the 
Snappy compressor (<code class="ph 
codeph">org.apache.geode.compression.SnappyCompressor</code>), which is bundled 
with <%=vars.product_name%>. See <a 
href="../../../managing/region_compression.html#topic_r43_wgc_gl">Region 
Compression</a>.</td>
 <td>no compression</td>
 </tr>
 <tr class="odd">

Reply via email to