You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by bu...@apache.org on 2012/06/12 22:47:33 UTC

svn commit: r821505 [1/2] - in /websites/staging/zookeeper/trunk/content: ./ bookkeeper/ bookkeeper/docs/r4.0.0/ bookkeeper/docs/r4.1.0/ bookkeeper/docs/trunk/

Author: buildbot
Date: Tue Jun 12 20:47:31 2012
New Revision: 821505

Log:
Staging update by buildbot for zookeeper

Modified:
    websites/staging/zookeeper/trunk/content/   (props changed)
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookieRecovery.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperConfig.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperConfigParams.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperInternals.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperOverview.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperProgrammer.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperStarted.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperStream.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/doc.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigBuild.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigDesign.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigUser.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/index.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/releaseNotes.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookieConfigParams.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookieRecovery.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperConfig.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperConfigParams.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperInternals.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperJMX.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperOverview.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperProgrammer.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperStarted.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperStream.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/doc.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigBuild.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigConsole.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigDesign.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigJMX.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigUser.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/index.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/releaseNotes.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookieConfigParams.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookieRecovery.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperConfig.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperConfigParams.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperInternals.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperJMX.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperOverview.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperProgrammer.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperStarted.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperStream.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/doc.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/hedwigBuild.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/hedwigConsole.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/hedwigDesign.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/hedwigJMX.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/hedwigUser.html
    websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/index.html
    websites/staging/zookeeper/trunk/content/bookkeeper/lists.html
    websites/staging/zookeeper/trunk/content/bylaws.html
    websites/staging/zookeeper/trunk/content/credits.html
    websites/staging/zookeeper/trunk/content/lists.html

Propchange: websites/staging/zookeeper/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 12 20:47:31 2012
@@ -1 +1 @@
-1349449
+1349515

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookieRecovery.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookieRecovery.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookieRecovery.html Tue Jun 12 20:47:31 2012
@@ -115,6 +115,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperConfig.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperConfig.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperConfig.html Tue Jun 12 20:47:31 2012
@@ -129,6 +129,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperConfigParams.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperConfigParams.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperConfigParams.html Tue Jun 12 20:47:31 2012
@@ -63,7 +63,7 @@
 
 <h3><span class="caps">NIO </span>server settings</h3>
 
-<table><tr><td><code>serverTcpNoDelay</code></td><td>This settings is used to enabled/disabled Nagle&#39;s algorithm, which is a means of improving the efficiency of <span class="caps">TCP</span>/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance. Default value is true.</td></tr></table>
+<table><tr><td><code>serverTcpNoDelay</code></td><td>This settings is used to enabled/disabled Nagle's algorithm, which is a means of improving the efficiency of <span class="caps">TCP</span>/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance. Default value is true.</td></tr></table>
 
 <h3>Ledger cache settings</h3>
 
@@ -105,6 +105,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperInternals.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperInternals.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperInternals.html Tue Jun 12 20:47:31 2012
@@ -78,7 +78,7 @@
 
 <p>You may use following settings to further fine tune the behavior of journalling on bookies:</p>
 
-<table><tr><td><code>journalMaxSizeMB</code></td><td>journal file size limitation. when a journal reaches this limitation, it will be closed and new journal file be created.</td></tr><tr><td><code>journalMaxBackups</code></td><td>how many old journal files whose id is less than LastLogMark &#39;s journal id.</td></tr></table>
+<table><tr><td><code>journalMaxSizeMB</code></td><td>journal file size limitation. when a journal reaches this limitation, it will be closed and new journal file be created.</td></tr><tr><td><code>journalMaxBackups</code></td><td>how many old journal files whose id is less than LastLogMark 's journal id.</td></tr></table>
 
 <blockquote><p><span class="caps">NOTE</span>: keeping number of old journal files would be useful for manually recovery in special case.</p></blockquote>
 
@@ -92,7 +92,7 @@
 
 <h2>Flat Ledger Manager</h2>
 
-<p>All ledgers&#39; metadata are put in a single zookeeper path, created using zookeeper sequential node, which can ensure uniqueness of ledger id. Each ledger node is prefixed with &#39;L&#39;.</p>
+<p>All ledgers' metadata are put in a single zookeeper path, created using zookeeper sequential node, which can ensure uniqueness of ledger id. Each ledger node is prefixed with 'L'.</p>
 
 <p>Bookie server manages its owned active ledgers in a hash map. So it is easy for bookie server to find what ledgers are deleted from zookeeper and garbage collect them. And its garbage collection flow is described as below:</p>
 
@@ -165,6 +165,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperOverview.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperOverview.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperOverview.html Tue Jun 12 20:47:31 2012
@@ -109,7 +109,7 @@
 <p><img src="images/bk-overview.jpg" alt="" />
 p. A simple use of BooKeeper is to implement a write-ahead transaction log. A server maintains an in-memory data structure (with periodic snapshots for example) and logs changes to that structure before it applies the change. The application server creates a ledger at startup and store the ledger id and password in a well known place (ZooKeeper maybe). When it needs to make a change, the server adds an entry with the change information to a ledger and apply the change when BookKeeper adds the entry successfully. The server can even use asyncAddEntry to queue up many changes for high change throughput. BooKeeper meticulously logs the changes in order and call the completion functions in order. </p>
 
-<p>When the application server dies, a backup server will come online, get the last snapshot and then it will open the ledger of the old server and read all the entries from the time the snapshot was taken. (Since it doesn&#39;t know the last entry number it will use <span class="caps">MAX</span>_INTEGER). Once all the entries have been processed, it will close the ledger and start a new one for its use. </p>
+<p>When the application server dies, a backup server will come online, get the last snapshot and then it will open the ledger of the old server and read all the entries from the time the snapshot was taken. (Since it doesn't know the last entry number it will use <span class="caps">MAX</span>_INTEGER). Once all the entries have been processed, it will close the ledger and start a new one for its use. </p>
 
 <p>A client library takes care of communicating with bookies and managing entry numbers. An entry has the following fields: </p>
 
@@ -158,7 +158,7 @@ p. A simple use of BooKeeper is to imple
 
 <p>If the ledger was closed gracefully, ZooKeeper will have the last entry and everything will work well. But, if the BookKeeper client that was writing the ledger dies, there is some recovery that needs to take place. </p>
 
-<p>The problematic entries are the ones at the end of the ledger. There can be entries in flight when a BookKeeper client dies. If the entry only gets to one bookie, the entry should not be readable since the entry will disappear if that bookie fails. If the entry is only on one bookie, that doesn&#39;t mean that the entry has not been recorded successfully; the other bookies that recorded the entry might have failed. </p>
+<p>The problematic entries are the ones at the end of the ledger. There can be entries in flight when a BookKeeper client dies. If the entry only gets to one bookie, the entry should not be readable since the entry will disappear if that bookie fails. If the entry is only on one bookie, that doesn't mean that the entry has not been recorded successfully; the other bookies that recorded the entry might have failed. </p>
 
 <p>The trick to making everything work is to have a correct idea of a last entry. We do it in roughly three steps: </p>
 
@@ -200,7 +200,7 @@ p. A simple use of BooKeeper is to imple
 </ol>
 
 <ul>
-<li>For performance reasons, <em>Entry Log</em> buffers entries in memory and commit them in batches, while <em>Ledger Cache</em> holds index pages in memory and flushes them lazily. We will discuss data flush and how to ensure data integrity in the following section &#39;Data Flush&#39;.</li>
+<li>For performance reasons, <em>Entry Log</em> buffers entries in memory and commit them in batches, while <em>Ledger Cache</em> holds index pages in memory and flushes them lazily. We will discuss data flush and how to ensure data integrity in the following section 'Data Flush'.</li>
 </ul>
 
 <h2>Data Flush</h2>
@@ -223,7 +223,7 @@ p. A simple use of BooKeeper is to imple
 </ol>
 </li>
 <li>Persists <em>LastLogMark</em> to disk, which means entries added before <em>LastLogMark</em> whose entry data and index page were also persisted to disk. It is the time to safely remove journal files created earlier than <em>txnLogId</em>.<ol>
-<li>If the bookie has crashed before persisting <em>LastLogMark</em> to disk, it still has journal files containing entries for which index pages may not have been persisted. Consequently, when this bookie restarts, it inspects journal files to restore those entries; data isn&#39;t lost.</li>
+<li>If the bookie has crashed before persisting <em>LastLogMark</em> to disk, it still has journal files containing entries for which index pages may not have been persisted. Consequently, when this bookie restarts, it inspects journal files to restore those entries; data isn't lost.</li>
 </ol></li>
 </ol>
 
@@ -265,6 +265,7 @@ p. A simple use of BooKeeper is to imple
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperProgrammer.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperProgrammer.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperProgrammer.html Tue Jun 12 20:47:31 2012
@@ -203,6 +203,7 @@ while (entries.hasMoreElements()) {
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperStarted.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperStarted.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperStarted.html Tue Jun 12 20:47:31 2012
@@ -59,7 +59,7 @@
 
 <h1>Getting Started: Setting up BookKeeper to write logs.</h1>
 
-<p>This document contains information to get you started quickly with BookKeeper. It is aimed primarily at developers willing to try it out, and contains simple installation instructions for a simple BookKeeper installation and a simple programming example. For further programming detail, please refer to  <a href="http://bookkeeperProgrammer.html">BookKeeper Programmer&#39;s Guide</a>. </p>
+<p>This document contains information to get you started quickly with BookKeeper. It is aimed primarily at developers willing to try it out, and contains simple installation instructions for a simple BookKeeper installation and a simple programming example. For further programming detail, please refer to  <a href="http://bookkeeperProgrammer.html">BookKeeper Programmer's Guide</a>. </p>
 
 <h1>Pre-requisites</h1>
 
@@ -79,7 +79,7 @@
 
 <h1>Setting up bookies</h1>
 
-<p>If you&#39;re bold and you want more than just running things locally, then you&#39;ll need to run bookies in different servers. You&#39;ll need at least three bookies to start with. </p>
+<p>If you're bold and you want more than just running things locally, then you'll need to run bookies in different servers. You'll need at least three bookies to start with. </p>
 
 <p>For each bookie, we need to execute a command like the following: </p>
 
@@ -180,6 +180,7 @@ bkc.close();
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperStream.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperStream.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/bookkeeperStream.html Tue Jun 12 20:47:31 2012
@@ -215,6 +215,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/doc.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/doc.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/doc.html Tue Jun 12 20:47:31 2012
@@ -53,12 +53,12 @@
         <tr>
         <td style="overflow: hidden;" valign="top" width="100%">
           <div class="wiki-content">
- <p>In the documentation directory, you&#39;ll find:</p>
+ <p>In the documentation directory, you'll find:</p>
 
 <ul>
 <li><code>build.txt</code>: Building Hedwig, or how to set up Hedwig</li>
-<li><code>user.txt</code>: User&#39;s Guide, or how to program against the Hedwig <span class="caps">API </span>and how to run it</li>
-<li><code>dev.txt</code>: Developer&#39;s Guide, or Hedwig internals and hacking details</li>
+<li><code>user.txt</code>: User's Guide, or how to program against the Hedwig <span class="caps">API </span>and how to run it</li>
+<li><code>dev.txt</code>: Developer's Guide, or Hedwig internals and hacking details</li>
 </ul>
 
 <p>These documents are all written in the <a href="http://johnmacfarlane.net/pandoc/">Pandoc</a> dialect of <a href="http://daringfireball.net/projects/markdown/">Markdown</a>. This makes them readable as plain text files, but also capable of generating <span class="caps">HTML </span>or LaTeX documentation.</p>
@@ -97,6 +97,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigBuild.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigBuild.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigBuild.html Tue Jun 12 20:47:31 2012
@@ -68,7 +68,7 @@
 
 <p>From the top level bookkeeper directory, run <code>mvn package</code>. This will compile and package the jars necessary for running hedwig. </p>
 
-<p>See the User&#39;s Guide for instructions on running and usage.</p>
+<p>See the User's Guide for instructions on running and usage.</p>
 
 <h1>Eclipse Instructions</h1>
 
@@ -76,13 +76,13 @@
 
 <ol>
 <li>Install the Subclipse plugin. Update site: <a href="http://subclipse.tigris.org/update_1.4.x">http://subclipse.tigris.org/update_1.4.x</a>.</li>
-<li>Install the Maven plugin. Update site: <a href="http://m2eclipse.sonatype.org/update">http://m2eclipse.sonatype.org/update</a>. From the list of packages available from this site, select everything under the &#34;Maven Integration&#34; category, and from the optional components select the ones with the word &#34;SCM&#34; in them.</li>
-<li>Go to Preferences &gt; Team &gt; <span class="caps">SVN.</span> For the <span class="caps">SVN </span>interface, choose &#34;Pure Java&#34;.</li>
+<li>Install the Maven plugin. Update site: <a href="http://m2eclipse.sonatype.org/update">http://m2eclipse.sonatype.org/update</a>. From the list of packages available from this site, select everything under the "Maven Integration" category, and from the optional components select the ones with the word "SCM" in them.</li>
+<li>Go to Preferences &gt; Team &gt; <span class="caps">SVN.</span> For the <span class="caps">SVN </span>interface, choose "Pure Java".</li>
 <li>Choose File &gt; New &gt; Project... &gt; Maven &gt; Checkout Maven Projects from <span class="caps">SCM.</span></li>
 <li>For the <span class="caps">SCM URL </span>type, choose <span class="caps">SVN.</span> For the <span class="caps">URL, </span>enter <span class="caps">SVN URL.</span> Maven will automatically create a top-level Eclipse project for each of the 4 Maven modules (recommended). If you want fewer top-level projects, uncheck the option of having a project for each module (under Advanced).</li>
 </ol>
 
-<p>You are now ready to run and debug the client and server code. See the User&#39;s Guide for instructions on running and usage.</p>
+<p>You are now ready to run and debug the client and server code. See the User's Guide for instructions on running and usage.</p>
           </div>
         </td>
         <td valign="top">
@@ -116,6 +116,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigDesign.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigDesign.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigDesign.html Tue Jun 12 20:47:31 2012
@@ -63,11 +63,11 @@
 
 <h1>Netty Notes</h1>
 
-<p>The asynchronous network IO infrastructure that Hedwig uses is <a href="http://www.jboss.org/netty">Netty</a>. Here are some notes on Netty&#39;s concurrency architecture and its filter pipeline design.</p>
+<p>The asynchronous network IO infrastructure that Hedwig uses is <a href="http://www.jboss.org/netty">Netty</a>. Here are some notes on Netty's concurrency architecture and its filter pipeline design.</p>
 
 <h2>Concurrency Architecture</h2>
 
-<p>After calling <code>ServerBootstrap.bind()</code>, Netty starts a boss thread (<code>NioServerSocketPipelineSink.Boss</code>) that just accepts new connections and registers them with one of the workers from the <code>NioWorker</code> pool in round-robin fashion (pool size defaults to <span class="caps">CPU </span>count). Each worker runs its own select loop over just the set of keys that have been registered with it. Workers start lazily on demand and run only so long as there are interested fd&#39;s/keys. All selected events are handled in the same thread and sent up the pipeline attached to the channel (this association is established by the boss as soon as a new connection is accepted).</p>
+<p>After calling <code>ServerBootstrap.bind()</code>, Netty starts a boss thread (<code>NioServerSocketPipelineSink.Boss</code>) that just accepts new connections and registers them with one of the workers from the <code>NioWorker</code> pool in round-robin fashion (pool size defaults to <span class="caps">CPU </span>count). Each worker runs its own select loop over just the set of keys that have been registered with it. Workers start lazily on demand and run only so long as there are interested fd's/keys. All selected events are handled in the same thread and sent up the pipeline attached to the channel (this association is established by the boss as soon as a new connection is accepted).</p>
 
 <p>All workers, and the boss, run via the executor thread pool; hence, the executor must support at least two simultaneous threads.</p>
 
@@ -90,9 +90,9 @@
 
 <h1>ReadAhead Cache</h1>
 
-<p>The delivery manager class is responsible for pushing published messages from the hubs to the subscribers. The most common case is that all subscribers are connected and either caught up, or close to the tail end of the topic. In this case, we don&#39;t want the delivery manager to be polling bookkeeper for any newly arrived messages on the topic; new messages should just be pushed to the delivery manager. However, there is also the uncommon case when a subscriber is behind, and messages must be pulled from Bookkeeper.</p>
+<p>The delivery manager class is responsible for pushing published messages from the hubs to the subscribers. The most common case is that all subscribers are connected and either caught up, or close to the tail end of the topic. In this case, we don't want the delivery manager to be polling bookkeeper for any newly arrived messages on the topic; new messages should just be pushed to the delivery manager. However, there is also the uncommon case when a subscriber is behind, and messages must be pulled from Bookkeeper.</p>
 
-<p>Since all publishes go through the hub, it is possible to cache the recently published messages in the hub, and then the delivery manager won&#39;t have to make the trip to bookkeeper to get the messages but instead get them from local process memory.</p>
+<p>Since all publishes go through the hub, it is possible to cache the recently published messages in the hub, and then the delivery manager won't have to make the trip to bookkeeper to get the messages but instead get them from local process memory.</p>
 
 <p>These ideas of push, pull, and caching are unified in the following way: - A hub has a cache of messages</p>
 
@@ -150,6 +150,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigUser.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigUser.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/hedwigUser.html Tue Jun 12 20:47:31 2012
@@ -55,7 +55,7 @@
           <div class="wiki-content">
  <h1>Design</h1>
 
-<p>In Hedwig, clients publish messages associated with a topic, and they subscribe to a topic to receive all messages published with that topic. Clients are associated with (publish to and subscribe from) a Hedwig <em>instance</em> (also referred to as a <em>region</em>), which consists of a number of servers called <em>hubs</em>. The hubs partition up topic ownership among themselves, and all publishes and subscribes to a topic must be done to its owning hub. When a client doesn&#39;t know the owning hub, it tries a default hub, which may redirect the client.</p>
+<p>In Hedwig, clients publish messages associated with a topic, and they subscribe to a topic to receive all messages published with that topic. Clients are associated with (publish to and subscribe from) a Hedwig <em>instance</em> (also referred to as a <em>region</em>), which consists of a number of servers called <em>hubs</em>. The hubs partition up topic ownership among themselves, and all publishes and subscribes to a topic must be done to its owning hub. When a client doesn't know the owning hub, it tries a default hub, which may redirect the client.</p>
 
 <p>Running a Hedwig instance requires a Zookeeper server and at least three Bookkeeper servers.</p>
 
@@ -65,7 +65,7 @@
 
 <p>Topics are independent; Hedwig provides no ordering across different topics.</p>
 
-<p>Version vectors are associated with each topic and serve as the identifiers for each message. Vectors consist of one component per region. A component value is the region&#39;s local sequence number on the topic, and is incremented each time a hub persists a message (published either locally or remotely) to <span class="caps">BK.</span></p>
+<p>Version vectors are associated with each topic and serve as the identifiers for each message. Vectors consist of one component per region. A component value is the region's local sequence number on the topic, and is incremented each time a hub persists a message (published either locally or remotely) to <span class="caps">BK.</span></p>
 
 <p><span class="caps">TODO</span>: More on how version vectors are to be used, and on maintaining vector-maxes.</p>
 
@@ -79,7 +79,7 @@
 
 <h2>Limits</h2>
 
-<p>Because the current implementation uses a single socket per subscription, the Hedwig requires a high <code>ulimit</code> on the number of open file descriptors. Non-root users can only use up to the limit specified in <code>/etc/security/limits.conf</code>; to raise this to 1024^2, as root, modify the &#34;nofile&#34; line in /etc/security/limits.conf on all hubs.</p>
+<p>Because the current implementation uses a single socket per subscription, the Hedwig requires a high <code>ulimit</code> on the number of open file descriptors. Non-root users can only use up to the limit specified in <code>/etc/security/limits.conf</code>; to raise this to 1024^2, as root, modify the "nofile" line in /etc/security/limits.conf on all hubs.</p>
 
 <h2>Running Servers</h2>
 
@@ -136,6 +136,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/index.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/index.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/index.html Tue Jun 12 20:47:31 2012
@@ -63,7 +63,7 @@
 <ul>
 <li><a href="./bookkeeperOverview.html">Overview</a></li>
 <li><a href="./bookkeeperStarted.html">Getting started</a></li>
-<li><a href="./bookkeeperProgrammer.html">Programmer&#39;s Guide</a></li>
+<li><a href="./bookkeeperProgrammer.html">Programmer's Guide</a></li>
 <li><a href="./bookkeeperConfig.html">Admin Guide</a></li>
 <li><a href="./bookkeeperConfigParams.html">Bookie Server Configuration Parameters</a></li>
 <li><a href="./bookkeeperInternals.html">BookKeeper Internals</a></li>
@@ -75,8 +75,8 @@
 
 <ul>
 <li><a href="./hedwigBuild.html">Building Hedwig, or how to set up Hedwig</a></li>
-<li><a href="./hedwigUser.html">User&#39;s Guide, or how to program against the Hedwig <span class="caps">API </span>and how to run it</a></li>
-<li><a href="./hedwigDesign.html">Developer&#39;s Guide, or Hedwig internals and hacking details</a></li>
+<li><a href="./hedwigUser.html">User's Guide, or how to program against the Hedwig <span class="caps">API </span>and how to run it</a></li>
+<li><a href="./hedwigDesign.html">Developer's Guide, or Hedwig internals and hacking details</a></li>
 </ul>
           </div>
         </td>
@@ -111,6 +111,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/releaseNotes.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/releaseNotes.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.0.0/releaseNotes.html Tue Jun 12 20:47:31 2012
@@ -258,6 +258,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookieConfigParams.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookieConfigParams.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookieConfigParams.html Tue Jun 12 20:47:31 2012
@@ -63,7 +63,7 @@
 
 <h3><span class="caps">NIO </span>server settings</h3>
 
-<table><tr><td><code>serverTcpNoDelay</code></td><td>This settings is used to enabled/disabled Nagle&#39;s algorithm, which is a means of improving the efficiency of <span class="caps">TCP</span>/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance. Default value is true.</td></tr></table>
+<table><tr><td><code>serverTcpNoDelay</code></td><td>This settings is used to enabled/disabled Nagle's algorithm, which is a means of improving the efficiency of <span class="caps">TCP</span>/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance. Default value is true.</td></tr></table>
 
 <h3>Ledger cache settings</h3>
 
@@ -109,6 +109,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookieRecovery.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookieRecovery.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookieRecovery.html Tue Jun 12 20:47:31 2012
@@ -115,6 +115,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperConfig.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperConfig.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperConfig.html Tue Jun 12 20:47:31 2012
@@ -115,7 +115,7 @@
 
 <h3>Missing disks or directories</h3>
 
-<p>Replacing disks or removing directories accidentally can cause a bookie to fail while trying to read a ledger fragment which the ledger metadata has claimed exists on the bookie. For this reason, when a bookie is started for the first time, it&#39;s disk configuration is fixed for the lifetime of that bookie. Any change to the disk configuration of the bookie, such as a crashed disk or an accidental configuration change, will result in the bookie being unable to start with the following error:</p>
+<p>Replacing disks or removing directories accidentally can cause a bookie to fail while trying to read a ledger fragment which the ledger metadata has claimed exists on the bookie. For this reason, when a bookie is started for the first time, it's disk configuration is fixed for the lifetime of that bookie. Any change to the disk configuration of the bookie, such as a crashed disk or an accidental configuration change, will result in the bookie being unable to start with the following error:</p>
 
 <p><code>2012-05-29 18:19:13,790 - ERROR - [main:BookieServer@314] - Exception running bookie server : </code><br />
 <code>org.apache.bookkeeper.bookie.BookieException$InvalidCookieException</code><br />
@@ -177,6 +177,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperConfigParams.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperConfigParams.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperConfigParams.html Tue Jun 12 20:47:31 2012
@@ -63,7 +63,7 @@
 
 <h3><span class="caps">NIO </span>server settings</h3>
 
-<table><tr><td><code>clientTcpNoDelay</code></td><td>This settings is used to enabled/disabled Nagle&#39;s algorithm, which is a means of improving the efficiency of <span class="caps">TCP</span>/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance. Default value is true.</td></tr></table>
+<table><tr><td><code>clientTcpNoDelay</code></td><td>This settings is used to enabled/disabled Nagle's algorithm, which is a means of improving the efficiency of <span class="caps">TCP</span>/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance. Default value is true.</td></tr></table>
 
 <h3>Ledger manager settings</h3>
 
@@ -107,6 +107,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperInternals.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperInternals.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperInternals.html Tue Jun 12 20:47:31 2012
@@ -78,7 +78,7 @@
 
 <p>You may use following settings to further fine tune the behavior of journalling on bookies:</p>
 
-<table><tr><td><code>journalMaxSizeMB</code></td><td>journal file size limitation. when a journal reaches this limitation, it will be closed and new journal file be created.</td></tr><tr><td><code>journalMaxBackups</code></td><td>how many old journal files whose id is less than LastLogMark &#39;s journal id.</td></tr></table>
+<table><tr><td><code>journalMaxSizeMB</code></td><td>journal file size limitation. when a journal reaches this limitation, it will be closed and new journal file be created.</td></tr><tr><td><code>journalMaxBackups</code></td><td>how many old journal files whose id is less than LastLogMark 's journal id.</td></tr></table>
 
 <blockquote><p><span class="caps">NOTE</span>: keeping number of old journal files would be useful for manually recovery in special case.</p></blockquote>
 
@@ -92,7 +92,7 @@
 
 <h2>Flat Ledger Manager</h2>
 
-<p>All ledgers&#39; metadata are put in a single zookeeper path, created using zookeeper sequential node, which can ensure uniqueness of ledger id. Each ledger node is prefixed with &#39;L&#39;.</p>
+<p>All ledgers' metadata are put in a single zookeeper path, created using zookeeper sequential node, which can ensure uniqueness of ledger id. Each ledger node is prefixed with 'L'.</p>
 
 <p>Bookie server manages its owned active ledgers in a hash map. So it is easy for bookie server to find what ledgers are deleted from zookeeper and garbage collect them. And its garbage collection flow is described as below:</p>
 
@@ -165,6 +165,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperJMX.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperJMX.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperJMX.html Tue Jun 12 20:47:31 2012
@@ -101,6 +101,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperOverview.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperOverview.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperOverview.html Tue Jun 12 20:47:31 2012
@@ -109,7 +109,7 @@
 <p><img src="images/bk-overview.jpg" alt="" />
 p. A simple use of BooKeeper is to implement a write-ahead transaction log. A server maintains an in-memory data structure (with periodic snapshots for example) and logs changes to that structure before it applies the change. The application server creates a ledger at startup and store the ledger id and password in a well known place (ZooKeeper maybe). When it needs to make a change, the server adds an entry with the change information to a ledger and apply the change when BookKeeper adds the entry successfully. The server can even use asyncAddEntry to queue up many changes for high change throughput. BooKeeper meticulously logs the changes in order and call the completion functions in order. </p>
 
-<p>When the application server dies, a backup server will come online, get the last snapshot and then it will open the ledger of the old server and read all the entries from the time the snapshot was taken. (Since it doesn&#39;t know the last entry number it will use <span class="caps">MAX</span>_INTEGER). Once all the entries have been processed, it will close the ledger and start a new one for its use. </p>
+<p>When the application server dies, a backup server will come online, get the last snapshot and then it will open the ledger of the old server and read all the entries from the time the snapshot was taken. (Since it doesn't know the last entry number it will use <span class="caps">MAX</span>_INTEGER). Once all the entries have been processed, it will close the ledger and start a new one for its use. </p>
 
 <p>A client library takes care of communicating with bookies and managing entry numbers. An entry has the following fields: </p>
 
@@ -158,7 +158,7 @@ p. A simple use of BooKeeper is to imple
 
 <p>If the ledger was closed gracefully, ZooKeeper will have the last entry and everything will work well. But, if the BookKeeper client that was writing the ledger dies, there is some recovery that needs to take place. </p>
 
-<p>The problematic entries are the ones at the end of the ledger. There can be entries in flight when a BookKeeper client dies. If the entry only gets to one bookie, the entry should not be readable since the entry will disappear if that bookie fails. If the entry is only on one bookie, that doesn&#39;t mean that the entry has not been recorded successfully; the other bookies that recorded the entry might have failed. </p>
+<p>The problematic entries are the ones at the end of the ledger. There can be entries in flight when a BookKeeper client dies. If the entry only gets to one bookie, the entry should not be readable since the entry will disappear if that bookie fails. If the entry is only on one bookie, that doesn't mean that the entry has not been recorded successfully; the other bookies that recorded the entry might have failed. </p>
 
 <p>The trick to making everything work is to have a correct idea of a last entry. We do it in roughly three steps: </p>
 
@@ -200,7 +200,7 @@ p. A simple use of BooKeeper is to imple
 </ol>
 
 <ul>
-<li>For performance reasons, <em>Entry Log</em> buffers entries in memory and commit them in batches, while <em>Ledger Cache</em> holds index pages in memory and flushes them lazily. We will discuss data flush and how to ensure data integrity in the following section &#39;Data Flush&#39;.</li>
+<li>For performance reasons, <em>Entry Log</em> buffers entries in memory and commit them in batches, while <em>Ledger Cache</em> holds index pages in memory and flushes them lazily. We will discuss data flush and how to ensure data integrity in the following section 'Data Flush'.</li>
 </ul>
 
 <h2>Data Flush</h2>
@@ -223,7 +223,7 @@ p. A simple use of BooKeeper is to imple
 </ol>
 </li>
 <li>Persists <em>LastLogMark</em> to disk, which means entries added before <em>LastLogMark</em> whose entry data and index page were also persisted to disk. It is the time to safely remove journal files created earlier than <em>txnLogId</em>.<ol>
-<li>If the bookie has crashed before persisting <em>LastLogMark</em> to disk, it still has journal files containing entries for which index pages may not have been persisted. Consequently, when this bookie restarts, it inspects journal files to restore those entries; data isn&#39;t lost.</li>
+<li>If the bookie has crashed before persisting <em>LastLogMark</em> to disk, it still has journal files containing entries for which index pages may not have been persisted. Consequently, when this bookie restarts, it inspects journal files to restore those entries; data isn't lost.</li>
 </ol></li>
 </ol>
 
@@ -287,6 +287,7 @@ p. A simple use of BooKeeper is to imple
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperProgrammer.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperProgrammer.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperProgrammer.html Tue Jun 12 20:47:31 2012
@@ -203,6 +203,7 @@ while (entries.hasMoreElements()) {
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperStarted.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperStarted.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperStarted.html Tue Jun 12 20:47:31 2012
@@ -59,7 +59,7 @@
 
 <h1>Getting Started: Setting up BookKeeper to write logs.</h1>
 
-<p>This document contains information to get you started quickly with BookKeeper. It is aimed primarily at developers willing to try it out, and contains simple installation instructions for a simple BookKeeper installation and a simple programming example. For further programming detail, please refer to  <a href="http://bookkeeperProgrammer.html">BookKeeper Programmer&#39;s Guide</a>. </p>
+<p>This document contains information to get you started quickly with BookKeeper. It is aimed primarily at developers willing to try it out, and contains simple installation instructions for a simple BookKeeper installation and a simple programming example. For further programming detail, please refer to  <a href="http://bookkeeperProgrammer.html">BookKeeper Programmer's Guide</a>. </p>
 
 <h1>Pre-requisites</h1>
 
@@ -79,7 +79,7 @@
 
 <h1>Setting up bookies</h1>
 
-<p>If you&#39;re bold and you want more than just running things locally, then you&#39;ll need to run bookies in different servers. You&#39;ll need at least three bookies to start with. </p>
+<p>If you're bold and you want more than just running things locally, then you'll need to run bookies in different servers. You'll need at least three bookies to start with. </p>
 
 <p>For each bookie, we need to execute a command like the following: </p>
 
@@ -180,6 +180,7 @@ bkc.close();
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperStream.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperStream.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/bookkeeperStream.html Tue Jun 12 20:47:31 2012
@@ -215,6 +215,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/doc.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/doc.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/doc.html Tue Jun 12 20:47:31 2012
@@ -53,12 +53,12 @@
         <tr>
         <td style="overflow: hidden;" valign="top" width="100%">
           <div class="wiki-content">
- <p>In the documentation directory, you&#39;ll find:</p>
+ <p>In the documentation directory, you'll find:</p>
 
 <ul>
 <li><code>build.txt</code>: Building Hedwig, or how to set up Hedwig</li>
-<li><code>user.txt</code>: User&#39;s Guide, or how to program against the Hedwig <span class="caps">API </span>and how to run it</li>
-<li><code>dev.txt</code>: Developer&#39;s Guide, or Hedwig internals and hacking details</li>
+<li><code>user.txt</code>: User's Guide, or how to program against the Hedwig <span class="caps">API </span>and how to run it</li>
+<li><code>dev.txt</code>: Developer's Guide, or Hedwig internals and hacking details</li>
 </ul>
 
 <p>These documents are all written in the <a href="http://johnmacfarlane.net/pandoc/">Pandoc</a> dialect of <a href="http://daringfireball.net/projects/markdown/">Markdown</a>. This makes them readable as plain text files, but also capable of generating <span class="caps">HTML </span>or LaTeX documentation.</p>
@@ -97,6 +97,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigBuild.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigBuild.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigBuild.html Tue Jun 12 20:47:31 2012
@@ -68,7 +68,7 @@
 
 <p>From the top level bookkeeper directory, run <code>mvn package</code>. This will compile and package the jars necessary for running hedwig. </p>
 
-<p>See the User&#39;s Guide for instructions on running and usage.</p>
+<p>See the User's Guide for instructions on running and usage.</p>
 
 <h1>Eclipse Instructions</h1>
 
@@ -76,13 +76,13 @@
 
 <ol>
 <li>Install the Subclipse plugin. Update site: <a href="http://subclipse.tigris.org/update_1.4.x">http://subclipse.tigris.org/update_1.4.x</a>.</li>
-<li>Install the Maven plugin. Update site: <a href="http://m2eclipse.sonatype.org/update">http://m2eclipse.sonatype.org/update</a>. From the list of packages available from this site, select everything under the &#34;Maven Integration&#34; category, and from the optional components select the ones with the word &#34;SCM&#34; in them.</li>
-<li>Go to Preferences &gt; Team &gt; <span class="caps">SVN.</span> For the <span class="caps">SVN </span>interface, choose &#34;Pure Java&#34;.</li>
+<li>Install the Maven plugin. Update site: <a href="http://m2eclipse.sonatype.org/update">http://m2eclipse.sonatype.org/update</a>. From the list of packages available from this site, select everything under the "Maven Integration" category, and from the optional components select the ones with the word "SCM" in them.</li>
+<li>Go to Preferences &gt; Team &gt; <span class="caps">SVN.</span> For the <span class="caps">SVN </span>interface, choose "Pure Java".</li>
 <li>Choose File &gt; New &gt; Project... &gt; Maven &gt; Checkout Maven Projects from <span class="caps">SCM.</span></li>
 <li>For the <span class="caps">SCM URL </span>type, choose <span class="caps">SVN.</span> For the <span class="caps">URL, </span>enter <span class="caps">SVN URL.</span> Maven will automatically create a top-level Eclipse project for each of the 4 Maven modules (recommended). If you want fewer top-level projects, uncheck the option of having a project for each module (under Advanced).</li>
 </ol>
 
-<p>You are now ready to run and debug the client and server code. See the User&#39;s Guide for instructions on running and usage.</p>
+<p>You are now ready to run and debug the client and server code. See the User's Guide for instructions on running and usage.</p>
           </div>
         </td>
         <td valign="top">
@@ -116,6 +116,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigConsole.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigConsole.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigConsole.html Tue Jun 12 20:47:31 2012
@@ -290,6 +290,7 @@ Finished 0.388 s.
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigDesign.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigDesign.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigDesign.html Tue Jun 12 20:47:31 2012
@@ -63,11 +63,11 @@
 
 <h1>Netty Notes</h1>
 
-<p>The asynchronous network IO infrastructure that Hedwig uses is <a href="http://www.jboss.org/netty">Netty</a>. Here are some notes on Netty&#39;s concurrency architecture and its filter pipeline design.</p>
+<p>The asynchronous network IO infrastructure that Hedwig uses is <a href="http://www.jboss.org/netty">Netty</a>. Here are some notes on Netty's concurrency architecture and its filter pipeline design.</p>
 
 <h2>Concurrency Architecture</h2>
 
-<p>After calling <code>ServerBootstrap.bind()</code>, Netty starts a boss thread (<code>NioServerSocketPipelineSink.Boss</code>) that just accepts new connections and registers them with one of the workers from the <code>NioWorker</code> pool in round-robin fashion (pool size defaults to <span class="caps">CPU </span>count). Each worker runs its own select loop over just the set of keys that have been registered with it. Workers start lazily on demand and run only so long as there are interested fd&#39;s/keys. All selected events are handled in the same thread and sent up the pipeline attached to the channel (this association is established by the boss as soon as a new connection is accepted).</p>
+<p>After calling <code>ServerBootstrap.bind()</code>, Netty starts a boss thread (<code>NioServerSocketPipelineSink.Boss</code>) that just accepts new connections and registers them with one of the workers from the <code>NioWorker</code> pool in round-robin fashion (pool size defaults to <span class="caps">CPU </span>count). Each worker runs its own select loop over just the set of keys that have been registered with it. Workers start lazily on demand and run only so long as there are interested fd's/keys. All selected events are handled in the same thread and sent up the pipeline attached to the channel (this association is established by the boss as soon as a new connection is accepted).</p>
 
 <p>All workers, and the boss, run via the executor thread pool; hence, the executor must support at least two simultaneous threads.</p>
 
@@ -90,9 +90,9 @@
 
 <h1>ReadAhead Cache</h1>
 
-<p>The delivery manager class is responsible for pushing published messages from the hubs to the subscribers. The most common case is that all subscribers are connected and either caught up, or close to the tail end of the topic. In this case, we don&#39;t want the delivery manager to be polling bookkeeper for any newly arrived messages on the topic; new messages should just be pushed to the delivery manager. However, there is also the uncommon case when a subscriber is behind, and messages must be pulled from Bookkeeper.</p>
+<p>The delivery manager class is responsible for pushing published messages from the hubs to the subscribers. The most common case is that all subscribers are connected and either caught up, or close to the tail end of the topic. In this case, we don't want the delivery manager to be polling bookkeeper for any newly arrived messages on the topic; new messages should just be pushed to the delivery manager. However, there is also the uncommon case when a subscriber is behind, and messages must be pulled from Bookkeeper.</p>
 
-<p>Since all publishes go through the hub, it is possible to cache the recently published messages in the hub, and then the delivery manager won&#39;t have to make the trip to bookkeeper to get the messages but instead get them from local process memory.</p>
+<p>Since all publishes go through the hub, it is possible to cache the recently published messages in the hub, and then the delivery manager won't have to make the trip to bookkeeper to get the messages but instead get them from local process memory.</p>
 
 <p>These ideas of push, pull, and caching are unified in the following way: - A hub has a cache of messages</p>
 
@@ -150,6 +150,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigJMX.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigJMX.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigJMX.html Tue Jun 12 20:47:31 2012
@@ -101,6 +101,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigUser.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigUser.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/hedwigUser.html Tue Jun 12 20:47:31 2012
@@ -55,7 +55,7 @@
           <div class="wiki-content">
  <h1>Design</h1>
 
-<p>In Hedwig, clients publish messages associated with a topic, and they subscribe to a topic to receive all messages published with that topic. Clients are associated with (publish to and subscribe from) a Hedwig <em>instance</em> (also referred to as a <em>region</em>), which consists of a number of servers called <em>hubs</em>. The hubs partition up topic ownership among themselves, and all publishes and subscribes to a topic must be done to its owning hub. When a client doesn&#39;t know the owning hub, it tries a default hub, which may redirect the client.</p>
+<p>In Hedwig, clients publish messages associated with a topic, and they subscribe to a topic to receive all messages published with that topic. Clients are associated with (publish to and subscribe from) a Hedwig <em>instance</em> (also referred to as a <em>region</em>), which consists of a number of servers called <em>hubs</em>. The hubs partition up topic ownership among themselves, and all publishes and subscribes to a topic must be done to its owning hub. When a client doesn't know the owning hub, it tries a default hub, which may redirect the client.</p>
 
 <p>Running a Hedwig instance requires a Zookeeper server and at least three Bookkeeper servers.</p>
 
@@ -65,7 +65,7 @@
 
 <p>Topics are independent; Hedwig provides no ordering across different topics.</p>
 
-<p>Version vectors are associated with each topic and serve as the identifiers for each message. Vectors consist of one component per region. A component value is the region&#39;s local sequence number on the topic, and is incremented each time a hub persists a message (published either locally or remotely) to <span class="caps">BK.</span></p>
+<p>Version vectors are associated with each topic and serve as the identifiers for each message. Vectors consist of one component per region. A component value is the region's local sequence number on the topic, and is incremented each time a hub persists a message (published either locally or remotely) to <span class="caps">BK.</span></p>
 
 <p><span class="caps">TODO</span>: More on how version vectors are to be used, and on maintaining vector-maxes.</p>
 
@@ -79,7 +79,7 @@
 
 <h2>Limits</h2>
 
-<p>Because the current implementation uses a single socket per subscription, the Hedwig requires a high <code>ulimit</code> on the number of open file descriptors. Non-root users can only use up to the limit specified in <code>/etc/security/limits.conf</code>; to raise this to 1024^2, as root, modify the &#34;nofile&#34; line in /etc/security/limits.conf on all hubs.</p>
+<p>Because the current implementation uses a single socket per subscription, the Hedwig requires a high <code>ulimit</code> on the number of open file descriptors. Non-root users can only use up to the limit specified in <code>/etc/security/limits.conf</code>; to raise this to 1024^2, as root, modify the "nofile" line in /etc/security/limits.conf on all hubs.</p>
 
 <h2>Running Servers</h2>
 
@@ -136,6 +136,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/index.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/index.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/index.html Tue Jun 12 20:47:31 2012
@@ -63,7 +63,7 @@
 <ul>
 <li><a href="./bookkeeperOverview.html">Overview</a></li>
 <li><a href="./bookkeeperStarted.html">Getting started</a></li>
-<li><a href="./bookkeeperProgrammer.html">Programmer&#39;s Guide</a></li>
+<li><a href="./bookkeeperProgrammer.html">Programmer's Guide</a></li>
 <li><a href="./bookieConfigParams.html">Bookie Server Configuration Parameters</a></li>
 <li><a href="./bookkeeperConfigParams.html">BookKeeper Configuration Parameters</a></li>
 <li><a href="./bookkeeperInternals.html">BookKeeper Internals</a></li>
@@ -82,8 +82,8 @@
 
 <ul>
 <li><a href="./hedwigBuild.html">Building Hedwig, or how to set up Hedwig</a></li>
-<li><a href="./hedwigUser.html">User&#39;s Guide, or how to program against the Hedwig <span class="caps">API </span>and how to run it</a></li>
-<li><a href="./hedwigDesign.html">Developer&#39;s Guide, or Hedwig internals and hacking details</a></li>
+<li><a href="./hedwigUser.html">User's Guide, or how to program against the Hedwig <span class="caps">API </span>and how to run it</a></li>
+<li><a href="./hedwigDesign.html">Developer's Guide, or Hedwig internals and hacking details</a></li>
 </ul>
 
 <h2>Hedwig Admin &amp; Ops</h2>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/releaseNotes.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/releaseNotes.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/r4.1.0/releaseNotes.html Tue Jun 12 20:47:31 2012
@@ -163,7 +163,7 @@
 </li>
 <li>[<a href='https://issues.apache.org/jira/browse/BOOKKEEPER-194'><span class="caps">BOOKKEEPER</span>-194</a>] -         Get correct latency for addEntry operations for <span class="caps">JMX.</span>
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/BOOKKEEPER-195'><span class="caps">BOOKKEEPER</span>-195</a>] -         HierarchicalLedgerManager doesn&#39;t consider idgen as a &#34;specialNode&#34;
+<li>[<a href='https://issues.apache.org/jira/browse/BOOKKEEPER-195'><span class="caps">BOOKKEEPER</span>-195</a>] -         HierarchicalLedgerManager doesn&#39;t consider idgen as a "specialNode"
 </li>
 <li>[<a href='https://issues.apache.org/jira/browse/BOOKKEEPER-197'><span class="caps">BOOKKEEPER</span>-197</a>] -         HedwigConsole uses the same file to load bookkeeper client config and hub server config
 </li>
@@ -317,6 +317,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookieConfigParams.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookieConfigParams.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookieConfigParams.html Tue Jun 12 20:47:31 2012
@@ -63,7 +63,7 @@
 
 <h3><span class="caps">NIO </span>server settings</h3>
 
-<table><tr><td><code>serverTcpNoDelay</code></td><td>This settings is used to enabled/disabled Nagle&#39;s algorithm, which is a means of improving the efficiency of <span class="caps">TCP</span>/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance. Default value is true.</td></tr></table>
+<table><tr><td><code>serverTcpNoDelay</code></td><td>This settings is used to enabled/disabled Nagle's algorithm, which is a means of improving the efficiency of <span class="caps">TCP</span>/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance. Default value is true.</td></tr></table>
 
 <h3>Ledger cache settings</h3>
 
@@ -109,6 +109,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookieRecovery.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookieRecovery.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookieRecovery.html Tue Jun 12 20:47:31 2012
@@ -115,6 +115,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperConfig.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperConfig.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperConfig.html Tue Jun 12 20:47:31 2012
@@ -115,7 +115,7 @@
 
 <h3>Missing disks or directories</h3>
 
-<p>Replacing disks or removing directories accidentally can cause a bookie to fail while trying to read a ledger fragment which the ledger metadata has claimed exists on the bookie. For this reason, when a bookie is started for the first time, it&#39;s disk configuration is fixed for the lifetime of that bookie. Any change to the disk configuration of the bookie, such as a crashed disk or an accidental configuration change, will result in the bookie being unable to start with the following error:</p>
+<p>Replacing disks or removing directories accidentally can cause a bookie to fail while trying to read a ledger fragment which the ledger metadata has claimed exists on the bookie. For this reason, when a bookie is started for the first time, it's disk configuration is fixed for the lifetime of that bookie. Any change to the disk configuration of the bookie, such as a crashed disk or an accidental configuration change, will result in the bookie being unable to start with the following error:</p>
 
 <p><code>2012-05-29 18:19:13,790 - ERROR - [main:BookieServer@314] - Exception running bookie server : </code><br />
 <code>org.apache.bookkeeper.bookie.BookieException$InvalidCookieException</code><br />
@@ -177,6 +177,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperConfigParams.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperConfigParams.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperConfigParams.html Tue Jun 12 20:47:31 2012
@@ -63,7 +63,7 @@
 
 <h3><span class="caps">NIO </span>server settings</h3>
 
-<table><tr><td><code>clientTcpNoDelay</code></td><td>This settings is used to enabled/disabled Nagle&#39;s algorithm, which is a means of improving the efficiency of <span class="caps">TCP</span>/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance. Default value is true.</td></tr></table>
+<table><tr><td><code>clientTcpNoDelay</code></td><td>This settings is used to enabled/disabled Nagle's algorithm, which is a means of improving the efficiency of <span class="caps">TCP</span>/IP networks by reducing the number of packets that need to be sent over the network. If you are sending many small messages, such that more than one can fit in a single IP packet, setting server.tcpnodelay to false to enable Nagle algorithm can provide better performance. Default value is true.</td></tr></table>
 
 <h3>Ledger manager settings</h3>
 
@@ -107,6 +107,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperInternals.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperInternals.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperInternals.html Tue Jun 12 20:47:31 2012
@@ -78,7 +78,7 @@
 
 <p>You may use following settings to further fine tune the behavior of journalling on bookies:</p>
 
-<table><tr><td><code>journalMaxSizeMB</code></td><td>journal file size limitation. when a journal reaches this limitation, it will be closed and new journal file be created.</td></tr><tr><td><code>journalMaxBackups</code></td><td>how many old journal files whose id is less than LastLogMark &#39;s journal id.</td></tr></table>
+<table><tr><td><code>journalMaxSizeMB</code></td><td>journal file size limitation. when a journal reaches this limitation, it will be closed and new journal file be created.</td></tr><tr><td><code>journalMaxBackups</code></td><td>how many old journal files whose id is less than LastLogMark 's journal id.</td></tr></table>
 
 <blockquote><p><span class="caps">NOTE</span>: keeping number of old journal files would be useful for manually recovery in special case.</p></blockquote>
 
@@ -92,7 +92,7 @@
 
 <h2>Flat Ledger Manager</h2>
 
-<p>All ledgers&#39; metadata are put in a single zookeeper path, created using zookeeper sequential node, which can ensure uniqueness of ledger id. Each ledger node is prefixed with &#39;L&#39;.</p>
+<p>All ledgers' metadata are put in a single zookeeper path, created using zookeeper sequential node, which can ensure uniqueness of ledger id. Each ledger node is prefixed with 'L'.</p>
 
 <p>Bookie server manages its owned active ledgers in a hash map. So it is easy for bookie server to find what ledgers are deleted from zookeeper and garbage collect them. And its garbage collection flow is described as below:</p>
 
@@ -165,6 +165,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperJMX.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperJMX.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperJMX.html Tue Jun 12 20:47:31 2012
@@ -101,6 +101,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperOverview.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperOverview.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperOverview.html Tue Jun 12 20:47:31 2012
@@ -109,7 +109,7 @@
 <p><img src="images/bk-overview.jpg" alt="" />
 p. A simple use of BooKeeper is to implement a write-ahead transaction log. A server maintains an in-memory data structure (with periodic snapshots for example) and logs changes to that structure before it applies the change. The application server creates a ledger at startup and store the ledger id and password in a well known place (ZooKeeper maybe). When it needs to make a change, the server adds an entry with the change information to a ledger and apply the change when BookKeeper adds the entry successfully. The server can even use asyncAddEntry to queue up many changes for high change throughput. BooKeeper meticulously logs the changes in order and call the completion functions in order. </p>
 
-<p>When the application server dies, a backup server will come online, get the last snapshot and then it will open the ledger of the old server and read all the entries from the time the snapshot was taken. (Since it doesn&#39;t know the last entry number it will use <span class="caps">MAX</span>_INTEGER). Once all the entries have been processed, it will close the ledger and start a new one for its use. </p>
+<p>When the application server dies, a backup server will come online, get the last snapshot and then it will open the ledger of the old server and read all the entries from the time the snapshot was taken. (Since it doesn't know the last entry number it will use <span class="caps">MAX</span>_INTEGER). Once all the entries have been processed, it will close the ledger and start a new one for its use. </p>
 
 <p>A client library takes care of communicating with bookies and managing entry numbers. An entry has the following fields: </p>
 
@@ -158,7 +158,7 @@ p. A simple use of BooKeeper is to imple
 
 <p>If the ledger was closed gracefully, ZooKeeper will have the last entry and everything will work well. But, if the BookKeeper client that was writing the ledger dies, there is some recovery that needs to take place. </p>
 
-<p>The problematic entries are the ones at the end of the ledger. There can be entries in flight when a BookKeeper client dies. If the entry only gets to one bookie, the entry should not be readable since the entry will disappear if that bookie fails. If the entry is only on one bookie, that doesn&#39;t mean that the entry has not been recorded successfully; the other bookies that recorded the entry might have failed. </p>
+<p>The problematic entries are the ones at the end of the ledger. There can be entries in flight when a BookKeeper client dies. If the entry only gets to one bookie, the entry should not be readable since the entry will disappear if that bookie fails. If the entry is only on one bookie, that doesn't mean that the entry has not been recorded successfully; the other bookies that recorded the entry might have failed. </p>
 
 <p>The trick to making everything work is to have a correct idea of a last entry. We do it in roughly three steps: </p>
 
@@ -200,7 +200,7 @@ p. A simple use of BooKeeper is to imple
 </ol>
 
 <ul>
-<li>For performance reasons, <em>Entry Log</em> buffers entries in memory and commit them in batches, while <em>Ledger Cache</em> holds index pages in memory and flushes them lazily. We will discuss data flush and how to ensure data integrity in the following section &#39;Data Flush&#39;.</li>
+<li>For performance reasons, <em>Entry Log</em> buffers entries in memory and commit them in batches, while <em>Ledger Cache</em> holds index pages in memory and flushes them lazily. We will discuss data flush and how to ensure data integrity in the following section 'Data Flush'.</li>
 </ul>
 
 <h2>Data Flush</h2>
@@ -223,7 +223,7 @@ p. A simple use of BooKeeper is to imple
 </ol>
 </li>
 <li>Persists <em>LastLogMark</em> to disk, which means entries added before <em>LastLogMark</em> whose entry data and index page were also persisted to disk. It is the time to safely remove journal files created earlier than <em>txnLogId</em>.<ol>
-<li>If the bookie has crashed before persisting <em>LastLogMark</em> to disk, it still has journal files containing entries for which index pages may not have been persisted. Consequently, when this bookie restarts, it inspects journal files to restore those entries; data isn&#39;t lost.</li>
+<li>If the bookie has crashed before persisting <em>LastLogMark</em> to disk, it still has journal files containing entries for which index pages may not have been persisted. Consequently, when this bookie restarts, it inspects journal files to restore those entries; data isn't lost.</li>
 </ol></li>
 </ol>
 
@@ -287,6 +287,7 @@ p. A simple use of BooKeeper is to imple
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperProgrammer.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperProgrammer.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperProgrammer.html Tue Jun 12 20:47:31 2012
@@ -203,6 +203,7 @@ while (entries.hasMoreElements()) {
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperStarted.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperStarted.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperStarted.html Tue Jun 12 20:47:31 2012
@@ -59,7 +59,7 @@
 
 <h1>Getting Started: Setting up BookKeeper to write logs.</h1>
 
-<p>This document contains information to get you started quickly with BookKeeper. It is aimed primarily at developers willing to try it out, and contains simple installation instructions for a simple BookKeeper installation and a simple programming example. For further programming detail, please refer to  <a href="http://bookkeeperProgrammer.html">BookKeeper Programmer&#39;s Guide</a>. </p>
+<p>This document contains information to get you started quickly with BookKeeper. It is aimed primarily at developers willing to try it out, and contains simple installation instructions for a simple BookKeeper installation and a simple programming example. For further programming detail, please refer to  <a href="http://bookkeeperProgrammer.html">BookKeeper Programmer's Guide</a>. </p>
 
 <h1>Pre-requisites</h1>
 
@@ -79,7 +79,7 @@
 
 <h1>Setting up bookies</h1>
 
-<p>If you&#39;re bold and you want more than just running things locally, then you&#39;ll need to run bookies in different servers. You&#39;ll need at least three bookies to start with. </p>
+<p>If you're bold and you want more than just running things locally, then you'll need to run bookies in different servers. You'll need at least three bookies to start with. </p>
 
 <p>For each bookie, we need to execute a command like the following: </p>
 
@@ -180,6 +180,7 @@ bkc.close();
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperStream.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperStream.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/bookkeeperStream.html Tue Jun 12 20:47:31 2012
@@ -215,6 +215,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>

Modified: websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/doc.html
==============================================================================
--- websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/doc.html (original)
+++ websites/staging/zookeeper/trunk/content/bookkeeper/docs/trunk/doc.html Tue Jun 12 20:47:31 2012
@@ -53,12 +53,12 @@
         <tr>
         <td style="overflow: hidden;" valign="top" width="100%">
           <div class="wiki-content">
- <p>In the documentation directory, you&#39;ll find:</p>
+ <p>In the documentation directory, you'll find:</p>
 
 <ul>
 <li><code>build.txt</code>: Building Hedwig, or how to set up Hedwig</li>
-<li><code>user.txt</code>: User&#39;s Guide, or how to program against the Hedwig <span class="caps">API </span>and how to run it</li>
-<li><code>dev.txt</code>: Developer&#39;s Guide, or Hedwig internals and hacking details</li>
+<li><code>user.txt</code>: User's Guide, or how to program against the Hedwig <span class="caps">API </span>and how to run it</li>
+<li><code>dev.txt</code>: Developer's Guide, or Hedwig internals and hacking details</li>
 </ul>
 
 <p>These documents are all written in the <a href="http://johnmacfarlane.net/pandoc/">Pandoc</a> dialect of <a href="http://daringfireball.net/projects/markdown/">Markdown</a>. This makes them readable as plain text files, but also capable of generating <span class="caps">HTML </span>or LaTeX documentation.</p>
@@ -97,6 +97,7 @@
 <h3>Documentation</h3>
 
 <ul>
+<li><a href="/bookkeeper/docs/r4.1.0">Release 4.1.0</a></li>
 <li><a href="/bookkeeper/docs/r4.0.0">Release 4.0.0</a></li>
 <li><a href="/bookkeeper/docs/trunk">Trunk</a></li>
 </ul>