You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ro...@apache.org on 2018/02/13 12:38:15 UTC

svn commit: r1824122 [1/7] - in /jackrabbit/site/live/oak/docs: ./ architecture/ coldstandby/ features/ grammar/ nodestore/ nodestore/document/ nodestore/segment/ oak-mongo-js/ oak_api/ plugins/ query/ security/ security/accesscontrol/ security/authent...

Author: rombert
Date: Tue Feb 13 12:38:14 2018
New Revision: 1824122

URL: http://svn.apache.org/viewvc?rev=1824122&view=rev
Log:
OAK-936: Site checkin for project Oak Documentation-1.10-SNAPSHOT

Added:
    jackrabbit/site/live/oak/docs/constraints.html
    jackrabbit/site/live/oak/docs/grammar/
    jackrabbit/site/live/oak/docs/grammar/sql2.csv
    jackrabbit/site/live/oak/docs/grammar/xpath.csv
Removed:
    jackrabbit/site/live/oak/docs/.DS_Store
    jackrabbit/site/live/oak/docs/query/grammar-sql3.html
    jackrabbit/site/live/oak/docs/query/grammar.html
Modified:
    jackrabbit/site/live/oak/docs/FAQ.html
    jackrabbit/site/live/oak/docs/architecture/nodestate.html
    jackrabbit/site/live/oak/docs/architecture/overview.html
    jackrabbit/site/live/oak/docs/architecture/transactional-model.html
    jackrabbit/site/live/oak/docs/articles.html
    jackrabbit/site/live/oak/docs/attribution.html
    jackrabbit/site/live/oak/docs/branching.html
    jackrabbit/site/live/oak/docs/clustering.html
    jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_died.png
    jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_working.png
    jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_works_again.png
    jackrabbit/site/live/oak/docs/coldstandby/coldstandby.html
    jackrabbit/site/live/oak/docs/coldstandby/mbeans.png
    jackrabbit/site/live/oak/docs/command_line.html
    jackrabbit/site/live/oak/docs/construct.html
    jackrabbit/site/live/oak/docs/dev_getting_started.html
    jackrabbit/site/live/oak/docs/developing-with-git.html
    jackrabbit/site/live/oak/docs/diagnostic-builds.html
    jackrabbit/site/live/oak/docs/differences.html
    jackrabbit/site/live/oak/docs/dos_and_donts.html
    jackrabbit/site/live/oak/docs/downloads.html
    jackrabbit/site/live/oak/docs/features/atomic-counter.html
    jackrabbit/site/live/oak/docs/features/oak-run-nodestore-connection-options.html
    jackrabbit/site/live/oak/docs/features/observation.html
    jackrabbit/site/live/oak/docs/index.html
    jackrabbit/site/live/oak/docs/jsop-diff.html
    jackrabbit/site/live/oak/docs/known_issues.html
    jackrabbit/site/live/oak/docs/license.html
    jackrabbit/site/live/oak/docs/migration.html
    jackrabbit/site/live/oak/docs/nodestore/compositens.html
    jackrabbit/site/live/oak/docs/nodestore/document/node-bundling.html
    jackrabbit/site/live/oak/docs/nodestore/document/secondary-store.html
    jackrabbit/site/live/oak/docs/nodestore/document/upgrade.html
    jackrabbit/site/live/oak/docs/nodestore/documentmk.html
    jackrabbit/site/live/oak/docs/nodestore/overview.html
    jackrabbit/site/live/oak/docs/nodestore/persistent-cache.html
    jackrabbit/site/live/oak/docs/nodestore/segment/changes.html
    jackrabbit/site/live/oak/docs/nodestore/segment/classes.html
    jackrabbit/site/live/oak/docs/nodestore/segment/overview.html
    jackrabbit/site/live/oak/docs/nodestore/segment/records.html
    jackrabbit/site/live/oak/docs/nodestore/segment/tar.html
    jackrabbit/site/live/oak/docs/nodestore/segmentmk.html
    jackrabbit/site/live/oak/docs/oak-mongo-js/index.html
    jackrabbit/site/live/oak/docs/oak-mongo-js/oak-mongo.js.html
    jackrabbit/site/live/oak/docs/oak-mongo-js/oak.html
    jackrabbit/site/live/oak/docs/oak_api/error_codes.html
    jackrabbit/site/live/oak/docs/oak_api/overview.html
    jackrabbit/site/live/oak/docs/osgi_config.html
    jackrabbit/site/live/oak/docs/participating.html
    jackrabbit/site/live/oak/docs/plugins/blobstore.html
    jackrabbit/site/live/oak/docs/query/flags.html
    jackrabbit/site/live/oak/docs/query/grammar-sql2.html
    jackrabbit/site/live/oak/docs/query/grammar-xpath.html
    jackrabbit/site/live/oak/docs/query/index-management.html
    jackrabbit/site/live/oak/docs/query/indexing.html
    jackrabbit/site/live/oak/docs/query/lucene-old.html
    jackrabbit/site/live/oak/docs/query/lucene.html
    jackrabbit/site/live/oak/docs/query/oak-run-indexing.html
    jackrabbit/site/live/oak/docs/query/ootb-index-change.html
    jackrabbit/site/live/oak/docs/query/ordered-index-migrate.html
    jackrabbit/site/live/oak/docs/query/ordered-index.html
    jackrabbit/site/live/oak/docs/query/pre-extract-text.html
    jackrabbit/site/live/oak/docs/query/property-index.html
    jackrabbit/site/live/oak/docs/query/query-engine.html
    jackrabbit/site/live/oak/docs/query/query-troubleshooting.html
    jackrabbit/site/live/oak/docs/query/query.html
    jackrabbit/site/live/oak/docs/query/search-mt.html
    jackrabbit/site/live/oak/docs/query/solr.html
    jackrabbit/site/live/oak/docs/release-schedule.html
    jackrabbit/site/live/oak/docs/security/accesscontrol.html
    jackrabbit/site/live/oak/docs/security/accesscontrol/default.html
    jackrabbit/site/live/oak/docs/security/accesscontrol/differences.html
    jackrabbit/site/live/oak/docs/security/accesscontrol/editing.html
    jackrabbit/site/live/oak/docs/security/authentication.html
    jackrabbit/site/live/oak/docs/security/authentication/default.html
    jackrabbit/site/live/oak/docs/security/authentication/differences.html
    jackrabbit/site/live/oak/docs/security/authentication/external/defaultusersync.html
    jackrabbit/site/live/oak/docs/security/authentication/external/dynamic.html
    jackrabbit/site/live/oak/docs/security/authentication/external/externallogin_examples.html
    jackrabbit/site/live/oak/docs/security/authentication/external/faq.html
    jackrabbit/site/live/oak/docs/security/authentication/externalloginmodule.html
    jackrabbit/site/live/oak/docs/security/authentication/identitymanagement.html
    jackrabbit/site/live/oak/docs/security/authentication/ldap.html
    jackrabbit/site/live/oak/docs/security/authentication/preauthentication.html
    jackrabbit/site/live/oak/docs/security/authentication/token/default.html
    jackrabbit/site/live/oak/docs/security/authentication/tokenmanagement.html
    jackrabbit/site/live/oak/docs/security/authentication/usersync.html
    jackrabbit/site/live/oak/docs/security/authorization.html
    jackrabbit/site/live/oak/docs/security/authorization/composite.html
    jackrabbit/site/live/oak/docs/security/authorization/cug.html
    jackrabbit/site/live/oak/docs/security/authorization/restriction.html
    jackrabbit/site/live/oak/docs/security/introduction.html
    jackrabbit/site/live/oak/docs/security/overview.html
    jackrabbit/site/live/oak/docs/security/permission.html
    jackrabbit/site/live/oak/docs/security/permission/default.html
    jackrabbit/site/live/oak/docs/security/permission/differences.html
    jackrabbit/site/live/oak/docs/security/permission/evaluation.html
    jackrabbit/site/live/oak/docs/security/permission/multiplexing.html
    jackrabbit/site/live/oak/docs/security/permission/permissionsandprivileges.html
    jackrabbit/site/live/oak/docs/security/principal.html
    jackrabbit/site/live/oak/docs/security/principal/cache.html
    jackrabbit/site/live/oak/docs/security/principal/differences.html
    jackrabbit/site/live/oak/docs/security/principal/principalprovider.html
    jackrabbit/site/live/oak/docs/security/privilege.html
    jackrabbit/site/live/oak/docs/security/privilege/default.html
    jackrabbit/site/live/oak/docs/security/privilege/differences.html
    jackrabbit/site/live/oak/docs/security/privilege/mappingtoitems.html
    jackrabbit/site/live/oak/docs/security/privilege/mappingtoprivileges.html
    jackrabbit/site/live/oak/docs/security/user.html
    jackrabbit/site/live/oak/docs/security/user/authorizableaction.html
    jackrabbit/site/live/oak/docs/security/user/authorizablenodename.html
    jackrabbit/site/live/oak/docs/security/user/default.html
    jackrabbit/site/live/oak/docs/security/user/differences.html
    jackrabbit/site/live/oak/docs/security/user/expiry.html
    jackrabbit/site/live/oak/docs/security/user/groupaction.html
    jackrabbit/site/live/oak/docs/security/user/history.html
    jackrabbit/site/live/oak/docs/security/user/membership.html
    jackrabbit/site/live/oak/docs/security/user/query.html
    jackrabbit/site/live/oak/docs/use_getting_started.html

Modified: jackrabbit/site/live/oak/docs/FAQ.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/FAQ.html?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/FAQ.html (original)
+++ jackrabbit/site/live/oak/docs/FAQ.html Tue Feb 13 12:38:14 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-08-30 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20170830" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013;  Frequently asked questions</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <ul class="dropdown-menu">
                   <li><a href="nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
+                  <li><a href="nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -131,7 +132,7 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-08-30<span class="divider">|</span>
 </li>
           <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
@@ -163,6 +164,7 @@
       </ul>
   </li>
     <li><a href="nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
+    <li><a href="nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li><a href="plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>

Modified: jackrabbit/site/live/oak/docs/architecture/nodestate.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/architecture/nodestate.html?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/architecture/nodestate.html (original)
+++ jackrabbit/site/live/oak/docs/architecture/nodestate.html Tue Feb 13 12:38:14 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-02-13 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20180213" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Understanding the node state model</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <ul class="dropdown-menu">
                   <li><a href="../nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
+                  <li><a href="../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -70,6 +71,8 @@
 <a href="../query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
                   <li><a href="../query/query-engine.html" title="Query Engine">Query Engine</a></li>
+                  <li><a href="../query/grammar-xpath.html" title="XPath Grammar">XPath Grammar</a></li>
+                  <li><a href="../query/grammar-sql2.html" title="SQL-2 Grammar">SQL-2 Grammar</a></li>
                   <li><a href="../query/query-troubleshooting.html" title="Troubleshooting">Troubleshooting</a></li>
                   <li><a href="../query/indexing.html" title="Indexing">Indexing</a></li>
                   <li><a href="../query/lucene.html" title="Lucene Index">Lucene Index</a></li>
@@ -92,6 +95,7 @@
             <li><a href="../migration.html" title="Migration">Migration</a></li>
             <li><a href="../differences.html" title="Differences to Jackrabbit 2">Differences to Jackrabbit 2</a></li>
             <li><a href="../known_issues.html" title="Known Issues">Known Issues</a></li>
+            <li><a href="../constraints.html" title="Constraints">Constraints</a></li>
             <li><a href="../dos_and_donts.html" title="Dos and Don'ts">Dos and Don'ts</a></li>
             <li><a href="../coldstandby/coldstandby.html" title="Cold Standby">Cold Standby</a></li>
             <li><a href="../FAQ.html" title="FAQ">FAQ</a></li>
@@ -104,6 +108,7 @@
             <li><a href="../participating.html" title="Participating">Participating</a></li>
             <li><a href="../developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
+            <li><a href="../branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="../attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="../release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -131,9 +136,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-02-13<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -164,12 +169,15 @@
       </ul>
   </li>
     <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
+    <li><a href="../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li><a href="../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
     <li><a href="../query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="../query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
+    <li><a href="../query/grammar-xpath.html" title="XPath Grammar"><span class="none"></span>XPath Grammar</a>  </li>
+    <li><a href="../query/grammar-sql2.html" title="SQL-2 Grammar"><span class="none"></span>SQL-2 Grammar</a>  </li>
     <li><a href="../query/query-troubleshooting.html" title="Troubleshooting"><span class="none"></span>Troubleshooting</a>  </li>
     <li><a href="../query/indexing.html" title="Indexing"><span class="none"></span>Indexing</a>  </li>
     <li><a href="../query/lucene.html" title="Lucene Index"><span class="none"></span>Lucene Index</a>  </li>
@@ -188,6 +196,7 @@
     <li><a href="../migration.html" title="Migration"><span class="none"></span>Migration</a>  </li>
     <li><a href="../differences.html" title="Differences to Jackrabbit 2"><span class="none"></span>Differences to Jackrabbit 2</a>  </li>
     <li><a href="../known_issues.html" title="Known Issues"><span class="none"></span>Known Issues</a>  </li>
+    <li><a href="../constraints.html" title="Constraints"><span class="none"></span>Constraints</a>  </li>
     <li><a href="../dos_and_donts.html" title="Dos and Don'ts"><span class="none"></span>Dos and Don'ts</a>  </li>
     <li><a href="../coldstandby/coldstandby.html" title="Cold Standby"><span class="none"></span>Cold Standby</a>  </li>
     <li><a href="../FAQ.html" title="FAQ"><span class="none"></span>FAQ</a>  </li>
@@ -196,6 +205,7 @@
     <li><a href="../participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="../developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
+    <li><a href="../branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="../attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="../release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -378,7 +388,7 @@ assert !barBuilder.exists();
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2017
+            <p>Copyright &copy;2012&#x2013;2018
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/architecture/overview.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/architecture/overview.html?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/architecture/overview.html (original)
+++ jackrabbit/site/live/oak/docs/architecture/overview.html Tue Feb 13 12:38:14 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-08-30 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20170830" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Oak - The big picture</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <ul class="dropdown-menu">
                   <li><a href="../nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
+                  <li><a href="../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -131,7 +132,7 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-08-30<span class="divider">|</span>
 </li>
           <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
@@ -164,6 +165,7 @@
       </ul>
   </li>
     <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
+    <li><a href="../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li><a href="../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>

Modified: jackrabbit/site/live/oak/docs/architecture/transactional-model.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/architecture/transactional-model.html?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/architecture/transactional-model.html (original)
+++ jackrabbit/site/live/oak/docs/architecture/transactional-model.html Tue Feb 13 12:38:14 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-02-13 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20180213" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Transactional model of sessions</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <ul class="dropdown-menu">
                   <li><a href="../nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
+                  <li><a href="../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -70,6 +71,8 @@
 <a href="../query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
                   <li><a href="../query/query-engine.html" title="Query Engine">Query Engine</a></li>
+                  <li><a href="../query/grammar-xpath.html" title="XPath Grammar">XPath Grammar</a></li>
+                  <li><a href="../query/grammar-sql2.html" title="SQL-2 Grammar">SQL-2 Grammar</a></li>
                   <li><a href="../query/query-troubleshooting.html" title="Troubleshooting">Troubleshooting</a></li>
                   <li><a href="../query/indexing.html" title="Indexing">Indexing</a></li>
                   <li><a href="../query/lucene.html" title="Lucene Index">Lucene Index</a></li>
@@ -92,6 +95,7 @@
             <li><a href="../migration.html" title="Migration">Migration</a></li>
             <li><a href="../differences.html" title="Differences to Jackrabbit 2">Differences to Jackrabbit 2</a></li>
             <li><a href="../known_issues.html" title="Known Issues">Known Issues</a></li>
+            <li><a href="../constraints.html" title="Constraints">Constraints</a></li>
             <li><a href="../dos_and_donts.html" title="Dos and Don'ts">Dos and Don'ts</a></li>
             <li><a href="../coldstandby/coldstandby.html" title="Cold Standby">Cold Standby</a></li>
             <li><a href="../FAQ.html" title="FAQ">FAQ</a></li>
@@ -104,6 +108,7 @@
             <li><a href="../participating.html" title="Participating">Participating</a></li>
             <li><a href="../developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
+            <li><a href="../branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="../attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="../release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -131,9 +136,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-02-13<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -163,12 +168,15 @@
       </ul>
   </li>
     <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
+    <li><a href="../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li><a href="../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
     <li><a href="../query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="../query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
+    <li><a href="../query/grammar-xpath.html" title="XPath Grammar"><span class="none"></span>XPath Grammar</a>  </li>
+    <li><a href="../query/grammar-sql2.html" title="SQL-2 Grammar"><span class="none"></span>SQL-2 Grammar</a>  </li>
     <li><a href="../query/query-troubleshooting.html" title="Troubleshooting"><span class="none"></span>Troubleshooting</a>  </li>
     <li><a href="../query/indexing.html" title="Indexing"><span class="none"></span>Indexing</a>  </li>
     <li><a href="../query/lucene.html" title="Lucene Index"><span class="none"></span>Lucene Index</a>  </li>
@@ -187,6 +195,7 @@
     <li><a href="../migration.html" title="Migration"><span class="none"></span>Migration</a>  </li>
     <li><a href="../differences.html" title="Differences to Jackrabbit 2"><span class="none"></span>Differences to Jackrabbit 2</a>  </li>
     <li><a href="../known_issues.html" title="Known Issues"><span class="none"></span>Known Issues</a>  </li>
+    <li><a href="../constraints.html" title="Constraints"><span class="none"></span>Constraints</a>  </li>
     <li><a href="../dos_and_donts.html" title="Dos and Don'ts"><span class="none"></span>Dos and Don'ts</a>  </li>
     <li><a href="../coldstandby/coldstandby.html" title="Cold Standby"><span class="none"></span>Cold Standby</a>  </li>
     <li><a href="../FAQ.html" title="FAQ"><span class="none"></span>FAQ</a>  </li>
@@ -195,6 +204,7 @@
     <li><a href="../participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="../developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
+    <li><a href="../branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="../attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="../release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -291,7 +301,7 @@ check(session3);
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2017
+            <p>Copyright &copy;2012&#x2013;2018
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/articles.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/articles.html?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/articles.html (original)
+++ jackrabbit/site/live/oak/docs/articles.html Tue Feb 13 12:38:14 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-11-28 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-02-13 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20171128" />
+    <meta name="Date-Revision-yyyymmdd" content="20180213" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Articles</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -71,6 +71,8 @@
 <a href="query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
                   <li><a href="query/query-engine.html" title="Query Engine">Query Engine</a></li>
+                  <li><a href="query/grammar-xpath.html" title="XPath Grammar">XPath Grammar</a></li>
+                  <li><a href="query/grammar-sql2.html" title="SQL-2 Grammar">SQL-2 Grammar</a></li>
                   <li><a href="query/query-troubleshooting.html" title="Troubleshooting">Troubleshooting</a></li>
                   <li><a href="query/indexing.html" title="Indexing">Indexing</a></li>
                   <li><a href="query/lucene.html" title="Lucene Index">Lucene Index</a></li>
@@ -93,6 +95,7 @@
             <li><a href="migration.html" title="Migration">Migration</a></li>
             <li><a href="differences.html" title="Differences to Jackrabbit 2">Differences to Jackrabbit 2</a></li>
             <li><a href="known_issues.html" title="Known Issues">Known Issues</a></li>
+            <li><a href="constraints.html" title="Constraints">Constraints</a></li>
             <li><a href="dos_and_donts.html" title="Dos and Don'ts">Dos and Don'ts</a></li>
             <li><a href="coldstandby/coldstandby.html" title="Cold Standby">Cold Standby</a></li>
             <li><a href="FAQ.html" title="FAQ">FAQ</a></li>
@@ -105,6 +108,7 @@
             <li><a href="participating.html" title="Participating">Participating</a></li>
             <li><a href="developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
+            <li><a href="branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -132,9 +136,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-11-28<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-02-13<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -172,6 +176,8 @@
     <li><a href="query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
+    <li><a href="query/grammar-xpath.html" title="XPath Grammar"><span class="none"></span>XPath Grammar</a>  </li>
+    <li><a href="query/grammar-sql2.html" title="SQL-2 Grammar"><span class="none"></span>SQL-2 Grammar</a>  </li>
     <li><a href="query/query-troubleshooting.html" title="Troubleshooting"><span class="none"></span>Troubleshooting</a>  </li>
     <li><a href="query/indexing.html" title="Indexing"><span class="none"></span>Indexing</a>  </li>
     <li><a href="query/lucene.html" title="Lucene Index"><span class="none"></span>Lucene Index</a>  </li>
@@ -190,6 +196,7 @@
     <li><a href="migration.html" title="Migration"><span class="none"></span>Migration</a>  </li>
     <li><a href="differences.html" title="Differences to Jackrabbit 2"><span class="none"></span>Differences to Jackrabbit 2</a>  </li>
     <li><a href="known_issues.html" title="Known Issues"><span class="none"></span>Known Issues</a>  </li>
+    <li><a href="constraints.html" title="Constraints"><span class="none"></span>Constraints</a>  </li>
     <li><a href="dos_and_donts.html" title="Dos and Don'ts"><span class="none"></span>Dos and Don'ts</a>  </li>
     <li><a href="coldstandby/coldstandby.html" title="Cold Standby"><span class="none"></span>Cold Standby</a>  </li>
     <li><a href="FAQ.html" title="FAQ"><span class="none"></span>FAQ</a>  </li>
@@ -198,6 +205,7 @@
     <li><a href="participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
+    <li><a href="branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -237,6 +245,8 @@
 
 <ul>
   
+<li>Valentin Olteanu, Michael Duerig, <a class="externalLink" href="https://adapt.to/2017/en/schedule/tarmk--facts-and-figures.html">TarMK: Facts and Figures</a></li>
+  
 <li>Michael Duerig, <a class="externalLink" href="https://adapt.to/2016/en/schedule/into-the-tar-pit--a-tarmk-deep-dive.html">Into the tar pit: a TarMK deep dive</a> (September 2016) adaptTo() 2016</li>
   
 <li>Michael Duerig, <a class="externalLink" href="https://adapt.to/2015/en/schedule/avoiding-and-dealing-with-conflicting-updates-in-oak.html">Avoiding and dealing with conflicting updates in Oak</a> (September 2015) adaptTo() 2015</li>
@@ -276,7 +286,7 @@
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2017
+            <p>Copyright &copy;2012&#x2013;2018
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/attribution.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/attribution.html?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/attribution.html (original)
+++ jackrabbit/site/live/oak/docs/attribution.html Tue Feb 13 12:38:14 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-08-30 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20170830" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Supporting software attribution</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <ul class="dropdown-menu">
                   <li><a href="nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
+                  <li><a href="nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -131,7 +132,7 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-08-30<span class="divider">|</span>
 </li>
           <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
@@ -163,6 +164,7 @@
       </ul>
   </li>
     <li><a href="nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
+    <li><a href="nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li><a href="plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>

Modified: jackrabbit/site/live/oak/docs/branching.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/branching.html?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/branching.html (original)
+++ jackrabbit/site/live/oak/docs/branching.html Tue Feb 13 12:38:14 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-17 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-02-13 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180117" />
+    <meta name="Date-Revision-yyyymmdd" content="20180213" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Branching</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -71,6 +71,8 @@
 <a href="query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
                   <li><a href="query/query-engine.html" title="Query Engine">Query Engine</a></li>
+                  <li><a href="query/grammar-xpath.html" title="XPath Grammar">XPath Grammar</a></li>
+                  <li><a href="query/grammar-sql2.html" title="SQL-2 Grammar">SQL-2 Grammar</a></li>
                   <li><a href="query/query-troubleshooting.html" title="Troubleshooting">Troubleshooting</a></li>
                   <li><a href="query/indexing.html" title="Indexing">Indexing</a></li>
                   <li><a href="query/lucene.html" title="Lucene Index">Lucene Index</a></li>
@@ -93,6 +95,7 @@
             <li><a href="migration.html" title="Migration">Migration</a></li>
             <li><a href="differences.html" title="Differences to Jackrabbit 2">Differences to Jackrabbit 2</a></li>
             <li><a href="known_issues.html" title="Known Issues">Known Issues</a></li>
+            <li><a href="constraints.html" title="Constraints">Constraints</a></li>
             <li><a href="dos_and_donts.html" title="Dos and Don'ts">Dos and Don'ts</a></li>
             <li><a href="coldstandby/coldstandby.html" title="Cold Standby">Cold Standby</a></li>
             <li><a href="FAQ.html" title="FAQ">FAQ</a></li>
@@ -133,7 +136,7 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-17<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-02-13<span class="divider">|</span>
 </li>
           <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
@@ -172,6 +175,8 @@
     <li><a href="query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
+    <li><a href="query/grammar-xpath.html" title="XPath Grammar"><span class="none"></span>XPath Grammar</a>  </li>
+    <li><a href="query/grammar-sql2.html" title="SQL-2 Grammar"><span class="none"></span>SQL-2 Grammar</a>  </li>
     <li><a href="query/query-troubleshooting.html" title="Troubleshooting"><span class="none"></span>Troubleshooting</a>  </li>
     <li><a href="query/indexing.html" title="Indexing"><span class="none"></span>Indexing</a>  </li>
     <li><a href="query/lucene.html" title="Lucene Index"><span class="none"></span>Lucene Index</a>  </li>
@@ -190,6 +195,7 @@
     <li><a href="migration.html" title="Migration"><span class="none"></span>Migration</a>  </li>
     <li><a href="differences.html" title="Differences to Jackrabbit 2"><span class="none"></span>Differences to Jackrabbit 2</a>  </li>
     <li><a href="known_issues.html" title="Known Issues"><span class="none"></span>Known Issues</a>  </li>
+    <li><a href="constraints.html" title="Constraints"><span class="none"></span>Constraints</a>  </li>
     <li><a href="dos_and_donts.html" title="Dos and Don'ts"><span class="none"></span>Dos and Don'ts</a>  </li>
     <li><a href="coldstandby/coldstandby.html" title="Cold Standby"><span class="none"></span>Cold Standby</a>  </li>
     <li><a href="FAQ.html" title="FAQ"><span class="none"></span>FAQ</a>  </li>

Modified: jackrabbit/site/live/oak/docs/clustering.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/clustering.html?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/clustering.html (original)
+++ jackrabbit/site/live/oak/docs/clustering.html Tue Feb 13 12:38:14 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-08-30 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20170830" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Clustering</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <ul class="dropdown-menu">
                   <li><a href="nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
+                  <li><a href="nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -131,7 +132,7 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2017-08-30<span class="divider">|</span>
 </li>
           <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
         </ul>
@@ -164,6 +165,7 @@
       </ul>
   </li>
     <li><a href="nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
+    <li><a href="nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li><a href="plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>

Modified: jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_died.png
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_died.png?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
Binary files jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_died.png (original) and jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_died.png Tue Feb 13 12:38:14 2018 differ

Modified: jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_working.png
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_working.png?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
Binary files jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_working.png (original) and jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_working.png Tue Feb 13 12:38:14 2018 differ

Modified: jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_works_again.png
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_works_again.png?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
Binary files jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_works_again.png (original) and jackrabbit/site/live/oak/docs/coldstandby/client_mbean_server_works_again.png Tue Feb 13 12:38:14 2018 differ

Modified: jackrabbit/site/live/oak/docs/coldstandby/coldstandby.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/coldstandby/coldstandby.html?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/coldstandby/coldstandby.html (original)
+++ jackrabbit/site/live/oak/docs/coldstandby/coldstandby.html Tue Feb 13 12:38:14 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-05-02 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-02-13 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20170502" />
+    <meta name="Date-Revision-yyyymmdd" content="20180213" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Cold Standby</title>
     <link rel="stylesheet" href="../css/apache-maven-fluido-1.6.min.css" />
@@ -63,6 +63,7 @@
               <ul class="dropdown-menu">
                   <li><a href="../nodestore/documentmk.html" title="Document NodeStore">Document NodeStore</a></li>
                   <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore">Segment NodeStore</a></li>
+                  <li><a href="../nodestore/compositens.html" title="Composite NodeStore">Composite NodeStore</a></li>
               </ul>
             </li>
             <li><a href="../plugins/blobstore.html" title="Blob Storage">Blob Storage</a></li>
@@ -70,6 +71,8 @@
 <a href="../query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
                   <li><a href="../query/query-engine.html" title="Query Engine">Query Engine</a></li>
+                  <li><a href="../query/grammar-xpath.html" title="XPath Grammar">XPath Grammar</a></li>
+                  <li><a href="../query/grammar-sql2.html" title="SQL-2 Grammar">SQL-2 Grammar</a></li>
                   <li><a href="../query/query-troubleshooting.html" title="Troubleshooting">Troubleshooting</a></li>
                   <li><a href="../query/indexing.html" title="Indexing">Indexing</a></li>
                   <li><a href="../query/lucene.html" title="Lucene Index">Lucene Index</a></li>
@@ -92,6 +95,7 @@
             <li><a href="../migration.html" title="Migration">Migration</a></li>
             <li><a href="../differences.html" title="Differences to Jackrabbit 2">Differences to Jackrabbit 2</a></li>
             <li><a href="../known_issues.html" title="Known Issues">Known Issues</a></li>
+            <li><a href="../constraints.html" title="Constraints">Constraints</a></li>
             <li><a href="../dos_and_donts.html" title="Dos and Don'ts">Dos and Don'ts</a></li>
             <li><a href="../coldstandby/coldstandby.html" title="Cold Standby">Cold Standby</a></li>
             <li><a href="../FAQ.html" title="FAQ">FAQ</a></li>
@@ -104,6 +108,7 @@
             <li><a href="../participating.html" title="Participating">Participating</a></li>
             <li><a href="../developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
+            <li><a href="../branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="../attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="../release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -131,9 +136,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-05-02<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-02-13<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -163,12 +168,15 @@
       </ul>
   </li>
     <li><a href="../nodestore/segment/overview.html" title="Segment NodeStore"><span class="none"></span>Segment NodeStore</a>  </li>
+    <li><a href="../nodestore/compositens.html" title="Composite NodeStore"><span class="none"></span>Composite NodeStore</a>  </li>
       </ul>
   </li>
     <li><a href="../plugins/blobstore.html" title="Blob Storage"><span class="none"></span>Blob Storage</a>  </li>
     <li><a href="../query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="../query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
+    <li><a href="../query/grammar-xpath.html" title="XPath Grammar"><span class="none"></span>XPath Grammar</a>  </li>
+    <li><a href="../query/grammar-sql2.html" title="SQL-2 Grammar"><span class="none"></span>SQL-2 Grammar</a>  </li>
     <li><a href="../query/query-troubleshooting.html" title="Troubleshooting"><span class="none"></span>Troubleshooting</a>  </li>
     <li><a href="../query/indexing.html" title="Indexing"><span class="none"></span>Indexing</a>  </li>
     <li><a href="../query/lucene.html" title="Lucene Index"><span class="none"></span>Lucene Index</a>  </li>
@@ -187,6 +195,7 @@
     <li><a href="../migration.html" title="Migration"><span class="none"></span>Migration</a>  </li>
     <li><a href="../differences.html" title="Differences to Jackrabbit 2"><span class="none"></span>Differences to Jackrabbit 2</a>  </li>
     <li><a href="../known_issues.html" title="Known Issues"><span class="none"></span>Known Issues</a>  </li>
+    <li><a href="../constraints.html" title="Constraints"><span class="none"></span>Constraints</a>  </li>
     <li><a href="../dos_and_donts.html" title="Dos and Don'ts"><span class="none"></span>Dos and Don'ts</a>  </li>
     <li class="active"><a href="#"><span class="none"></span>Cold Standby</a>
   </li>
@@ -196,6 +205,7 @@
     <li><a href="../participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="../developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="../diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
+    <li><a href="../branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="../attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="../release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -237,21 +247,25 @@
 <p>The <i>Cold Standby</i> feature allows one or more clients to connect to a primary instance and ensure automatic on-the-fly synchronization of the repository state from the master to the client(s). The sync process is one-way only. Data stored on the master is never changed. The only purpose of this client installation(s) is to guarantee an (almost live) data copy and enable a quick switch from the master to a client installation without data loss.</p></div>
 <div class="section">
 <h3><a name="What_is_isnt"></a>What is isn&#x2019;t</h3>
-<p>The <i>Cold Standby</i> feature does not guarantee file, filesystem or even repository <b>integrity</b>! If the content of a tar file is corrupted, a file is missing or anything similar happens to the locally stored files the installation will break because these situation or not checked, detected or treated!</p></div>
+<p>The <i>Cold Standby</i> feature does not guarantee file, filesystem or even repository <b>integrity</b>! If the content of a tar file is corrupted, a file is missing or anything similar happens to the locally stored files the installation will break because these situations are not checked, detected or treated!</p></div>
 <div class="section">
 <h3><a name="How_it_works"></a>How it works</h3>
-<p>On the master a TCP port is opened and listening to incoming messages. Currently there a two messages implemented:</p>
+<p>On the master a TCP port is opened and listening to incoming messages. Currently there are four messages implemented:</p>
 
 <ul>
   
 <li>give me the segment id of the current head</li>
   
-<li>give me a segment data with a specified id</li>
+<li>give me the segment data for a segment with the specified id</li>
+  
+<li>give me all the segment ids referenced by a segment with the specified id</li>
+  
+<li>give me the blob data for a blob with the specified id</li>
 </ul>
-<p>The clients periodically request the segment id of the current head of the master. If the segment is locally unknown it will be retrieved. If it&#x2019;s already present the segments are compared and referenced segments (if necessary) will be requested, too.</p></div>
+<p>The clients periodically request the segment id of the current head of the master. If the segment is locally unknown it will be retrieved. If it&#x2019;s already present the segments are compared and referenced segments and blobs (if necessary) will be requested, too.</p></div>
 <div class="section">
 <h3><a name="Prerequisites"></a>Prerequisites</h3>
-<p>An Oak installation using the SegmentNodeStore</p></div>
+<p>An Oak installation using the SegmentNodeStore.</p></div>
 <div class="section">
 <h3><a name="Setup"></a>Setup</h3>
 
@@ -259,22 +273,21 @@
   
 <li>Perform a filesystem based copy of the master repository.</li>
   
-<li>on the master activate the feature by specifying the runmode <tt>primary</tt>.</li>
+<li>On the master activate the feature by specifying the runmode <tt>primary</tt>.</li>
   
-<li>on the client(s) activate the feature by specifying the runmode <tt>standby</tt> (add additional parameters if desired) and specify the path to the repository</li>
+<li>On the client(s) activate the feature by specifying the runmode <tt>standby</tt> (add additional parameters if desired) and specify the path to the repository.</li>
   
-<li>start the master and the client(s).</li>
+<li>Start the master and the client(s).</li>
 </ol>
 <p>You can add the additional configuration option <tt>secure=true</tt> if you like a SSL secured connection between the client and the master. It must be garantueed that <b>all</b> clients and the master either use secure or standard connections! A mixed configuration will definitely fail.</p>
 <p>The clients specify the master host using the <tt>host</tt> (default is <tt>localhost</tt>) and <tt>port</tt> (default is <tt>8023</tt>) configuration options. For monitoring reasons (see below) the client(s) must be distinctable. Therefore a generic UUID is automatically created for each running client and this UUID is used to identify the client on the master. If you want to specify the name of the client you can set a system property <tt>standbyID</tt>.</p>
-<!-- TODO: add the master specific arguments (like the accepted incoming IP ranges) -->
-<p>The master can define the TCP port the feature is listening (default is <tt>8023</tt>) using the <tt>port</tt> configuration option. If you want to restrict the communication you can specify a list of allowed IPs or IP ranges&#x2026;.</p></div>
+<p>The master can define the TCP port the feature is listening (default is <tt>8023</tt>) using the <tt>port</tt> configuration option. If you want to restrict the communication you can specify a list of allowed IPs or IP ranges.</p></div>
 <div class="section">
 <h3><a name="Robustness"></a>Robustness</h3>
 <p>The data flow is designed to detect and handle connection and network related problems automatically. All packets are bundled with checksums and as soon as problems with the connection or damaged packets occur retry mechanisms are triggered.</p></div>
 <div class="section">
 <h3><a name="Monitoring"></a>Monitoring</h3>
-<p>The <i>Cold Standby</i> feature exposes informations using JMX/MBeans. Doing so you can inspect the current state of the client(s) and the master using standard tools like <tt>jconsole</tt> or <tt>jmc</tt> (if running JDK 1.7 or higher). The information can be found if you look for a <tt>org.apache.jackrabbit.oak:type=&quot;Standby&quot;</tt> MBean named <tt>Status</tt>.</p>
+<p>The <i>Cold Standby</i> feature exposes information using JMX/MBeans. Doing so, you can inspect the current state of the client(s) and the master using standard tools like <tt>jconsole</tt> or <tt>jmc</tt> (if running JDK 1.7 or higher). The information can be found if you look for a <tt>org.apache.jackrabbit.oak:type=&quot;Standby&quot;</tt> MBean named <tt>Status</tt>.</p>
 <div class="section">
 <div class="section">
 <h5><a name="Client"></a>Client</h5>
@@ -304,13 +317,13 @@
 <h6><a name="Examples"></a>Examples</h6>
 <p>A typical communication with the server can look like this (the server is contacted every five seconds and there is no error at all): </p>
 <p><img src="client_mbean_server_working.png" alt="Screenshot showing MBeans with working server" /></p>
-<p>The server can not be contacted anyore:</p>
+<p>The server can not be contacted anymore:</p>
 <p><img src="client_mbean_server_died.png" alt="Screenshot showing MBeans with server died" /></p>
-<p>The server is live and reachable again and after some errors everythings is up and running again:</p>
+<p>The server is live and reachable again and after some errors everything is up and running again:</p>
 <p><img src="client_mbean_server_works_again.png" alt="Screenshot showing MBeans with server working again" /></p></div></div>
 <div class="section">
 <h5><a name="Master"></a>Master</h5>
-<p>Observing the master exposes some general (non client-specific) informations via a MBean whose id value is the port number the <tt>Cold Standby</tt> service is using (usually <tt>8023</tt>). There are almost the same attributes and methods as described above but the values differ:</p>
+<p>Observing the master exposes some general (non client-specific) information via a MBean whose id value is the port number the <tt>Cold Standby</tt> service is using (usually <tt>8023</tt>). There are almost the same attributes and methods as described above, but the values differ:</p>
 
 <ul>
   
@@ -322,7 +335,7 @@
   
 <li><tt>SecondsSinceLastSuccess</tt>: not available in master mode</li>
 </ul>
-<p>Furthermore informations for each (up to 10) clients can be retrieved. The MBean id is the name of the client (see above). There are no invokable methods for these MBeans but some very useful readonly attributes:</p>
+<p>Furthermore, information for each (up to 10) clients can be retrieved. The MBean id is the name of the client (see above). There are no invokable methods for these MBeans, but some very useful readonly attributes:</p>
 
 <ul>
   
@@ -347,13 +360,13 @@
 <div class="section">
 <div class="section">
 <h5><a name="Master"></a>Master</h5>
-<p>Running on the master enabling the <i>Cold Standby</i> feature has almost no measurable impact on the performance. The additional CPU consumption is very low and the extra harddisk and network IO shouldn&#x2019;t have any drawbacks.</p></div>
+<p>Running on the master, enabling the <i>Cold Standby</i> feature has almost no measurable impact on the performance. The additional CPU consumption is very low and the extra harddisk and network IO shouldn&#x2019;t have any drawbacks.</p></div>
 <div class="section">
 <h5><a name="Client"></a>Client</h5>
-<p>Things look differently on the client! During a sync process you can expect at least one CPU core running close to 100% for all the time. Due to the fact that the procedure is not multithreaded you can&#x2019;t speed up the process by using multiple cores. If no data is changed/transferred there will be no measurable activity. The expected throughput is about 700 KB / sec. Obviously this number will vary depending on the hardware and network environment but it does not depend on the size of the repository or whether you use SSL encryption or not. You should keep this in mind when estimating the time needed for an initial sync or when much data was changed in the meantime on the master node.</p></div></div></div>
+<p>Things look differently on the client! During a sync process you can expect at least one CPU core running close to 100% for all the time. Due to the fact that the procedure is not multithreaded you can&#x2019;t speed up the process by using multiple cores. If no data is changed/transferred there will be no measurable activity. The expected throughput is about 700 KB / sec. Obviously this number will vary depending on the hardware and network environment, but it does not depend on the size of the repository or whether you use SSL encryption or not. You should keep this in mind when estimating the time needed for an initial sync or when much data was changed in the meantime on the master node.</p></div></div></div>
 <div class="section">
 <h3><a name="One_word_about_security"></a>One word about security</h3>
-<p>Assuming that the client(s) and the master run in the same intranet security zone there <b>should</b> be no security issue enabling the <i>Cold Standby</i> feature. Nevertheless you can add extra security by enabling SSL connections between the client(s) and the master (see above). Doing so reduces the possibility that the data is compromised by a man-in-the-middle. Furthermore you can specify the allowed client(s) by restricting the IP-address of incoming requests. This should help to garantuee that no one in the intranet can copy the repository (by accident).</p></div></div>
+<p>Assuming that the client(s) and the master run in the same intranet security zone there <b>should</b> be no security issue enabling the <i>Cold Standby</i> feature. Nevertheless, you can add extra security by enabling SSL connections between the client(s) and the master (see above). Doing so reduces the possibility that the data is compromised by a man-in-the-middle. Furthermore, you can specify the allowed client(s) by restricting the IP-address of incoming requests. This should help garantuee that no one in the intranet can copy the repository (by accident).</p></div></div>
         </div>
       </div>
     </div>
@@ -361,7 +374,7 @@
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2017
+            <p>Copyright &copy;2012&#x2013;2018
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>

Modified: jackrabbit/site/live/oak/docs/coldstandby/mbeans.png
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/coldstandby/mbeans.png?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
Binary files jackrabbit/site/live/oak/docs/coldstandby/mbeans.png (original) and jackrabbit/site/live/oak/docs/coldstandby/mbeans.png Tue Feb 13 12:38:14 2018 differ

Modified: jackrabbit/site/live/oak/docs/command_line.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/command_line.html?rev=1824122&r1=1824121&r2=1824122&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/command_line.html (original)
+++ jackrabbit/site/live/oak/docs/command_line.html Tue Feb 13 12:38:14 2018
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-12-20 
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-02-13 
  | Rendered using Apache Maven Fluido Skin 1.6
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20171220" />
+    <meta name="Date-Revision-yyyymmdd" content="20180213" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Command Line Tools</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
@@ -71,6 +71,8 @@
 <a href="query/query.html" title="Query">Query</a>
               <ul class="dropdown-menu">
                   <li><a href="query/query-engine.html" title="Query Engine">Query Engine</a></li>
+                  <li><a href="query/grammar-xpath.html" title="XPath Grammar">XPath Grammar</a></li>
+                  <li><a href="query/grammar-sql2.html" title="SQL-2 Grammar">SQL-2 Grammar</a></li>
                   <li><a href="query/query-troubleshooting.html" title="Troubleshooting">Troubleshooting</a></li>
                   <li><a href="query/indexing.html" title="Indexing">Indexing</a></li>
                   <li><a href="query/lucene.html" title="Lucene Index">Lucene Index</a></li>
@@ -93,6 +95,7 @@
             <li><a href="migration.html" title="Migration">Migration</a></li>
             <li><a href="differences.html" title="Differences to Jackrabbit 2">Differences to Jackrabbit 2</a></li>
             <li><a href="known_issues.html" title="Known Issues">Known Issues</a></li>
+            <li><a href="constraints.html" title="Constraints">Constraints</a></li>
             <li><a href="dos_and_donts.html" title="Dos and Don'ts">Dos and Don'ts</a></li>
             <li><a href="coldstandby/coldstandby.html" title="Cold Standby">Cold Standby</a></li>
             <li><a href="FAQ.html" title="FAQ">FAQ</a></li>
@@ -105,6 +108,7 @@
             <li><a href="participating.html" title="Participating">Participating</a></li>
             <li><a href="developing-with-git.html" title="Developing with Git">Developing with Git</a></li>
             <li><a href="diagnostic-builds.html" title="Cutting diagnostic builds">Cutting diagnostic builds</a></li>
+            <li><a href="branching.html" title="Branching off a new stable">Branching off a new stable</a></li>
             <li><a href="attribution.html" title="Attribution">Attribution</a></li>
             <li><a href="release-schedule.html" title="Release Schedule">Release Schedule</a></li>
         </ul>
@@ -132,9 +136,9 @@
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2017-12-20<span class="divider">|</span>
+        <li id="publishDate">Last Published: 2018-02-13<span class="divider">|</span>
 </li>
-          <li id="projectVersion">Version: 1.8-SNAPSHOT</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
         </ul>
       </div>
       <div class="row-fluid">
@@ -171,6 +175,8 @@
     <li><a href="query/query.html" title="Query"><span class="icon-chevron-down"></span>Query</a>
       <ul class="nav nav-list">
     <li><a href="query/query-engine.html" title="Query Engine"><span class="none"></span>Query Engine</a>  </li>
+    <li><a href="query/grammar-xpath.html" title="XPath Grammar"><span class="none"></span>XPath Grammar</a>  </li>
+    <li><a href="query/grammar-sql2.html" title="SQL-2 Grammar"><span class="none"></span>SQL-2 Grammar</a>  </li>
     <li><a href="query/query-troubleshooting.html" title="Troubleshooting"><span class="none"></span>Troubleshooting</a>  </li>
     <li><a href="query/indexing.html" title="Indexing"><span class="none"></span>Indexing</a>  </li>
     <li><a href="query/lucene.html" title="Lucene Index"><span class="none"></span>Lucene Index</a>  </li>
@@ -190,6 +196,7 @@
     <li><a href="migration.html" title="Migration"><span class="none"></span>Migration</a>  </li>
     <li><a href="differences.html" title="Differences to Jackrabbit 2"><span class="none"></span>Differences to Jackrabbit 2</a>  </li>
     <li><a href="known_issues.html" title="Known Issues"><span class="none"></span>Known Issues</a>  </li>
+    <li><a href="constraints.html" title="Constraints"><span class="none"></span>Constraints</a>  </li>
     <li><a href="dos_and_donts.html" title="Dos and Don'ts"><span class="none"></span>Dos and Don'ts</a>  </li>
     <li><a href="coldstandby/coldstandby.html" title="Cold Standby"><span class="none"></span>Cold Standby</a>  </li>
     <li><a href="FAQ.html" title="FAQ"><span class="none"></span>FAQ</a>  </li>
@@ -198,6 +205,7 @@
     <li><a href="participating.html" title="Participating"><span class="none"></span>Participating</a>  </li>
     <li><a href="developing-with-git.html" title="Developing with Git"><span class="none"></span>Developing with Git</a>  </li>
     <li><a href="diagnostic-builds.html" title="Cutting diagnostic builds"><span class="none"></span>Cutting diagnostic builds</a>  </li>
+    <li><a href="branching.html" title="Branching off a new stable"><span class="none"></span>Branching off a new stable</a>  </li>
     <li><a href="attribution.html" title="Attribution"><span class="none"></span>Attribution</a>  </li>
     <li><a href="release-schedule.html" title="Release Schedule"><span class="none"></span>Release Schedule</a>  </li>
           <li class="nav-header">Links</li>
@@ -253,7 +261,7 @@
 <p>To list the checkpoints of a repository, use:</p>
 
 <div class="source">
-<div class="source"><pre class="prettyprint">java -mx4g -jar oak-run-*.jar checkpoint &lt;repository&gt;
+<div class="source"><pre class="prettyprint">java -mx4g -jar oak-run-*.jar checkpoints &lt;repository&gt;
 </pre></div></div>
 <p>When using the (default) Tar storage, the <tt>&lt;repository&gt;</tt> setting is the path to the directory that contains the segment (data*.tar) files.</p></div>
 <div class="section">
@@ -263,13 +271,13 @@
 <div class="source">
 <div class="source"><pre class="prettyprint">java -mx4g -jar oak-run-*.jar compact &lt;repository&gt;
 </pre></div></div>
-<p>It makes sense to find and remove the old checkpoints, using the <tt>checkpoint</tt> command described above.</p></div>
+<p>It makes sense to find and remove the old checkpoints, using the <tt>checkpoints</tt> command described above.</p></div>
 <div class="section">
 <h4><a name="Index_Management"></a>Index Management</h4>
 <p>The oak-run index operation is used to <a href="./query/index-management.html">manage indexes</a>.</p></div>
 <div class="section">
 <h4><a name="System_properties_supported_by_the_oak-run"></a>System properties supported by the oak-run</h4>
-<p>When performing operations on the SegmentNodeStore (eg. backup, checkpoint, compact), it&#x2019;s possible to tweak various system properties to get the optimal performance. These are:</p>
+<p>When performing operations on the SegmentNodeStore (eg. backup, checkpoints, compact), it&#x2019;s possible to tweak various system properties to get the optimal performance. These are:</p>
 
 <ul>
   
@@ -284,7 +292,7 @@
 <p>Example:</p>
 
 <div class="source">
-<div class="source"><pre class="prettyprint">java -Dtar.memoryMapped=true -mx4g -jar oak-run-*.jar checkpoint &lt;repository&gt;
+<div class="source"><pre class="prettyprint">java -Dtar.memoryMapped=true -mx4g -jar oak-run-*.jar checkpoints &lt;repository&gt;
 </pre></div></div></div>
 <div class="section">
 <h4><a name="Analyzing_Thread_Dumps"></a>Analyzing Thread Dumps</h4>
@@ -309,7 +317,7 @@ mongo --shell oak-mongo.js
     <footer>
       <div class="container-fluid">
         <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2017
+            <p>Copyright &copy;2012&#x2013;2018
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
 All rights reserved.</p>
         </div>