1 files changed, 27 insertions, 12 deletions
diff --git a/docs/csharp/html/Fields_T_BerkeleyDB_ReplicationConfig.htm b/docs/csharp/html/Fields_T_BerkeleyDB_ReplicationConfig.htm
index 3e99fb57..af2c325d 100644
--- a/docs/csharp/html/Fields_T_BerkeleyDB_ReplicationConfig.htm
+++ b/docs/csharp/html/Fields_T_BerkeleyDB_ReplicationConfig.htm
@@ -1,4 +1,4 @@
-<html xmlns:MSHelp="http://msdn.microsoft.com/mshelp" xmlns:mshelp="http://msdn.microsoft.com/mshelp" xmlns:ddue="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8" /><META NAME="save" CONTENT="history" /><title>ReplicationConfig Fields</title><link rel="stylesheet" type="text/css" href="../styles/presentation.css" /><link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" /><script type="text/javascript" src="../scripts/EventUtilities.js"> </script><script type="text/javascript" src="../scripts/SplitScreen.js"> </script><script type="text/javascript" src="../scripts/Dropdown.js"> </script><script type="text/javascript" src="../scripts/script_manifold.js"> </script><script type="text/javascript" src="../scripts/script_feedBack.js"> </script><script type="text/javascript" src="../scripts/CheckboxMenu.js"> </script><script type="text/javascript" src="../scripts/CommonUtilities.js"> </script><meta name="container" content="BerkeleyDB" /><meta name="file" content="Fields_T_BerkeleyDB_ReplicationConfig" /><meta name="guid" content="Fields_T_BerkeleyDB_ReplicationConfig" /><xml><MSHelp:Attr Name="AssetID" Value="Fields.T:BerkeleyDB.ReplicationConfig" /><MSHelp:TOCTitle Title="ReplicationConfig Fields" /><MSHelp:RLTitle Title="ReplicationConfig Fields (BerkeleyDB)" /><MSHelp:Keyword Index="A" Term="Fields.T:BerkeleyDB.ReplicationConfig" /><MSHelp:Keyword Index="A" Term="frlrfBerkeleyDBReplicationConfigFieldsTopic" /><MSHelp:Keyword Index="K" Term="ReplicationConfig class, fields" /><MSHelp:Attr Name="DevLang" Value="CSharp" /><MSHelp:Attr Name="DevLang" Value="VB" /><MSHelp:Attr Name="DevLang" Value="C++" /><MSHelp:Attr Name="Locale" Value="en-us" /><MSHelp:Attr Name="TopicType" Value="kbSyntax" /><MSHelp:Attr Name="TopicType" Value="apiref" /><MSHelp:Attr Name="AssemblyVersion" Value="5.3.21.0" /></xml></head><body><input type="hidden" id="userDataCache" class="userDataStyle" /><input type="hidden" id="hiddenScrollOffset" /><img id="collapseImage" style="display:none; height:0; width:0;" src="../icons/collapse_all.gif" title="Collapse image" /><img id="expandImage" style="display:none; height:0; width:0;" src="../icons/expand_all.gif" title="Expand Image" /><img id="collapseAllImage" style="display:none; height:0; width:0;" src="../icons/collapse_all.gif" /><img id="expandAllImage" style="display:none; height:0; width:0;" src="../icons/expand_all.gif" /><img id="dropDownImage" style="display:none; height:0; width:0;" src="../icons/dropdown.gif" /><img id="dropDownHoverImage" style="display:none; height:0; width:0;" src="../icons/dropdownHover.gif" /><img id="copyImage" style="display:none; height:0; width:0;" src="../icons/copycode.gif" title="Copy image" /><img id="copyHoverImage" style="display:none; height:0; width:0;" src="../icons/copycodeHighlight.gif" title="CopyHover image" /><div id="header"><table id="topTable" cellspacing="0" cellpadding="0"><tr><td><span onclick="ExpandCollapseAll(toggleAllImage)" style="cursor:default;" onkeypress="ExpandCollapseAll_CheckKey(toggleAllImage, event)" tabindex="0"><img ID="toggleAllImage" class="toggleAll" src="../icons/collapse_all.gif" /> <label id="collapseAllLabel" for="toggleAllImage" style="display: none;">Collapse All</label><label id="expandAllLabel" for="toggleAllImage" style="display: none;">Expand All</label> </span><span>    </span><span id="devlangsDropdown" class="filter" tabindex="0"><img id="devlangsDropdownImage" src="../icons/dropdown.gif" /> <label id="devlangsMenuAllLabel" for="devlangsDropdownImage" style="display: none;"><nobr>Code: All </nobr></label><label id="devlangsMenuMultipleLabel" for="devlangsDropdownImage" style="display: none;"><nobr>Code: Multiple </nobr></label><label id="devlangsMenuCSharpLabel" for="devlangsDropdownImage" style="display: none;"><nobr>Code: C# </nobr></label><label id="devlangsMenuVisualBasicLabel" for="devlangsDropdownImage" style="display: none;"><nobr>Code: Visual Basic </nobr></label><label id="devlangsMenuManagedCPlusPlusLabel" for="devlangsDropdownImage" style="display: none;"><nobr>Code: Visual C++ </nobr></label></span><span>    </span><span id="memberOptionsDropdown" class="filter" tabindex="0"><img id="memberOptionsDropdownImage" src="../icons/dropdown.gif" /> <label id="memberOptionsMenuAllLabel" for="memberOptionsDropdownImage" style="display: none;"><nobr>Members: Show All </nobr></label><label id="memberOptionsMenuMultipleLabel" for="memberOptionsDropdownImage" style="display: none;"><nobr>Members: Filtered </nobr></label><label id="memberOptionsMenuProtectedLabel" for="memberOptionsDropdownImage" style="display: none;"><nobr>Members: Filtered </nobr></label><label id="memberOptionsMenuInheritedLabel" for="memberOptionsDropdownImage" style="display: none;"><nobr>Members: Filtered </nobr></label></span></td></tr></table><div id="devlangsMenu"><input id="CSharpCheckbox" type="checkbox" data="CSharp,cs,'persist'" value="on" onClick="SetLanguage(this)" /><label class="checkboxLabel" for="CSharpCheckbox">C#</label><br /><input id="VisualBasicCheckbox" type="checkbox" data="VisualBasic,vb,'persist'" value="on" onClick="SetLanguage(this)" /><label class="checkboxLabel" for="VisualBasicCheckbox">Visual Basic</label><br /><input id="ManagedCPlusPlusCheckbox" type="checkbox" data="ManagedCPlusPlus,cpp,'persist'" value="on" onClick="SetLanguage(this)" /><label class="checkboxLabel" for="ManagedCPlusPlusCheckbox">Visual C++</label><br /></div><div id="memberOptionsMenu"><input id="ProtectedCheckbox" type="checkbox" data="Protected" value="on" onClick="SetMemberOptions(this, 'vis')" /><label class="checkboxLabel" for="ProtectedCheckbox">Include Protected Members</label><br /><input id="InheritedCheckbox" type="checkbox" data="Inherited" value="on" onClick="SetMemberOptions(this, 'decl')" /><label class="checkboxLabel" for="InheritedCheckbox">Include Inherited Members</label><br /></div><table id="bottomTable" cellpadding="0" cellspacing="0"><tr id="headerTableRow1"><td align="left"><span id="runningHeaderText">Berkeley DB .NET API Documentation</span></td></tr><tr id="headerTableRow2"><td align="left"><span id="nsrTitle">ReplicationConfig Fields</span></td></tr><tr id="headerTableRow3"><td align="left"><a href="T_BerkeleyDB_ReplicationConfig.htm">ReplicationConfig Class</a>  <a href="#seeAlsoToggle" onclick="OpenSection(seeAlsoToggle)">See Also</a>  
+<html xmlns:MSHelp="http://msdn.microsoft.com/mshelp" xmlns:mshelp="http://msdn.microsoft.com/mshelp" xmlns:ddue="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8" /><META NAME="save" CONTENT="history" /><title>ReplicationConfig Fields</title><link rel="stylesheet" type="text/css" href="../styles/presentation.css" /><link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" /><script type="text/javascript" src="../scripts/EventUtilities.js"> </script><script type="text/javascript" src="../scripts/SplitScreen.js"> </script><script type="text/javascript" src="../scripts/Dropdown.js"> </script><script type="text/javascript" src="../scripts/script_manifold.js"> </script><script type="text/javascript" src="../scripts/script_feedBack.js"> </script><script type="text/javascript" src="../scripts/CheckboxMenu.js"> </script><script type="text/javascript" src="../scripts/CommonUtilities.js"> </script><meta name="container" content="BerkeleyDB" /><meta name="file" content="Fields_T_BerkeleyDB_ReplicationConfig" /><meta name="guid" content="Fields_T_BerkeleyDB_ReplicationConfig" /><xml><MSHelp:Attr Name="AssetID" Value="Fields.T:BerkeleyDB.ReplicationConfig" /><MSHelp:TOCTitle Title="ReplicationConfig Fields" /><MSHelp:RLTitle Title="ReplicationConfig Fields (BerkeleyDB)" /><MSHelp:Keyword Index="A" Term="Fields.T:BerkeleyDB.ReplicationConfig" /><MSHelp:Keyword Index="A" Term="frlrfBerkeleyDBReplicationConfigFieldsTopic" /><MSHelp:Keyword Index="K" Term="ReplicationConfig class, fields" /><MSHelp:Attr Name="DevLang" Value="CSharp" /><MSHelp:Attr Name="DevLang" Value="VB" /><MSHelp:Attr Name="DevLang" Value="C++" /><MSHelp:Attr Name="Locale" Value="en-us" /><MSHelp:Attr Name="TopicType" Value="kbSyntax" /><MSHelp:Attr Name="TopicType" Value="apiref" /><MSHelp:Attr Name="AssemblyVersion" Value="6.1.23.0" /></xml></head><body><input type="hidden" id="userDataCache" class="userDataStyle" /><input type="hidden" id="hiddenScrollOffset" /><img id="collapseImage" style="display:none; height:0; width:0;" src="../icons/collapse_all.gif" title="Collapse image" /><img id="expandImage" style="display:none; height:0; width:0;" src="../icons/expand_all.gif" title="Expand Image" /><img id="collapseAllImage" style="display:none; height:0; width:0;" src="../icons/collapse_all.gif" /><img id="expandAllImage" style="display:none; height:0; width:0;" src="../icons/expand_all.gif" /><img id="dropDownImage" style="display:none; height:0; width:0;" src="../icons/dropdown.gif" /><img id="dropDownHoverImage" style="display:none; height:0; width:0;" src="../icons/dropdownHover.gif" /><img id="copyImage" style="display:none; height:0; width:0;" src="../icons/copycode.gif" title="Copy image" /><img id="copyHoverImage" style="display:none; height:0; width:0;" src="../icons/copycodeHighlight.gif" title="CopyHover image" /><div id="header"><table id="topTable" cellspacing="0" cellpadding="0"><tr><td><span onclick="ExpandCollapseAll(toggleAllImage)" style="cursor:default;" onkeypress="ExpandCollapseAll_CheckKey(toggleAllImage, event)" tabindex="0"><img ID="toggleAllImage" class="toggleAll" src="../icons/collapse_all.gif" /> <label id="collapseAllLabel" for="toggleAllImage" style="display: none;">Collapse All</label><label id="expandAllLabel" for="toggleAllImage" style="display: none;">Expand All</label> </span><span>    </span><span id="devlangsDropdown" class="filter" tabindex="0"><img id="devlangsDropdownImage" src="../icons/dropdown.gif" /> <label id="devlangsMenuAllLabel" for="devlangsDropdownImage" style="display: none;"><nobr>Code: All </nobr></label><label id="devlangsMenuMultipleLabel" for="devlangsDropdownImage" style="display: none;"><nobr>Code: Multiple </nobr></label><label id="devlangsMenuCSharpLabel" for="devlangsDropdownImage" style="display: none;"><nobr>Code: C# </nobr></label><label id="devlangsMenuVisualBasicLabel" for="devlangsDropdownImage" style="display: none;"><nobr>Code: Visual Basic </nobr></label><label id="devlangsMenuManagedCPlusPlusLabel" for="devlangsDropdownImage" style="display: none;"><nobr>Code: Visual C++ </nobr></label></span><span>    </span><span id="memberOptionsDropdown" class="filter" tabindex="0"><img id="memberOptionsDropdownImage" src="../icons/dropdown.gif" /> <label id="memberOptionsMenuAllLabel" for="memberOptionsDropdownImage" style="display: none;"><nobr>Members: Show All </nobr></label><label id="memberOptionsMenuMultipleLabel" for="memberOptionsDropdownImage" style="display: none;"><nobr>Members: Filtered </nobr></label><label id="memberOptionsMenuProtectedLabel" for="memberOptionsDropdownImage" style="display: none;"><nobr>Members: Filtered </nobr></label><label id="memberOptionsMenuInheritedLabel" for="memberOptionsDropdownImage" style="display: none;"><nobr>Members: Filtered </nobr></label></span></td></tr></table><div id="devlangsMenu"><input id="CSharpCheckbox" type="checkbox" data="CSharp,cs,'persist'" value="on" onClick="SetLanguage(this)" /><label class="checkboxLabel" for="CSharpCheckbox">C#</label><br /><input id="VisualBasicCheckbox" type="checkbox" data="VisualBasic,vb,'persist'" value="on" onClick="SetLanguage(this)" /><label class="checkboxLabel" for="VisualBasicCheckbox">Visual Basic</label><br /><input id="ManagedCPlusPlusCheckbox" type="checkbox" data="ManagedCPlusPlus,cpp,'persist'" value="on" onClick="SetLanguage(this)" /><label class="checkboxLabel" for="ManagedCPlusPlusCheckbox">Visual C++</label><br /></div><div id="memberOptionsMenu"><input id="ProtectedCheckbox" type="checkbox" data="Protected" value="on" onClick="SetMemberOptions(this, 'vis')" /><label class="checkboxLabel" for="ProtectedCheckbox">Include Protected Members</label><br /><input id="InheritedCheckbox" type="checkbox" data="Inherited" value="on" onClick="SetMemberOptions(this, 'decl')" /><label class="checkboxLabel" for="InheritedCheckbox">Include Inherited Members</label><br /></div><table id="bottomTable" cellpadding="0" cellspacing="0"><tr id="headerTableRow1"><td align="left"><span id="runningHeaderText">Berkeley DB .NET API Documentation</span></td></tr><tr id="headerTableRow2"><td align="left"><span id="nsrTitle">ReplicationConfig Fields</span></td></tr><tr id="headerTableRow3"><td align="left"><a href="T_BerkeleyDB_ReplicationConfig.htm">ReplicationConfig Class</a>  <a href="#seeAlsoToggle" onclick="OpenSection(seeAlsoToggle)">See Also</a>  
   <span id="headfeedbackarea" class="feedbackhead">
       <a href="javascript:SubmitFeedback('','Berkeley DB .NET API Documentation','','','','%0\dYour%20feedback%20is%20used%20to%20improve%20the%20documentation%20and%20the%20product.%20Your%20e-mail%20address%20will%20not%20be%20used%20for%20any%20other%20purpose%20and%20is%20disposed%20of%20after%20the%20issue%20you%20report%20is%20resolved.%20%20While%20working%20to%20resolve%20the%20issue%20that%20you%20report,%20you%20may%20be%20contacted%20via%20e-mail%20to%20get%20further%20details%20or%20clarification%20on%20the%20feedback%20you%20sent.%20After%20the%20issue%20you%20report%20has%20been%20addressed,%20you%20may%20receive%20an%20e-mail%20to%20let%20you%20know%20that%20your%20feedback%20has%20been%20addressed.%0\A%0\d','Customer%20Feedback');">
         
@@ -8,14 +8,14 @@
 </td></tr></table><table id="gradientTable"><tr><td class="nsrBottom" background="../icons/gradient.gif" /></tr></table></div><div id="mainSection"><div id="mainBody"><div id="allHistory" class="saveHistory" onsave="saveAll()" onload="loadAll()" /><span style="color: DarkGray"> </span><p>The <a href="T_BerkeleyDB_ReplicationConfig.htm">ReplicationConfig</a> type exposes the following members.</p><h1 class="heading"><span onclick="ExpandCollapse(fieldTableToggle)" style="cursor:default;" onkeypress="ExpandCollapse_CheckKey(fieldTableToggle, event)" tabindex="0"><img id="fieldTableToggle" class="toggle" name="toggleSwitch" src="../icons/collapse_all.gif" />Fields</span></h1><div id="fieldTableSection" class="section" name="collapseableSection" style=""><table id="memberList" class="members" frame="lhs" cellpadding="2"><col width="10%" /><tr><th class="iconColumn">
                
             </th><th class="nameColumn">Name</th><th class="descriptionColumn">Description</th></tr><tr data="public;declared;notNetfw;"><td><img src="../icons/pubfield.gif" title="Public field" /></td><td><a href="F_BerkeleyDB_ReplicationConfig_AutoInit.htm">AutoInit</a></td><td><div class="summary">
-            If true, the replication master will automatically re-initialize
+            If true, the replication master automatically re-initializes
             outdated clients (defaults to true). 
             </div></td></tr><tr data="public;declared;notNetfw;"><td><img src="../icons/pubfield.gif" title="Public field" /></td><td><a href="F_BerkeleyDB_ReplicationConfig_BulkTransfer.htm">BulkTransfer</a></td><td><div class="summary">
-            If true, the replication master will send groups of records to the
+            If true, the replication master sends groups of records to the
             clients in a single network transfer
             </div></td></tr><tr data="public;declared;notNetfw;"><td><img src="../icons/pubfield.gif" title="Public field" /></td><td><a href="F_BerkeleyDB_ReplicationConfig_DelayClientSync.htm">DelayClientSync</a></td><td><div class="summary">
-            If true, the client will delay synchronizing to a newly declared
-            master (defaults to false). Clients configured in this way will
+            If true, the client delays synchronizing to a newly declared
+            master (defaults to false). Clients configured in this way
             remain unsynchronized until the application calls
             <a href="M_BerkeleyDB_DatabaseEnvironment_RepSync.htm">RepSync<span class="languageSpecificText"><span class="cs">()</span><span class="cpp">()</span><span class="nu">()</span></span></a>. 
             </div></td></tr><tr data="public;declared;notNetfw;"><td><img src="../icons/pubfield.gif" title="Public field" /></td><td><a href="F_BerkeleyDB_ReplicationConfig_Elections.htm">Elections</a></td><td><div class="summary">
@@ -33,17 +33,32 @@
             If true, Berkeley DB method calls that would normally block while
             clients are in recovery will return errors immediately (defaults to
             false).
+            </div></td></tr><tr data="public;declared;notNetfw;"><td><img src="../icons/pubfield.gif" title="Public field" /></td><td><a href="F_BerkeleyDB_ReplicationConfig_PrefmasClient.htm">PrefmasClient</a></td><td><div class="summary">
+            This flag is used to specify the client site in a replication group
+            operating in preferred master mode. A preferred master replication
+            group must contain only two sites, with one site specified as the
+            preferred master site and the other site specified as the client
+            site. The client site in a preferred master replication group takes
+            over temporarily as master when the preferred master site is
+            unavailable.
+            </div></td></tr><tr data="public;declared;notNetfw;"><td><img src="../icons/pubfield.gif" title="Public field" /></td><td><a href="F_BerkeleyDB_ReplicationConfig_PrefmasMaster.htm">PrefmasMaster</a></td><td><div class="summary">
+            This flag is used to specify the preferred master site in a
+            replication group operating in preferred master mode. A preferred
+            master replication group must contain only two sites, with one site
+            specified as the preferred master site and the other site specified
+            as the client site. The preferred master site operates as the
+            master site whenever possible.
             </div></td></tr><tr data="public;declared;notNetfw;"><td><img src="../icons/pubfield.gif" title="Public field" /></td><td><a href="F_BerkeleyDB_ReplicationConfig_RepMgrAckPolicy.htm">RepMgrAckPolicy</a></td><td><div class="summary">
-            Specify how master and client sites will handle acknowledgment of
-            replication messages which are necessary for "permanent" records.
+            Specify how master and client sites handle the acknowledgment of
+            replication messages which is necessary for "permanent" records.
             The current implementation requires all sites in a replication group
-            configure the same acknowledgement policy. 
+            to configure the same acknowledgement policy. 
             </div></td></tr><tr data="public;declared;notNetfw;"><td><img src="../icons/pubfield.gif" title="Public field" /></td><td><a href="F_BerkeleyDB_ReplicationConfig_RepmgrSitesConfig.htm">RepmgrSitesConfig</a></td><td><div class="summary">
             A list of site configurations.
             </div></td></tr><tr data="public;declared;notNetfw;"><td><img src="../icons/pubfield.gif" title="Public field" /></td><td><a href="F_BerkeleyDB_ReplicationConfig_Strict2Site.htm">Strict2Site</a></td><td><div class="summary">
-            If true, the Replication Manager will observe the strict "majority"
+            If true, the Replication Manager observes the strict "majority"
             rule in managing elections, even in a group with only 2 sites. This
-            means the client in a 2-site group will be unable to take over as
+            means the client in a 2-site group is unable to take over as
             master if the original master fails or becomes disconnected. (See
             the Elections section in the Berkeley DB Reference Guide for more
             information.) Both sites in the replication group should have the
@@ -52,7 +67,7 @@
             The delegate used to transmit data using the replication
             application's communication infrastructure.
             </div></td></tr><tr data="public;declared;notNetfw;"><td><img src="../icons/pubfield.gif" title="Public field" /></td><td><a href="F_BerkeleyDB_ReplicationConfig_UseMasterLeases.htm">UseMasterLeases</a></td><td><div class="summary">
-            If true, master leases will be used for this site (defaults to
+            If true, master leases are used for this site (defaults to
             false). 
             </div></td></tr></table></div><h1 class="heading"><span onclick="ExpandCollapse(seeAlsoToggle)" style="cursor:default;" onkeypress="ExpandCollapse_CheckKey(seeAlsoToggle, event)" tabindex="0"><img id="seeAlsoToggle" class="toggle" name="toggleSwitch" src="../icons/collapse_all.gif" />See Also</span></h1><div id="seeAlsoSection" class="section" name="collapseableSection" style=""><div class="seeAlsoStyle"><a href="T_BerkeleyDB_ReplicationConfig.htm">ReplicationConfig Class</a></div><div class="seeAlsoStyle"><a href="N_BerkeleyDB.htm">BerkeleyDB Namespace</a></div></div></div><div id="footer"><div class="footerLine"><img width="100%" height="3px" src="../icons/footer.gif" title="Footer image" /></div><A NAME="feedback"></A><span id="fb" class="feedbackcss"> </span>
-Report Feedback on this item in the Oracle Technology Network Forum <p />Copyright (c) 2008, 2012 Oracle. All rights reserved.</div></div></body></html>
-\ No newline at end of file
+Report Feedback on this item in the Oracle Technology Network Forum <p />Copyright (c) 2008, 2015 Oracle. All rights reserved.</div></div></body></html>
+\ No newline at end of file