You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/01/26 10:59:54 UTC

svn commit: r1822271 [2/16] - in /jackrabbit/site/live/oak/docs: ./ architecture/ coldstandby/ features/ nodestore/ nodestore/document/ nodestore/segment/ oak-mongo-js/ oak-mongo-js/fonts/ oak-mongo-js/scripts/ oak-mongo-js/styles/ oak_api/ plugins/ qu...

Modified: jackrabbit/site/live/oak/docs/branching.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/branching.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/branching.html (original)
+++ jackrabbit/site/live/oak/docs/branching.html Fri Jan 26 10:59:53 2018
@@ -1,305 +1,311 @@
-<!DOCTYPE html>
-<!--
- | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-17 
- | 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 http-equiv="Content-Language" content="en" />
-    <title>Jackrabbit Oak &#x2013; Branching</title>
-    <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
-    <link rel="stylesheet" href="./css/site.css" />
-    <link rel="stylesheet" href="./css/print.css" media="print" />
-      <script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
-      </head>
-    <body class="topBarEnabled">
-                  <a href="https://github.com/apache/jackrabbit-oak">
-      <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
-        src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"
-        alt="Fork me on GitHub">
-    </a>
-      <div id="topbar" class="navbar navbar-fixed-top ">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-        <a data-target=".nav-collapse" data-toggle="collapse" class="btn btn-navbar">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </a>
-<a class="brand" href="./"  title="Oak logo"><img src="oak_logo.png" alt="Oak logo" />
-</a>
-            <ul class="nav">
-        <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Overview <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-            <li><a href="index.html" title="Jackrabbit Oak">Jackrabbit Oak</a></li>
-            <li><a href="license.html" title="License">License</a></li>
-            <li><a href="downloads.html" title="Downloads">Downloads</a></li>
-            <li><a href="articles.html" title="Articles">Articles</a></li>
-        </ul>
-      </li>
-        <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Concepts and Architecture <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-            <li><a href="architecture/overview.html" title="Overview">Overview</a></li>
-            <li><a href="architecture/nodestate.html" title="The Node State Model">The Node State Model</a></li>
-        </ul>
-      </li>
-        <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Main APIs <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-            <li><a href="http://www.day.com/specs/jcr/2.0/index.html" title="JCR API">JCR API</a></li>
-            <li><a href="oak_api/overview.html" title="Oak API">Oak API</a></li>
-        </ul>
-      </li>
-        <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Features and Plugins <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-            <li class="dropdown-submenu">
-<a href="nodestore/overview.html" title="Node Storage">Node Storage</a>
-              <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>
-            <li class="dropdown-submenu">
-<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/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>
-                  <li><a href="query/property-index.html" title="Property Index">Property Index</a></li>
-                  <li><a href="query/solr.html" title="Solr Index">Solr Index</a></li>
-              </ul>
-            </li>
-            <li><a href="security/overview.html" title="Security">Security</a></li>
-            <li><a href="features/atomic-counter.html" title="Atomic Counter">Atomic Counter</a></li>
-            <li><a href="features/observation.html" title="Observation">Observation</a></li>
-        </ul>
-      </li>
-        <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Using Oak <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-            <li><a href="use_getting_started.html" title="Getting Started">Getting Started</a></li>
-            <li><a href="construct.html" title="Repository Construction">Repository Construction</a></li>
-            <li><a href="osgi_config.html" title="Configuring Oak">Configuring Oak</a></li>
-            <li><a href="command_line.html" title="Command Line Tools">Command Line Tools</a></li>
-            <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="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>
-        </ul>
-      </li>
-        <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developing Oak <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-            <li><a href="dev_getting_started.html" title="Getting Started">Getting Started</a></li>
-            <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>
-      </li>
-        <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Links <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-            <li><a href="http://jackrabbit.apache.org/oak" title="Apache Jackrabbit Oak">Apache Jackrabbit Oak</a></li>
-            <li><a href="http://jackrabbit.apache.org/" title="Apache Jackrabbit">Apache Jackrabbit</a></li>
-        </ul>
-      </li>
-              </ul>
-            </div>
-        </div>
-      </div>
-    </div>
-    <div class="container-fluid">
-      <div id="banner">
-        <div class="pull-left"><div id="bannerLeft"><h2>Oak Documentation</h2>
-</div>
-</div>
-        <div class="pull-right"></div>
-        <div class="clear"><hr/></div>
-      </div>
-
-      <div id="breadcrumbs">
-        <ul class="breadcrumb">
-        <li id="publishDate">Last Published: 2018-01-17<span class="divider">|</span>
-</li>
-          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
-        </ul>
-      </div>
-      <div class="row-fluid">
-        <div id="leftColumn" class="span2">
-          <div class="well sidebar-nav">
-<ul class="nav nav-list">
-          <li class="nav-header">Overview</li>
-    <li><a href="index.html" title="Jackrabbit Oak"><span class="none"></span>Jackrabbit Oak</a>  </li>
-    <li><a href="license.html" title="License"><span class="none"></span>License</a>  </li>
-    <li><a href="downloads.html" title="Downloads"><span class="none"></span>Downloads</a>  </li>
-    <li><a href="articles.html" title="Articles"><span class="none"></span>Articles</a>  </li>
-          <li class="nav-header">Concepts and Architecture</li>
-    <li><a href="architecture/overview.html" title="Overview"><span class="none"></span>Overview</a>  </li>
-    <li><a href="architecture/nodestate.html" title="The Node State Model"><span class="none"></span>The Node State Model</a>  </li>
-          <li class="nav-header">Main APIs</li>
-    <li><a href="http://www.day.com/specs/jcr/2.0/index.html" class="externalLink" title="JCR API"><span class="none"></span>JCR API</a>  </li>
-    <li><a href="oak_api/overview.html" title="Oak API"><span class="none"></span>Oak API</a>  </li>
-          <li class="nav-header">Features and Plugins</li>
-    <li><a href="nodestore/overview.html" title="Node Storage"><span class="icon-chevron-down"></span>Node Storage</a>
-      <ul class="nav nav-list">
-    <li><a href="nodestore/documentmk.html" title="Document NodeStore"><span class="icon-chevron-down"></span>Document NodeStore</a>
-      <ul class="nav nav-list">
-    <li><a href="nodestore/document/node-bundling.html" title="Node Bundling"><span class="none"></span>Node Bundling</a>  </li>
-    <li><a href="nodestore/document/secondary-store.html" title="Secondary Store"><span class="none"></span>Secondary Store</a>  </li>
-    <li><a href="nodestore/persistent-cache.html" title="Persistent Cache"><span class="none"></span>Persistent Cache</a>  </li>
-    <li><a href="clustering.html" title="Clustering"><span class="none"></span>Clustering</a>  </li>
-      </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/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>
-    <li><a href="query/property-index.html" title="Property Index"><span class="none"></span>Property Index</a>  </li>
-    <li><a href="query/solr.html" title="Solr Index"><span class="none"></span>Solr Index</a>  </li>
-      </ul>
-  </li>
-    <li><a href="security/overview.html" title="Security"><span class="none"></span>Security</a>  </li>
-    <li><a href="features/atomic-counter.html" title="Atomic Counter"><span class="none"></span>Atomic Counter</a>  </li>
-    <li><a href="features/observation.html" title="Observation"><span class="none"></span>Observation</a>  </li>
-          <li class="nav-header">Using Oak</li>
-    <li><a href="use_getting_started.html" title="Getting Started"><span class="none"></span>Getting Started</a>  </li>
-    <li><a href="construct.html" title="Repository Construction"><span class="none"></span>Repository Construction</a>  </li>
-    <li><a href="osgi_config.html" title="Configuring Oak"><span class="none"></span>Configuring Oak</a>  </li>
-    <li><a href="command_line.html" title="Command Line Tools"><span class="none"></span>Command Line Tools</a>  </li>
-    <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="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>
-          <li class="nav-header">Developing Oak</li>
-    <li><a href="dev_getting_started.html" title="Getting Started"><span class="none"></span>Getting Started</a>  </li>
-    <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 class="active"><a href="#"><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>
-    <li><a href="http://jackrabbit.apache.org/oak" class="externalLink" title="Apache Jackrabbit Oak"><span class="none"></span>Apache Jackrabbit Oak</a>  </li>
-    <li><a href="http://jackrabbit.apache.org/" class="externalLink" title="Apache Jackrabbit"><span class="none"></span>Apache Jackrabbit</a>  </li>
-  </ul>
-          <hr />
-          <div id="poweredBy">
-          <script type="text/javascript">asyncJs( 'https://apis.google.com/js/plusone.js' )</script>
-        <div class="g-plusone" data-href="http://jackrabbit.apache.org/oak/docs/" data-size="tall" ></div>
-                  <div class="clear"></div>
-              <div class="clear"></div>
-              <div class="clear"></div>
-              <div class="clear"></div>
-  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
-              </div>
-          </div>
-        </div>
-        <div id="bodyColumn"  class="span10" >
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  --><h1>Branching</h1>
-<p>Following a quick reminder on how to do branching for a stable release.</p>
-<p>It&#x2019;s based on the 1.8 branching, fix the commands where needed. For details about each option please refer to the <a class="externalLink" href="http://maven.apache.org/maven-release/maven-release-plugin/branch-mojo.html">official documentation</a>.</p>
-<div class="section">
-<h2><a name="a1._Test_the_command_locally"></a>1. Test the command locally</h2>
-
-<div class="source">
-<div class="source"><pre class="prettyprint">$ mvn release:branch -DbranchName=1.8 \
-  -DbranchBase=https://svn.apache.org/repos/asf/jackrabbit/oak/branches \
-  -DupdateBranchVersions=true -DreleaseVersion=1.8.0-SNAPSHOT \
-  -DdryRun=true
-</pre></div></div>
-<p>You will be prompted for the next trunk version. In our example: <tt>1.10-SNAPSHOT</tt>.</p>
-<p>Check that the following files contains the right versions</p>
-
-<div class="source">
-<div class="source"><pre class="prettyprint">pom.xml.branch        # should be 1.8.0-SNAPSHOT
-pom.xml.next          # should be 1.10-SNAPSHOT
-pom.xml.releaseBackup # should be 1.8-SNAPSHOT
-</pre></div></div></div>
-<div class="section">
-<h2><a name="a2._Revert_the_local_changes"></a>2. Revert the local changes</h2>
-<p>You&#x2019;ll have a bunch of files locally that are not committed to svn. Just to have a clean situation clean up everything</p>
-
-<div class="source">
-<div class="source"><pre class="prettyprint">$ svn st | grep '^?' | awk '{print $2}' | xargs rm
-</pre></div></div></div>
-<div class="section">
-<h2><a name="a3._Actual_branching"></a>3. Actual branching</h2>
-<p>Re-execute the first command <b>without</b> the <tt>-DdryRun=true</tt></p>
-
-<div class="source">
-<div class="source"><pre class="prettyprint">$ mvn release:branch -DbranchName=1.8 \
-  -DbranchBase=https://svn.apache.org/repos/asf/jackrabbit/oak/branches \
-  -DupdateBranchVersions=true -DreleaseVersion=1.8.0-SNAPSHOT \
-</pre></div></div>
-<p>Now you can checkout the branch and proceed with the release as normal.</p></div>
-<div class="section">
-<h2><a name="a4._Final_Checks_and_leftovers"></a>4. Final Checks and leftovers</h2>
-<p><tt>release:branch</tt> will leave behind the <tt>oak-doc</tt>&#x2019;s pom. You&#x2019;ll have to manually update the version referring to the new <tt>oak-parent</tt>. See <a class="externalLink" href="http://svn.apache.org/r1820738">r1820738</a> for an example.</p></div>
-<div class="section">
-<h2><a name="References"></a>References</h2>
-
-<ul>
-  
-<li><a class="externalLink" href="http://maven.apache.org/maven-release/maven-release-plugin/branch-mojo.html">http://maven.apache.org/maven-release/maven-release-plugin/branch-mojo.html</a></li>
-  
-<li><a class="externalLink" href="http://maven.apache.org/maven-release/maven-release-plugin/examples/branch.html">http://maven.apache.org/maven-release/maven-release-plugin/examples/branch.html</a></li>
-  
-<li><a class="externalLink" href="http://jackrabbit.apache.org/jcr/creating-releases.html">http://jackrabbit.apache.org/jcr/creating-releases.html</a></li>
-</ul></div>
-        </div>
-      </div>
-    </div>
-    <hr/>
-    <footer>
-      <div class="container-fluid">
-        <div class="row-fluid">
-            <p>Copyright &copy;2012&#x2013;2018
-<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.</p>
-        </div>
-                          <div id="ohloh" class="pull-right">
-      <script type="text/javascript" src="https://www.ohloh.net/p/jackrabbit-oak/widgets/project_thin_badge.js"></script>
-    </div>
-        </div>
-    </footer>
-    </body>
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-25 
+ | 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="20180125" />
+    <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" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+      <script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
+      </head>
+    <body class="topBarEnabled">
+                  <a href="https://github.com/apache/jackrabbit-oak">
+      <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+        src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"
+        alt="Fork me on GitHub">
+    </a>
+      <div id="topbar" class="navbar navbar-fixed-top ">
+      <div class="navbar-inner">
+        <div class="container-fluid">
+        <a data-target=".nav-collapse" data-toggle="collapse" class="btn btn-navbar">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </a>
+<a class="brand" href="./"  title="Oak logo"><img src="oak_logo.png" alt="Oak logo" />
+</a>
+            <ul class="nav">
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Overview <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="index.html" title="Jackrabbit Oak">Jackrabbit Oak</a></li>
+            <li><a href="license.html" title="License">License</a></li>
+            <li><a href="downloads.html" title="Downloads">Downloads</a></li>
+            <li><a href="articles.html" title="Articles">Articles</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Concepts and Architecture <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="architecture/overview.html" title="Overview">Overview</a></li>
+            <li><a href="architecture/nodestate.html" title="The Node State Model">The Node State Model</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Main APIs <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="http://www.day.com/specs/jcr/2.0/index.html" title="JCR API">JCR API</a></li>
+            <li><a href="oak_api/overview.html" title="Oak API">Oak API</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Features and Plugins <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li class="dropdown-submenu">
+<a href="nodestore/overview.html" title="Node Storage">Node Storage</a>
+              <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>
+            <li class="dropdown-submenu">
+<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>
+                  <li><a href="query/property-index.html" title="Property Index">Property Index</a></li>
+                  <li><a href="query/solr.html" title="Solr Index">Solr Index</a></li>
+              </ul>
+            </li>
+            <li><a href="security/overview.html" title="Security">Security</a></li>
+            <li><a href="features/atomic-counter.html" title="Atomic Counter">Atomic Counter</a></li>
+            <li><a href="features/observation.html" title="Observation">Observation</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Using Oak <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="use_getting_started.html" title="Getting Started">Getting Started</a></li>
+            <li><a href="construct.html" title="Repository Construction">Repository Construction</a></li>
+            <li><a href="osgi_config.html" title="Configuring Oak">Configuring Oak</a></li>
+            <li><a href="command_line.html" title="Command Line Tools">Command Line Tools</a></li>
+            <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>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developing Oak <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="dev_getting_started.html" title="Getting Started">Getting Started</a></li>
+            <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>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Links <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="http://jackrabbit.apache.org/oak" title="Apache Jackrabbit Oak">Apache Jackrabbit Oak</a></li>
+            <li><a href="http://jackrabbit.apache.org/" title="Apache Jackrabbit">Apache Jackrabbit</a></li>
+        </ul>
+      </li>
+              </ul>
+            </div>
+        </div>
+      </div>
+    </div>
+    <div class="container-fluid">
+      <div id="banner">
+        <div class="pull-left"><div id="bannerLeft"><h2>Oak Documentation</h2>
+</div>
+</div>
+        <div class="pull-right"></div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+        <li id="publishDate">Last Published: 2018-01-25<span class="divider">|</span>
+</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
+        </ul>
+      </div>
+      <div class="row-fluid">
+        <div id="leftColumn" class="span2">
+          <div class="well sidebar-nav">
+<ul class="nav nav-list">
+          <li class="nav-header">Overview</li>
+    <li><a href="index.html" title="Jackrabbit Oak"><span class="none"></span>Jackrabbit Oak</a>  </li>
+    <li><a href="license.html" title="License"><span class="none"></span>License</a>  </li>
+    <li><a href="downloads.html" title="Downloads"><span class="none"></span>Downloads</a>  </li>
+    <li><a href="articles.html" title="Articles"><span class="none"></span>Articles</a>  </li>
+          <li class="nav-header">Concepts and Architecture</li>
+    <li><a href="architecture/overview.html" title="Overview"><span class="none"></span>Overview</a>  </li>
+    <li><a href="architecture/nodestate.html" title="The Node State Model"><span class="none"></span>The Node State Model</a>  </li>
+          <li class="nav-header">Main APIs</li>
+    <li><a href="http://www.day.com/specs/jcr/2.0/index.html" class="externalLink" title="JCR API"><span class="none"></span>JCR API</a>  </li>
+    <li><a href="oak_api/overview.html" title="Oak API"><span class="none"></span>Oak API</a>  </li>
+          <li class="nav-header">Features and Plugins</li>
+    <li><a href="nodestore/overview.html" title="Node Storage"><span class="icon-chevron-down"></span>Node Storage</a>
+      <ul class="nav nav-list">
+    <li><a href="nodestore/documentmk.html" title="Document NodeStore"><span class="icon-chevron-down"></span>Document NodeStore</a>
+      <ul class="nav nav-list">
+    <li><a href="nodestore/document/node-bundling.html" title="Node Bundling"><span class="none"></span>Node Bundling</a>  </li>
+    <li><a href="nodestore/document/secondary-store.html" title="Secondary Store"><span class="none"></span>Secondary Store</a>  </li>
+    <li><a href="nodestore/persistent-cache.html" title="Persistent Cache"><span class="none"></span>Persistent Cache</a>  </li>
+    <li><a href="clustering.html" title="Clustering"><span class="none"></span>Clustering</a>  </li>
+      </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>
+    <li><a href="query/property-index.html" title="Property Index"><span class="none"></span>Property Index</a>  </li>
+    <li><a href="query/solr.html" title="Solr Index"><span class="none"></span>Solr Index</a>  </li>
+      </ul>
+  </li>
+    <li><a href="security/overview.html" title="Security"><span class="none"></span>Security</a>  </li>
+    <li><a href="features/atomic-counter.html" title="Atomic Counter"><span class="none"></span>Atomic Counter</a>  </li>
+    <li><a href="features/observation.html" title="Observation"><span class="none"></span>Observation</a>  </li>
+          <li class="nav-header">Using Oak</li>
+    <li><a href="use_getting_started.html" title="Getting Started"><span class="none"></span>Getting Started</a>  </li>
+    <li><a href="construct.html" title="Repository Construction"><span class="none"></span>Repository Construction</a>  </li>
+    <li><a href="osgi_config.html" title="Configuring Oak"><span class="none"></span>Configuring Oak</a>  </li>
+    <li><a href="command_line.html" title="Command Line Tools"><span class="none"></span>Command Line Tools</a>  </li>
+    <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>
+          <li class="nav-header">Developing Oak</li>
+    <li><a href="dev_getting_started.html" title="Getting Started"><span class="none"></span>Getting Started</a>  </li>
+    <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 class="active"><a href="#"><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>
+    <li><a href="http://jackrabbit.apache.org/oak" class="externalLink" title="Apache Jackrabbit Oak"><span class="none"></span>Apache Jackrabbit Oak</a>  </li>
+    <li><a href="http://jackrabbit.apache.org/" class="externalLink" title="Apache Jackrabbit"><span class="none"></span>Apache Jackrabbit</a>  </li>
+  </ul>
+          <hr />
+          <div id="poweredBy">
+          <script type="text/javascript">asyncJs( 'https://apis.google.com/js/plusone.js' )</script>
+        <div class="g-plusone" data-href="http://jackrabbit.apache.org/oak/docs/" data-size="tall" ></div>
+                  <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
+  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
+              </div>
+          </div>
+        </div>
+        <div id="bodyColumn"  class="span10" >
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  --><h1>Branching</h1>
+<p>Following a quick reminder on how to do branching for a stable release.</p>
+<p>It&#x2019;s based on the 1.8 branching, fix the commands where needed. For details about each option please refer to the <a class="externalLink" href="http://maven.apache.org/maven-release/maven-release-plugin/branch-mojo.html">official documentation</a>.</p>
+<div class="section">
+<h2><a name="a1._Test_the_command_locally"></a>1. Test the command locally</h2>
+
+<div class="source">
+<div class="source"><pre class="prettyprint">$ mvn release:branch -DbranchName=1.8 \
+  -DbranchBase=https://svn.apache.org/repos/asf/jackrabbit/oak/branches \
+  -DupdateBranchVersions=true -DreleaseVersion=1.8.0-SNAPSHOT \
+  -DdryRun=true
+</pre></div></div>
+<p>You will be prompted for the next trunk version. In our example: <tt>1.10-SNAPSHOT</tt>.</p>
+<p>Check that the following files contains the right versions</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint">pom.xml.branch        # should be 1.8.0-SNAPSHOT
+pom.xml.next          # should be 1.10-SNAPSHOT
+pom.xml.releaseBackup # should be 1.8-SNAPSHOT
+</pre></div></div></div>
+<div class="section">
+<h2><a name="a2._Revert_the_local_changes"></a>2. Revert the local changes</h2>
+<p>You&#x2019;ll have a bunch of files locally that are not committed to svn. Just to have a clean situation clean up everything</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint">$ svn st | grep '^?' | awk '{print $2}' | xargs rm
+</pre></div></div></div>
+<div class="section">
+<h2><a name="a3._Actual_branching"></a>3. Actual branching</h2>
+<p>Re-execute the first command <b>without</b> the <tt>-DdryRun=true</tt></p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint">$ mvn release:branch -DbranchName=1.8 \
+  -DbranchBase=https://svn.apache.org/repos/asf/jackrabbit/oak/branches \
+  -DupdateBranchVersions=true -DreleaseVersion=1.8.0-SNAPSHOT \
+</pre></div></div>
+<p>Now you can checkout the branch and proceed with the release as normal.</p></div>
+<div class="section">
+<h2><a name="a4._Final_Checks_and_leftovers"></a>4. Final Checks and leftovers</h2>
+<p><tt>release:branch</tt> will leave behind the <tt>oak-doc</tt>&#x2019;s pom. You&#x2019;ll have to manually update the version referring to the new <tt>oak-parent</tt>. See <a class="externalLink" href="http://svn.apache.org/r1820738">r1820738</a> for an example.</p></div>
+<div class="section">
+<h2><a name="References"></a>References</h2>
+
+<ul>
+  
+<li><a class="externalLink" href="http://maven.apache.org/maven-release/maven-release-plugin/branch-mojo.html">http://maven.apache.org/maven-release/maven-release-plugin/branch-mojo.html</a></li>
+  
+<li><a class="externalLink" href="http://maven.apache.org/maven-release/maven-release-plugin/examples/branch.html">http://maven.apache.org/maven-release/maven-release-plugin/examples/branch.html</a></li>
+  
+<li><a class="externalLink" href="http://jackrabbit.apache.org/jcr/creating-releases.html">http://jackrabbit.apache.org/jcr/creating-releases.html</a></li>
+</ul></div>
+        </div>
+      </div>
+    </div>
+    <hr/>
+    <footer>
+      <div class="container-fluid">
+        <div class="row-fluid">
+            <p>Copyright &copy;2012&#x2013;2018
+<a href="https://www.apache.org/">The Apache Software Foundation</a>.
+All rights reserved.</p>
+        </div>
+                          <div id="ohloh" class="pull-right">
+      <script type="text/javascript" src="https://www.ohloh.net/p/jackrabbit-oak/widgets/project_thin_badge.js"></script>
+    </div>
+        </div>
+    </footer>
+    </body>
 </html>
\ No newline at end of file

Modified: jackrabbit/site/live/oak/docs/clustering.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/clustering.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/clustering.html (original)
+++ jackrabbit/site/live/oak/docs/clustering.html Fri Jan 26 10:59:53 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-01-25 
  | 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="20180125" />
     <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>
@@ -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-01-25<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>
@@ -243,7 +253,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/coldstandby.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/coldstandby/coldstandby.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/coldstandby/coldstandby.html (original)
+++ jackrabbit/site/live/oak/docs/coldstandby/coldstandby.html Fri Jan 26 10:59:53 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-01-25 
  | 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="20180125" />
     <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-01-25<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>
@@ -361,7 +371,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/command_line.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/command_line.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/command_line.html (original)
+++ jackrabbit/site/live/oak/docs/command_line.html Fri Jan 26 10:59:53 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-01-25 
  | 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="20180125" />
     <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-01-25<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>
@@ -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>

Added: jackrabbit/site/live/oak/docs/constraints.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/constraints.html?rev=1822271&view=auto
==============================================================================
--- jackrabbit/site/live/oak/docs/constraints.html (added)
+++ jackrabbit/site/live/oak/docs/constraints.html Fri Jan 26 10:59:53 2018
@@ -0,0 +1,287 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2018-01-26 
+ | 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="20180126" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>Jackrabbit Oak &#x2013; Constraints</title>
+    <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+      <script type="text/javascript" src="./js/apache-maven-fluido-1.6.min.js"></script>
+      </head>
+    <body class="topBarEnabled">
+                  <a href="https://github.com/apache/jackrabbit-oak">
+      <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+        src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"
+        alt="Fork me on GitHub">
+    </a>
+      <div id="topbar" class="navbar navbar-fixed-top ">
+      <div class="navbar-inner">
+        <div class="container-fluid">
+        <a data-target=".nav-collapse" data-toggle="collapse" class="btn btn-navbar">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </a>
+<a class="brand" href="./"  title="Oak logo"><img src="oak_logo.png" alt="Oak logo" />
+</a>
+            <ul class="nav">
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Overview <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="index.html" title="Jackrabbit Oak">Jackrabbit Oak</a></li>
+            <li><a href="license.html" title="License">License</a></li>
+            <li><a href="downloads.html" title="Downloads">Downloads</a></li>
+            <li><a href="articles.html" title="Articles">Articles</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Concepts and Architecture <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="architecture/overview.html" title="Overview">Overview</a></li>
+            <li><a href="architecture/nodestate.html" title="The Node State Model">The Node State Model</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Main APIs <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="http://www.day.com/specs/jcr/2.0/index.html" title="JCR API">JCR API</a></li>
+            <li><a href="oak_api/overview.html" title="Oak API">Oak API</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Features and Plugins <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li class="dropdown-submenu">
+<a href="nodestore/overview.html" title="Node Storage">Node Storage</a>
+              <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>
+            <li class="dropdown-submenu">
+<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>
+                  <li><a href="query/property-index.html" title="Property Index">Property Index</a></li>
+                  <li><a href="query/solr.html" title="Solr Index">Solr Index</a></li>
+              </ul>
+            </li>
+            <li><a href="security/overview.html" title="Security">Security</a></li>
+            <li><a href="features/atomic-counter.html" title="Atomic Counter">Atomic Counter</a></li>
+            <li><a href="features/observation.html" title="Observation">Observation</a></li>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Using Oak <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="use_getting_started.html" title="Getting Started">Getting Started</a></li>
+            <li><a href="construct.html" title="Repository Construction">Repository Construction</a></li>
+            <li><a href="osgi_config.html" title="Configuring Oak">Configuring Oak</a></li>
+            <li><a href="command_line.html" title="Command Line Tools">Command Line Tools</a></li>
+            <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>
+        </ul>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developing Oak <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="dev_getting_started.html" title="Getting Started">Getting Started</a></li>
+            <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>
+      </li>
+        <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Links <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="http://jackrabbit.apache.org/oak" title="Apache Jackrabbit Oak">Apache Jackrabbit Oak</a></li>
+            <li><a href="http://jackrabbit.apache.org/" title="Apache Jackrabbit">Apache Jackrabbit</a></li>
+        </ul>
+      </li>
+              </ul>
+            </div>
+        </div>
+      </div>
+    </div>
+    <div class="container-fluid">
+      <div id="banner">
+        <div class="pull-left"><div id="bannerLeft"><h2>Oak Documentation</h2>
+</div>
+</div>
+        <div class="pull-right"></div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+        <li id="publishDate">Last Published: 2018-01-26<span class="divider">|</span>
+</li>
+          <li id="projectVersion">Version: 1.10-SNAPSHOT</li>
+        </ul>
+      </div>
+      <div class="row-fluid">
+        <div id="leftColumn" class="span2">
+          <div class="well sidebar-nav">
+<ul class="nav nav-list">
+          <li class="nav-header">Overview</li>
+    <li><a href="index.html" title="Jackrabbit Oak"><span class="none"></span>Jackrabbit Oak</a>  </li>
+    <li><a href="license.html" title="License"><span class="none"></span>License</a>  </li>
+    <li><a href="downloads.html" title="Downloads"><span class="none"></span>Downloads</a>  </li>
+    <li><a href="articles.html" title="Articles"><span class="none"></span>Articles</a>  </li>
+          <li class="nav-header">Concepts and Architecture</li>
+    <li><a href="architecture/overview.html" title="Overview"><span class="none"></span>Overview</a>  </li>
+    <li><a href="architecture/nodestate.html" title="The Node State Model"><span class="none"></span>The Node State Model</a>  </li>
+          <li class="nav-header">Main APIs</li>
+    <li><a href="http://www.day.com/specs/jcr/2.0/index.html" class="externalLink" title="JCR API"><span class="none"></span>JCR API</a>  </li>
+    <li><a href="oak_api/overview.html" title="Oak API"><span class="none"></span>Oak API</a>  </li>
+          <li class="nav-header">Features and Plugins</li>
+    <li><a href="nodestore/overview.html" title="Node Storage"><span class="icon-chevron-down"></span>Node Storage</a>
+      <ul class="nav nav-list">
+    <li><a href="nodestore/documentmk.html" title="Document NodeStore"><span class="icon-chevron-down"></span>Document NodeStore</a>
+      <ul class="nav nav-list">
+    <li><a href="nodestore/document/node-bundling.html" title="Node Bundling"><span class="none"></span>Node Bundling</a>  </li>
+    <li><a href="nodestore/document/secondary-store.html" title="Secondary Store"><span class="none"></span>Secondary Store</a>  </li>
+    <li><a href="nodestore/persistent-cache.html" title="Persistent Cache"><span class="none"></span>Persistent Cache</a>  </li>
+    <li><a href="clustering.html" title="Clustering"><span class="none"></span>Clustering</a>  </li>
+      </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>
+    <li><a href="query/property-index.html" title="Property Index"><span class="none"></span>Property Index</a>  </li>
+    <li><a href="query/solr.html" title="Solr Index"><span class="none"></span>Solr Index</a>  </li>
+      </ul>
+  </li>
+    <li><a href="security/overview.html" title="Security"><span class="none"></span>Security</a>  </li>
+    <li><a href="features/atomic-counter.html" title="Atomic Counter"><span class="none"></span>Atomic Counter</a>  </li>
+    <li><a href="features/observation.html" title="Observation"><span class="none"></span>Observation</a>  </li>
+          <li class="nav-header">Using Oak</li>
+    <li><a href="use_getting_started.html" title="Getting Started"><span class="none"></span>Getting Started</a>  </li>
+    <li><a href="construct.html" title="Repository Construction"><span class="none"></span>Repository Construction</a>  </li>
+    <li><a href="osgi_config.html" title="Configuring Oak"><span class="none"></span>Configuring Oak</a>  </li>
+    <li><a href="command_line.html" title="Command Line Tools"><span class="none"></span>Command Line Tools</a>  </li>
+    <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 class="active"><a href="#"><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>
+          <li class="nav-header">Developing Oak</li>
+    <li><a href="dev_getting_started.html" title="Getting Started"><span class="none"></span>Getting Started</a>  </li>
+    <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>
+    <li><a href="http://jackrabbit.apache.org/oak" class="externalLink" title="Apache Jackrabbit Oak"><span class="none"></span>Apache Jackrabbit Oak</a>  </li>
+    <li><a href="http://jackrabbit.apache.org/" class="externalLink" title="Apache Jackrabbit"><span class="none"></span>Apache Jackrabbit</a>  </li>
+  </ul>
+          <hr />
+          <div id="poweredBy">
+          <script type="text/javascript">asyncJs( 'https://apis.google.com/js/plusone.js' )</script>
+        <div class="g-plusone" data-href="http://jackrabbit.apache.org/oak/docs/" data-size="tall" ></div>
+                  <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
+  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
+              </div>
+          </div>
+        </div>
+        <div id="bodyColumn"  class="span10" >
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  --><h1>Constraints</h1>
+<div class="section">
+<h2><a name="Item_Names"></a>Item Names</h2>
+<p>The JCR specification already restricts what can go into the &#x201c;local&#x201d; part of an item name - see <a class="externalLink" href="https://docs.adobe.com/docs/en/spec/jcr/2.0/3_Repository_Model.html#3.2%20Names">JCR v2.0 Specification, Section 3.2</a>. In particular:</p>
+
+<ul>
+  
+<li>Characters not allowed in XML are forbidden in names as well; this affects  most control characters plus unpaired surrogates; see <a class="externalLink" href="https://www.w3.org/TR/xml/#NT-Char">Extensible Markup  Language (XML) 1.0 (Fifth Edition), Section 2.2</a>.</li>
+  
+<li>Furthermore, the names <tt>.</tt> and <tt>..</tt> can not be used.</li>
+  
+<li>Finally, the characters <tt>/</tt>, <tt>:</tt>, <tt>[</tt>, <tt>]</tt>, <tt>|</tt>, and <tt>*</tt> are forbidden. For these, the <a class="externalLink" href="https://docs.adobe.com/docs/en/spec/jcr/2.0/3_Repository_Model.html#3.2.5.4%20Exposing%20Non-JCR%20Names">JCR v2.0 Specification, Section 3.2.5.4</a> proposes a mapping to &#x201c;private-use&#x201d; code points.</li>
+</ul>
+<p>On top of that, Oak implements several <i>additional</i> restrictions (as per <a class="externalLink" href="https://docs.adobe.com/content/docs/en/spec/jcr/2.0/3_Repository_Model.html#3.2.4%20Naming%20Restrictions">JCR v2.0 Specification, Section 3.2.4</a>):</p>
+
+<ul>
+  
+<li>The space character (U+0020) is disallowed at the beginning and the end of a (local) name (see <a class="externalLink" href="https://docs.adobe.com/content/docs/en/spec/jcr/2.0/5_Reading.html#5.2.2.1%20Name%20Patterns">JCR v2.0 Specification, Section 5.2.2.1</a> for motivation).</li>
+  
+<li>Other <a class="externalLink" href="https://docs.oracle.com/javase/8/docs/api/java/lang/Character.html#isWhitespace-char-">Whitespace characters</a> are disallowed (but see <a class="externalLink" href="https://issues.apache.org/jira/browse/OAK-4857">OAK-4857</a>).</li>
+</ul>
+<p>Finally, the chosen persistence implementation might restrict node names even further, for instance:</p>
+
+<ul>
+  
+<li>in the &#x201c;Document NodeStore&#x201d;, the UTF-8 representation of local names can not exceed ~150 bytes.</li>
+</ul></div>
+        </div>
+      </div>
+    </div>
+    <hr/>
+    <footer>
+      <div class="container-fluid">
+        <div class="row-fluid">
+            <p>Copyright &copy;2012&#x2013;2018
+<a href="https://www.apache.org/">The Apache Software Foundation</a>.
+All rights reserved.</p>
+        </div>
+                          <div id="ohloh" class="pull-right">
+      <script type="text/javascript" src="https://www.ohloh.net/p/jackrabbit-oak/widgets/project_thin_badge.js"></script>
+    </div>
+        </div>
+    </footer>
+    </body>
+</html>
\ No newline at end of file

Modified: jackrabbit/site/live/oak/docs/construct.html
URL: http://svn.apache.org/viewvc/jackrabbit/site/live/oak/docs/construct.html?rev=1822271&r1=1822270&r2=1822271&view=diff
==============================================================================
--- jackrabbit/site/live/oak/docs/construct.html (original)
+++ jackrabbit/site/live/oak/docs/construct.html Fri Jan 26 10:59:53 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-01-25 
  | 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="20180125" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Jackrabbit Oak &#x2013; Repository Construction</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-01-25<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>
@@ -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>
@@ -286,7 +296,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>