You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bu...@apache.org on 2015/09/18 21:04:40 UTC

svn commit: r965934 [1/2] - in /websites/staging/directory/trunk/content: ./ api/user-guide/

Author: buildbot
Date: Fri Sep 18 19:04:38 2015
New Revision: 965934

Log:
Staging update by buildbot for directory

Added:
    websites/staging/directory/trunk/content/api/user-guide/4.1.1-schema-objects.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.1.1-attribute-types.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.1.2-object-classes.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.1.3-syntaxes.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.1.4-matching-rules.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.1.5-dit-content-rules.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.1.6-dit-structure-rules.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.1.7-matching-rule-uses.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.1.8-name-forms.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.1.9-apacheds-schema-elements.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.2-registries.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.3-schema-loader.html
Removed:
    websites/staging/directory/trunk/content/api/user-guide/4.1.2-schema-object.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.2.1-attribute-types.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.2.2-object-classes.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.2.3-syntaxes.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.2.4-matching-rules.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.2.5-dit-content-rules.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.2.6-dit-structure-rules.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.2.7-matching-rule-uses.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.2.8-name-forms.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.2.9-apacheds-schema-elements.mdtextt
    websites/staging/directory/trunk/content/api/user-guide/4.1.3-registries.html
    websites/staging/directory/trunk/content/api/user-guide/4.1.4-schema-loader.html
Modified:
    websites/staging/directory/trunk/content/   (props changed)
    websites/staging/directory/trunk/content/api/user-guide/4-schema-management.html
    websites/staging/directory/trunk/content/api/user-guide/4.1-schema-manager.html

Propchange: websites/staging/directory/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Sep 18 19:04:38 2015
@@ -1 +1 @@
-1703389
+1703910

Modified: websites/staging/directory/trunk/content/api/user-guide/4-schema-management.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4-schema-management.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4-schema-management.html Fri Sep 18 19:04:38 2015
@@ -189,22 +189,23 @@ h2:hover > .headerlink, h3:hover > .head
 <p>A LDAP Schema is a complex combinaison of many schema elements. We will define here what are those schema elements, and how we organize them. Last, not least, we will explain how to leverage the schema on the client side.</p>
 <h2 id="contents">Contents<a class="headerlink" href="#contents" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="4.1-schema-manager.html">SchemaManager</a></li>
-<li><a href="4.1.1-schema-manager-introduction.html">Introduction</a></li>
-<li><a href="4.1.2-schema-object.html">SchemaObject</a><ul>
-<li><a href="4.1.2.1-attribute-types.html">AttributeTypes</a></li>
-<li><a href="4.1.2.2-object-classes.html">ObjectClasses</a></li>
-<li><a href="4.1.2.3-syntaxes.html">Syntaxes</a></li>
-<li><a href="4.1.2.4-matching-rules.html">MatchingRules</a></li>
-<li><a href="4.1.2.5-dit-content-rules.html">DITContentRules</a></li>
-<li><a href="4.1.2.6-dit-structure-rules.html">DITStructureRules</a></li>
-<li><a href="4.1.2.7-matching-rule-uses.html">MatchingRuleUses</a></li>
-<li><a href="4.1.2.8-name-forms.html">NameForms</a></li>
-<li><a href="4.1.2.9-apacheds-schema-elements.html">ApacheDS Schema Elements</a></li>
+<li><a href="4.1-schema-manager.html">SchemaManager</a><ul>
+<li><a href="4.1.1-schema-objects.html">SchemaObjects</a><ul>
+<li><a href="4.1.1.1-attribute-types.html">AttributeTypes</a></li>
+<li><a href="4.1.1.2-object-classes.html">ObjectClasses</a></li>
+<li><a href="4.1.1.3-syntaxes.html">Syntaxes</a></li>
+<li><a href="4.1.1.4-matching-rules.html">MatchingRules</a></li>
+<li><a href="4.1.1.5-dit-content-rules.html">DITContentRules</a></li>
+<li><a href="4.1.1.6-dit-structure-rules.html">DITStructureRules</a></li>
+<li><a href="4.1.1.7-matching-rule-uses.html">MatchingRuleUses</a></li>
+<li><a href="4.1.1.8-name-forms.html">NameForms</a></li>
+<li><a href="4.1.1.9-apacheds-schema-elements.html">ApacheDS Schema Elements</a></li>
+</ul>
+</li>
+<li><a href="4.1.2-registries.html">Registries</a></li>
+<li><a href="4.1.3-schema-loader.html">SchemaLoader</a></li>
 </ul>
 </li>
-<li><a href="4.1.3-registries.html">Registries</a></li>
-<li><a href="4.1.4-schema-loader.html">SchemaLoader</a></li>
 </ul>
 
 

Modified: websites/staging/directory/trunk/content/api/user-guide/4.1-schema-manager.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.1-schema-manager.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.1-schema-manager.html Fri Sep 18 19:04:38 2015
@@ -166,7 +166,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="4.1.1-schema-manager-introduction..html">4.1.1 - Introduction</a>
+            <a href="5-ldap-security.html">5 - LDAP Security</a>
 		
         </div>
         <div class="clearfix"></div>
@@ -188,19 +188,36 @@ h2:hover > .headerlink, h3:hover > .head
 <p>The API and the ApacheDS server have to keep the schema elements available. This is done through what we call the <strong>SchemaManager</strong>. It hides all the internal structure from the users.</p>
 <h2 id="contents">Contents<a class="headerlink" href="#contents" title="Permanent link">&para;</a></h2>
 <ul>
-<li><a href="4.1.1-schema-manager-introduction.html">Introduction</a></li>
-<li><a href="4.1.2-schema-object.html">SchemaObject</a></li>
-<li><a href="4.1.2.1-attribute-types.html">AttributeTypes</a></li>
-<li><a href="4.1.2.2-object-classes.html">ObjectClasses</a></li>
-<li><a href="4.1.2.3-syntaxes.html">Syntaxes</a></li>
-<li><a href="4.1.2.4-matching-rules.html">MatchingRules</a></li>
-<li><a href="4.1.2.5-dit-content-rules.html">DITContentRules</a></li>
-<li><a href="4.1.2.6-dit-structure-rules.html">DITStructureRules</a></li>
-<li><a href="4.1.2.7-matching-rule-uses.html">MatchingRuleUses</a></li>
-<li><a href="4.1.2.8-name-forms.html">NameForms</a></li>
-<li><a href="4.1.2.9-apacheds-schema-elements.html">ApacheDS Schema Elements</a></li>
-<li><a href="4.1.3-registries.html">Registries</a></li>
-<li><a href="4.1.4-schema-loader.html">SchemaLoader</a></li>
+<li><a href="4.1.1-schema-objects.html">SchemaObjects</a><ul>
+<li><a href="4.1.1.1-attribute-types.html">AttributeTypes</a></li>
+<li><a href="4.1.1.2-object-classes.html">ObjectClasses</a></li>
+<li><a href="4.1.1.3-syntaxes.html">Syntaxes</a></li>
+<li><a href="4.1.1.4-matching-rules.html">MatchingRules</a></li>
+<li><a href="4.1.1.5-dit-content-rules.html">DITContentRules</a></li>
+<li><a href="4.1.1.6-dit-structure-rules.html">DITStructureRules</a></li>
+<li><a href="4.1.1.7-matching-rule-uses.html">MatchingRuleUses</a></li>
+<li><a href="4.1.1.8-name-forms.html">NameForms</a></li>
+<li><a href="4.1.1.9-apacheds-schema-elements.html">ApacheDS Schema Elements</a></li>
+</ul>
+</li>
+<li><a href="4.1.2-registries.html">Registries</a></li>
+<li><a href="4.1.43-schema-loader.html">SchemaLoader</a></li>
+</ul>
+<h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">&para;</a></h2>
+<p>The <strong>SchemaManager</strong> stores all the Schema elements (<strong><a href="">AttributeTypes (e)</a></strong>, <strong><a href="">ObjectClasses (e)</a></strong>, ... Internally, we store those elements into what we call the <strong>Registries</strong>, which are hives where each Schema Objects are stored. Each schema element has a dedicated <strong>Registry</strong>. Think of it as a Map which returns a reference to a specific Schema Element when you know it's name or its OID.</p>
+<div class="codehilite"><pre><span class="n">Note</span> <span class="o">:</span> <span class="k">each</span> <span class="n">Schema</span> <span class="n">Element</span> <span class="k">is</span> <span class="n">properly</span> <span class="n">defined</span> <span class="n">by</span> <span class="n">one</span> <span class="n">of</span> <span class="n">its</span> <span class="n">names</span> <span class="n">or</span> <span class="n">its</span> <span class="n">OID</span><span class="o">.</span> <span class="n">The</span> <span class="n">OID</span> <span class="k">is</span> <span class="n">unique</span> <span class="n">across</span> <span class="n">all</span> <span class="n">the</span> <span class="n">schema</span> <span class="n">elements</span><span class="o">,</span>
+<span class="n">when</span> <span class="n">the</span> <span class="n">name</span> <span class="n">can</span> <span class="n">be</span> <span class="n">used</span> <span class="k">in</span> <span class="n">different</span> <span class="n">schema</span> <span class="n">element</span> <span class="o">(</span><span class="k">for</span> <span class="n">instance</span><span class="o">,</span> <span class="n">the</span> <span class="o">**</span><span class="n">audio</span><span class="o">**</span> <span class="n">AttributeType</span> <span class="n">or</span> <span class="n">ObjectClass</span><span class="o">)</span>
+</pre></div>
+
+
+<p>From the user point of view, the <strong>SchemaManager</strong> is seen as a representation of the available LDAP schema elements. It can of course be extended, or modified, by adding or removing some schema elements. For historic reasons, the schema elements are gathered into what we call a <strong>schema</strong>. Usually, this is what you load into a <strong>schemaManager</strong></p>
+<p>The server has one instance of a <strong>SchemaManager</strong>, which is used internally, and a user won't control it, in any case. On the client side, we can load a <strong>SchemaManager</strong> either from the server (and then we have a duplicated instance), or from existing schema files. We can even create a brand new <strong>SchemaManager</strong> and fill it with all what we need.</p>
+<h2 id="the-various-pieces-of-the-puzzle">The various pieces of the puzzle...<a class="headerlink" href="#the-various-pieces-of-the-puzzle" title="Permanent link">&para;</a></h2>
+<p>Creating a <strong>SchemaManager</strong> results in a complex structure to be created, and involves a lot of other helper class to be used. We will separate the description in three groups :</p>
+<ul>
+<li>The elements stored in the <strong>SchemaManager</strong></li>
+<li>The containers in which those <strong>SchemaObject</strong> instances are stored, called <strong>Registries</strong></li>
+<li>The classes used to initialize the <strong>SchemaManager</strong>, called the <strong>SchemaLoader</strong> (whch comes in various flavors)</li>
 </ul>
 <h2 id="getting-a-schemamanager">Getting a SchemaManager<a class="headerlink" href="#getting-a-schemamanager" title="Permanent link">&para;</a></h2>
 <p>The very first thing when you want to have access to the schema elements is to access to the <strong>SchemaManager</strong>. This can be done in many ways :</p>
@@ -228,7 +245,7 @@ h2:hover > .headerlink, h3:hover > .head
         </div>
         <div class="nav_next">
         
-            <a href="4.1.1-schema-manager-introduction..html">4.1.1 - Introduction</a>
+            <a href="5-ldap-security.html">5 - LDAP Security</a>
 		
         </div>
         <div class="clearfix"></div>

Added: websites/staging/directory/trunk/content/api/user-guide/4.1.1-schema-objects.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.1.1-schema-objects.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/4.1.1-schema-objects.html Fri Sep 18 19:04:38 2015
@@ -0,0 +1,316 @@
+<!DOCTYPE html>
+<!--
+    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.
+-->
+<html>
+	<head>
+		<title>4.1.1 - Schema Objects &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../../images/api-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Main
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>LDAP API</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../mavibot">
+                        
+                        Mavibot
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../escimo">
+                        
+                        eSCIMo
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../fortress">
+                        
+                        Fortress
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../kerby">
+                        
+                        Kerby
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <!--ul>
+      <li>
+        <a href="http://bit.ly/1n9YlQT" target="_blank">
+          <img src="./../../images/ApacheConBudapest.png" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0" style="margin-bottom:-3px;"/>
+        </a>
+      </li>
+    </ul-->
+    <h5>LDAP API 1.0</h5>
+    <ul>
+        <li><a href="./../../api/">Home</a></li>
+        <li><a href="./../../api/news.html">News</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M31</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1-schema-manager.html">4.1 - Schema Manager</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1-schema-manager.html">4.1 - Schema Manager</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.2-registries.html">4.1.2 - Registries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="412-schema-objects">4.1.2 - Schema Objects<a class="headerlink" href="#412-schema-objects" title="Permanent link">&para;</a></h1>
+<h2 id="content">Content<a class="headerlink" href="#content" title="Permanent link">&para;</a></h2>
+<ul>
+<li><a href="4.1.1.1-attribute-types.html">AttributeTypes</a></li>
+<li><a href="4.1.1.2-object-classes.html">ObjectClasses</a></li>
+<li><a href="4.1.1.3-syntaxes.html">Syntaxes</a></li>
+<li><a href="4.1.1.4-matching-rules.html">MatchingRules</a></li>
+<li><a href="4.1.1.5-dit-content-rules.html">DITContentRules</a></li>
+<li><a href="4.1.1.6-dit-structure-rules.html">DITStructureRules</a></li>
+<li><a href="4.1.1.7-matching-rule-uses.html">MatchingRuleUses</a></li>
+<li><a href="4.1.1.8-name-forms.html">NameForms</a></li>
+<li><a href="4.1.1.9-apacheds-schema-elements.html">ApacheDS Schema Elements</a></li>
+</ul>
+<h1 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">&para;</a></h1>
+<p>LDAP defines 8 different Schema Objects, that are used to define what we can store in a LDAP server, how what we store is organized, and which constraints are applied on those elements.</p>
+<p>In the API, we also define 3 other <strong>SchemaObjects</strong>, which are necessary to control the values and to compare them. They are hard coded, and can be extended if needed.</p>
+<h2 id="the-schema-object-list">The Schema Object list<a class="headerlink" href="#the-schema-object-list" title="Permanent link">&para;</a></h2>
+<p>Here are the 8 LDAP <strong>SchemaObject</strong>s and the 3 additional ones :</p>
+<table class="table">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><strong><a href="4.8-object-classes.html">ObjectClasses (e)</a></strong></td>
+<td>Defines the permitted <strong>AttributeType</strong>s of an entry</td>
+</tr>
+<tr>
+<td><strong><a href="4.2-attribute-types.html">AttributeTypes (...)</a></strong></td>
+<td>Defines the type of attributes we can store in an entry</td>
+</tr>
+<tr>
+<td><strong><a href="4.9-syntaxes.html">Syntaxes (e)</a></strong></td>
+<td>Defines the syntax that is applied to the <strong>AttributeType</strong> values</td>
+</tr>
+<tr>
+<td><strong><a href="4.5-matching-rules.html">MatchingRules (e)</a></strong></td>
+<td>The rules that are used to match <strong>AttributeType</strong>'s values</td>
+</tr>
+<tr>
+<td><strong><a href="4.3-dit-content-rules.html">DITContentRules (e)</a></strong></td>
+<td>Defines the allowed or forbidden <strong>AttributeType</strong>s and <strong>ObjectClasse</strong>s</td>
+</tr>
+<tr>
+<td><strong><a href="4.4-dit-structure-rules.html">DITStructureRules (e)</a></strong></td>
+<td>Defines the hierarchical relationships between entries</td>
+</tr>
+<tr>
+<td><strong><a href="4.7-name-forms.html">NameForms (e)</a></strong></td>
+<td>Defines the <strong>AttributeType</strong>s that may be use in a <strong>RDN</strong></td>
+</tr>
+<tr>
+<td><strong><a href="4.6-matching-rule-uses.html">MatchingRuleUses (e)</a></strong></td>
+<td>Defines the <strong>AttributeType</strong>s that can be used for a <strong>MatchingRule</strong></td>
+</tr>
+<tr>
+<td><em><strong><a href="">SyntaxChecker (e)</a></strong></em></td>
+<td>The function that do the check on values</td>
+</tr>
+<tr>
+<td><em><strong><a href="">Normalizer (e)</a></strong></em></td>
+<td>The function that normalize the values</td>
+</tr>
+<tr>
+<td><em><strong><a href="">LdapComparator (e)</a></strong></em></td>
+<td>The function that compare two values</td>
+</tr>
+</tbody>
+</table>
+<p>The last three elements are ApacheDS specific.</p>
+<p>All those elements have some tight relationships. The following schema expose all the relations between all those elements :</p>
+<p><img alt="" src="../../images/SchemaObjects.png" /></p>
+<h2 id="java-class-hierarchy">Java Class hierarchy<a class="headerlink" href="#java-class-hierarchy" title="Permanent link">&para;</a></h2>
+<p>Here is the relation between the various Java classes that are implementing the various <strong>SchemaObject</strong>s elements :</p>
+<p><img alt="" src="../../images/schemaObjectHier.png" /></p>
+<p>As we can see, the 3 specific <strong>SchemaObject</strong>s are derived from a <strong>LoadableSchemaObject</strong> abstract class, which allows the developper to inject a new instance of one of those 3 <strong>SchemaObject</strong>s.</p>
+<p>From teh developper point of view, the interesting methods are the following :</p>
+<ul>
+<li>equals() : checks that two <strong>SchemaObject</strong> instances are equals</li>
+<li>getDescription() : gets the DESC part of the <strong>SchemaObject</strong></li>
+<li>getExtension(String) : gets the given extension (X-abc)</li>
+<li>getExtensions() : gets all the extensions for this <strong>SchemaObject</strong></li>
+<li>getName() : gets the first name fo this <strong>SchemaObject</strong></li>
+<li>getNames() : gets all the nales for this <strong>SchemaObject</strong></li>
+<li>getObjectType() : gets the <strong>SchemaObject</strong> type</li>
+<li>getOid() : gets the <strong>SchemaObject</strong> OID</li>
+<li>getSchemaName() : gets the associated shcema name, if any</li>
+<li>getSpecification() : gets the OpenLDAP synatx specification for this <strong>SchemaObject</strong></li>
+<li>hasExtension(String) : tells if this <strong>SchemaObject</strong> has some extensions</li>
+<li>isDisabled() : tells if this <strong>SchemaObject</strong> is disabled</li>
+<li>isEnabled() : tells if this <strong>SchemaObject</strong> is enabled</li>
+<li>isObsolete() : tells if this <strong>SchemaObject</strong> is obsolete and should not been used</li>
+<li>isReadOnly() : tells if this <strong>SchemaObject</strong> can't be modified</li>
+</ul>
+<p>All those methods are available for all the <strong>SchemaObject</strong>. There are specific methods available for each specific <strong>SchemaObject</strong>, taht will be exposed in the dedicated pages.</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1-schema-manager.html">4.1 - Schema Manager</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1-schema-manager.html">4.1 - Schema Manager</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.2-registries.html">4.1.2 - Registries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2015, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse, Apache EnMasse, Apache Kerby, Kerby
+                Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file

Added: websites/staging/directory/trunk/content/api/user-guide/4.1.1.1-attribute-types.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.1.1.1-attribute-types.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/4.1.1.1-attribute-types.html Fri Sep 18 19:04:38 2015
@@ -0,0 +1,274 @@
+<!DOCTYPE html>
+<!--
+    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.
+-->
+<html>
+	<head>
+		<title>4.1.1.1 - AttributeTypes &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../../images/api-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Main
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>LDAP API</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../mavibot">
+                        
+                        Mavibot
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../escimo">
+                        
+                        eSCIMo
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../fortress">
+                        
+                        Fortress
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../kerby">
+                        
+                        Kerby
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <!--ul>
+      <li>
+        <a href="http://bit.ly/1n9YlQT" target="_blank">
+          <img src="./../../images/ApacheConBudapest.png" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0" style="margin-bottom:-3px;"/>
+        </a>
+      </li>
+    </ul-->
+    <h5>LDAP API 1.0</h5>
+    <ul>
+        <li><a href="./../../api/">Home</a></li>
+        <li><a href="./../../api/news.html">News</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M31</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1.1-schema-objects.html">4.1.1 - Schema Objects</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1.1-schema-object.html">4.1.1 - Schema Objects</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.1.2-object-classes.html">4.1.1.2 - ObjectClasses</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="4111-attributetypes">4.1.1.1 - AttributeTypes<a class="headerlink" href="#4111-attributetypes" title="Permanent link">&para;</a></h1>
+<p>The <strong>AttributeType</strong> <strong>SchemaObject</strong> expose some extra parameters. Here is the description as found in RFC 4512 :</p>
+<div class="codehilite"><pre>4<span class="p">.</span>1<span class="p">.</span>2<span class="p">.</span>  <span class="n">Attribute</span> <span class="n">Types</span>
+
+<span class="n">Attribute</span> <span class="n">Type</span> <span class="n">definitions</span> <span class="n">are</span> <span class="n">written</span> <span class="n">according</span> <span class="n">to</span> <span class="n">the</span> <span class="n">ABNF</span><span class="p">:</span>
+
+ <span class="n">AttributeTypeDescription</span> <span class="p">=</span> <span class="n">LPAREN</span> <span class="n">WSP</span>
+     <span class="n">numericoid</span>                    <span class="p">;</span> <span class="n">object</span> <span class="n">identifier</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">NAME</span>&quot; <span class="n">SP</span> <span class="n">qdescrs</span> <span class="p">]</span>      <span class="p">;</span> <span class="n">short</span> <span class="n">names</span> <span class="p">(</span><span class="n">descriptors</span><span class="p">)</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">DESC</span>&quot; <span class="n">SP</span> <span class="n">qdstring</span> <span class="p">]</span>     <span class="p">;</span> <span class="n">description</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">OBSOLETE</span>&quot; <span class="p">]</span>             <span class="p">;</span> <span class="n">not</span> <span class="n">active</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">SUP</span>&quot; <span class="n">SP</span> <span class="n">oid</span> <span class="p">]</span>           <span class="p">;</span> <span class="n">supertype</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">EQUALITY</span>&quot; <span class="n">SP</span> <span class="n">oid</span> <span class="p">]</span>      <span class="p">;</span> <span class="n">equality</span> <span class="n">matching</span> <span class="n">rule</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">ORDERING</span>&quot; <span class="n">SP</span> <span class="n">oid</span> <span class="p">]</span>      <span class="p">;</span> <span class="n">ordering</span> <span class="n">matching</span> <span class="n">rule</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">SUBSTR</span>&quot; <span class="n">SP</span> <span class="n">oid</span> <span class="p">]</span>        <span class="p">;</span> <span class="n">substrings</span> <span class="n">matching</span> <span class="n">rule</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">SYNTAX</span>&quot; <span class="n">SP</span> <span class="n">noidlen</span> <span class="p">]</span>    <span class="p">;</span> <span class="n">value</span> <span class="n">syntax</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">SINGLE</span><span class="o">-</span><span class="n">VALUE</span>&quot; <span class="p">]</span>         <span class="p">;</span> <span class="n">single</span><span class="o">-</span><span class="n">value</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">COLLECTIVE</span>&quot; <span class="p">]</span>           <span class="p">;</span> <span class="n">collective</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">NO</span><span class="o">-</span><span class="n">USER</span><span class="o">-</span><span class="n">MODIFICATION</span>&quot; <span class="p">]</span> <span class="p">;</span> <span class="n">not</span> <span class="n">user</span> <span class="n">modifiable</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">USAGE</span>&quot; <span class="n">SP</span> <span class="n">usage</span> <span class="p">]</span>       <span class="p">;</span> <span class="n">usage</span>
+     <span class="n">extensions</span> <span class="n">WSP</span> <span class="n">RPAREN</span>         <span class="p">;</span> <span class="n">extensions</span>
+
+ <span class="n">usage</span> <span class="p">=</span> &quot;<span class="n">userApplications</span>&quot;     <span class="o">/</span>  <span class="p">;</span> <span class="n">user</span>
+         &quot;<span class="n">directoryOperation</span>&quot;   <span class="o">/</span>  <span class="p">;</span> <span class="n">directory</span> <span class="n">operational</span>
+         &quot;<span class="n">distributedOperation</span>&quot; <span class="o">/</span>  <span class="p">;</span> <span class="n">DSA</span><span class="o">-</span><span class="n">shared</span> <span class="n">operational</span>
+         &quot;<span class="n">dSAOperation</span>&quot;            <span class="p">;</span> <span class="n">DSA</span><span class="o">-</span><span class="n">specific</span> <span class="n">operational</span>
+</pre></div>
+
+
+<p>The follwing methods have been added to cover the ones that are not already present in the <strong>SchemaObject</strong> interface :</p>
+<ul>
+<li>getEquality() : returns the <strong>MatchingRule</strong> instance used to control the equality of the <strong>AttributeType</strong></li>
+<li>getEqualityName() : returns the name of the EQUALITY <strong>MatchingRule</strong>.</li>
+<li>getEqualityOid() : returns the OID of the EQUALITY <strong>MatchingRule</strong>.</li>
+<li>getOrdering() : returns the <strong>MatchingRule</strong> instance used to control the ordering of the <em>AttributeType</em>*</li>
+<li>getOrderingName() : returns the name of the ORDERING <strong>MatchingRule</strong>.</li>
+<li>getOrderingOid() : returns the OID of the ORDERING <strong>MatchingRule</strong>.</li>
+<li>getSubstring() : returns the <strong>MatchingRule</strong> instance used to match a substring from the <strong>AttributeType</strong></li>
+<li>getSubstringName() : returns the name of the SUBSTR <strong>MatchingRule</strong>.</li>
+<li>getSubstringOid() : returns the OID of the SUBSTR <strong>MatchingRule</strong>.</li>
+<li>getSuperior() : returns the <strong>AttributeType</strong> instance that this instance inherits from</li>
+<li>getSuperiorName() : returns the superior <strong>AttributeType</strong>'s name</li>
+<li>getSuperiorOid() : returns the superior <strong>AttributeType</strong>'s OID</li>
+<li>getSyntax() : returns the associated <strong>LdapSyntax</strong> instance (or the parent's <strong>AttributeType</strong>'s one)</li>
+<li>getSyntaxLength() : returns the maximum length for the <strong>AttributeType</strong> value</li>
+<li>getSyntaxName() : returns the associated <strong>LdapSyntax</strong> instance's name</li>
+<li>getSyntaxOid() :  returns the associated <strong>LdapSyntax</strong> instance's OID</li>
+<li>getUsage() : returns the usage (one of (USER_APPLICATIONS, DIRECTORY_OPERATION, DISTRIBUTED_OPERATION and DSA_OPERATION)</li>
+<li>isAncestorOf(AttributeType) : tells if the <strong>AttributeType</strong> is the superior of another one</li>
+<li>isCollective() : tells if the <strong>AttributeType</strong> is a collective attribute</li>
+<li>isDescendantOf(AttributeType)</li>
+<li>isOperational() : tells if the <strong>AttributeType</strong> is an operational attribute (one of DIRECTORY_OPERATION, DISTRIBUTED_OPERATION and DSA_OPERATION)</li>
+<li>isSingleValued() : tells if the <strong>AttributeType</strong> only accept single values</li>
+<li>isUser() : tells if the <strong>AttributeType</strong> is a USER_APPLICATIONS attribute</li>
+<li>isUserModifiable() : tells if the <strong>AttributeType</strong> is modifiable or not</li>
+</ul>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1.1-schema-objects.html">4.1.1 - Schema Objects</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1.1-schema-object.html">4.1.1 - Schema Objects</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.1.2-object-classes.html">4.1.1.2 - ObjectClasses</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2015, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse, Apache EnMasse, Apache Kerby, Kerby
+                Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file

Added: websites/staging/directory/trunk/content/api/user-guide/4.1.1.2-object-classes.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.1.1.2-object-classes.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/4.1.1.2-object-classes.html Fri Sep 18 19:04:38 2015
@@ -0,0 +1,219 @@
+<!DOCTYPE html>
+<!--
+    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.
+-->
+<html>
+	<head>
+		<title>4.1.1.2 - ObjectClasses &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../../images/api-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Main
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>LDAP API</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../mavibot">
+                        
+                        Mavibot
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../escimo">
+                        
+                        eSCIMo
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../fortress">
+                        
+                        Fortress
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../kerby">
+                        
+                        Kerby
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <!--ul>
+      <li>
+        <a href="http://bit.ly/1n9YlQT" target="_blank">
+          <img src="./../../images/ApacheConBudapest.png" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0" style="margin-bottom:-3px;"/>
+        </a>
+      </li>
+    </ul-->
+    <h5>LDAP API 1.0</h5>
+    <ul>
+        <li><a href="./../../api/">Home</a></li>
+        <li><a href="./../../api/news.html">News</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M31</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1.1.1-attribute-types.html">4.1.1.1 - AttributeTypes</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1.1-schema-objects.html">4.1.1 - Schema Objects</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.2.3-syntaxes.html">4.1.1.3 - Syntaxes</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="4112-objectclasses">4.1.1.2 - ObjectClasses<a class="headerlink" href="#4112-objectclasses" title="Permanent link">&para;</a></h1>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1.1.1-attribute-types.html">4.1.1.1 - AttributeTypes</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1.1-schema-objects.html">4.1.1 - Schema Objects</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.2.3-syntaxes.html">4.1.1.3 - Syntaxes</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2015, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse, Apache EnMasse, Apache Kerby, Kerby
+                Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file

Added: websites/staging/directory/trunk/content/api/user-guide/4.1.1.3-syntaxes.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.1.1.3-syntaxes.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/4.1.1.3-syntaxes.html Fri Sep 18 19:04:38 2015
@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<!--
+    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.
+-->
+<html>
+	<head>
+		<title>4.1.1.3 - Syntaxes &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../../images/api-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Main
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>LDAP API</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../mavibot">
+                        
+                        Mavibot
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../escimo">
+                        
+                        eSCIMo
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../fortress">
+                        
+                        Fortress
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../kerby">
+                        
+                        Kerby
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <!--ul>
+      <li>
+        <a href="http://bit.ly/1n9YlQT" target="_blank">
+          <img src="./../../images/ApacheConBudapest.png" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0" style="margin-bottom:-3px;"/>
+        </a>
+      </li>
+    </ul-->
+    <h5>LDAP API 1.0</h5>
+    <ul>
+        <li><a href="./../../api/">Home</a></li>
+        <li><a href="./../../api/news.html">News</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M31</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1.1.2-object-classes.html">4.1.1.2 - ObjectClasses</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1.1-schema-objects.html">4.1.1 - Schema Objects</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.1.4-matching-rules.html">4.1.1.4 - MatchingRules</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="4113-syntaxes">4.1.1.3 - Syntaxes<a class="headerlink" href="#4113-syntaxes" title="Permanent link">&para;</a></h1>
+<p>The <strong>LdapSyntax</strong> class implements the LDAP <strong>Syntax</strong>s schema objects. A <strong>Syntax</strong> defines a constraints applied to the <strong>AttributeType</strong> value. Here is the TFC description of a <strong>Syntax</strong> :</p>
+<div class="codehilite"><pre> <span class="n">SyntaxDescription</span> <span class="p">=</span> <span class="n">LPAREN</span> <span class="n">WSP</span>
+     <span class="n">numericoid</span>                 <span class="p">;</span> <span class="n">object</span> <span class="n">identifier</span>
+     <span class="p">[</span> <span class="n">SP</span> &quot;<span class="n">DESC</span>&quot; <span class="n">SP</span> <span class="n">qdstring</span> <span class="p">]</span>  <span class="p">;</span> <span class="n">description</span>
+     <span class="n">extensions</span> <span class="n">WSP</span> <span class="n">RPAREN</span>      <span class="p">;</span> <span class="n">extensions</span>
+</pre></div>
+
+
+<p>The important part of the <strong>Syntax</strong> is its <strong>OID</strong> which is used in the <strong>AttributeType</strong> and <strong>MatchingRule</strong>.</p>
+<p>In order to enforce a <strong>Syntax</strong>, the <strong>LDAP API</strong> is associated with a <strong>SyntaxChecker</strong>, which is a Java class (see the chapter about ApacheDS Schema Elements).</p>
+<h2 id="methods">Methods<a class="headerlink" href="#methods" title="Permanent link">&para;</a></h2>
+<p>The two important methods you might use are :</p>
+<ul>
+<li>getSyntaxChecker() : retreive the associated class that is used to check a syntax</li>
+<li>isHumanReadable() : tells if the AttributeType is a String or a byte[]</li>
+</ul>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1.1.2-object-classes.html">4.1.1.2 - ObjectClasses</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1.1-schema-objects.html">4.1.1 - Schema Objects</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.1.4-matching-rules.html">4.1.1.4 - MatchingRules</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2015, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse, Apache EnMasse, Apache Kerby, Kerby
+                Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file

Added: websites/staging/directory/trunk/content/api/user-guide/4.1.1.4-matching-rules.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.1.1.4-matching-rules.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/4.1.1.4-matching-rules.html Fri Sep 18 19:04:38 2015
@@ -0,0 +1,236 @@
+<!DOCTYPE html>
+<!--
+    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.
+-->
+<html>
+	<head>
+		<title>4.1.1.4 - MatchingRules &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../../images/api-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Main
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>LDAP API</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../mavibot">
+                        
+                        Mavibot
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../escimo">
+                        
+                        eSCIMo
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../fortress">
+                        
+                        Fortress
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../kerby">
+                        
+                        Kerby
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <!--ul>
+      <li>
+        <a href="http://bit.ly/1n9YlQT" target="_blank">
+          <img src="./../../images/ApacheConBudapest.png" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0" style="margin-bottom:-3px;"/>
+        </a>
+      </li>
+    </ul-->
+    <h5>LDAP API 1.0</h5>
+    <ul>
+        <li><a href="./../../api/">Home</a></li>
+        <li><a href="./../../api/news.html">News</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M31</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1.1.3-syntaxes.html">4.1.1.3 - Syntaxes</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1.1-schema-objects.html">4.1.1 - Schema Objects</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.1.5-dit-content-rules.html">4.1.1.5 - DITContentRules</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="4114-matchingrules">4.1.1.4 - MatchingRules<a class="headerlink" href="#4114-matchingrules" title="Permanent link">&para;</a></h1>
+<p>A <strong>MatchingRule</strong> is used when processing a search <strong>Filter</strong> evaluation, or a <strong>Compare</strong> or <strong>Modify</strong> operation. An <strong>AttributeType</strong> can define up to 3 types of <strong>MatchingRule</strong> :</p>
+<ul>
+<li>EQUALITY</li>
+<li>ORDERING</li>
+<li>SUBSTR</li>
+</ul>
+<p>There are a few extra parameter that are defined in the <strong>MatchingRule</strong> class :</p>
+<ul>
+<li>getSyntax() : gets the <strong>Syntax</strong> instance associated with the <strong>MatchingRule</strong></li>
+<li>getSyntaxOid() : gets the <strong>Syntax</strong> OID associated with the <strong>MatchingRule</strong></li>
+</ul>
+<p>We also have 2 specific methods that are used to compare or normalize a value :</p>
+<ul>
+<li>getLdapComparator() : gets the <strong>LdapComparator</strong> to use to compare 2 values</li>
+<li>getNormalizer() : gets the <strong>Normalizer</strong> used to normalize a value</li>
+</ul>
+<p>Those are convenient methods, specifically when you will need to compare two values.</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1.1.3-syntaxes.html">4.1.1.3 - Syntaxes</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1.1-schema-objects.html">4.1.1 - Schema Objects</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.1.5-dit-content-rules.html">4.1.1.5 - DITContentRules</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2015, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse, Apache EnMasse, Apache Kerby, Kerby
+                Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file

Added: websites/staging/directory/trunk/content/api/user-guide/4.1.1.5-dit-content-rules.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.1.1.5-dit-content-rules.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/4.1.1.5-dit-content-rules.html Fri Sep 18 19:04:38 2015
@@ -0,0 +1,219 @@
+<!DOCTYPE html>
+<!--
+    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.
+-->
+<html>
+	<head>
+		<title>4.1.1.5 - DitContentRules &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../../images/api-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Main
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>LDAP API</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../mavibot">
+                        
+                        Mavibot
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../escimo">
+                        
+                        eSCIMo
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../fortress">
+                        
+                        Fortress
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../kerby">
+                        
+                        Kerby
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <!--ul>
+      <li>
+        <a href="http://bit.ly/1n9YlQT" target="_blank">
+          <img src="./../../images/ApacheConBudapest.png" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0" style="margin-bottom:-3px;"/>
+        </a>
+      </li>
+    </ul-->
+    <h5>LDAP API 1.0</h5>
+    <ul>
+        <li><a href="./../../api/">Home</a></li>
+        <li><a href="./../../api/news.html">News</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M31</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="./../../api/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="./../../api/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1.1.4-matching-rules.html">4.1.1.4 - MatchingRules</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1.1-schema-objects.html">4.1.1 - SchemaO bjects</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.6-dit-structure-rules.html">4.1.6 - DitStructureRules</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="4115-ditcontentrules">4.1.1.5 - DitContentRules<a class="headerlink" href="#4115-ditcontentrules" title="Permanent link">&para;</a></h1>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4.1.1.4-matching-rules.html">4.1.1.4 - MatchingRules</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="4.1.1-schema-objects.html">4.1.1 - SchemaO bjects</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="4.1.6-dit-structure-rules.html">4.1.6 - DitStructureRules</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2015, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse, Apache EnMasse, Apache Kerby, Kerby
+                Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file