Author: buildbot
Date: Tue Oct 30 11:15:10 2012
New Revision: 836581

Log:
Staging update by buildbot for directory

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.1-what-apacheds-is.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/1.5-sample-configuration.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-ug/4.1-mozilla-thunderbird.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 11:15:10 2012
@@ -1 +1 @@
-1403631
+1403665

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 11:15:10 2012
@@ -125,9 +125,10 @@
     </div>
 
 
-<h3 id="1-how-to-begin">1 - How to begin</h3>
+<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>
 <ul>
-<li><a href="1-how-to-begin.html">1 - How to begin</a><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>
 <li><a href="1.3-installing-and-starting.html">1.3 - Installing and starting the server</a></li>
@@ -141,19 +142,6 @@
 </li>
 <li><a href="1.5-sample-configuration.html">1.5 - About the sample configurations and sample directory data</a></li>
 </ul>
-</li>
-<li><a href="2-handling-data.html">2 - Handling of data within your directory</a></li>
-<li><a href="3-basic-security.html">3 - Basic Security</a><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>
-<li><a href="3.3-enabling-ssl.html">3.3 - How to enable SSL</a></li>
-</ul>
-</li>
-<li><a href="4-integrating-apacheds.html">4 - Integrating ApacheDS with other programs</a><ul>
-<li><a href="4.1-mozilla-thunderbird.html">4.1 - Mozilla Thunderbird</a></li>
-</ul>
-</li>
-</ul>
 
 
     <div class="nav">

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.1-what-apacheds-is.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.1-what-apacheds-is.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.1-what-apacheds-is.html Tue Oct 30 11:15:10 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">
         
@@ -163,8 +163,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">
         

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 11:15:10 2012
@@ -126,6 +126,8 @@
 
 
 <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>
 <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/1.5-sample-configuration.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.5-sample-configuration.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.5-sample-configuration.html Tue Oct 30 11:15:10 2012
@@ -118,7 +118,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="2-handling-data.html">2 - Handling of data within your directory</a>
+            <a href="2-handling-data.html">2 - Handling data within your directory</a>
 		
         </div>
         <div class="clearfix"></div>
@@ -224,7 +224,7 @@ In order to increase recognition, all ex
         </div>
         <div class="nav_next">
         
-            <a href="2-handling-data.html">2 - Handling of data within your directory</a>
+            <a href="2-handling-data.html">2 - Handling data within your directory</a>
 		
         </div>
         <div class="clearfix"></div>

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 11:15:10 2012
@@ -125,8 +125,27 @@
     </div>
 
 
-<h1 id="2-handling-of-data-within-your-directory">2 - Handling of data within your directory</h1>
-<p>TODO...</p>
+<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>
+<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>
+</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>
+</ul>
+</li>
+</ul>
 
 
     <div class="nav">

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 11:15:10 2012
@@ -108,7 +108,7 @@
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="2-handling-data.html">2 - Handling of data within your directory</a>
+            <a href="2-handling-data.html">2 - Handling data within your directory</a>
 		
         </div>
         <div class="nav_up">
@@ -126,6 +126,8 @@
 
 
 <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>
 <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>
@@ -136,7 +138,7 @@
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="2-handling-data.html">2 - Handling of data within your directory</a>
+            <a href="2-handling-data.html">2 - Handling data within your directory</a>
 		
         </div>
         <div class="nav_up">

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 11:15:10 2012
@@ -126,6 +126,11 @@
 
 
 <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>
+<ul>
+<li><a href="4.1-mozilla-thunderbird.html">4.1 - Mozilla Thunderbird Integration</a></li>
+</ul>
 
 
     <div class="nav">

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/4.1-mozilla-thunderbird.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/4.1-mozilla-thunderbird.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/4.1-mozilla-thunderbird.html Tue Oct 30 11:15:10 2012
@@ -17,7 +17,7 @@
 -->
 <html>
 	<head>
-		<title>4.1 - Mozilla Thunderbird &mdash; Apache Directory</title>
+		<title>4.1 - Mozilla Thunderbird Integration &mdash; Apache Directory</title>
 		
         <link href="./../../css/common.css" rel="stylesheet" type="text/css">
     	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
@@ -125,7 +125,7 @@
     </div>
 
 
-<h1 id="41-mozilla-thunderbird">4.1 - Mozilla Thunderbird</h1>
+<h1 id="41-mozilla-thunderbird-integration">4.1 - Mozilla Thunderbird Integration</h1>
 
 
     <div class="nav">

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 11:15:10 2012
@@ -107,17 +107,10 @@
 
 
 <h1 id="apacheds-v20-basic-users-guide">ApacheDS v2.0 Basic User's Guide</h1>
-<p><DIV class="note" markdown="1">
-<strong>Work in progress</strong></p>
-<p>Unfortunately the Basic User's Guide for ApacheDS 2.0 is not finished yet. We have started to move and revise the content, things you find here are work in progress but should be valid for ApacheDS 2.0. 
-</DIV></p>
+<p>This guide is primarily for people new to ApacheDS 2.0. If you plan to use the server as is, maybe even for your first LDAP experience, you'll (hopefully) find all information necessary to do so. Only basic configuration tasks are covered. Learn more about the options you have (and many other things) in the <a href="advanced-users-guide.html">ApacheDS v2.0 Advanced User's Guide</a>.</p>
+<p><strong>LDAP</strong> is a complex set of technology, <em>Apache Directory Server</em> is offering more than just <strong>LDAP</strong>, so it's good to get a quick grip on the server.</p>
 <h2 id="about-this-guide">About this guide</h2>
 <p>Getting started. Learn how to download and install ApacheDS 2.0 on different platforms, connect to it with various clients (graphical tools among others), manipulate the data within your directory and integrate ApacheDS with other software. The same sample data, provided as a download, is used through the whole guide.</p>
-<h3 id="audience">Audience</h3>
-<p>This guide is primarily for people new to ApacheDS 2.0. If you plan to use the server as is, maybe even for your first LDAP experience, you'll (hopefully) find all information necessary to do so. Only basic configuration tasks are covered. Learn more about the options you have (and many other things) in the <a href="advanced-users-guide.html">ApacheDS v2.0 Advanced User's Guide</a>.</p>
-<h3 id="feedback-welcome">Feedback welcome!</h3>
-<p>We are quite interested to improve the content of this guide. Feel free to provide us feedback:</p>
-<p><img alt="email" src="../images/email.png" /> <a href="mailto:users@directory.apache.org">mailto:users@directory.apache.org</a> </p>
 <h2 id="table-of-contents">Table of contents</h2>
 <ul>
 <li><a href="basic-ug/1-how-to-begin.html">1 - How to begin</a><ul>
@@ -147,6 +140,9 @@
 </ul>
 </li>
 </ul>
+<h3 id="feedback-welcome">Feedback welcome!</h3>
+<p>We are quite interested to improve the content of this guide. Feel free to provide us feedback:</p>
+<p><img alt="email" src="../images/email.png" /> <a href="mailto:users@directory.apache.org">mailto:users@directory.apache.org</a> </p>