directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r836588 - in /websites/staging/directory/trunk/content: ./ apacheds/ apacheds/basic-ug/
Date Tue, 30 Oct 2012 13:24:06 GMT
Author: buildbot
Date: Tue Oct 30 13:24:05 2012
New Revision: 836588

Log:
Staging update by buildbot for directory

Added:
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.1-data-modification.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.1-adding-entries.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.2-deleting-entries.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.3-modifying-entries.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.4-moving-entries.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.2-searching-data.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.1-simple-search.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.3-introducing-schema.html
Modified:
    websites/staging/directory/trunk/content/   (props changed)
    websites/staging/directory/trunk/content/apacheds/basic-ug/1-how-to-begin.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2-handling-data.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/3-basic-security.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/4-integrating-apacheds.html
    websites/staging/directory/trunk/content/apacheds/basic-users-guide.html

Propchange: websites/staging/directory/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Oct 30 13:24:05 2012
@@ -1 +1 @@
-1403665
+1403687

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1-how-to-begin.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1-how-to-begin.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1-how-to-begin.html Tue Oct 30 13:24:05 2012
@@ -127,7 +127,7 @@
 
 <h1 id="1-how-to-begin">1 - How to begin</h1>
 <p>This chapter helps you to set up a server, with the minimal configuration options being explained. That should be enough to get a running server.</p>
-<h2 id="content">Content</h2>
+<h2 id="table-of-content">Table of content</h2>
 <ul>
 <li><a href="1.1-what-apacheds-is.html">1.1 - What Apache Directory Server is</a></li>
 <li><a href="1.2-some-background.html">1.2 - Some Background. Directories, directory services and LDAP</a></li>

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html Tue Oct 30 13:24:05 2012
@@ -127,7 +127,7 @@
 
 <h1 id="14-basic-configuration-tasks">1.4 - Basic configuration tasks</h1>
 <p>In this chapter, we will explain how to configure some basic parameters in the server ou just installed. We won't expose all the options in this <em>Basic User Guide</em>, you can check in the <em>Advanced User Guide</em> for more options if needed.</p>
-<h2 id="content">Content</h2>
+<h2 id="table-of-content">Table of content</h2>
 <ul>
 <li><a href="1.4.1-changing-server-port.html">1.4.1 - Changing the server port for LDAP</a></li>
 <li><a href="1.4.2-changing-admin-password.html">1.4.2 - Changing the admin password</a></li>

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/2-handling-data.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2-handling-data.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2-handling-data.html Tue Oct 30 13:24:05 2012
@@ -108,8 +108,8 @@
     <div class="nav">
         <div class="nav_prev">
         
-			&nbsp;
-        
+            <a href="1-how-to-begin.html">1 - How to begin</a>
+		
         </div>
         <div class="nav_up">
         
@@ -127,32 +127,29 @@
 
 <h1 id="2-handling-data-within-your-directory">2 - Handling data within your directory</h1>
 <p>Now that your server is up and running, you can use it to add, modify, remove and search entries. You can also manage its schema, extendng it to fit your needs.</p>
-<h2 id="content">Content</h2>
+<h2 id="table-of-content">Table of content</h2>
 <ul>
-<li><a href="2-handling-of-data.html">2 - Handling of data within your directory</a><ul>
-<li><a href="2.1-data-modification.html">2.1 - Data modifications</a><ul>
-<li><a href="2.1-adding-data.html">2.1.1 - Adding Entries</a></li>
-<li><a href="2.2-deleting-data.html">2.1.2 - Deleting Entries</a></li>
-<li><a href="2.2-modifying-data.html">2.1.3 - Modifying Entries</a></li>
-<li><a href="2.2-modifying-data.html">2.1.4 - Moving Entries</a></li>
+<li><a href="2.1-data-modification.html">2.1 - Data modification</a><ul>
+<li><a href="2.1.1-adding-entries.html">2.1.1 - Adding Entries</a></li>
+<li><a href="2.1.2-deleting-entries.html">2.1.2 - Deleting Entries</a></li>
+<li><a href="2.1.3-modifying-entries.html">2.1.3 - Modifying Entries</a></li>
+<li><a href="2.1.4-moving-entries.html">2.1.4 - Moving Entries</a></li>
 </ul>
 </li>
 <li><a href="2.2-searching-data.html">2.2 - Searching Data</a><ul>
 <li><a href="2.2.1-simple-search.html">2.2.1 - Simple search</a></li>
-<li><a href="2.2.1-simple-search.html">2.2.1 - More search options</a></li>
-</ul>
-</li>
-<li><a href="2.3-basic-schema-operations.html">2.3 - The Schema </a></li>
+<li><a href="2.2.2-more-search-options.html">2.2.2 - More search options</a></li>
 </ul>
 </li>
+<li><a href="2.3-introducing-schema.html">2.3 - Introducing the Schema </a></li>
 </ul>
 
 
     <div class="nav">
         <div class="nav_prev">
         
-			&nbsp;
-        
+            <a href="1-how-to-begin.html">1 - How to begin</a>
+		
         </div>
         <div class="nav_up">
         

Added: websites/staging/directory/trunk/content/apacheds/basic-ug/2.1-data-modification.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.1-data-modification.html (added)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.1-data-modification.html Tue Oct 30 13:24:05 2012
@@ -0,0 +1,167 @@
+<!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>2.1 - Data modification &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        <STRONG>ApacheDS</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        Apache LDAP API
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>ApacheDS 2.0</h5>
+    <ul>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M8</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin- bottom:- 3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+        <li><a href="./../../apacheds/basic-users-guide.html">Basic User's Guide </a></li>
+        <li><a href="./../../apacheds/advanced-users-guide.html">Advanced User's Guide</a></li>
+        <li><a href="./../../apacheds/developers-guide.html">Developer's Guide</a></li>
+        <!--li><a href="./../../apacheds/gen-docs/latest">Generated Reports (e.g. JavaDocs)</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="2-handling-data.html">2 - Handling of data within your directory</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-handling-data.html">2 - Handling of data within your directory</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="21-data-modification">2.1 - Data modification</h1>
+<p>TODO</p>
+<h2 id="table-of-content">Table of content</h2>
+<ul>
+<li><a href="2.1.1-adding-entries.html">2.1.1 - Adding Entries</a></li>
+<li><a href="2.1.2-deleting-entries.html">2.1.2 - Deleting Entries</a></li>
+<li><a href="2.1.3-modifying-entries.html">2.1.3 - Modifying Entries</a></li>
+<li><a href="2.1.4-moving-entries.html">2.1.4 - Moving Entries</a></li>
+</ul>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2-handling-data.html">2 - Handling of data within your directory</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-handling-data.html">2 - Handling of data within your directory</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <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, 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/apacheds/basic-ug/2.1.1-adding-entries.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.1-adding-entries.html (added)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.1-adding-entries.html Tue Oct 30 13:24:05 2012
@@ -0,0 +1,160 @@
+<!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>2.1.1 - Adding Entries &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        <STRONG>ApacheDS</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        Apache LDAP API
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>ApacheDS 2.0</h5>
+    <ul>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M8</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin- bottom:- 3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+        <li><a href="./../../apacheds/basic-users-guide.html">Basic User's Guide </a></li>
+        <li><a href="./../../apacheds/advanced-users-guide.html">Advanced User's Guide</a></li>
+        <li><a href="./../../apacheds/developers-guide.html">Developer's Guide</a></li>
+        <!--li><a href="./../../apacheds/gen-docs/latest">Generated Reports (e.g. JavaDocs)</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="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.1.2-deleting-entries.html">2.1.2 - Deleting Entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="211-adding-entries">2.1.1 - Adding Entries</h1>
+<p>TODO</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.1.2-deleting-entries.html">2.1.2 - Deleting Entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <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, 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/apacheds/basic-ug/2.1.2-deleting-entries.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.2-deleting-entries.html (added)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.2-deleting-entries.html Tue Oct 30 13:24:05 2012
@@ -0,0 +1,160 @@
+<!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>2.1.2 - Deleting Entries &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        <STRONG>ApacheDS</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        Apache LDAP API
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>ApacheDS 2.0</h5>
+    <ul>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M8</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin- bottom:- 3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+        <li><a href="./../../apacheds/basic-users-guide.html">Basic User's Guide </a></li>
+        <li><a href="./../../apacheds/advanced-users-guide.html">Advanced User's Guide</a></li>
+        <li><a href="./../../apacheds/developers-guide.html">Developer's Guide</a></li>
+        <!--li><a href="./../../apacheds/gen-docs/latest">Generated Reports (e.g. JavaDocs)</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="2.1.1-adding-entries.html">2.1.1 - Adding Entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.1.3-modifying-entries.html">2.1.3 - Modifying Entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="212-deleting-entries">2.1.2 - Deleting Entries</h1>
+<p>TODO</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.1.1-adding-entries.html">2.1.1 - Adding Entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.1.3-modifying-entries.html">2.1.3 - Modifying Entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <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, 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/apacheds/basic-ug/2.1.3-modifying-entries.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.3-modifying-entries.html (added)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.3-modifying-entries.html Tue Oct 30 13:24:05 2012
@@ -0,0 +1,160 @@
+<!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>2.1.3 - Modifying Entries &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        <STRONG>ApacheDS</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        Apache LDAP API
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>ApacheDS 2.0</h5>
+    <ul>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M8</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin- bottom:- 3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+        <li><a href="./../../apacheds/basic-users-guide.html">Basic User's Guide </a></li>
+        <li><a href="./../../apacheds/advanced-users-guide.html">Advanced User's Guide</a></li>
+        <li><a href="./../../apacheds/developers-guide.html">Developer's Guide</a></li>
+        <!--li><a href="./../../apacheds/gen-docs/latest">Generated Reports (e.g. JavaDocs)</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="2.1.2-deleting-entries.html">2.1.2 - Deleting Entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.1.4-moving-entries.html">2.1.4 - Moving Entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="213-modifying-entries">2.1.3 - Modifying Entries</h1>
+<p>TODO</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.1.2-deleting-entries.html">2.1.2 - Deleting Entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.1.4-moving-entries.html">2.1.4 - Moving Entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <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, 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/apacheds/basic-ug/2.1.4-moving-entries.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.4-moving-entries.html (added)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.1.4-moving-entries.html Tue Oct 30 13:24:05 2012
@@ -0,0 +1,160 @@
+<!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>2.1.4 - Moving Entries &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        <STRONG>ApacheDS</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        Apache LDAP API
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>ApacheDS 2.0</h5>
+    <ul>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M8</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin- bottom:- 3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+        <li><a href="./../../apacheds/basic-users-guide.html">Basic User's Guide </a></li>
+        <li><a href="./../../apacheds/advanced-users-guide.html">Advanced User's Guide</a></li>
+        <li><a href="./../../apacheds/developers-guide.html">Developer's Guide</a></li>
+        <!--li><a href="./../../apacheds/gen-docs/latest">Generated Reports (e.g. JavaDocs)</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="2.1.3-modifying-entries.html">2.1.3 - Modifying Entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="214-moving-entries">2.1.4 - Moving Entries</h1>
+<p>TODO</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.1.3-modifying-entries.html">2.1.3 - Modifying Entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <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, 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/apacheds/basic-ug/2.2-searching-data.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.2-searching-data.html (added)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.2-searching-data.html Tue Oct 30 13:24:05 2012
@@ -0,0 +1,165 @@
+<!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>2.2 - Searching Data &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        <STRONG>ApacheDS</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        Apache LDAP API
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>ApacheDS 2.0</h5>
+    <ul>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M8</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin- bottom:- 3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+        <li><a href="./../../apacheds/basic-users-guide.html">Basic User's Guide </a></li>
+        <li><a href="./../../apacheds/advanced-users-guide.html">Advanced User's Guide</a></li>
+        <li><a href="./../../apacheds/developers-guide.html">Developer's Guide</a></li>
+        <!--li><a href="./../../apacheds/gen-docs/latest">Generated Reports (e.g. JavaDocs)</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="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-handling-data.html">2 - Handling of data within your directory</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.3-introducing-schema.html">2.3 - The Schema</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="22-searching-data">2.2 - Searching Data</h1>
+<p>TODO</p>
+<h2 id="table-of-content">Table of content</h2>
+<ul>
+<li><a href="2.2.1-simple-search.html">2.2.1 - Simple search</a></li>
+<li><a href="2.2.2-more-search-options.html">2.2.2 - More search options</a></li>
+</ul>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.1-data-modification.html">2.1 - Data modification</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-handling-data.html">2 - Handling of data within your directory</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.3-introducing-schema.html">2.3 - The Schema</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <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, 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/apacheds/basic-ug/2.2.1-simple-search.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.1-simple-search.html (added)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.1-simple-search.html Tue Oct 30 13:24:05 2012
@@ -0,0 +1,160 @@
+<!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>2.2.1 - Simple search &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        <STRONG>ApacheDS</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        Apache LDAP API
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>ApacheDS 2.0</h5>
+    <ul>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M8</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin- bottom:- 3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+        <li><a href="./../../apacheds/basic-users-guide.html">Basic User's Guide </a></li>
+        <li><a href="./../../apacheds/advanced-users-guide.html">Advanced User's Guide</a></li>
+        <li><a href="./../../apacheds/developers-guide.html">Developer's Guide</a></li>
+        <!--li><a href="./../../apacheds/gen-docs/latest">Generated Reports (e.g. JavaDocs)</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="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.2.2-more-search-options.html">2.2.2 - More search options</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="221-simple-search">2.2.1 - Simple search</h1>
+<p>TODO</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.2.2-more-search-options.html">2.2.2 - More search options</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <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, 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/apacheds/basic-ug/2.2.2-more-search-options.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.html (added)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.html Tue Oct 30 13:24:05 2012
@@ -0,0 +1,160 @@
+<!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>2.2.2 - More search options &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        <STRONG>ApacheDS</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        Apache LDAP API
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>ApacheDS 2.0</h5>
+    <ul>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M8</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin- bottom:- 3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+        <li><a href="./../../apacheds/basic-users-guide.html">Basic User's Guide </a></li>
+        <li><a href="./../../apacheds/advanced-users-guide.html">Advanced User's Guide</a></li>
+        <li><a href="./../../apacheds/developers-guide.html">Developer's Guide</a></li>
+        <!--li><a href="./../../apacheds/gen-docs/latest">Generated Reports (e.g. JavaDocs)</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="2.2.1 - Simple search">2.2.1-simple-search.html</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.3-introducing-schema.html">2.3 - The Schema</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="222-more-search-options">2.2.2 - More search options</h1>
+<p>TODO</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.2.1 - Simple search">2.2.1-simple-search.html</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.3-introducing-schema.html">2.3 - The Schema</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <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, 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/apacheds/basic-ug/2.3-introducing-schema.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.3-introducing-schema.html (added)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.3-introducing-schema.html Tue Oct 30 13:24:05 2012
@@ -0,0 +1,160 @@
+<!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>2.3 - The Schema &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        <STRONG>ApacheDS</STRONG>
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        Apache LDAP API
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>ApacheDS 2.0</h5>
+    <ul>
+        <li><a href="./../../apacheds/">Home</a></li>
+        <li><a href="./../../apacheds/features.html">Features</a></li>
+    </ul>
+    <h5>Downloads</h5>
+    <ul>
+        <li><a href="./../../apacheds/downloads.html">ApacheDS 2.0.0-M8</a>&nbsp;&nbsp;<img src="./../../images/new_badge.gif" alt="" style="margin- bottom:- 3px;" border="0"></li>
+        <li><a href="./../../apacheds/download-old-versions.html">Older versions</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+        <li><a href="./../../apacheds/basic-users-guide.html">Basic User's Guide </a></li>
+        <li><a href="./../../apacheds/advanced-users-guide.html">Advanced User's Guide</a></li>
+        <li><a href="./../../apacheds/developers-guide.html">Developer's Guide</a></li>
+        <!--li><a href="./../../apacheds/gen-docs/latest">Generated Reports (e.g. JavaDocs)</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="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-handling-data.html">2 - Handling of data within your directory</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="3-basic-security.html">3 - Basic Security</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="23-the-schema">2.3 - The Schema</h1>
+<p>TODO</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.2-searching-data.html">2.2 - Searching Data</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-handling-data.html">2 - Handling of data within your directory</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="3-basic-security.html">3 - Basic Security</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <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, 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

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/3-basic-security.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/3-basic-security.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/3-basic-security.html Tue Oct 30 13:24:05 2012
@@ -127,7 +127,7 @@
 
 <h1 id="3-basic-security">3 - Basic Security</h1>
 <p>This chapter expose the basic security configuration you can setup. It covers simple authentication, authorization and SSL.</p>
-<h2 id="content">Content</h2>
+<h2 id="table-of-content">Table of content</h2>
 <ul>
 <li><a href="3.1-authentication-options.html">3.1 - Authentication options</a></li>
 <li><a href="3.2-basic-authorization.html">3.2 - Basic authorization</a></li>

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/4-integrating-apacheds.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/4-integrating-apacheds.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/4-integrating-apacheds.html Tue Oct 30 13:24:05 2012
@@ -127,7 +127,7 @@
 
 <h1 id="4-integrating-apacheds-with-other-programs">4 - Integrating ApacheDS with other programs</h1>
 <p>In this chapter, we expose various environments that are depending on <em>Apache Directory Server</em>, and how to set those environments. As <em>Apache Directory Server</em> is an <strong>LDAP</strong> server, it can be used to manage messaging users, web servers like <strong>Tomcat</strong>, users in a <strong>Unix</strong> environment, etc.</p>
-<h2 id="content">Content</h2>
+<h2 id="table-of-content">Table of content</h2>
 <ul>
 <li><a href="4.1-mozilla-thunderbird.html">4.1 - Mozilla Thunderbird Integration</a></li>
 </ul>

Modified: websites/staging/directory/trunk/content/apacheds/basic-users-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-users-guide.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-users-guide.html Tue Oct 30 13:24:05 2012
@@ -128,7 +128,22 @@
 <li><a href="basic-ug/1.5-sample-configuration.html">1.5 - About the sample configurations and sample directory data</a></li>
 </ul>
 </li>
-<li><a href="basic-ug/2-sample-configuration.html">2 - Handling of data within your directory</a></li>
+<li><a href="basic-ug/2-handling-data.html">2 - Handling of data within your directory</a><ul>
+<li><a href="basic-ug/2.1-data-modification.html">2.1 - Data modification</a><ul>
+<li><a href="basic-ug/2.1.1-adding-data.html">2.1.1 - Adding Entries</a></li>
+<li><a href="basic-ug/2.1.2-deleting-data.html">2.1.2 - Deleting Entries</a></li>
+<li><a href="basic-ug/2.1.3-modifying-data.html">2.1.3 - Modifying Entries</a></li>
+<li><a href="basic-ug/2.1.4-moving-data.html">2.1.4 - Moving Entries</a></li>
+</ul>
+</li>
+<li><a href="basic-ug/2.2-searching-data.html">2.2 - Searching Data</a><ul>
+<li><a href="basic-ug/2.2.1-simple-search.html">2.2.1 - Simple search</a></li>
+<li><a href="basic-ug/2.2.2-more-search-options.html">2.2.2 - More search options</a></li>
+</ul>
+</li>
+<li><a href="basic-ug/2.3-introducing-schema.html">2.3 - Introducing the Schema </a></li>
+</ul>
+</li>
 <li><a href="basic-ug/3-basic-security.html">3 - Basic Security</a><ul>
 <li><a href="basic-ug/3.1-authentication-options.html">3.1 - Authentication options</a></li>
 <li><a href="basic-ug/3.2-basic-authorization.html">3.2 - Basic authorization</a></li>



Mime
View raw message