From commits-return-49441-archive-asf-public=cust-asf.ponee.io@directory.apache.org  Sun Jul  1 23:49:24 2018
Return-Path: <commits-return-49441-archive-asf-public=cust-asf.ponee.io@directory.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id 5F580180778
	for <archive-asf-public@cust-asf.ponee.io>; Sun,  1 Jul 2018 23:49:22 +0200 (CEST)
Received: (qmail 73679 invoked by uid 500); 1 Jul 2018 21:49:21 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 73669 invoked by uid 99); 1 Jul 2018 21:49:21 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jul 2018 21:49:21 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 24A663A0650
	for <commits@directory.apache.org>; Sun,  1 Jul 2018 21:49:20 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1031968 [6/11] - in /websites/staging/directory/trunk/content:
 ./ apacheds/ apacheds/advanced-ug/ apacheds/basic-ug/
 apacheds/configuration/ apacheds/download/ apacheds/kerberos-ug/ api/
 api/download/ api/internal-design-guide/ api/user-gu...
Date: Sun, 01 Jul 2018 21:49:17 -0000
To: commits@directory.apache.org
From: buildbot@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20180701214920.24A663A0650@svn01-us-west.apache.org>

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 Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -234,8 +234,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.1-schema.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.1-schema.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.1-schema.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -212,8 +212,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2-schema-manager.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2-schema-manager.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2-schema-manager.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -255,8 +255,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.1-schema-objects.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.1-schema-objects.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.1-schema-objects.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -308,8 +308,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.1.1-attribute-types.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.1.1-attribute-types.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.1.1-attribute-types.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -267,8 +267,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.1.2-object-classes.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.1.2-object-classes.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.1.2-object-classes.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -243,8 +243,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.1.3-syntaxes.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.1.3-syntaxes.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.1.3-syntaxes.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -227,8 +227,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.1.4-matching-rules.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.1.4-matching-rules.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.1.4-matching-rules.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -229,8 +229,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.1.5-dit-content-rules.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.1.5-dit-content-rules.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.1.5-dit-content-rules.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -212,8 +212,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.1.6-dit-structure-rules.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.1.6-dit-structure-rules.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.1.6-dit-structure-rules.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -212,8 +212,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.1.7-matching-rule-uses.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.1.7-matching-rule-uses.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.1.7-matching-rule-uses.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -212,8 +212,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.1.8-name-forms.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.1.8-name-forms.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.1.8-name-forms.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -212,8 +212,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.1.9-apacheds-schema-elements.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.1.9-apacheds-schema-elements.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.1.9-apacheds-schema-elements.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -245,8 +245,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.2-registries.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.2-registries.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.2-registries.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/4.2.3-schema-loader.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/4.2.3-schema-loader.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/4.2.3-schema-loader.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -212,8 +212,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/5-ldap-security.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5-ldap-security.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5-ldap-security.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -227,8 +227,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/5.1-ldaps.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5.1-ldaps.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5.1-ldaps.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -330,8 +330,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/5.2-start-tls.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5.2-start-tls.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5.2-start-tls.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -269,8 +269,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/5.3-sasl-bind.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5.3-sasl-bind.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5.3-sasl-bind.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -378,8 +378,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/5.4-password-handling.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5.4-password-handling.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5.4-password-handling.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/5.5-certificates.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5.5-certificates.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5.5-certificates.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/5.6-aci-and-acls.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/5.6-aci-and-acls.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/5.6-aci-and-acls.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6-ldap-data-structures.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6-ldap-data-structures.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6-ldap-data-structures.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -249,8 +249,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.1-administrative-point.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.1-administrative-point.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.1-administrative-point.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -262,8 +262,8 @@ These classes are currently only used by
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.10-dit-content-rule.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.10-dit-content-rule.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.10-dit-content-rule.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.11-dit-structure-rule.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.11-dit-structure-rule.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.11-dit-structure-rule.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.12-entry.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.12-entry.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.12-entry.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -591,8 +591,8 @@ The attribute's values order is irreleva
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.13-expr-node.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.13-expr-node.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.13-expr-node.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.14-ldap-comparator.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.14-ldap-comparator.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.14-ldap-comparator.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.15-ldap-result.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.15-ldap-result.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.15-ldap-result.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.16-ldap-syntax.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.16-ldap-syntax.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.16-ldap-syntax.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.17-ldap-url.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.17-ldap-url.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.17-ldap-url.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.18-ldif-control.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.18-ldif-control.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.18-ldif-control.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.19-ldif-entry.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.19-ldif-entry.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.19-ldif-entry.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.2-administrative-role.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.2-administrative-role.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.2-administrative-role.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -233,8 +233,8 @@ These classes are currently only used by
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.20-matching-rule.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.20-matching-rule.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.20-matching-rule.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.21-matching-rule-use.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.21-matching-rule-use.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.21-matching-rule-use.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.22-message.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.22-message.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.22-message.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.23-modification.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.23-modification.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.23-modification.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.24-name-form.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.24-name-form.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.24-name-form.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.25-normalizer.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.25-normalizer.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.25-normalizer.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.26-object-class.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.26-object-class.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.26-object-class.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.27-oid.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.27-oid.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.27-oid.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -248,8 +248,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.28-rdn.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.28-rdn.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.28-rdn.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>

Modified: websites/staging/directory/trunk/content/api/user-guide/6.29-referral.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/6.29-referral.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/6.29-referral.html Sun Jul  1 21:49:14 2018
@@ -66,9 +66,9 @@
                         
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="./../../escimo">
+                    <a href="./../../scimple">
                         
-                        eSCIMo
+                        SCIMple
                         
                     </a>
                     &nbsp;|&nbsp;
@@ -214,8 +214,8 @@ h2:hover > .headerlink, h3:hover > .head
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <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.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,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>