zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject zookeeper git commit: ZOOKEEPER-2635: regenerate document for branch-3.5 before release.
Date Tue, 21 Mar 2017 19:09:10 GMT
Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.5 abad02e42 -> cc2ea4926


ZOOKEEPER-2635: regenerate document for branch-3.5 before release.

Will create a separate PR for master (though there is not much need, but previous commit by
Flavio also updated doc for master, so just for completeness sake.).

I don't believe anyone is going to review bin diffs by naked eye, so I am going to merge this
right away.

Author: Michael Han <hanm@apache.org>

Reviewers: Michael Han <hanm@apache.org>

Closes #202 from hanm/ZOOKEEPER-2635


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/cc2ea492
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/cc2ea492
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/cc2ea492

Branch: refs/heads/branch-3.5
Commit: cc2ea49262d0f9eae7ef697e00ea9210516052c1
Parents: abad02e
Author: Michael Han <hanm@apache.org>
Authored: Tue Mar 21 12:09:06 2017 -0700
Committer: Michael Han <hanm@apache.org>
Committed: Tue Mar 21 12:09:06 2017 -0700

----------------------------------------------------------------------
 docs/index.html                        |   2 +-
 docs/index.pdf                         | Bin 12643 -> 12657 bytes
 docs/javaExample.html                  |   2 +-
 docs/javaExample.pdf                   | Bin 33876 -> 33818 bytes
 docs/linkmap.html                      |   2 +-
 docs/linkmap.pdf                       | Bin 10808 -> 10826 bytes
 docs/recipes.html                      |   2 +-
 docs/recipes.pdf                       | Bin 33882 -> 33856 bytes
 docs/zookeeperAdmin.html               |  87 ++++++++++++++++++++--------
 docs/zookeeperAdmin.pdf                | Bin 93572 -> 95592 bytes
 docs/zookeeperHierarchicalQuorums.html |   2 +-
 docs/zookeeperHierarchicalQuorums.pdf  | Bin 6635 -> 6654 bytes
 docs/zookeeperInternals.html           |   2 +-
 docs/zookeeperInternals.pdf            | Bin 48848 -> 48811 bytes
 docs/zookeeperJMX.html                 |   2 +-
 docs/zookeeperJMX.pdf                  | Bin 16473 -> 16475 bytes
 docs/zookeeperObservers.html           |   2 +-
 docs/zookeeperObservers.pdf            | Bin 12860 -> 12868 bytes
 docs/zookeeperOver.html                |   2 +-
 docs/zookeeperOver.pdf                 | Bin 302506 -> 302467 bytes
 docs/zookeeperProgrammers.html         |  30 ++++++----
 docs/zookeeperProgrammers.pdf          | Bin 142154 -> 143745 bytes
 docs/zookeeperQuotas.html              |   2 +-
 docs/zookeeperQuotas.pdf               | Bin 11170 -> 11184 bytes
 docs/zookeeperReconfig.html            |   6 +-
 docs/zookeeperReconfig.pdf             | Bin 62104 -> 62362 bytes
 docs/zookeeperStarted.html             |   2 +-
 docs/zookeeperStarted.pdf              | Bin 28099 -> 28078 bytes
 docs/zookeeperTutorial.html            |   2 +-
 docs/zookeeperTutorial.pdf             | Bin 30533 -> 30478 bytes
 30 files changed, 99 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/index.html
----------------------------------------------------------------------
diff --git a/docs/index.html b/docs/index.html
index 58df388..8174a86 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -341,7 +341,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <div id="logos"></div>
 <!--+

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/index.pdf
----------------------------------------------------------------------
diff --git a/docs/index.pdf b/docs/index.pdf
index 6e6cf50..6d2c0c8 100644
Binary files a/docs/index.pdf and b/docs/index.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/javaExample.html
----------------------------------------------------------------------
diff --git a/docs/javaExample.html b/docs/javaExample.html
index ab0fade..12bb13b 100644
--- a/docs/javaExample.html
+++ b/docs/javaExample.html
@@ -890,7 +890,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/javaExample.pdf
----------------------------------------------------------------------
diff --git a/docs/javaExample.pdf b/docs/javaExample.pdf
index 3803a92..e9a16ae 100644
Binary files a/docs/javaExample.pdf and b/docs/javaExample.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/linkmap.html
----------------------------------------------------------------------
diff --git a/docs/linkmap.html b/docs/linkmap.html
index 41d976f..b1f888f 100644
--- a/docs/linkmap.html
+++ b/docs/linkmap.html
@@ -384,7 +384,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/linkmap.pdf
----------------------------------------------------------------------
diff --git a/docs/linkmap.pdf b/docs/linkmap.pdf
index 137714a..26fb06a 100644
Binary files a/docs/linkmap.pdf and b/docs/linkmap.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/recipes.html
----------------------------------------------------------------------
diff --git a/docs/recipes.html b/docs/recipes.html
index 8db9ef4..163041e 100644
--- a/docs/recipes.html
+++ b/docs/recipes.html
@@ -1014,7 +1014,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/recipes.pdf
----------------------------------------------------------------------
diff --git a/docs/recipes.pdf b/docs/recipes.pdf
index 1c6a66e..99f5a20 100644
Binary files a/docs/recipes.pdf and b/docs/recipes.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperAdmin.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperAdmin.html b/docs/zookeeperAdmin.html
index 7a109c9..a65681e 100644
--- a/docs/zookeeperAdmin.html
+++ b/docs/zookeeperAdmin.html
@@ -302,7 +302,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="#sc_zkCommands">ZooKeeper Commands</a>
 <ul class="minitoc">
 <li>
-<a href="#The+Four+Letter+Words">The Four Letter Words</a>
+<a href="#sc_4lw">The Four Letter Words</a>
 </li>
 <li>
 <a href="#sc_adminserver">The AdminServer</a>
@@ -940,14 +940,10 @@ server.3=zoo3:2888:3888</pre>
           of the znodes stored by a particular serving ensemble. These
           are the snapshot and transactional log files. As changes are
           made to the znodes these changes are appended to a
-          transaction log. Occasionally, when a log grows large, a
+          transaction log, occasionally, when a log grows large, a
           snapshot of the current state of all znodes will be written
-          to the filesystem and a new transaction log file is created
-          for future transactions. During snapshotting, ZooKeeper may
-          continue appending incoming transactions to the old log file.
-          Therefore, some transactions which are newer than a snapshot
-          may be found in the last transaction log preceding the
-          snapshot.
+          to the filesystem. This snapshot supercedes all previous
+          logs.
         </p>
 <p>A ZooKeeper server <strong>will not remove
         old snapshots and log files</strong> when using the default
@@ -1205,10 +1201,8 @@ server.3=zoo3:2888:3888</pre>
 <p>(Java system property: <strong>zookeeper.snapCount</strong>)</p>
 <p>ZooKeeper logs transactions to a transaction
               log. After snapCount transactions are written to a log
-              file a snapshot is started. It also influences rollover
-              of the current transaction log to a new file. However,
-              the creation of a new snapshot and rollover of transaction
-              log proceed independently. The default snapCount is
+              file a snapshot is started and a new transaction log
+              file is created. The default snapCount is
               100,000.</p>
 </dd>
 
@@ -1531,6 +1525,36 @@ server.3=zoo3:2888:3888</pre>
               </p>
 </dd>
 
+          
+<dt>
+<term>4lw.commands.whitelist</term>
+</dt>
+<dd>
+<p>(Java system property: <strong>zookeeper.4lw.commands.whitelist</strong>)</p>
+<p>
+<strong>New in 3.5.3:</strong>
+                A list of comma separated <a href="#sc_4lw">Four Letter Words</a>
+                commands that user wants to use. A valid Four Letter Words
+                command must be put in this list else ZooKeeper server will
+                not enable the command.
+                By default the whitelist only contains "srvr" command
+                which zkServer.sh uses. The rest of four letter word commands are disabled
+                by default.
+              </p>
+<p>Here's an example of the configuration that enables stat, ruok, conf, and isro
+              command while disabling the rest of Four Letter Words command:</p>
+<pre class="code">
+                4lw.commands.whitelist=stat, ruok, conf, isro
+              </pre>
+<p>If you really need enable all four letter word commands by default, you can use
+                the asterisk option so you don't have to include every command one by one
in the list.
+                As an example, this will enable all four letter word commands:
+              </p>
+<pre class="code">
+                4lw.commands.whitelist=*
+              </pre>
+</dd>
+
         
 </dl>
 <p></p>
@@ -1933,7 +1957,7 @@ server.3=zoo3:2888:3888</pre>
 </dl>
 <a name="sc_zkCommands"></a>
 <h3 class="h4">ZooKeeper Commands</h3>
-<a name="The+Four+Letter+Words"></a>
+<a name="sc_4lw"></a>
 <h4>The Four Letter Words</h4>
 <p>ZooKeeper responds to a small set of commands. Each command is
         composed of four letters. You issue the commands to ZooKeeper via telnet
@@ -1942,6 +1966,15 @@ server.3=zoo3:2888:3888</pre>
         general information about the server and connected clients,
         while "srvr" and "cons" give extended details on server and
         connections respectively.</p>
+<p>
+<strong>New in 3.5.3:</strong>
+          Four Letter Words need to be explicitly white listed before using.
+          Please refer <strong>4lw.commands.whitelist</strong>
+           described in <a href="#sc_clusterOptions">
+            cluster configuration section</a> for details.
+          Moving forward, Four Letter Words will be deprecated, please use
+          <a href="#sc_adminserver">AdminServer</a> instead.
+        </p>
 <dl>
           
 <dt>
@@ -2350,11 +2383,8 @@ server.3=zoo3:2888:3888</pre>
 <p>The Log Directory contains the ZooKeeper transaction logs.
         Before any update takes place, ZooKeeper ensures that the transaction
         that represents the update is written to non-volatile storage. A new
-        log file is started when the number of transactions written to the
-		current log file reaches a (variable) threshold. The threshold is
-		computed using the same parameter which influences the frequency of
-		snapshotting (see snapCount above). The log file's suffix is the first
-		zxid written to that log.</p>
+        log file is started each time a snapshot is begun. The log file's
+        suffix is the first zxid written to that log.</p>
 <a name="sc_filemanagement"></a>
 <h4>File Management</h4>
 <p>The format of snapshot and log files does not change between
@@ -2369,12 +2399,8 @@ server.3=zoo3:2888:3888</pre>
 <p>The ZooKeeper server creates snapshot and log files, but
         never deletes them. The retention policy of the data and log
         files is implemented outside of the ZooKeeper server. The
-        server itself only needs the latest complete fuzzy snapshot, all log
-		files following it, and the last log file preceding it.  The latter
-		requirement is necessary to include updates which happened after this
-		snapshot was started but went into the existing log file at that time.
-		This is possible because snapshotting and rolling over of logs
-		proceed somewhat independently in Zookeeper. See the
+        server itself only needs the latest complete fuzzy snapshot
+        and the log files from the start of that snapshot. See the
         <a href="#sc_maintenance">maintenance</a> section in
         this document for more details on setting a retention policy
         and maintenance of ZooKeeper storage.
@@ -2443,6 +2469,17 @@ server.3=zoo3:2888:3888</pre>
             is to run load tests, and then make sure you are well below the
             usage limit that would cause the system to swap.</p>
 </dd>
+
+        
+<dt>
+<term>Publicly accessible deployment</term>
+</dt>
+<dd>
+<p>
+              A ZooKeeper ensemble is expected to operate in a trusted computing environment.
+              It is thus recommended to deploy ZooKeeper behind a firewall.
+            </p>
+</dd>
       
 </dl>
 <a name="sc_bestPractices"></a>
@@ -2475,7 +2512,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperAdmin.pdf
----------------------------------------------------------------------
diff --git a/docs/zookeeperAdmin.pdf b/docs/zookeeperAdmin.pdf
index 5a12299..7e6586d 100644
Binary files a/docs/zookeeperAdmin.pdf and b/docs/zookeeperAdmin.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperHierarchicalQuorums.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperHierarchicalQuorums.html b/docs/zookeeperHierarchicalQuorums.html
index 5a227fa..7948729 100644
--- a/docs/zookeeperHierarchicalQuorums.html
+++ b/docs/zookeeperHierarchicalQuorums.html
@@ -254,7 +254,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperHierarchicalQuorums.pdf
----------------------------------------------------------------------
diff --git a/docs/zookeeperHierarchicalQuorums.pdf b/docs/zookeeperHierarchicalQuorums.pdf
index 69bed0e..c9b5213 100644
Binary files a/docs/zookeeperHierarchicalQuorums.pdf and b/docs/zookeeperHierarchicalQuorums.pdf
differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperInternals.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperInternals.html b/docs/zookeeperInternals.html
index c9f3b69..08d6ede 100644
--- a/docs/zookeeperInternals.html
+++ b/docs/zookeeperInternals.html
@@ -783,7 +783,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperInternals.pdf
----------------------------------------------------------------------
diff --git a/docs/zookeeperInternals.pdf b/docs/zookeeperInternals.pdf
index a3d72c3..afaa29d 100644
Binary files a/docs/zookeeperInternals.pdf and b/docs/zookeeperInternals.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperJMX.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperJMX.html b/docs/zookeeperJMX.html
index f99a893..40f9574 100644
--- a/docs/zookeeperJMX.html
+++ b/docs/zookeeperJMX.html
@@ -457,7 +457,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperJMX.pdf
----------------------------------------------------------------------
diff --git a/docs/zookeeperJMX.pdf b/docs/zookeeperJMX.pdf
index 73d3223..d072de7 100644
Binary files a/docs/zookeeperJMX.pdf and b/docs/zookeeperJMX.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperObservers.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperObservers.html b/docs/zookeeperObservers.html
index 0070986..842839c 100644
--- a/docs/zookeeperObservers.html
+++ b/docs/zookeeperObservers.html
@@ -344,7 +344,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperObservers.pdf
----------------------------------------------------------------------
diff --git a/docs/zookeeperObservers.pdf b/docs/zookeeperObservers.pdf
index 250cccd..d9440c8 100644
Binary files a/docs/zookeeperObservers.pdf and b/docs/zookeeperObservers.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperOver.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperOver.html b/docs/zookeeperOver.html
index 7d5f4bd..04da3b5 100644
--- a/docs/zookeeperOver.html
+++ b/docs/zookeeperOver.html
@@ -682,7 +682,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperOver.pdf
----------------------------------------------------------------------
diff --git a/docs/zookeeperOver.pdf b/docs/zookeeperOver.pdf
index 8607664..b7cb7c1 100644
Binary files a/docs/zookeeperOver.pdf and b/docs/zookeeperOver.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperProgrammers.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperProgrammers.html b/docs/zookeeperProgrammers.html
index 324ec5d..6af1f1d 100644
--- a/docs/zookeeperProgrammers.html
+++ b/docs/zookeeperProgrammers.html
@@ -1307,11 +1307,14 @@ document.write("Last Published: " + document.lastModified);
     be able to read <em>/app/status</em>; ACLs are not
     recursive.</p>
 <p>ZooKeeper supports pluggable authentication schemes. Ids are
-    specified using the form <em>scheme:id</em>,
-    where <em>scheme</em> is a the authentication scheme
-    that the id corresponds to. For
-    example, <em>ip:172.16.16.1</em> is an id for a
-    host with the address <em>172.16.16.1</em>.</p>
+    specified using the form <em>scheme:expression</em>,
+    where <em>scheme</em> is the authentication scheme
+    that the id corresponds to. The set of valid expressions are defined
+    by the scheme. For example, <em>ip:172.16.16.1</em> is
+    an id for a host with the address <em>172.16.16.1</em>
+    using the <em>ip</em> scheme, whereas <em>digest:bob:password</em>
+    is an id for the user with the name of <em>bob</em> using
+    the <em>digest</em> scheme.</p>
 <p>When a client connects to ZooKeeper and authenticates
     itself, ZooKeeper associates all the ids that correspond to a
     client with the clients connection. These ids are checked against
@@ -1393,9 +1396,16 @@ document.write("Last Published: " + document.lastModified);
         
 <li>
 <p>
-<strong>auth</strong> doesn't
-        use any id, represents any authenticated
-        user.</p>
+<strong>auth</strong> is a special
+        scheme which ignores any provided expression and instead uses the current user,
+        credentials, and scheme. Any expression (whether <em>user</em> like with
SASL
+        authentication or <em>user:password</em> like with DIGEST authentication)
provided is ignored
+        by the ZooKeeper server when persisting the ACL. However, the expression must still
be
+        provided in the ACL because the ACL must match the form <em>scheme:expression:perms</em>.
+        This scheme is provided as a convenience as it is a common use-case for
+        a user to create a znode and then restrict access to that znode to only that user.
+        If there is no authenticated user, setting an ACL with the auth scheme will fail.
+        </p>
 </li>
 
         
@@ -2310,7 +2320,7 @@ authProvider.2=com.f.MyAuth2
 <p>If you are using watches, you must look for the connected watch
         event. When a ZooKeeper client disconnects from a server, you will
         not receive notification of changes until reconnected. If you are
-        watching for a znode to come into existance, you will miss the event
+        watching for a znode to come into existence, you will miss the event
         if the znode is created and deleted while you are disconnected.</p>
       
 </li>
@@ -2493,7 +2503,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperProgrammers.pdf
----------------------------------------------------------------------
diff --git a/docs/zookeeperProgrammers.pdf b/docs/zookeeperProgrammers.pdf
index 4ac5203..1b7b625 100644
Binary files a/docs/zookeeperProgrammers.pdf and b/docs/zookeeperProgrammers.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperQuotas.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperQuotas.html b/docs/zookeeperQuotas.html
index d45eee8..a2d96a2 100644
--- a/docs/zookeeperQuotas.html
+++ b/docs/zookeeperQuotas.html
@@ -268,7 +268,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperQuotas.pdf
----------------------------------------------------------------------
diff --git a/docs/zookeeperQuotas.pdf b/docs/zookeeperQuotas.pdf
index 6af0654..9ec9231 100644
Binary files a/docs/zookeeperQuotas.pdf and b/docs/zookeeperQuotas.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperReconfig.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperReconfig.html b/docs/zookeeperReconfig.html
index 8d2c730..05e00e5 100644
--- a/docs/zookeeperReconfig.html
+++ b/docs/zookeeperReconfig.html
@@ -589,6 +589,10 @@ server.3=125.23.63.25:2782:2785:participant</pre>
               from ZooKeeper class, and use of this API requires ACL setup and user
               authentication (see <a href="#sc_reconfig_access_control">Security</a>
for more information.).
             </p>
+<p>Note: for temporary backward compatibility, the reconfig() APIs will remain in ZooKeeper.java
+              where they were for a few alpha versions of 3.5.x. However, these APIs are
deprecated and users
+              should move to the reconfigure() APIs in ZooKeeperAdmin.java.
+            </p>
 </dd>
 
         
@@ -1232,7 +1236,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperReconfig.pdf
----------------------------------------------------------------------
diff --git a/docs/zookeeperReconfig.pdf b/docs/zookeeperReconfig.pdf
index 7dbcb4f..6906890 100644
Binary files a/docs/zookeeperReconfig.pdf and b/docs/zookeeperReconfig.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperStarted.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperStarted.html b/docs/zookeeperStarted.html
index 1a16008..19be58d 100644
--- a/docs/zookeeperStarted.html
+++ b/docs/zookeeperStarted.html
@@ -608,7 +608,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperStarted.pdf
----------------------------------------------------------------------
diff --git a/docs/zookeeperStarted.pdf b/docs/zookeeperStarted.pdf
index 8bcdf80..98fc185 100644
Binary files a/docs/zookeeperStarted.pdf and b/docs/zookeeperStarted.pdf differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperTutorial.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperTutorial.html b/docs/zookeeperTutorial.html
index d9af6c7..472d8f4 100644
--- a/docs/zookeeperTutorial.html
+++ b/docs/zookeeperTutorial.html
@@ -872,7 +872,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 <div class="copyright">
         Copyright &copy;
-         2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+          <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cc2ea492/docs/zookeeperTutorial.pdf
----------------------------------------------------------------------
diff --git a/docs/zookeeperTutorial.pdf b/docs/zookeeperTutorial.pdf
index 2f246d0..352e55e 100644
Binary files a/docs/zookeeperTutorial.pdf and b/docs/zookeeperTutorial.pdf differ


Mime
View raw message