directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r866770 [6/9] - in /websites/staging/directory/trunk/content: ./ apacheds/ apacheds/advanced-ug/ apacheds/basic-ug/ apacheds/configuration/ apacheds/kerberos-ug/ api/ api/gen-docs/ api/gen-docs/latest/ api/groovy-api/ api/user-guide/ studio/
Date Fri, 21 Jun 2013 10:04:40 GMT
Modified: websites/staging/directory/trunk/content/apacheds/configuration/ads-2.0-configuration.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/configuration/ads-2.0-configuration.html (original)
+++ websites/staging/directory/trunk/content/apacheds/configuration/ads-2.0-configuration.html Fri Jun 21 10:04:38 2013
@@ -206,195 +206,195 @@ have to connect on the server and to mod
 <p>Here is the existing structure, where we have defined one <em>LDAP</em> server
 (<em>ldapServer1</em>), backed by one <em>Directory Service</em> (<em>DS1</em>), and two
 associated transports (<em>ldapSrv1</em> and <em>ldapsSrv1</em>) :</p>
-<div class="codehilite"><pre><span class="n">ou</span><span class="o">=</span><span class="n">config</span>
+<div class="codehilite"><pre><span class="n">ou</span><span class="p">=</span><span class="n">config</span>
  <span class="o">|</span>
- <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">directoryServiceId</span><span class="o">=</span><span class="n">default</span>
+ <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">directoryServiceId</span><span class="p">=</span><span class="n">default</span>
       <span class="o">|</span>
-      <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">changeLogId</span><span class="o">=</span><span class="n">defaultChangeLog</span>
+      <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">changeLogId</span><span class="p">=</span><span class="n">defaultChangeLog</span>
       <span class="o">|</span>
-      <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">journalId</span><span class="o">=</span><span class="n">defaultJournal</span>
+      <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">journalId</span><span class="p">=</span><span class="n">defaultJournal</span>
       <span class="o">|</span>
-      <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">interceptors</span>
+      <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">interceptors</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">aciAuthorizationInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">aciAuthorizationInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">authenticationInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">authenticationInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">authenticators</span>
+      <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">authenticators</span>
       <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">authenticatorid</span><span class="o">=</span><span class="n">anonymousauthenticator</span>
+      <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">authenticatorid</span><span class="p">=</span><span class="n">anonymousauthenticator</span>
       <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">authenticatorid</span><span class="o">=</span><span class="n">simpleauthenticator</span>
+      <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">authenticatorid</span><span class="p">=</span><span class="n">simpleauthenticator</span>
       <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">authenticatorid</span><span class="o">=</span><span class="n">strongauthenticator</span>
+      <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">authenticatorid</span><span class="p">=</span><span class="n">strongauthenticator</span>
       <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">passwordPolicies</span>
+      <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">passwordPolicies</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">pwdId</span><span class="o">=</span><span class="n">default</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">pwdId</span><span class="p">=</span><span class="n">default</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">collectiveAttributeInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">collectiveAttributeInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">defaultAuthorizationInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">defaultAuthorizationInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">eventInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">eventInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">exceptionInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">exceptionInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">keyDerivationInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">keyDerivationInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">normalizationInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">normalizationInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">operationalAttributeInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">operationalAttributeInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">passwordHashingInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">passwordHashingInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">referralInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">referralInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">schemaInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">schemaInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">subentryInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">subentryInterceptor</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="o">=</span><span class="n">triggerInterceptor</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">interceptorId</span><span class="p">=</span><span class="n">triggerInterceptor</span>
       <span class="o">|</span>
-      <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">partitions</span>
+      <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">partitions</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">partitionId</span><span class="o">=</span><span class="nb">system</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">partitionId</span><span class="p">=</span><span class="n">system</span>
       <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">indexes</span>
+      <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">indexes</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheRdn</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheRdn</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheSubLevel</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheSubLevel</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apachePresence</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apachePresence</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheOneLevel</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheOneLevel</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheOneAlias</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheOneAlias</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheSubAlias</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheSubAlias</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheAlias</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheAlias</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">objectClass</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">objectClass</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">entryUUID</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">entryUUID</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">entryCSN</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">entryCSN</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">ou</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">ou</span>
       <span class="o">|</span>    <span class="o">|</span>         <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">uid</span>
+      <span class="o">|</span>    <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">uid</span>
       <span class="o">|</span>    <span class="o">|</span>
-      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">partitionId</span><span class="o">=</span><span class="n">example</span>
+      <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">partitionId</span><span class="p">=</span><span class="n">example</span>
       <span class="o">|</span>     <span class="o">|</span>
-      <span class="o">|</span>     <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">indexes</span>
+      <span class="o">|</span>     <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">indexes</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheRdn</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheRdn</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheSubLevel</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheSubLevel</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apachePresence</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apachePresence</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheOneLevel</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheOneLevel</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheOneAlias</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheOneAlias</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheSubAlias</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheSubAlias</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">apacheAlias</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">apacheAlias</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">objectClass</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">objectClass</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">entryUUID</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">entryUUID</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">entryCSN</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">entryCSN</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">ou</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">ou</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">uid</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">uid</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">dc</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">dc</span>
       <span class="o">|</span>          <span class="o">|</span>
-      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="o">=</span><span class="n">krb5PrincipalName</span>
+      <span class="o">|</span>          <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">indexAttributeId</span><span class="p">=</span><span class="n">krb5PrincipalName</span>
       <span class="o">|</span>
-      <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">servers</span>
+      <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">servers</span>
        <span class="o">|</span>
-       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="o">=</span><span class="n">changePasswordServer</span>
+       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="p">=</span><span class="n">changePasswordServer</span>
        <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">transports</span>
+       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">transports</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="o">=</span><span class="n">tcp</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="p">=</span><span class="n">tcp</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="o">=</span><span class="n">udp</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="p">=</span><span class="n">udp</span>
        <span class="o">|</span>
-       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="o">=</span><span class="n">dnsServer</span>
+       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="p">=</span><span class="n">dnsServer</span>
        <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">transports</span>
+       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">transports</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="o">=</span><span class="n">tcp</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="p">=</span><span class="n">tcp</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="o">=</span><span class="n">udp</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="p">=</span><span class="n">udp</span>
        <span class="o">|</span>
-       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="o">=</span><span class="n">httpServer</span>
+       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="p">=</span><span class="n">httpServer</span>
        <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">transports</span>
+       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">transports</span>
        <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="o">=</span><span class="n">http</span>
+       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="p">=</span><span class="n">http</span>
        <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="o">=</span><span class="n">https</span>
+       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="p">=</span><span class="n">https</span>
        <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">httpWebApps</span>
+       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">httpWebApps</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">id</span><span class="o">=</span><span class="n">testapp</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">id</span><span class="p">=</span><span class="n">testapp</span>
        <span class="o">|</span>
-       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="o">=</span><span class="n">kerberosServer</span>
+       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="p">=</span><span class="n">kerberosServer</span>
        <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">transports</span>
+       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">transports</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="o">=</span><span class="n">tcp</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="p">=</span><span class="n">tcp</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="o">=</span><span class="n">udp</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="p">=</span><span class="n">udp</span>
        <span class="o">|</span>
-       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="o">=</span><span class="n">ldapServer</span>
+       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="p">=</span><span class="n">ldapServer</span>
        <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">replConsumers</span>
+       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">replConsumers</span>
        <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">transports</span>
+       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">transports</span>
        <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="o">=</span><span class="n">ldap</span>
+       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="p">=</span><span class="n">ldap</span>
        <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="o">=</span><span class="n">ldaps</span>
+       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportid</span><span class="p">=</span><span class="n">ldaps</span>
        <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">extendedOpHandlers</span>
+       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">extendedOpHandlers</span>
        <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">extendedOpId</span><span class="o">=</span><span class="n">gracefulShutdownHandler</span>
+       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">extendedOpId</span><span class="p">=</span><span class="n">gracefulShutdownHandler</span>
        <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">extendedOpId</span><span class="o">=</span><span class="n">starttlshandler</span>
+       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">extendedOpId</span><span class="p">=</span><span class="n">starttlshandler</span>
        <span class="o">|</span>    <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">extendedOpId</span><span class="o">=</span><span class="n">storedprochandler</span>
+       <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">extendedOpId</span><span class="p">=</span><span class="n">storedprochandler</span>
        <span class="o">|</span>    <span class="o">|</span>
-       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">saslMechHandlers</span>
+       <span class="o">|</span>    <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">saslMechHandlers</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="o">=</span><span class="n">CRAM</span><span class="o">-</span><span class="n">MD5</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="p">=</span><span class="n">CRAM</span><span class="o">-</span><span class="n">MD5</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="o">=</span><span class="n">DIGEST</span><span class="o">-</span><span class="n">MD5</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="p">=</span><span class="n">DIGEST</span><span class="o">-</span><span class="n">MD5</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="o">=</span><span class="n">GSS</span><span class="o">-</span><span class="n">SPNEGO</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="p">=</span><span class="n">GSS</span><span class="o">-</span><span class="n">SPNEGO</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="o">=</span><span class="n">GSSAPI</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="p">=</span><span class="n">GSSAPI</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="o">=</span><span class="n">NTLM</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="p">=</span><span class="n">NTLM</span>
        <span class="o">|</span>         <span class="o">|</span>
-       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="o">=</span><span class="n">SIMPLE</span>
+       <span class="o">|</span>         <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">saslMechName</span><span class="p">=</span><span class="n">SIMPLE</span>
        <span class="o">|</span>
-       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="o">=</span><span class="n">ntpServer</span>
+       <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">serverId</span><span class="p">=</span><span class="n">ntpServer</span>
         <span class="o">|</span>
-        <span class="o">+--</span><span class="n">ou</span><span class="o">=</span><span class="n">transports</span>
+        <span class="o">+--</span><span class="n">ou</span><span class="p">=</span><span class="n">transports</span>
              <span class="o">|</span>
-             <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="o">=</span><span class="n">tcp</span>
+             <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="p">=</span><span class="n">tcp</span>
              <span class="o">|</span>
-             <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="o">=</span><span class="n">udp</span>
+             <span class="o">+--</span><span class="n">ads</span><span class="o">-</span><span class="n">transportId</span><span class="p">=</span><span class="n">udp</span>
 </pre></div>
 
 
@@ -889,10 +889,10 @@ incoming requests </td></tr>
 create :<em>TcpTransport</em> or <em>UdpTransport</em>.</p>
 <p>For instance, in the current <em>server.xml</em> file, we have this configuration
 for the <em>LDAP</em> server and for the <em>Kerberos</em> server :</p>
-<div class="codehilite"><pre>  <span class="o">...</span>
-  <span class="o">&lt;</span><span class="n">ldapServer</span> <span class="n">id</span><span class="o">=</span><span class="s">&quot;ldapServer&quot;</span> <span class="o">...&gt;</span>
-    <span class="sr">&lt;transports&gt;</span>
-      <span class="o">&lt;</span><span class="n">tcpTransport</span> <span class="n">address</span><span class="o">=</span><span class="s">&quot;0.0.0.0&quot;</span> <span class="n">port</span><span class="o">=</span><span class="s">&quot;10389&quot;</span> <span class="n">nbThreads</span><span class="o">=</span><span class="s">&quot;8&quot;</span>
+<div class="codehilite"><pre>  <span class="p">...</span>
+  <span class="o">&lt;</span><span class="n">ldapServer</span> <span class="n">id</span><span class="p">=</span>&quot;<span class="n">ldapServer</span>&quot; <span class="p">...</span><span class="o">&gt;</span>
+    <span class="o">&lt;</span><span class="n">transports</span><span class="o">&gt;</span>
+      <span class="o">&lt;</span><span class="n">tcpTransport</span> <span class="n">address</span><span class="p">=</span>&quot;0<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span>0&quot; <span class="n">port</span><span class="p">=</span>&quot;10389&quot; <span class="n">nbThreads</span><span class="p">=</span>&quot;8&quot;
 </pre></div>
 
 

Modified: websites/staging/directory/trunk/content/apacheds/download-old-versions.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/download-old-versions.html (original)
+++ websites/staging/directory/trunk/content/apacheds/download-old-versions.html Fri Jun 21 10:04:38 2013
@@ -120,256 +120,104 @@
 
 <h1 id="download-old-versions">Download Old Versions</h1>
 <h2 id="apacheds-20">ApacheDS 2.0</h2>
-<p><DIV markdown="1">
-<center></p>
-<table>
-<thead>
-<tr>
-<th align="center">Version</th>
-<th align="center">Download Link</th>
-<th align="center">Date</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td align="center">ApacheDS 2.0.0-M11 binaries</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/dist/2.0.0-M11/">Download</a></td>
-<td align="center">03/Mar/2013</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M11 sources</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/2.0.0-M11/">Download</a></td>
-<td align="center">03/Mar/2013</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M10 binaries</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/dist/2.0.0-M10/">Download</a></td>
-<td align="center">28/Jan/2013</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M10 sources</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/2.0.0-M10/">Download</a></td>
-<td align="center">28/Jan/2013</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M9</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M9">Download</a></td>
-<td align="center">02/Jan/2013</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M8</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M8">Download</a></td>
-<td align="center">12/Oct/2012</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M7</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M7">Download</a></td>
-<td align="center">21/May/2012</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M6</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M6">Download</a></td>
-<td align="center">29/Feb/2012</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M5</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M5">Download</a></td>
-<td align="center">07/Feb/2012</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M4</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M4">Download</a></td>
-<td align="center">09/Jan/2012</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M3</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M3">Download</a></td>
-<td align="center">12/Sep/2011</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M2</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M2">Download</a></td>
-<td align="center">22/Aug/2011</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 2.0.0-M1</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M1">Download</a></td>
-<td align="center">25/Jun/2011</td>
-</tr>
-</tbody>
-</table>
-<p></center>
-</DIV></p>
+<DIV markdown="1">
+<center>
+
+| Version| Download Link | Date |
+|:-:|:-:|:-:|
+| ApacheDS 2.0.0-M11 binaries | [Download](http://archive.apache.org/dist/directory/apacheds/dist/2.0.0-M11/) | 03/Mar/2013 |
+| ApacheDS 2.0.0-M11 sources | [Download](http://archive.apache.org/dist/directory/apacheds/2.0.0-M11/) | 03/Mar/2013 |
+| ApacheDS 2.0.0-M10 binaries | [Download](http://archive.apache.org/dist/directory/apacheds/dist/2.0.0-M10/) | 28/Jan/2013 |
+| ApacheDS 2.0.0-M10 sources | [Download](http://archive.apache.org/dist/directory/apacheds/2.0.0-M10/) | 28/Jan/2013 |
+| ApacheDS 2.0.0-M9 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M9) | 02/Jan/2013 |
+| ApacheDS 2.0.0-M8 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M8) | 12/Oct/2012 |
+| ApacheDS 2.0.0-M7 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M7) | 21/May/2012 |
+| ApacheDS 2.0.0-M6 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M6) | 29/Feb/2012 |
+| ApacheDS 2.0.0-M5 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M5) | 07/Feb/2012 |
+| ApacheDS 2.0.0-M4 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M4) | 09/Jan/2012 |
+| ApacheDS 2.0.0-M3 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M3) | 12/Sep/2011 |
+| ApacheDS 2.0.0-M2 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M2) | 22/Aug/2011 |
+| ApacheDS 2.0.0-M1 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/2.0/2.0.0-M1) | 25/Jun/2011 |
+
+</center>
+</DIV>
+
 <h2 id="apacheds-15-not-maintained">ApacheDS 1.5 (not maintained)</h2>
-<p><DIV markdown="1">
-<center></p>
-<table>
-<thead>
-<tr>
-<th align="center">Version</th>
-<th align="center">Download Link</th>
-<th align="center">Date</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td align="center">ApacheDS 1.5.7</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.7/">Download</a></td>
-<td align="center">24/Apr/2010</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.5.6</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.6/">Download</a></td>
-<td align="center">22/Mar/2010</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.5.5</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.5/">Download</a></td>
-<td align="center">19/Aug/2009</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.5.4</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.4/">Download</a></td>
-<td align="center">07/Sep/2008</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.5.3</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.3/">Download</a></td>
-<td align="center">13/Jul/2008</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.5.2</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.2/">Download</a></td>
-<td align="center">17/Apr/2008</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.5.1</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.1/">Download</a></td>
-<td align="center">02/Sep/2007</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.5.0</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.0/">Download</a></td>
-<td align="center">11/Apr/2007</td>
-</tr>
-</tbody>
-</table>
-<p></center>
-</DIV></p>
+<DIV markdown="1">
+<center>
+
+| Version| Download Link | Date |
+|:-:|:-:|:-:|
+| ApacheDS 1.5.7 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.7/) | 24/Apr/2010 |
+| ApacheDS 1.5.6 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.6/) | 22/Mar/2010 |
+| ApacheDS 1.5.5 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.5/) | 19/Aug/2009 |
+| ApacheDS 1.5.4 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.4/) | 07/Sep/2008 |
+| ApacheDS 1.5.3 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.3/) | 13/Jul/2008 |
+| ApacheDS 1.5.2 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.2/) | 17/Apr/2008 |
+| ApacheDS 1.5.1 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.1/) | 02/Sep/2007 |
+| ApacheDS 1.5.0 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/1.5/1.5.0/) | 11/Apr/2007 |
+
+</center>
+</DIV>
+
 <h2 id="apacheds-10-not-maintained">ApacheDS 1.0 (not maintained)</h2>
-<p><DIV markdown="1">
-<center></p>
-<table>
-<thead>
-<tr>
-<th align="center">Version</th>
-<th align="center">Download Link</th>
-<th align="center">Date</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td align="center">ApacheDS 1.0.2</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0.2/">Download</a></td>
-<td align="center">26/May/2007</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.0.1</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0.1/">Download</a></td>
-<td align="center">22/Feb/2007</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.0.0</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0.0/">Download</a></td>
-<td align="center">06/Oct/2006</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.0-RC4</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0-RC4/">Download</a></td>
-<td align="center">05/Sep/2006</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.0-RC3</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0-RC3/">Download</a></td>
-<td align="center">09/May/2006</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.0-RC2</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0-RC2/">Download</a></td>
-<td align="center">30/Apr/2006</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 1.0-RC1</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0-RC1/">Download</a></td>
-<td align="center">24/Feb/2006</td>
-</tr>
-</tbody>
-</table>
-<p></center>
-</DIV></p>
+<DIV markdown="1">
+<center>
+
+| Version| Download Link | Date |
+|:-:|:-:|:-:|
+| ApacheDS 1.0.2 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0.2/) | 26/May/2007 |
+| ApacheDS 1.0.1 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0.1/) | 22/Feb/2007 |
+| ApacheDS 1.0.0 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0.0/) | 06/Oct/2006 |
+| ApacheDS 1.0-RC4 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0-RC4/) | 05/Sep/2006 |
+| ApacheDS 1.0-RC3 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0-RC3/) | 09/May/2006 |
+| ApacheDS 1.0-RC2 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0-RC2/) | 30/Apr/2006 |
+| ApacheDS 1.0-RC1 | [Download](http://archive.apache.org/dist/directory/apacheds/stable/1.0/1.0-RC1/) | 24/Feb/2006 |
+
+</center>
+</DIV>
+
 <h2 id="apacheds-09-not-maintained">ApacheDS 0.9 (not maintained)</h2>
-<p><DIV markdown="1">
-<center></p>
-<table>
-<thead>
-<tr>
-<th align="center">Version</th>
-<th align="center">Download Link</th>
-<th align="center">Date</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td align="center">ApacheDS 0.9.3</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/0.9/0.9.3">Download</a></td>
-<td align="center">01/Nov/2005</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 0.9.2</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/0.9/0.9.2">Download</a></td>
-<td align="center">30/Aug/2005</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 0.9.1</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/0.9/0.9.1">Download</a></td>
-<td align="center">30/Jul/2005</td>
-</tr>
-<tr>
-<td align="center">ApacheDS 0.9.0</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/apacheds/unstable/0.9/0.9.0">Download</a></td>
-<td align="center">08/May/2005</td>
-</tr>
-</tbody>
-</table>
-<p></center>
-</DIV></p>
-<p><DIV class="note" markdown="1">
-We encourage you to verify the integrity of the downloaded file using:</p>
-<ul>
-<li>the ASC file (OpenPGP compatible signature) with the <a href="http://www.apache.org/dist/directory/KEYS">KEYS</a> file (code signing keys used to sign the product)</li>
-<li>the MD5 file (checksum).
-</DIV></li>
-</ul>
+<DIV markdown="1">
+<center>
+
+| Version| Download Link | Date |
+|:-:|:-:|:-:|
+| ApacheDS 0.9.3 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/0.9/0.9.3) | 01/Nov/2005 |
+| ApacheDS 0.9.2 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/0.9/0.9.2) | 30/Aug/2005 |
+| ApacheDS 0.9.1 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/0.9/0.9.1) | 30/Jul/2005 |
+| ApacheDS 0.9.0 | [Download](http://archive.apache.org/dist/directory/apacheds/unstable/0.9/0.9.0) | 08/May/2005 |
+
+</center>
+</DIV>
+
+<DIV class="note" markdown="1">
+We encourage you to verify the integrity of the downloaded file using:
+
+* the ASC file (OpenPGP compatible signature) with the [KEYS](http://www.apache.org/dist/directory/KEYS) file (code signing keys used to sign the product)
+* the MD5 file (checksum).
+</DIV>
+
 <h2 id="verify-the-integrity-of-the-file">Verify the integrity of the file</h2>
 <p>The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/directory/KEYS">keys</a> file as well as the asc signature file for the relevant distribution. Then verify the signatures using:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">pgpk</span> <span class="o">-</span><span class="n">a</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">pgpv</span> <span class="n">apache_1</span><span class="mf">.3.24</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">pgpk</span> <span class="o">-</span><span class="n">a</span> <span class="n">KEYS</span>
+$ <span class="n">pgpv</span> <span class="n">apache_1</span><span class="p">.</span>3<span class="p">.</span>24<span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
 </pre></div>
 
 
 <p>or</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">pgp</span> <span class="o">-</span><span class="n">ka</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">pgp</span> <span class="n">apache_1</span><span class="mf">.3.24</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">pgp</span> <span class="o">-</span><span class="n">ka</span> <span class="n">KEYS</span>
+$ <span class="n">pgp</span> <span class="n">apache_1</span><span class="p">.</span>3<span class="p">.</span>24<span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
 </pre></div>
 
 
 <p>or</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">gpg</span> <span class="o">--</span><span class="nb">import</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">gpg</span> <span class="o">--</span><span class="n">verify</span> <span class="n">apache_1</span><span class="mf">.3.24</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">gpg</span> <span class="o">--</span><span class="n">import</span> <span class="n">KEYS</span>
+$ <span class="n">gpg</span> <span class="o">--</span><span class="n">verify</span> <span class="n">apache_1</span><span class="p">.</span>3<span class="p">.</span>24<span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
 </pre></div>
 
 
-<p>Alternatively, you can verify the MD5 signature on the files. A unix program called md5 or md5sum is included in many unix distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>. Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>, <a href="http://www.pc-tools.net/win32/freeware/console/], or [here|http://www.slavasoft.com/fsum/">here</a>.</p>
+<p>Alternatively, you can verify the MD5 signature on the files. A unix program called md5 or md5sum is included in many unix distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>. Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>, <a href="http://www.pc-tools.net/win32/freeware/console/],%20or%20[here|http://www.slavasoft.com/fsum/">here</a>.</p>
 
 
 

Modified: websites/staging/directory/trunk/content/apacheds/index.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/index.html (original)
+++ websites/staging/directory/trunk/content/apacheds/index.html Fri Jun 21 10:04:38 2013
@@ -119,13 +119,14 @@
 
 
 
-    <h1 id="apachedswzxhzdk0">ApacheDS&trade;</h1>
+    <h1 id="apachedswzxhzdk3">ApacheDS&trade;</h1>
 <p><strong>ApacheDS&trade;</strong> is an extensible and embeddable directory server entirely written in Java, which has been certified LDAPv3 compatible by the Open Group. Besides LDAP it supports Kerberos 5 and the Change Password Protocol. It has been designed to introduce triggers, stored procedures, queues and views to the world of LDAP which has lacked these rich constructs.</p>
 <h2 id="versioning-scheme">Versioning Scheme</h2>
 <p>The version number of <em>ApacheDS</em> has the following form:</p>
-<p><DIV class="info" markdown="1">
-    &lt;major&gt;.&lt;minor&gt;.&lt;micro&gt; [-M&lt;milestone number&gt; or -RC&lt;release candidate number&gt;]
-</DIV></p>
+<DIV class="info" markdown="1">
+    &lt;major>.&lt;minor>.&lt;micro> \[-M&lt;milestone number> or -RC&lt;release candidate number>]
+</DIV>
+
 <p>This scheme has three number components:</p>
 <ul>
 <li>The <strong>major</strong> number increases when there are incompatible changes in the API.</li>
@@ -139,14 +140,16 @@
 <li>No label implies <strong>GA</strong> (General Availability), which means the release is stable enough and therefore ready for production environment.</li>
 </ul>
 <p><strong>ApacheDS</strong> 1.0 is considered a dead branch. <strong>ApacheDS</strong> <strong>1.5.X</strong> are intermediary versions toward <strong>ApacheDS</strong> <strong>2.0</strong>, which is currently being developped.</p>
-<p><DIV class="tip" markdown="1">
-    Users should start with the latest <em>2.0</em> version, even if it's not stabilized yet. 
-</DIV></p>
-<p><DIV class="info" markdown="1">
-    A <strong>stable</strong> version is a version with a frozen set of features, and a frozen <strong>API</strong>. We don't release a version if all the integration tests are not passing, so any release should be considered stable enogh to be used.<BR/>
+<DIV class="tip" markdown="1">
+    Users should start with the latest *2.0* version, even if it's not stabilized yet. 
+</DIV>
+
+<DIV class="info" markdown="1">
+    A **stable** version is a version with a frozen set of features, and a frozen **API**. We don't release a version if all the integration tests are not passing, so any release should be considered stable enogh to be used.<BR/>
     Although we may add new features between two milestones, and the data structure may change, which may imply that the data have to be extracted and reimported in order for the server to be operational.<BR/>
     The configuration might also evolve between two versions.
-</DIV></p>
+</DIV>
+
 <h2 id="important-new-features-in-apacheds-20">Important new features in ApacheDS 2.0</h2>
 <p>The following new features have been added in the 2.0 version :</p>
 <ul>
@@ -175,8 +178,7 @@
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1826">DIRSERVER-1826</a> - The ads-pwdFailureCountInterval is not taken into account</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1834">DIRSERVER-1834</a> - Broken backend when using AT with no EQUALITY MR</li>
 </ul>
-<p>This is a critical version, and anyone using 2.0.0-M11 should replace it with this version.<br />
-</p>
+<p>This is a critical version, and anyone using 2.0.0-M11 should replace it with this version.  </p>
 <p>Downloads are available <a href="downloads.html">here</a></p>
 <h2 id="apacheds-200-m11-released-posted-on-march-3rd-2013">ApacheDS 2.0.0-M11 released <em>posted on March 3rd, 2013</em></h2>
 <p>The Apache Directory team is pleased to announce the release of ApacheDS 2.0.0-M11, the eleventh milestone towards a 2.0 version.</p>

Modified: websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.1-realms.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.1-realms.html (original)
+++ websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.1-realms.html Fri Jun 21 10:04:38 2013
@@ -145,15 +145,17 @@
 <h2 id="realm-name">Realm name</h2>
 <p>In order to distinguish the <strong>Realms</strong>, we give them a unique name. This name can be anything, but a convention is to use the DNS name of the Kerberos server, and to use uppercase.</p>
 <p>For instance, say that th Kerberos server is installed on a machine whose domain name is <strong>apache.org</strong>, then we will use <strong>APACHE.ORG</strong> as the <strong>Realm</strong> name (but you could use <strong>Apache.org</strong> or even <strong>MyApacheDomain</strong>).</p>
-<p><DIV class="info" markdown="1">
-Note that the name is case sensitive. <strong>apache.org</strong> is a different realm than <strong>APACHE.ORG</strong>.
-</DIV></p>
+<DIV class="info" markdown="1">
+Note that the name is case sensitive. **apache.org** is a different realm than **APACHE.ORG**.
+</DIV>
+
 <p>The <strong>Realm</strong> name wil be used all over Kerberos to name <strong>Principals</strong> and <strong>Services</strong></p>
 <h2 id="default-realm-for-apacheds-kerberos-server">Default Realm for ApacheDS Kerberos Server</h2>
 <p>When <strong>ApacheDS Kerberos Server</strong> installed, the default <strong>Realm</strong> name is set to <strong>EXAMPLE.COM</strong>. This can be changed  either using <strong>Studio</strong>, by accessing the server configuration and changing the 'Primary KDC Realm', as show in this picture :</p>
-<p><DIV align="center">
-<img alt="Kerberos Realm Configuration" src="images/kerberos-realm-config.png" />
-</DIV></p>
+<DIV align="center">
+![Kerberos Realm Configuration](images/kerberos-realm-config.png)
+</DIV>
+
 <p>or by modifying the LDIF configuration directly, by modifying the following entry :</p>
 <div class="codehilite"><pre>dn: ads-serverId=kerberosServer,ou=servers,ads-directoryServiceId=default,ou=config
 ...

Modified: websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.2-principals.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.2-principals.html (original)
+++ websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.2-principals.html Fri Jun 21 10:04:38 2013
@@ -159,14 +159,15 @@
 </pre></div>
 
 
-<p><DIV class="info" markdown="1">
+<DIV class="info" markdown="1">
 For hosts, we use "host" as a primary, and the instances are the hostnames.
-</DIV></p>
+</DIV>
+
 <p>Those are examples of valid <strong>Principals</strong></p>
-<div class="codehilite"><pre><span class="n">john</span><span class="nv">@APACHE</span><span class="o">.</span><span class="n">ORG</span>                             <span class="n">A</span> <span class="n">user</span>
-<span class="n">john</span><span class="o">/</span><span class="n">admin</span><span class="nv">@APACHE</span><span class="o">.</span><span class="n">ORG</span>                       <span class="n">A</span> <span class="n">user</span> <span class="n">who</span> <span class="n">is</span> <span class="n">an</span> <span class="n">admin</span>
-<span class="n">host</span><span class="sr">/www.apache.org/</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="nv">@APACHE</span><span class="o">.</span><span class="n">ORG</span>   <span class="n">A</span> <span class="n">host</span> <span class="n">with</span> <span class="n">two</span> <span class="n">hostnames</span>
-<span class="n">ldap</span><span class="o">/</span><span class="n">www</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="nv">@APACHE</span><span class="o">.</span><span class="n">ORG</span>              <span class="n">A</span> <span class="n">service</span> <span class="p">(</span><span class="n">Ldap</span> <span class="n">server</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="n">john</span><span class="p">@</span><span class="n">APACHE</span><span class="p">.</span><span class="n">ORG</span>                             <span class="n">A</span> <span class="n">user</span>
+<span class="n">john</span><span class="o">/</span><span class="n">admin</span><span class="p">@</span><span class="n">APACHE</span><span class="p">.</span><span class="n">ORG</span>                       <span class="n">A</span> <span class="n">user</span> <span class="n">who</span> <span class="n">is</span> <span class="n">an</span> <span class="n">admin</span>
+<span class="n">host</span><span class="o">/</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">@</span><span class="n">APACHE</span><span class="p">.</span><span class="n">ORG</span>   <span class="n">A</span> <span class="n">host</span> <span class="n">with</span> <span class="n">two</span> <span class="n">hostnames</span>
+<span class="n">ldap</span><span class="o">/</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">@</span><span class="n">APACHE</span><span class="p">.</span><span class="n">ORG</span>              <span class="n">A</span> <span class="n">service</span> <span class="p">(</span><span class="n">Ldap</span> <span class="n">server</span><span class="p">)</span>
 </pre></div>
 
 

Modified: websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.3-keys.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.3-keys.html (original)
+++ websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.3-keys.html Fri Jun 21 10:04:38 2013
@@ -140,9 +140,10 @@
 <h1 id="113-keys">1.1.3 - Keys</h1>
 <p>The <strong>Kerberos</strong> server generates keys based on the password we provide. Those keys are stored in the server and used to encrypt and decrypt the data being exchanged with the client.</p>
 <p>The Key is computed using either the user's password or a random value, and is salted with the realm. </p>
-<p><DIV class="INFO" markdown="1">
+<DIV class="INFO" markdown="1">
 Using the realm as the salt offers a level of protection : if one's key is broken on a realm, that does not mean the password is compromised. The key on another realm would still be safe.
-</DIV></p>
+</DIV>
+
 <h2 id="how-it-works-in-apacheds">How it works in ApacheDS ?</h2>
 <p>When you add a new entry in the server, it generates a secret key using the password and the <strong>Principal</strong> of the added entry. For instance, say we add this entry :</p>
 <div class="codehilite"><pre>dn: uid=hnelson,ou=users,dc=example,dc=com
@@ -170,22 +171,24 @@ sn: Nelson
 </pre></div>
 
 
-<p><DIV class="INFO" mardown="1">
+<DIV class="INFO" mardown="1">
 There is a special case : if the password is "randomkey", the key will be generated using a random number created on the fly.
-</DIV></p>
-<p><DIV class="INFO" mardown="1">
-Note that we will generate more than one key : we generate one key for each of the supported encryption types. </p>
-<p>ApacheDS Kerberos server supports the following set of encryption types :</p>
-<div class="codehilite"><pre><span class="o">*</span> <span class="n">DES_CBC_MD5</span>
-<span class="o">*</span> <span class="n">DES3_CBC_SHA1_KD</span>
-<span class="o">*</span> <span class="n">RC4_HMAC</span>
-<span class="o">*</span> <span class="n">AES128_CTS_HMAC_SHA1_96</span>
-<span class="o">*</span> <span class="n">AES256_CTS_HMAC_SHA1_96</span>
-</pre></div>
+</DIV>
+
+<DIV class="INFO" mardown="1">
+Note that we will generate more than one key : we generate one key for each of the supported encryption types.
+
+ApacheDS Kerberos server supports the following set of encryption types :
+
+    * DES_CBC_MD5
+    * DES3_CBC_SHA1_KD
+    * RC4_HMAC
+    * AES128_CTS_HMAC_SHA1_96
+    * AES256_CTS_HMAC_SHA1_96
 
+The default encryption types used by the server are, aes128-cts-hmac-sha1-96, des-cbc-md5 and des3-cbc-sha1-kd DES_CBC_MD5. The supported encryption types can be added or removed by modifying the Kerberos server configuration.
+</DIV>
 
-<p>The default encryption types used by the server are, aes128-cts-hmac-sha1-96, des-cbc-md5 and des3-cbc-sha1-kd DES_CBC_MD5. The supported encryption types can be added or removed by modifying the Kerberos server configuration.
-</DIV></p>
 <p>The modified entry will now look like :</p>
 <div class="codehilite"><pre>dn: uid=hnelson,ou=users,dc=example,dc=com
 objectClass: inetOrgPerson

Modified: websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.4-kdc.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.4-kdc.html (original)
+++ websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.4-kdc.html Fri Jun 21 10:04:38 2013
@@ -144,14 +144,16 @@
 * a database (ApacheDS)</p>
 <p>The <strong>KDC</strong> role is to authenticate users and distribute tickets based on the information stored in its database.</p>
 <p>The <strong>Apache Kerberos Server</strong> contains all these three components and hence is a <strong>KDC</strong>.</p>
-<p><DIV class="info" markdown="1">
-We could allow the <strong>Kerberos Server</strong> to manage more than one <strong>KDC</strong>, but this is not currently possible.
-</DIV></p>
+<DIV class="info" markdown="1">
+We could allow the **Kerberos Server** to manage more than one **KDC**, but this is not currently possible.
+</DIV>
+
 <p>The <strong>KDC</strong> is associated with a <strong>Realm</strong>.</p>
 <p>The following schema expose the way the <strong>KDC</strong> works :</p>
-<p><DIV align="center">
-<img alt="KDC usage" src="images/kerberos-auth.png" />
-</DIV></p>
+<DIV align="center">
+![KDC usage](images/kerberos-auth.png)
+</DIV>
+
 <p>In order to use a service, the client needs to get a ticket for this service from the <strong>KDC</strong>. This requires a two step process, where the client first authenticates himself, and then get back a ticket to use with the targeted server.</p>
 <p>Though the Autehntication and Ticket Granting services look like running in separate servers, a signle Kerberos server implementation oftent contains both.</p>
 

Modified: websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.6-as.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.6-as.html (original)
+++ websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.6-as.html Fri Jun 21 10:04:38 2013
@@ -139,16 +139,18 @@
 
 <h1 id="116-as-authentication-server">1.1.6 - AS (Authentication Server)</h1>
 <p>One of the two server components of a <strong>Kerberos</strong> server is the Authentication Server, which authenticates clients, and issues tickets (<strong>TGT</strong>, or <em>Ticket Granting Ticket</em>) that the user can send to the <strong>TGS</strong> to get a service ticket.</p>
-<p><DIV class="info" markdown="1">
-The <strong>TGT</strong>, or <em>Ticket Granting Ticket</em>, is a ticket that a client can use to get a service ticket. In fact, the authentication server considers the <strong>TGS</strong> as just another service, and generates a ticket for the user to access this service.
-</DIV></p>
+<DIV class="info" markdown="1">
+The **TGT**, or _Ticket Granting Ticket_, is a ticket that a client can use to get a service ticket. In fact, the authentication server considers the **TGS** as just another service, and generates a ticket for the user to access this service.
+</DIV>
+
 <p>The beauty of the <strong>AS</strong> is that it does not verify that the client issuing a request is a valid client : it just returns a tickat that an attacker won't be able to process if he does not have the client's password.</p>
 <h2 id="exhanges-between-the-client-and-the-as">Exhanges between the client and the AS</h2>
 <p>As we can see, for the client to get a <strong>TGT</strong>, it's just a matter of sending a simple request, which is sent without any encryption whatsoever (some might consider that a BER encoded message is already cryptic enough, though ;-).</p>
 <p>Here is the standard exchange :</p>
-<p><DIV align="center">
-<img alt="Kerberos Authentication with no pre-auth" src="images/kerberos-as-no-padata.png" />
-</DIV></p>
+<DIV align="center">
+![Kerberos Authentication with no pre-auth](images/kerberos-as-no-padata.png)
+</DIV>
+
 <p>There is still a potential security breach in this scenario : as the server issues a <strong>TGT</strong> to the client, containing the secret key built using the user's password, it is possible to decrypt the ticket using a brute force attack (and this is more likely to happen if the password is weak...)</p>
 <p>Of course, as each ticket has a limited life time, the ticket won't be valid when the attaker successfully cracked the ticket, but that doesn't matter : the user's password is now known, and a new ticket can be requested safely, giving access to the services.</p>
 <p><strong>Kerberos 5</strong> introduced a mechanism to workaround this issue : the user has to provide a proof that he is who he pretends to be. As we can see, it defeats the premise we made : the <strong>Kerberos</strong> still wants to check the users...</p>
@@ -156,9 +158,9 @@ The <strong>TGT</strong>, or <em>Ticket 
 <h3 id="pre-authentication">Pre-Authentication</h3>
 <p>Now, let's see how does a client 'proves' that he is who he pretends to be. The protocol allows the server to ask for some proof, by the means of asking the client to send the server a timestamp encrypted with the user's secret key : if the server can decrypt the timestamp using the client's secret key, then that proves the client's identity, and now  the server can send the <strong>TGT</strong>. This exchange is called PreAuthentication.</p>
 <p>Here is the exchange, when  :</p>
-<p><DIV align="center">
-<img alt="Kerberos Authentication with pre-auth" src="images/kerberos-as-padata.png" />
-</DIV></p>
+<DIV align="center">
+![Kerberos Authentication with pre-auth](images/kerberos-as-padata.png)
+</DIV>
 
 
     <div class="nav">

Modified: websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.8-tickets.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.8-tickets.html (original)
+++ websites/staging/directory/trunk/content/apacheds/kerberos-ug/1.1.8-tickets.html Fri Jun 21 10:04:38 2013
@@ -143,9 +143,10 @@
 <p>It also contains many other fields, like the ticket's expiration date, for instance.</p>
 <h2 id="whats-inside-a-ticket">What's inside a Ticket ?</h2>
 <p>Here are the information that can be found in a ticket. Most of them are encrypted using the service's secret key.</p>
-<p><DIV align="center">
-<img alt="Ticket" src="images/ticket.png" />
-</DIV></p>
+<DIV align="center">
+![Ticket](images/ticket.png)
+</DIV>
+
 <p>The blue boxes are optionnal informations.</p>
 
 

Modified: websites/staging/directory/trunk/content/apacheds/kerberos-ug/4.1-authenticate-kinit.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/kerberos-ug/4.1-authenticate-kinit.html (original)
+++ websites/staging/directory/trunk/content/apacheds/kerberos-ug/4.1-authenticate-kinit.html Fri Jun 21 10:04:38 2013
@@ -193,8 +193,7 @@ $
 
 
 <p>As we can see, we have obtained a ticket which will expire 6 hours after its creation, which can be renexed for 7 days, encrypted using AES-128 algorithm, ticket that can be used by the <strong>TGS</strong>.</p>
-<p>All is good !   <br />
-</p>
+<p>All is good !     </p>
 <h2 id="troubleshooting">Troubleshooting</h2>
 <p>So it does not work...</p>
 <p>There are many possible reason why you can't get a ticket.</p>



Mime
View raw message