You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bu...@apache.org on 2013/04/15 17:37:10 UTC

svn commit: r858570 - in /websites/staging/directory/trunk/content: ./ apacheds/advanced-ug/

Author: buildbot
Date: Mon Apr 15 15:37:09 2013
New Revision: 858570

Log:
Staging update by buildbot for directory

Added:
    websites/staging/directory/trunk/content/apacheds/advanced-ug/5-administration.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/5.1-layout.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/5.2-start-stop.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/5.3-logs.html
Modified:
    websites/staging/directory/trunk/content/   (props changed)
    websites/staging/directory/trunk/content/apacheds/advanced-ug/0-community.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/1-architecture.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/2-server-config.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/3-admin-model.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/4-authentication-and-authorization.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1-authentication.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.1-simple-authn.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2-sasl-authn.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2.4-sasl-gssapi-authn.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.3-kerberos-authn.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2-authorization.html

Propchange: websites/staging/directory/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 15 15:37:09 2013
@@ -1 +1 @@
-1468110
+1468126

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/0-community.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/0-community.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/0-community.html Mon Apr 15 15:37:09 2013
@@ -130,7 +130,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="1-architecture.html">1 - Architecture</a>
+            <a href="0.1-reporting-bugs.html">0.1. Reporting Bugs</a>
 		
         </div>
         <div class="clearfix"></div>
@@ -161,7 +161,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="1-architecture.html">1 - Architecture</a>
+            <a href="0.1-reporting-bugs.html">0.1. Reporting Bugs</a>
 		
         </div>
         <div class="clearfix"></div>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/1-architecture.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/1-architecture.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/1-architecture.html Mon Apr 15 15:37:09 2013
@@ -120,7 +120,7 @@
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="0-community.html">0 - Community</a>
+            <a href="0.3-contributing.html">0.3 - Contributing</a>
 		
         </div>
         <div class="nav_up">
@@ -130,7 +130,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="2-server-config.html">2 - Server Configuration</a>
+            <a href="1.1-architecture-overview.html">1.1 - Architectural Overview</a>
 		
         </div>
         <div class="clearfix"></div>
@@ -152,7 +152,7 @@
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="0-community.html">0 - Community</a>
+            <a href="0.3-contributing.html">0.3 - Contributing</a>
 		
         </div>
         <div class="nav_up">
@@ -162,7 +162,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="2-server-config.html">2 - Server Configuration</a>
+            <a href="1.1-architecture-overview.html">1.1 - Architectural Overview</a>
 		
         </div>
         <div class="clearfix"></div>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/2-server-config.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/2-server-config.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/2-server-config.html Mon Apr 15 15:37:09 2013
@@ -120,7 +120,7 @@
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="1-architecture.html">1 - Architecture</a>
+            <a href="1.5-backend.html">1.5 - Backend</a>
 		
         </div>
         <div class="nav_up">
@@ -1415,7 +1415,7 @@ ads-httpAppCtxPath: /home/app1
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="1-architecture.html">1 - Architecture</a>
+            <a href="1.5-backend.html">1.5 - Backend</a>
 		
         </div>
         <div class="nav_up">

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/3-admin-model.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/3-admin-model.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/3-admin-model.html Mon Apr 15 15:37:09 2013
@@ -130,7 +130,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="4-authentication-and-authorization.html">4 - Authentication and Authorization</a>
+            <a href="3.1-administrative-points.html">3.1 - Administrative Points</a>
 		
         </div>
         <div class="clearfix"></div>
@@ -205,7 +205,7 @@ then one area totally includes the other
         </div>
         <div class="nav_next">
         
-            <a href="4-authentication-and-authorization.html">4 - Authentication and Authorization</a>
+            <a href="3.1-administrative-points.html">3.1 - Administrative Points</a>
 		
         </div>
         <div class="clearfix"></div>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4-authentication-and-authorization.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4-authentication-and-authorization.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4-authentication-and-authorization.html Mon Apr 15 15:37:09 2013
@@ -120,7 +120,7 @@
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="3-admin-model.html">3 - Administrative Model</a>
+            <a href="3.2-operations-on-an-administrativepoint.html">3.2 Operations on an a Administrative Point</a>
 		
         </div>
         <div class="nav_up">
@@ -130,7 +130,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="5-administration.html"></a>
+            <a href="4.1-authentication.html"></a>
 		
         </div>
         <div class="clearfix"></div>
@@ -201,7 +201,7 @@
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="3-admin-model.html">3 - Administrative Model</a>
+            <a href="3.2-operations-on-an-administrativepoint.html">3.2 Operations on an a Administrative Point</a>
 		
         </div>
         <div class="nav_up">
@@ -211,7 +211,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="5-administration.html"></a>
+            <a href="4.1-authentication.html"></a>
 		
         </div>
         <div class="clearfix"></div>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1-authentication.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1-authentication.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1-authentication.html Mon Apr 15 15:37:09 2013
@@ -130,7 +130,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="4.2-authorization.html">4.2 - Authorization</a>
+            <a href="4.1.1-simple-authn.html">4.1.1 - Simple authentication</a>
 		
         </div>
         <div class="clearfix"></div>
@@ -182,7 +182,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="4.2-authorization.html">4.2 - Authorization</a>
+            <a href="4.1.1-simple-authn.html">4.1.1 - Simple authentication</a>
 		
         </div>
         <div class="clearfix"></div>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.1-simple-authn.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.1-simple-authn.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.1-simple-authn.html Mon Apr 15 15:37:09 2013
@@ -130,7 +130,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="4.1.2-sasl-authn.html">4.1.2 - SASL authentication</a>
+            <a href="4.1.1.1-anonymous-authn.html">4.1.1.1 - Anonymous Authentication</a>
 		
         </div>
         <div class="clearfix"></div>
@@ -161,7 +161,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="4.1.2-sasl-authn.html">4.1.2 - SASL authentication</a>
+            <a href="4.1.1.1-anonymous-authn.html">4.1.1.1 - Anonymous Authentication</a>
 		
         </div>
         <div class="clearfix"></div>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2-sasl-authn.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2-sasl-authn.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2-sasl-authn.html Mon Apr 15 15:37:09 2013
@@ -130,7 +130,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="4.1.3-kerberos-authn.html">4.1.3 - Kerberos authentication</a>
+            <a href="4.1.2.1-sasl-plain-text-authn.html">4.1.2.1 - SASL PLAIN text Authentication</a>
 		
         </div>
         <div class="clearfix"></div>
@@ -212,7 +212,7 @@
         </div>
         <div class="nav_next">
         
-            <a href="4.1.3-kerberos-authn.html">4.1.3 - Kerberos authentication</a>
+            <a href="4.1.2.1-sasl-plain-text-authn.html">4.1.2.1 - SASL PLAIN text Authentication</a>
 		
         </div>
         <div class="clearfix"></div>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2.4-sasl-gssapi-authn.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2.4-sasl-gssapi-authn.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2.4-sasl-gssapi-authn.html Mon Apr 15 15:37:09 2013
@@ -139,12 +139,33 @@
 
 <h1 id="4124-sasl-gssapi-authentication">4.1.2.4 - SASL GSSAPI Authentication</h1>
 <p>This authentication mechanism is specified in the following RFCs :</p>
-<div class="codehilite"><pre><span class="o">*</span> <span class="p">[</span><span class="n">RFC</span> <span class="mi">2222</span><span class="p">](</span><span class="n">http:</span><span class="sr">//</span><span class="n">tools</span><span class="o">.</span><span class="n">ietf</span><span class="o">.</span><span class="n">org</span><span class="sr">/html/</span><span class="n">rfc2222</span><span class="p">)</span>
-<span class="o">*</span> <span class="p">[</span><span class="n">RFC</span> <span class="p">](</span><span class="n">http:</span><span class="sr">//</span><span class="n">tools</span><span class="o">.</span><span class="n">ietf</span><span class="o">.</span><span class="n">org</span><span class="sr">/html/</span><span class="n">rfc</span><span class="p">)</span>
-<span class="o">*</span> <span class="p">[</span><span class="n">RFC</span> <span class="mi">4752</span><span class="p">](</span><span class="n">http:</span><span class="sr">//</span><span class="n">tools</span><span class="o">.</span><span class="n">ietf</span><span class="o">.</span><span class="n">org</span><span class="sr">/html/</span><span class="n">rfc4752</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="o">*</span> <span class="p">[</span><span class="n">RFC</span> <span class="mi">4752</span><span class="p">](</span><span class="n">http:</span><span class="sr">//</span><span class="n">tools</span><span class="o">.</span><span class="n">ietf</span><span class="o">.</span><span class="n">org</span><span class="sr">/html/</span><span class="n">rfc4752</span><span class="p">)</span>
 </pre></div>
 
 
+<p>It's more specically used for Kerberos V5 authentication. As <strong>Apache Directory Server</strong> is also a <em>Kerberos Server</em>, it comes as a natural extension of the server.</p>
+<p>It requires some configuration though. </p>
+<h2 id="configuration">Configuration</h2>
+<p>The idea is for the <strong>LDAP</strong> server to delegate the authenticatio  to the <strong>Kerberos</strong> Server.</p>
+<h2 id="usage">Usage</h2>
+<p>MessageType : BIND_REQUEST
+Message ID : 1
+    BindRequest
+        Version : '3'
+        Name : ''
+        Sasl credentials
+            Mechanism :'GSSAPI'
+            Credentials : (omitted-for-safety)</p>
+<p>MessageType : BIND_RESPONSE
+Message ID : 1
+    BindResponse
+        Ldap Result
+            Result code : (SASL_BIND_IN_PROGRESS) saslBindInProgress -- new
+            Matched Dn : 'null'
+            Diagnostic message : 'null'
+        Server sasl credentials : ''</p>
+
+
     <div class="nav">
         <div class="nav_prev">
         

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.3-kerberos-authn.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.3-kerberos-authn.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.3-kerberos-authn.html Mon Apr 15 15:37:09 2013
@@ -120,7 +120,7 @@
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="4.1.2-sasl-authn.html">4.1.2 - SASL authentication</a>
+            <a href="4.1.2.6-sasl-ntlm-authn.html">4.1.2.6 - SASL NTLM Authentication</a>
 		
         </div>
         <div class="nav_up">
@@ -143,7 +143,7 @@
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="4.1.2-sasl-authn.html">4.1.2 - SASL authentication</a>
+            <a href="4.1.2.6-sasl-ntlm-authn.html">4.1.2.6 - SASL NTLM Authentication</a>
 		
         </div>
         <div class="nav_up">

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2-authorization.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2-authorization.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2-authorization.html Mon Apr 15 15:37:09 2013
@@ -120,7 +120,7 @@
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="4.1-authentication.html">4.1 - Authentication</a>
+            <a href="4.1.4-certificate-authn.html">4.1.4 - Client authentication through certificates</a>
 		
         </div>
         <div class="nav_up">
@@ -214,7 +214,7 @@ time.</p>
     <div class="nav">
         <div class="nav_prev">
         
-            <a href="4.1-authentication.html">4.1 - Authentication</a>
+            <a href="4.1.4-certificate-authn.html">4.1.4 - Client authentication through certificates</a>
 		
         </div>
         <div class="nav_up">

Added: websites/staging/directory/trunk/content/apacheds/advanced-ug/5-administration.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5-administration.html (added)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5-administration.html Mon Apr 15 15:37:09 2013
@@ -0,0 +1,178 @@
+<!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>5 - Administration &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../../images/server-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        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-M11</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-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</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>
+    <a href="http://acna13.eventbrite.com/?ref=ecount"><img src="http://holdenweb.com/static/images/BannerSquareSmall.png" width="168" height="140"></a>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4-authentication-and-authorization.html">4 - Authentication and Authorization</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="../advanced-user-guide.html">Advanced User Guide</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="5.1-layout.html">5.1 - Layout</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="5-administration">5 - Administration</h1>
+<p>This chapter describe how to administrate the <strong>Apache Directory Server</strong>.</p>
+<h2 id="chapter-content">Chapter content</h2>
+<ul>
+<li><a href="5.1-layout.html">5.1 - Layout</a></li>
+<li><a href="5.2-start-stop.html">5.2 - Starting and stopping the server</a></li>
+<li><a href="5.3-logs.html">5.3 - Logs</a></li>
+</ul>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="4-authentication-and-authorization.html">4 - Authentication and Authorization</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="../advanced-user-guide.html">Advanced User Guide</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="5.1-layout.html">5.1 - Layout</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/advanced-ug/5.1-layout.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5.1-layout.html (added)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5.1-layout.html Mon Apr 15 15:37:09 2013
@@ -0,0 +1,172 @@
+<!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>5.1 - Layout &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../../images/server-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        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-M11</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-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</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>
+    <a href="http://acna13.eventbrite.com/?ref=ecount"><img src="http://holdenweb.com/static/images/BannerSquareSmall.png" width="168" height="140"></a>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="5-administration.html">5 - Administration</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="5-administration.html">5 - Administration</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="5.2-start-stop.html">5.2 - Starting and Stopping</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="51-layout">5.1 - Layout</h1>
+<p>// To be completed</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="5-administration.html">5 - Administration</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="5-administration.html">5 - Administration</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="5.2-start-stop.html">5.2 - Starting and Stopping</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/advanced-ug/5.2-start-stop.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5.2-start-stop.html (added)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5.2-start-stop.html Mon Apr 15 15:37:09 2013
@@ -0,0 +1,172 @@
+<!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>5.2 - Starting and Stopping the server &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../../images/server-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        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-M11</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-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</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>
+    <a href="http://acna13.eventbrite.com/?ref=ecount"><img src="http://holdenweb.com/static/images/BannerSquareSmall.png" width="168" height="140"></a>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="5.1-layout.html">5.1 - Server Layout</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="5-administration.html">5 - Administration</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="5.2-logs.html">5.2 - SLogs</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="51-starting-and-stopping-the-server">5.1 - Starting and Stopping the server</h1>
+<p>// To be completed</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="5.1-layout.html">5.1 - Server Layout</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="5-administration.html">5 - Administration</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="5.2-logs.html">5.2 - SLogs</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/advanced-ug/5.3-logs.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5.3-logs.html (added)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5.3-logs.html Mon Apr 15 15:37:09 2013
@@ -0,0 +1,175 @@
+<!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>5.3 - Logs &mdash; Apache Directory</title>
+		
+        <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+    	<link href="./../../css/green.css" rel="stylesheet" type="text/css">
+    
+        
+        <link rel="shortcut icon" href="./../../images/server-icon_16x16.png">
+    
+        <!-- Google Analytics -->
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            _uacct = "UA-1358462-1";
+            urchinTracker();
+        </script>
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        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-M11</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-user-guide.html">Basic User Guide </a></li>
+        <li><a href="./../../apacheds/advanced-user-guide.html">Advanced User Guide</a></li>
+        <li><a href="./../../apacheds/developer-guide.html">Developer Guide</a></li>
+        <li><a href="./../../apacheds/kerberos-user-guide.html">Kerberos User Guide</a></li>
+        <li><a href="./../../apacheds/configuration/ads-2.0-configuration.html">Configuration</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>
+    <a href="http://acna13.eventbrite.com/?ref=ecount"><img src="http://holdenweb.com/static/images/BannerSquareSmall.png" width="168" height="140"></a>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="5.2-start-stop.html">5.2 - Starting and Stopping the server</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="5-administration.html">5 - Administration</a>
+		
+        </div>
+        <div class="nav_next">
+        
+			&nbsp;
+        
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="51-logs">5.1 - Logs</h1>
+<p>We use SLF4J as a facade for logs, and Log4J in the standalone server. </p>
+<p>The logs can be configured by modifiying the log4j.properties file which can be found in the <em>conf</em> directory (see the previous chapter 5.1). Here is a simple example of configuration :</p>
+<div class="codehilite"><pre>
+</pre></div>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="5.2-start-stop.html">5.2 - Starting and Stopping the server</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="5-administration.html">5 - Administration</a>
+		
+        </div>
+        <div class="nav_next">
+        
+			&nbsp;
+        
+        </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