directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r881197 [1/2] - in /websites/staging/directory/trunk/content: ./ apacheds/ apacheds/advanced-ug/ apacheds/basic-ug/ apacheds/configuration/ mavibot/ mavibot/user-guide/ studio/
Date Fri, 04 Oct 2013 17:51:34 GMT
Author: buildbot
Date: Fri Oct  4 17:51:33 2013
New Revision: 881197

Log:
Staging update by buildbot for directory

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.2-network.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/1.3-directory-service.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/1.4-interceptors.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/1.5-backend.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.1.1-simple-authn.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.1.2-name-password-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.2-sasl-cram-md5-authn.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2.3-sasl-digest-md5-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.2.6-the-acdf-engine.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html
    websites/staging/directory/trunk/content/apacheds/advanced-ug/4.3-password-policy.html
    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
    websites/staging/directory/trunk/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.4-configure-logging.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2-handling-data.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.2-searching-data.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.1-simple-search.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.3-introducing-schema.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/2.3.1-adding-schema-elements.html
    websites/staging/directory/trunk/content/apacheds/basic-ug/4.1-mozilla-thunderbird.html
    websites/staging/directory/trunk/content/apacheds/configuration/ads-2.0-configuration.html
    websites/staging/directory/trunk/content/apacheds/index.html
    websites/staging/directory/trunk/content/apacheds/news.html
    websites/staging/directory/trunk/content/mavibot/coding-standards.html
    websites/staging/directory/trunk/content/mavibot/five-minutes-tutorial.html
    websites/staging/directory/trunk/content/mavibot/news.html
    websites/staging/directory/trunk/content/mavibot/user-guide/2.1-logical-structure.html
    websites/staging/directory/trunk/content/mavibot/user-guide/2.2-physical-storage.html
    websites/staging/directory/trunk/content/special-thanks.html
    websites/staging/directory/trunk/content/studio/internationalization.html

Propchange: websites/staging/directory/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Oct  4 17:51:33 2013
@@ -1 +1 @@
-1528558
+1529240

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 Fri Oct  4 17:51:33 2013
@@ -146,7 +146,7 @@
 
 <h1 id="0-community">0 - Community</h1>
 <p>This chapter explains how to work with the community around the project. The ASF is a community of volunteers, most of them working out of their working time to get the best possible software available to the users, for free. </p>
-<p>As a community, we appreciate feedbacks, bug reports, even criticisms, but we valuate contributions as the best way to make this collaborative work a better software.</p>
+<p>As a community, we appreciate feedbacks, bug reports, even criticisms, but we value contributions as the best way to make this collaborative work a better software.</p>
 <h1 id="table-of-content">Table of content</h1>
 <ul>
 <li><a href="0.1-reporting-bugs.html">0.1. Reporting Bugs</a></li>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/1.2-network.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/1.2-network.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/1.2-network.html Fri Oct  4 17:51:33 2013
@@ -145,7 +145,7 @@
 
 
 <h1 id="12-network-layer">1.2 - Network Layer</h1>
-<p>This layer is the part the user connects to when he wants to obtain some data from the server. This is not a mandatory part ot the server : we don't need to use it when the server is embedded.</p>
+<p>This layer is the part the user connects to when he wants to obtain some data from the server. This is not a mandatory part of the server : we don't need to use it when the server is embedded.</p>
 <p>We offer more than just LDAP protocol, the server also include various protocols :</p>
 <ul>
 <li>Kerberos</li>
@@ -154,7 +154,7 @@
 <li>DNS</li>
 <li>ChangePassword</li>
 </ul>
-<p>Not all of them are implemented in the current version, but at least the Kerberos server is available. The other protocols have been developped as a proof of concept : as they are all depending upon a storage database, we have used the LDAP server as a storage.</p>
+<p>Not all of them are implemented in the current version, but at least the Kerberos server is available. The other protocols have been developed as a proof of concept : as they are all depending upon a storage database, we have used the LDAP server as a storage.</p>
 <p>It's perfectly possible to imagine more protocols being implemented in the near future...</p>
 <h2 id="server-startup">Server startup</h2>
 <p>This chapter title is a bit misleading. We don't start a server, we start a <em>DirectoryService</em>, then we start various servers on top of it.

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/1.3-directory-service.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/1.3-directory-service.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/1.3-directory-service.html Fri Oct  4 17:51:33 2013
@@ -147,12 +147,12 @@
 <h1 id="13-directoryservice">1.3 - DirectoryService</h1>
 <p>The <em>DirectoryService</em> is the core of the server. This is where we process incoming requests and ask the backend for data. </p>
 <p>It has an entry point, the <em>OperationManager</em>, which is in charge of pushing the requests into the <em>Interceptors</em> chain, and to protect the server against concurrent modifications.</p>
-<p>Then the request is going through every <em>Interceptor</em> being registred for this operation. When we have gone through all the <em>Interceptors</em>, we have reached the <em>PartitionNexus</em>, which is the connection with the backends.</p>
+<p>Then the request is going through every <em>Interceptor</em> being registered for this operation. When we have gone through all the <em>Interceptors</em>, we have reached the <em>PartitionNexus</em>, which is the connection with the backends.</p>
 <p>We now just have to determinate which type of <em>Backend</em> we should address, and this is done using the <em>Dn</em>. The request is then transmitted to the <em>Backend</em>, which returns the result.</p>
 <p>The result bubbles up through the <em>Interceptors</em> as we unfold the stack stack, up to the <em>OperationManager</em> and to the caller.</p>
 <h2 id="environment">Environment</h2>
 <p>The <em>DirectoryService</em> knows about its execution environment : it has a <em>schemaManager</em> instance, it knows about the <em>Interceptors</em> chain, it stores a map of all the pending requests (it's necessary as one may abandon some request), it holds the existing <em>Sessions</em>.</p>
-<p>In other word, the <em>DirectoryService</em> is not only the part of teh server executing the logic, it also holds the current state of every clients.</p>
+<p>In other word, the <em>DirectoryService</em> is not only the part of the server executing the logic, it also holds the current state of every clients.</p>
 
 
     <div class="nav">

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/1.4-interceptors.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/1.4-interceptors.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/1.4-interceptors.html Fri Oct  4 17:51:33 2013
@@ -145,7 +145,7 @@
 
 
 <h1 id="14-interceptors">1.4 - Interceptors</h1>
-<p><em>Interceptors</em> are functional layers inside the <em>DirectoryService</em>. Ech one of them are responsible for a specific task. They are ordered, and this order is not to be changed.</p>
+<p><em>Interceptors</em> are functional layers inside the <em>DirectoryService</em>. Each one of them are responsible for a specific task. They are ordered, and this order is not to be changed.</p>
 <p>Some <em>Interceptors</em> can be disabled, some other can be enabled. It's also possible to add some new one.</p>
 <p>All in all, they will handle operations from a specific functional aspect.</p>
 <h2 id="handled-operations">Handled operations</h2>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/1.5-backend.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/1.5-backend.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/1.5-backend.html Fri Oct  4 17:51:33 2013
@@ -161,7 +161,7 @@
 <p>It comes in two forms : one single file, or many fles (one per entry). It's always backed by a in-memory <em>Backend</em>, otherwise it would not be possible to retrieve the entries. </p>
 <p>As we depend on a in-memory backend, which handles the indexes, we have to create those indexes when this <em>Backend</em> is read, which can be a costly operation. </p>
 <h3 id="future-backends">Future Backends</h3>
-<p>We intend to add another in-memory backend, based on <em>Mavibot</em>, a <strong>MVCC BTREE</strong>. The biggest advantage over the other systems is that it's fast, it allows concurrent reads without locks when the other <em>Backend</em> block the reads when some write operation is being processed. Also it saves on disk it contents peridodically, and has a Journal so that we can recover fro a crash.</p>
+<p>We intend to add another in-memory backend, based on <em>Mavibot</em>, a <strong>MVCC BTREE</strong>. The biggest advantage over the other systems is that it's fast, it allows concurrent reads without locks when the other <em>Backend</em> block the reads when some write operation is being processed. Also it saves on disk it contents periodically, and has a Journal so that we can recover from a crash.</p>
 <p>The only drawback is that all the entries and indexes must hold in memory. On the other hand, we don't anymore need a cache.</p>
 <h2 id="how-it-works">How it works</h2>
 <p>Basically, each <em>Backend</em> instance inherit from the <em>AbstractBTreePartition</em> class. We can see that a <em>Backend</em> <strong>must</strong> be a <strong>Btree</strong>.</p>
@@ -170,7 +170,7 @@
 <p>The <em>MasterTable</em> contains all the entries, serialized. </p>
 <p>This table is a <Key, Value> <strong>BTree</strong>, where the key is the entry's <strong>UUID</strong>, and the value the serialized entry.</p>
 <DIV class="note" markdown="1">
-Theorically, we could be able to read it, and restore the whole database, indexes included, assuming that we know which index we have to create. Sadly, it's not enough, as the entries are stored without any information about their position in the **DIT**.
+Theoretically, we could be able to read it, and restore the whole database, indexes included, assuming that we know which index we have to create. Sadly, it's not enough, as the entries are stored without any information about their position in the **DIT**.
 </DIV>
 
 <h3 id="indexes">Indexes</h3>

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 Fri Oct  4 17:51:33 2013
@@ -145,7 +145,7 @@
 
 
 <h1 id="2-server-configuraion">2 - Server Configuraion</h1>
-<p>We will now describe the server configuration. Usually, all the configuration is done using Apache Directory Studio, which offers a pretty GUI. One can also configure the server using LDAP request, as the configuration is stored in teh <strong>DIT</strong>. Otherwise, all the configuration modifications won't be applied on a started server : usually, you will have to restart the server in order to get those modifications applied.</p>
+<p>We will now describe the server configuration. Usually, all the configuration is done using Apache Directory Studio, which offers a pretty GUI. One can also configure the server using LDAP request, as the configuration is stored in the <strong>DIT</strong>. Otherwise, all the configuration modifications won't be applied on a started server : usually, you will have to restart the server in order to get those modifications applied.</p>
 <p>It's a good policy not to modify the LDIF files by hand, but instead to use the Studio Configuration plugin to modify your configuration. </p>
 <h1 id="overall-structure">Overall structure</h1>
 <p>The configuration is stored in a hierarchical order, where sub-elements are related to their parent. For instance, the <em>Transports</em> are associated to the <em>Server</em> they are child of. If we have many kind of servers, we will have as many transports as we have servers.</p>
@@ -209,7 +209,7 @@ Note that bold attributes are mandatory 
 </DIV>
 
 <h1 id="directory-service">Directory Service</h1>
-<p>This is the key of the whole server : the place where we store the data. Most of the servers are depending on this component. You maye have more than one server, but only one <em>DirectoryService</em>. This compoent itself refers to the servers that will be started, plus the backends it will depends on.</p>
+<p>This is the key of the whole server : the place where we store the data. Most of the servers are depending on this component. You may have more than one server, but only one <em>DirectoryService</em>. This component itself refers to the servers that will be started, plus the backends it will depends on.</p>
 <p>Here are the configuration parameters for this components :</p>
 <table>
 <thead>
@@ -377,8 +377,8 @@ Note that bold attributes are mandatory 
 </table>
 <h2 id="interceptors">Interceptors</h2>
 <p>The <em>Interceptors</em> are generally not configurable. You don't want to change their order, nor remove or add some. The fact that they appear in the configuration is because we use this to initialize the server.</p>
-<p>However, at least one <em>Interceptor</em> can be confiured : the <em>authenticationInterceptor</em>. </p>
-<p>In the case where one would like to add an interceptor, it's enough to add the associated entry containing the interceptor identifier, under the <em>ou=interceptors</em> entry. It must have an order. Here are the elements taht can be configured in such a case :</p>
+<p>However, at least one <em>Interceptor</em> can be configured : the <em>authenticationInterceptor</em>. </p>
+<p>In the case where one would like to add an interceptor, it's enough to add the associated entry containing the interceptor identifier, under the <em>ou=interceptors</em> entry. It must have an order. Here are the elements that can be configured in such a case :</p>
 <table>
 <thead>
 <tr>
@@ -614,7 +614,7 @@ Note that bold attributes are mandatory 
 </tbody>
 </table>
 <h2 id="partitions">Partitions</h2>
-<p>The <em>Partition</em> is the part of the server storing your data. There are many parts that need to be configured in order to obtain the best performances out of the server. It's also the part of the configuraton you are the more likely to modify, adding new <em>Partitions</em> or adding new <em>Indexes</em>.</p>
+<p>The <em>Partition</em> is the part of the server storing your data. There are many parts that need to be configured in order to obtain the best performances out of the server. It's also the part of the configuration you are the more likely to modify, adding new <em>Partitions</em> or adding new <em>Indexes</em>.</p>
 <p>You may have more than one <em>Partition</em> in your <em>DirectoryService</em>. We have at least three existing <em>Partition</em>, the <em>ou=system</em> <em>Partition</em>, the <em>ou=config</em> <em>Partition</em> and the <em>ou=schema</em> <em>Partition</em>. The former is a <em>JDBM</em> <em>Partition</em>, when the two others are <em>LDIF</em> _Partitions.</p>
 <h3 id="jdbm-partition">JDBM Partition</h3>
 <p>A <em>JDBM Partition</em> have the following configurable elements :</p>
@@ -699,7 +699,7 @@ Note that bold attributes are mandatory 
 </tr>
 <tr>
 <td>objectClass</td>
-<td>Stores the relatio between an ObjectClass an the entry using it</td>
+<td>Stores the relation between an ObjectClass an the entry using it</td>
 </tr>
 <tr>
 <td>entryCSN</td>
@@ -712,7 +712,7 @@ Note that bold attributes are mandatory 
 </tbody>
 </table>
 <h5 id="indexed-attribute">Indexed Attribute</h5>
-<p>IndexedATtributes have a type, depending on the <em>Partition</em> they are associetd with. Currently, we have only one type, <em>JdbmIndex</em>. They have specific configurable elements.</p>
+<p>IndexedATtributes have a type, depending on the <em>Partition</em> they are associated with. Currently, we have only one type, <em>JdbmIndex</em>. They have specific configurable elements.</p>
 <p>Each index attribute have four basic elements that can be configured :</p>
 <table>
 <thead>
@@ -783,7 +783,7 @@ Note that bold attributes are mandatory 
 <td>ads-indexCacheSize</td>
 <td><em>int</em></td>
 <td>100</td>
-<td>The numbr of cached pages for this index</td>
+<td>The number of cached pages for this index</td>
 </tr>
 </tbody>
 </table>
@@ -940,7 +940,7 @@ Note that bold attributes are mandatory 
 <td><strong>ads-maxTimeLimit</strong></td>
 <td><em>int</em></td>
 <td>1000</td>
-<td>The maimum number of seconds the server will use to process a search request</td>
+<td>The maximum number of seconds the server will use to process a search request</td>
 </tr>
 <tr>
 <td><strong>ads-maxPDUSize</strong></td>
@@ -995,7 +995,7 @@ Note that bold attributes are mandatory 
 <p>(*) org.apache.directory.server.ldap.replication.provider.SyncReplRequestHandler</p>
 <h3 id="repl-consumers">Repl Consumers</h3>
 <p>This part of the configuration deals with the replication. It provides all the information for a server to become a consumer. A server can have many different consumers set. </p>
-<p>All the consumers are stord under the <em>ou=replConsumers</em> entry, under the respectiver server entry.</p>
+<p>All the consumers are stored under the <em>ou=replConsumers</em> entry, under the respective server entry.</p>
 <p>Here are the configurable elements :</p>
 <table>
 <thead>
@@ -1035,7 +1035,7 @@ Note that bold attributes are mandatory 
 <td><strong>ads-replAliasDerefMode</strong></td>
 <td><em>String</em></td>
 <td>NEVER_DEREF_ALIASES</td>
-<td>The alias deeferencing mode to use</td>
+<td>The alias dereferencing mode to use</td>
 </tr>
 <tr>
 <td><strong>ads-replAttributes</strong></td>
@@ -1071,7 +1071,7 @@ Note that bold attributes are mandatory 
 <td><strong>ads-replSearchSizeLimit</strong></td>
 <td><em>int</em></td>
 <td>0</td>
-<td>The maximum numbr of entries to get back</td>
+<td>The maximum number of entries to get back</td>
 </tr>
 <tr>
 <td><strong>ads-replSearchTimeOut</strong></td>
@@ -1178,7 +1178,7 @@ Note that bold attributes are mandatory 
 <li>NTLM</li>
 <li>SIMPLE</li>
 </ul>
-<p>This list is stored in the configuration. It's possible to add new mechnaism if needed, smply by adding an entry containg those elements, under the <em>ou=saslMechHandlers</em></p>
+<p>This list is stored in the configuration. It's possible to add new mechanisms if needed, simply by adding an entry containing those elements, under the <em>ou=saslMechHandlers</em></p>
 <table>
 <thead>
 <tr>
@@ -1222,7 +1222,7 @@ Note that bold attributes are mandatory 
 </tbody>
 </table>
 <h2 id="kerberos-server">Kerberos Server</h2>
-<p>The <em>KerberosServer</em> configuration is an important part of the configuration. It deoends on a <em>DirectoryService</em> too, as most of the informations managed by a <em>KerberosServer</em> are store there.</p>
+<p>The <em>KerberosServer</em> configuration is an important part of the configuration. It depends on a <em>DirectoryService</em> too, as most of the informations managed by a <em>KerberosServer</em> are store there.</p>
 <p>The list of attributes that can be modified is exposed in the following table. </p>
 <table>
 <thead>
@@ -1360,7 +1360,7 @@ Note that bold attributes are mandatory 
 </tr>
 </tbody>
 </table>
-<p>An <em>HttpServer</em> without webApps is pretty useless, we now have to configure the underlaying web applications</p>
+<p>An <em>HttpServer</em> without webApps is pretty useless, we now have to configure the underlying web applications</p>
 <h3 id="http-web-apps">Http Web Apps</h3>
 <p>Each <em>WebApp</em> configuration must be added under the <em>ou=webapps</em> entry. Here are the configurable elements :</p>
 <table>

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 Fri Oct  4 17:51:33 2013
@@ -151,15 +151,15 @@
 </ul>
 <h1 id="3-administrative-model">3 - Administrative Model</h1>
 <p>The <strong>Administrative Model</strong> is a really critical notion that needs to be understood, because it drives many of ApacheDS roles.</p>
-<p>It's directly inherited by the <strong>X.500</strong> Administrative model (in fact, we do implement the full <strong>X.500</strong> sepcification related to <strong>AAs</strong>).</p>
+<p>It's directly inherited by the <strong>X.500</strong> Administrative model (in fact, we do implement the full <strong>X.500</strong> specification related to <strong>AAs</strong>).</p>
 <h2 id="what-is-the-administrative-model">What is the Administrative Model ?</h2>
-<p>The idea is to define the <strong>DIT</strong> as some areas which are administrated.
+<p>The idea is to define the <strong>DIT</strong> as some areas which are administered.
 Each area can be defined, and covers a set of entries, and each area can manage one ore more roles we want to manage.
 Those roles can be related to authorization, schema, etc... Each of these areas can overlap, but in any case, if two areas are overlapping,
 then one area totally includes the other one.</p>
 <p>The Administrative Model is everything we need to implement in order to be able to manage roles on some defined areas.</p>
 <h2 id="areas">Areas</h2>
-<p>An Area describes a part of the <strong>DIT</strong> which will start from a specific entry, and span across a part of the subtree starting at the base entry. An area is administrated by an <strong>AP</strong> (Administrative Point) which holds all the needed information about the area and the roles.</p>
+<p>An Area describes a part of the <strong>DIT</strong> which will start from a specific entry, and span across a part of the subtree starting at the base entry. An area is administered by an <strong>AP</strong> (Administrative Point) which holds all the needed information about the area and the roles.</p>
 <p>We have three kind of areas :</p>
 <ul>
 <li>AAA : Autonomous Administrative Areas</li>

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 Fri Oct  4 17:51:33 2013
@@ -146,7 +146,7 @@
 
 <h1 id="411-simple-authentication">4.1.1 - Simple Authentication</h1>
 <p>This authentication mode uses a <strong>Simple Bind Request</strong>. It's just about sending a name and a password to the server, which will either create a session for the given credentials, or reject the request.</p>
-<p>As we said, we have to pass a name and a password. This leads to three different combinaison of <strong>Simple Bind</strong> :</p>
+<p>As we said, we have to pass a name and a password. This leads to three different combinations of <strong>Simple Bind</strong> :</p>
 <ul>
 <li><a href="4.1.1.1-anonymous-authn.html">4.1.1.1 - Anonymous Authentication</a></li>
 <li><a href="4.1.1.2-name-password-authn.html">4.1.1.2 - Name/Password Authentication</a></li>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.1.2-name-password-authn.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.1.2-name-password-authn.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.1.2-name-password-authn.html Fri Oct  4 17:51:33 2013
@@ -153,7 +153,7 @@
 <p>The password is not visible here, but this is just for security reasons.</p>
 <p>This request is sent to the server, which will check that the <strong>uid=admin,ou=system</strong> exists in its backend. If it doesn't, the authentication will fail.</p>
 <h2 id="password-check">Password check</h2>
-<p>That's not enough : once the user is retreived, we have to check the provided password against the stored password. </p>
+<p>That's not enough : once the user is retrieved, we have to check the provided password against the stored password. </p>
 <p>The entry associated with the user should contain a <strong>userPassword</strong> AttributeType, otherwise the request will be rejected. Here is an example of such an entry :</p>
 <div class="codehilite"><pre>version: 1
 
@@ -177,7 +177,7 @@ userPassword:: c2VjcmV0
 
 <p>Not exactly safe...</p>
 <h3 id="password-storage">Password storage</h3>
-<p>As we have juste seen, the password is stored in plain text in the server. This is not exatcly safe ! As soon as someone gets access to your server, all the passwords are compromised. This is certainly not the way we want to protect our users !</p>
+<p>As we have just seen, the password is stored in plain text in the server. This is not exactly safe ! As soon as someone gets access to your server, all the passwords are compromised. This is certainly not the way we want to protect our users !</p>
 <p>Hopefully, you can hash those passwords, instead of storing them as provided. </p>
 <DIV class="note" markdown="1">
 A hashed password is not a password we can decrypt : when we hash a password, we lose some information. Also note that two different passwords might result in the exact same hash value, but it's unlikely.
@@ -246,7 +246,7 @@ A hashed password is not a password we c
 </table>
 <h3 id="how-it-works">How it works ?</h3>
 <p>So the server receives a Name/Password authentication request. The password is <em>in clear text</em> up to this point. Once the user is found in the server, and if it has a <strong>userPassword</strong> attributeType, the server extracts each values contained in this AttributeType (we may have more than one password per user) and check the provided password against those values.</p>
-<p>This is not as simple as it seems : as we may have hashed the values on the server, we first have to detect the selected hash method, and then hash the provided password, which result is compaed to the stored hashed value.</p>
+<p>This is not as simple as it seems : as we may have hashed the values on the server, we first have to detect the selected hash method, and then hash the provided password, which result is compared to the stored hashed value.</p>
 <p>Hopefully, the hash method is stored within the hashed password in the server :</p>
 <div class="codehilite"><pre>version: 1
 
@@ -264,7 +264,7 @@ userPassword:: {CRYPT}FgGgCMynLfYGw
 </pre></div>
 
 
-<p>Here, one of the <strong>userPassword</strong> value is hashed using the <strong>crypt</strong> algorithm. The following code is used to chekc the provided password :</p>
+<p>Here, one of the <strong>userPassword</strong> value is hashed using the <strong>crypt</strong> algorithm. The following code is used to check the provided password :</p>
 <div class="codehilite"><pre>for each stored password
   if it has a hash method 
     then 

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 Fri Oct  4 17:51:33 2013
@@ -180,7 +180,7 @@
 <p>Configuring this list can also be done using <strong>Studio ApacheDS Configuration</strong> plugin :</p>
 <p><img alt="ApacheDS SASL mechanisms configuration" src="images/sasl-mechanisms-config.png" /></p>
 <h2 id="usage-and-security">Usage and security</h2>
-<p>Most of teh existing <strong>SASL</strong> mechanisms are just either useless (<strong>PLAIN</strong>, <strong>ANONYMOUS</strong>) or too weak to be used in a secured environement (<strong>DIGEST-MD5</strong> or <strong>CRAM-MD5</strong>).</p>
+<p>Most of the existing <strong>SASL</strong> mechanisms are just either useless (<strong>PLAIN</strong>, <strong>ANONYMOUS</strong>) or too weak to be used in a secured environment (<strong>DIGEST-MD5</strong> or <strong>CRAM-MD5</strong>).</p>
 <p>A new <strong>SASL</strong> mechanism has been designed to replace the last two mechanisms : <strong>SCRAM</strong> (<a href="http://www.ietf.org/rfc/rfc5802.txt">RFC 5802</a>).</p>
 <p>In any case, if you are using one of those mechanisms, be sure to activate <strong>TLS</strong>.</p>
 <h2 id="specifications">Specifications</h2>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2.2-sasl-cram-md5-authn.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2.2-sasl-cram-md5-authn.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2.2-sasl-cram-md5-authn.html Fri Oct  4 17:51:33 2013
@@ -146,9 +146,9 @@
 
 <h1 id="4122-sasl-cram-md5-authentication">4.1.2.2 - SASL CRAM-MD5 Authentication</h1>
 <p>The <strong>CRAM-MD5</strong> <strong>SASL</strong> mechanism is defined by <a href="http://www.ietf.org/rfc/rfc2195.txt">RFC 2195</a>.</p>
-<p>We will have an exchange between the client, which will send an empty <em>Bind request</em> (ie, the username and credentials won't be sent the first time), and the server will return a challenge.</p>
+<p>We will have an exchange between the client, which will send an empty <em>Bind request</em> (i.e., the username and credentials won't be sent the first time), and the server will return a challenge.</p>
 <DIV class="warning" markdown="1">
-It's not recommanded to use this mechanism.
+It's not recommended to use this mechanism.
 </DIV>
 
 <h2 id="usage">Usage</h2>
@@ -176,7 +176,7 @@ Message ID : 1
 </pre></div>
 
 
-<p>and will accordingly send a new <em>BindRequest</em> whith the appropriate credentials whch has been hashed with the server's provided challenge token :</p>
+<p>and will accordingly send a new <em>BindRequest</em> with the appropriate credentials which have been hashed with the server's provided challenge token :</p>
 <div class="codehilite"><pre>MessageType : BIND_REQUEST
 Message ID : 2
     BindRequest
@@ -188,7 +188,7 @@ Message ID : 2
 </pre></div>
 
 
-<p>In any case, the full exchange aims at transfering the user's credential encrypted instead of passing it in clear text. Once the server receives the password, it will check it against the stored password which must be stored in clear text.</p>
+<p>In any case, the full exchange aims at transferring the user's credential encrypted instead of passing it in clear text. Once the server receives the password, it will check it against the stored password which must be stored in clear text.</p>
 <p>When the server receives a <strong>SASL PLAIN</strong> bind request, it will look for the first entry which <strong>uid</strong> is equal to the provided value, starting from the server <strong>searchBaseDN</strong> position in the DIT.</p>
 <DIV class="note" markdown="1">
 ApacheDS expect the given name to be stored in the **UID** Attribute. This is not configurable in this version of the server.

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2.3-sasl-digest-md5-authn.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2.3-sasl-digest-md5-authn.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.1.2.3-sasl-digest-md5-authn.html Fri Oct  4 17:51:33 2013
@@ -145,9 +145,9 @@
 
 
 <h1 id="4123-sasl-digest-md5-authentication">4.1.2.3 - SASL DIGEST-MD5 Authentication</h1>
-<p>The <strong>DIGEST-MD5</strong> <strong>SASL</strong> mechanism is defined by <a href="http://www.ietf.org/rfc/rfc2829.txt">RFC 2829</a>, which has been moved to an <em>historic</em> status by <a href="http://www.ietf.org/rfc/rfc6631.txt">RFC 6331</a>, due to its intrinsec weaknesses.</p>
+<p>The <strong>DIGEST-MD5</strong> <strong>SASL</strong> mechanism is defined by <a href="http://www.ietf.org/rfc/rfc2829.txt">RFC 2829</a>, which has been moved to an <em>historic</em> status by <a href="http://www.ietf.org/rfc/rfc6631.txt">RFC 6331</a>, due to its intrinsic weaknesses.</p>
 <DIV class="warning" markdown="1">
-It's not recommanded to use this mechanism.
+It's not recommended to use this mechanism.
 </DIV>
 
 <h2 id="usage">Usage</h2>
@@ -163,7 +163,7 @@ Message ID : 1
 </pre></div>
 
 
-<p>The server respons with a <em>BindResponses</em> containing a challenge :</p>
+<p>The server responds with a <em>BindResponses</em> containing a challenge :</p>
 <div class="codehilite"><pre>MessageType : BIND_RESPONSE
 Message ID : 2
     BindResponse

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 Fri Oct  4 17:51:33 2013
@@ -150,10 +150,10 @@
 </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's more specifically 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>
+<p>The idea is for the <strong>LDAP</strong> server to delegate the authentication  to the <strong>Kerberos</strong> Server.</p>
 <h2 id="usage">Usage</h2>
 <p>MessageType : BIND_REQUEST
 Message ID : 1

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6-the-acdf-engine.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6-the-acdf-engine.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.6-the-acdf-engine.html Fri Oct  4 17:51:33 2013
@@ -149,7 +149,7 @@
 <ul>
 <li><a href="4.2.6.1-how-it-works.html">4.2.6.1 - How it works</a></li>
 <li><a href="4.2.6.2-selections.html">4.2.6.2 - Selections</a></li>
-<li><a href="4.2.6.3-constraints.html">4.2.6.3 - Constratints</a></li>
+<li><a href="4.2.6.3-constraints.html">4.2.6.3 - Constraints</a></li>
 <li><a href="4.2.6.4-priority.html">4.2.6.4 - Priority</a></li>
 </ul>
 

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html Fri Oct  4 17:51:33 2013
@@ -184,8 +184,8 @@
 </pre></div>
 
 
-<p>There are several parameters to this simple ACIItem. Here's a breif
-exaplanation of each field and it's meaning or significance.</p>
+<p>There are several parameters to this simple ACIItem. Here's a brief
+explanation of each field and it's meaning or significance.</p>
 <table>
 <thead>
 <tr>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/4.3-password-policy.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/4.3-password-policy.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/4.3-password-policy.html Fri Oct  4 17:51:33 2013
@@ -148,11 +148,11 @@
 <p>The <strong>Password Policy for LDAP Directories</strong> is a <strong><a href="http://tools.ietf.org/html/draft-behera-ldap-password-policy-10">RFC</a></strong> draft that has been designed for the very first version in 1999, and the latest version is from 2009. Although it's still a draft, and it's currently noted as inactive, it has been implemented by many existing <strong>LDAP</strong> servers.</p>
 <p><strong>ApacheDS</strong> implements most of the draft.</p>
 <DIV class="warning" markdown="1">
-Enforcing a strict passowrd policy is extremely punitive to users. It may leads users to workaround the policy by storing their password in a post-it, a workaround that will defeat any password policy...
+Enforcing a strict password policy is extremely punitive to users. It may leads users to workaround the policy by storing their password in a post-it, a workaround that will defeat any password policy...
 
 Always try to think about better alternatives than force users to always define a password with 10 or more characters, including numbers, upper and lower case, special chars, and to change it every month...
 
-A long sentence (4 or 5 words), like "The horse has won the race three time" is most certainly a better passowrd than any other combinaison, and is easy to remember...
+A long sentence (4 or 5 words), like "The horse has won the race three time" is most certainly a better password than any other combination, and is easy to remember...
 </DIV>
 
 <h2 id="what-is-a-password-policy">What is a password policy ?</h2>
@@ -186,7 +186,7 @@ First of all, it's important to know tha
 <table>
 <thead>
 <tr>
-<th>Attrinbte</th>
+<th>Attribute</th>
 <th>Default value</th>
 <th>Comment</th>
 </tr>
@@ -200,7 +200,7 @@ First of all, it's important to know tha
 <tr>
 <td>ads-pwdCheckQuality</td>
 <td>1</td>
-<td>The kind of quality we wnt for the password (0, 1, or 2)</td>
+<td>The kind of quality we want for the password (0, 1, or 2)</td>
 </tr>
 <tr>
 <td>ads-pwdExpireWarning</td>
@@ -235,7 +235,7 @@ First of all, it's important to know tha
 <tr>
 <td>ads-pwdLockoutDuration</td>
 <td>0</td>
-<td>The delay in seconds we wait before allowing a new attept when the password hs been locked</td>
+<td>The delay in seconds we wait before allowing a new attempt when the password hs been locked</td>
 </tr>
 <tr>
 <td>ads-pwdMaxAge</td>
@@ -347,11 +347,11 @@ Note that the specification allows the a
 <h4 id="enablingdisabling-the-passwordpolicy">Enabling/Disabling the PasswordPolicy</h4>
 <p>The <em>PasswordPolicy</em> is enabled by default. It's possible to disable it by setting the <em>ads-enabled</em> value to FALSE, with a server restart.</p>
 <h2 id="password-protection">Password protection</h2>
-<p>This part is exposing the various technics the system uses to protect your password from an attack.</p>
+<p>This part is exposing the various techniques the system uses to protect your password from an attack.</p>
 <h3 id="password-guessing-limit">Password guessing limit</h3>
 <p>The idea is to protect the password against multiple guess attempts. The following rules are applied:</p>
 <ul>
-<li>a counter tracks the failed attemps, and blocks when it's reached</li>
+<li>a counter tracks the failed attempts, and blocks when it's reached</li>
 <li>an incremental delay is added after a failure before a new attempt can be done</li>
 <li>a global delay for all the failed attempt is used, when reached, the account is locked</li>
 </ul>
@@ -435,7 +435,7 @@ In order to activate this control the ad
 Impacted Attributes: ads-pwdLockout, ads-pwdMaxFailure, ads-pwdLockoutDuration
 </DIV>
 
-<p>When we have reached a number of failed attempt, the account will be locked. We can set another attribute to tell the server that the locked out account can be unlocked afer a delay: the <em>ads-pwdLockoutDuration</em> Attribute stores this delay.</p>
+<p>When we have reached a number of failed attempt, the account will be locked. We can set another attribute to tell the server that the locked out account can be unlocked after a delay: the <em>ads-pwdLockoutDuration</em> Attribute stores this delay.</p>
 <p>When the account is locked, no further attempt will succeed, even if the correct password is sent. After the delay, the user will be unlocked.</p>
 <h4 id="purging-failures">Purging failures</h4>
 <DIV class="info" markdown="1">
@@ -492,7 +492,7 @@ Impacted Attribute: ads-pwdMaxAge
 <p>A password may have a limited life expectation, and when this age is reached, the password will be invalidated. This is configured through the <em>ads-pwdMaxAge</em> parameter, which contains the number of second a password will last.</p>
 <p>This password invalidation can be overruled by the two next parameters.</p>
 <DIV class="warning" markdown="1">
-This parameter works hands in hands with some othe rparameter, like the ads-pwdGraceAuthNLimit and ads-GraceExpire. If those parameters are set too, you may get some different delay for your password expiration.
+This parameter works hands in hands with some other parameter, like the ads-pwdGraceAuthNLimit and ads-GraceExpire. If those parameters are set too, you may get some different delay for your password expiration.
 </DIV>
 
 <h4 id="password-grace-auth-n-limit">Password grace auth N limit</h4>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/5-administration.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5-administration.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5-administration.html Fri Oct  4 17:51:33 2013
@@ -145,7 +145,7 @@
 
 
 <h1 id="5-administration">5 - Administration</h1>
-<p>This chapter describe how to administrate the <strong>Apache Directory Server</strong>.</p>
+<p>This chapter describe how to administer 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>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/5.1-layout.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5.1-layout.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5.1-layout.html Fri Oct  4 17:51:33 2013
@@ -196,7 +196,7 @@
 <li><em><strong>LICENCE</strong></em> and <em><strong>NOTICE</strong></em> files contains the required legal information about ApacheDS.</li>
 </ul>
 <h3 id="5112-instance-layout">5.1.1.2 Instance Layout</h3>
-<p>ApacheDS is built to be able to run multiple instances of the server at the same time, which means that optionally an <em><strong>instances</strong></em> folder can be found in the installation layout (or elswhere on disk depending on the platform).
+<p>ApacheDS is built to be able to run multiple instances of the server at the same time, which means that optionally an <em><strong>instances</strong></em> folder can be found in the installation layout (or elsewhere on disk depending on the platform).
 In that folder, can be found a single or multiple directories, all sharing the same layout, corresponding to all ApacheDS instance (one directory per instance, named by the id of the instance).</p>
 <p>Here's how this instance layout can be described:</p>
 <div class="codehilite"><pre>[Instance-Layout]
@@ -223,7 +223,7 @@ In that folder, can be found a single or
 <li>The <em><strong>cache/</strong></em> directory is empty upon installation and contains all the data required for the cache system after the first start of the server.</li>
 <li>The <em><strong>conf/</strong></em> directory contains:<ul>
 <li>an additional <em><strong>wrapper.conf</strong></em> where general configuration defined in the installation layout can be overwritten for the given instance.</li>
-<li>a <em><strong>log4j.properties</strong></em> file which is reponsible for logging configuration.</li>
+<li>a <em><strong>log4j.properties</strong></em> file which is responsible for logging configuration.</li>
 <li>a <em><strong>config.ldif</strong></em> file corresponding to the inner configuration of ApacheDS.</li>
 </ul>
 </li>

Modified: 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 (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5.2-start-stop.html Fri Oct  4 17:51:33 2013
@@ -195,7 +195,7 @@ $ <span class="n">apacheds</span><span c
 <h3 id="stopping-apacheds">Stopping ApacheDS</h3>
 <p>ApacheDS can be stopped by hitting <em><strong>CTL+C</strong></em> in the terminal the server was launched with. If the <em><strong>apacheds.bat</strong></em> command was double-clicked, closing the terminal window will also stop ApacheDS. </p>
 <h2 id="522-windows-installer-exe">5.2.2 Windows Installer (.exe)</h2>
-<p>ApacheDS is registered as a service on Windows. Start and Stop operations can be achieved in the <em><strong>Services</strong></em> utility which is accessible via <em><strong>Start</strong></em> &gt; <em><strong>Contol Panel</strong></em> &gt; <em><strong>Administration Tools</strong></em> &gt; <em><strong>Services</strong></em>.</p>
+<p>ApacheDS is registered as a service on Windows. Start and Stop operations can be achieved in the <em><strong>Services</strong></em> utility which is accessible via <em><strong>Start</strong></em> &gt; <em><strong>Control Panel</strong></em> &gt; <em><strong>Administration Tools</strong></em> &gt; <em><strong>Services</strong></em>.</p>
 <p>ApacheDS also provides an easier access to the <em><strong>Services</strong></em> utility via <em><strong>Start</strong></em> &gt; <em><strong>All Programs</strong></em> &gt; <em><strong>ApacheDS</strong></em> &gt; <em><strong>Manage ApacheDS</strong></em>. </p>
 <h3 id="starting-apacheds_1">Starting ApacheDS</h3>
 <p>The ApacheDS service can be started right-clicking on the <em><strong>ApacheDS - Default</strong></em> service and selecting <em><strong>Start</strong></em> in the context menu.</p>

Modified: websites/staging/directory/trunk/content/apacheds/advanced-ug/5.3-logs.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/advanced-ug/5.3-logs.html (original)
+++ websites/staging/directory/trunk/content/apacheds/advanced-ug/5.3-logs.html Fri Oct  4 17:51:33 2013
@@ -147,7 +147,7 @@
 <h1 id="53-logs">5.3 - Logs</h1>
 <h2 id="531-logs-overview">5.3.1 Logs overview</h2>
 <p>ApacheDS internally uses SLF4J as a facade for logs and Log4J is bundled in the standalone ApacheDS distributions. </p>
-<p>Logs can be configured by modifiying the <em><strong>log4j.properties</strong></em> file which can be found in the <em><strong>conf</strong></em> directory of the server instance (see the previous chapter "<a href="5.1-layout.html">5.1 - Layout</a>").</p>
+<p>Logs can be configured by modifying the <em><strong>log4j.properties</strong></em> file which can be found in the <em><strong>conf</strong></em> directory of the server instance (see the previous chapter "<a href="5.1-layout.html">5.1 - Layout</a>").</p>
 <p>Here is the Log4J configuration that comes with ApacheDS:</p>
 <div class="codehilite"><pre>#############################################################################
 #    Licensed to the Apache Software Foundation (ASF) under one or more

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

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.4-configure-logging.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.4-configure-logging.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/1.4.4-configure-logging.html Fri Oct  4 17:51:33 2013
@@ -172,8 +172,8 @@
 <h2 id="apacheds-and-logging">ApacheDS and logging</h2>
 <p>ApacheDS 2.0 uses <a href="http://www.slf4j.org/">SLF4J</a> as its logging solution. This is a simple facade for various logging APIs. The default for ApacheDS 2.0 is <a href="http://logging.apache.org/log4j/">log4j</a>.</p>
 <h2 id="default-behavior-after-installation">Default behavior after installation</h2>
-<p>By default, ApacheDS writes log files in the directory <em><APACHDS_HOME>/var/log/</em>. Besides stdout, a <a href="http://logging.apache.org/log4j/docs/api/org/apache/log4j/RollingFileAppender.html">RollingFileAppender</a> is used to collect warnings and errors. It backups the log files when they reach a certain size. </p>
-<p>Here is what the default configuration file <em>log4j.properties</em>, which is located in <em><APACHDS_HOME>/conf/</em>, looks like.
+<p>By default, ApacheDS writes log files in the directory <em><APACHEDS_HOME>/var/log/</em>. Besides stdout, a <a href="http://logging.apache.org/log4j/docs/api/org/apache/log4j/RollingFileAppender.html">RollingFileAppender</a> is used to collect warnings and errors. It backups the log files when they reach a certain size. </p>
+<p>Here is what the default configuration file <em>log4j.properties</em>, which is located in <em><APACHEDS_HOME>/conf/</em>, looks like.
 The name of the <em>RollingFileAppender</em> is "R":</p>
 <div class="codehilite"><pre><span class="n">log4j</span><span class="p">.</span><span class="n">rootCategory</span><span class="p">=</span><span class="n">WARN</span><span class="p">,</span> <span class="n">stdout</span><span class="p">,</span> <span class="n">R</span>
 
@@ -192,7 +192,7 @@ The name of the <em>RollingFileAppender<
 
 <span class="n">log4j</span><span class="p">.</span><span class="n">appender</span><span class="p">.</span><span class="n">stdout</span><span class="p">.</span><span class="n">layout</span><span class="p">.</span><span class="n">ConversionPattern</span><span class="p">=[</span><span class="c">%d{HH:mm:ss}] %p [%c] - %m%n</span>
 
-# <span class="n">with</span> <span class="n">these</span> <span class="n">we</span><span class="o">&#39;</span><span class="n">ll</span> <span class="n">not</span> <span class="n">get</span> <span class="n">innundated</span> <span class="n">when</span> <span class="n">switching</span> <span class="n">to</span> <span class="n">DEBUG</span>
+# <span class="n">with</span> <span class="n">these</span> <span class="n">we</span><span class="o">&#39;</span><span class="n">ll</span> <span class="n">not</span> <span class="n">get</span> <span class="n">inundated</span> <span class="n">when</span> <span class="n">switching</span> <span class="n">to</span> <span class="n">DEBUG</span>
 <span class="n">log4j</span><span class="p">.</span><span class="n">logger</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">directory</span><span class="p">.</span><span class="n">shared</span><span class="p">.</span><span class="n">ldap</span><span class="p">.</span><span class="n">name</span><span class="p">=</span><span class="n">WARN</span>
 <span class="n">log4j</span><span class="p">.</span><span class="n">logger</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">springframework</span><span class="p">=</span><span class="n">WARN</span>
 <span class="n">log4j</span><span class="p">.</span><span class="n">logger</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">directory</span><span class="p">.</span><span class="n">shared</span><span class="p">.</span><span class="n">codec</span><span class="p">=</span><span class="n">WARN</span>
@@ -235,7 +235,7 @@ The name of the <em>RollingFileAppender<
 <p>If the default logging does not meet your requirements, you can easily adjust the configuration to your needs.</p>
 <h2 id="adjusting-logging-to-your-needs">Adjusting logging to your needs</h2>
 <h3 id="log-file-location-where-the-log-files-are-placed">Log file location (where the log files are placed)</h3>
-<p>By default the log files are placed at <em><APACHDS_HOME>/var/log/</em>, but that can be changed.</p>
+<p>By default the log files are placed at <em><APACHEDS_HOME>/var/log/</em>, but that can be changed.</p>
 <h4 id="linuxmacossolaris">Linux/MacOS/Solaris</h4>
 <p>On this systems the location of the log files is configured via an entry in <em>/bin/server.init</em>. Look for the following lines and change it to your preferences:</p>
 <div class="codehilite"><pre>$<span class="n">DAEMON_HOME</span><span class="o">/</span><span class="n">apacheds</span> <span class="o">\</span>
@@ -290,7 +290,7 @@ $<span class="n">APACHEDS_HOME</span> <s
 <p>These detailed log messages took much file space and time and therefore should only be enabled globally in order to analyze problems.</p>
 <p>It is possible to configure the logging more fine grained by using categories. Within the default configuration there are some examples:</p>
 <div class="codehilite"><pre><span class="p">...</span>
-# <span class="n">with</span> <span class="n">these</span> <span class="n">we</span><span class="o">&#39;</span><span class="n">ll</span> <span class="n">not</span> <span class="n">get</span> <span class="n">innundated</span> <span class="n">when</span> <span class="n">switching</span> <span class="n">to</span> <span class="n">DEBUG</span>
+# <span class="n">with</span> <span class="n">these</span> <span class="n">we</span><span class="o">&#39;</span><span class="n">ll</span> <span class="n">not</span> <span class="n">get</span> <span class="n">inundated</span> <span class="n">when</span> <span class="n">switching</span> <span class="n">to</span> <span class="n">DEBUG</span>
 <span class="n">log4j</span><span class="p">.</span><span class="n">logger</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">directory</span><span class="p">.</span><span class="n">shared</span><span class="p">.</span><span class="n">ldap</span><span class="p">.</span><span class="n">name</span><span class="p">=</span><span class="n">WARN</span>
 <span class="n">log4j</span><span class="p">.</span><span class="n">logger</span><span class="p">.</span><span class="n">org</span><span class="p">.</span><span class="n">springframework</span><span class="p">=</span><span class="n">WARN</span>
 <span class="n">log4j</span><span class="p">.</span><span class="n">logger</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">directory</span><span class="p">.</span><span class="n">shared</span><span class="p">.</span><span class="n">codec</span><span class="p">=</span><span class="n">WARN</span>

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/2-handling-data.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2-handling-data.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2-handling-data.html Fri Oct  4 17:51:33 2013
@@ -145,7 +145,7 @@
 
 
 <h1 id="2-handling-data-within-your-directory">2 - Handling data within your directory</h1>
-<p>Now that your server is up and running, you can use it to add, modify, remove and search entries. You can also manage its schema, extendng it to fit your needs.</p>
+<p>Now that your server is up and running, you can use it to add, modify, remove and search entries. You can also manage its schema, extending it to fit your needs.</p>
 <h2 id="table-of-content">Table of content</h2>
 <ul>
 <li><a href="2.1-data-modification.html">2.1 - Data modification</a><ul>

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/2.2-searching-data.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.2-searching-data.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.2-searching-data.html Fri Oct  4 17:51:33 2013
@@ -145,7 +145,7 @@
 
 
 <h1 id="22-searching-data">2.2 - Searching Data</h1>
-<p>Searching is the most frequent operation done on a LDAP server : everything is optimizd so that the search operation is as fast as possible.</p>
+<p>Searching is the most frequent operation done on a LDAP server : everything is optimized so that the search operation is as fast as possible.</p>
 <p>We will show how to do some simple searches on <em>Apache Directory Server</em> in the following pages.</p>
 <h2 id="table-of-content">Table of content</h2>
 <ul>

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.1-simple-search.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.1-simple-search.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.1-simple-search.html Fri Oct  4 17:51:33 2013
@@ -165,7 +165,7 @@
 </pre></div>
 
 
-<p>Here, we see that we are connecting to the <strong>sanzibar</strong> server, on its <strong>10389</strong> port. As we haven't provided any user, this is an anonymous search, which should be allowed if the server accept anonymous searches.
+<p>Here, we see that we are connecting to the <strong>zanzibar</strong> server, on its <strong>10389</strong> port. As we haven't provided any user, this is an anonymous search, which should be allowed if the server accept anonymous searches.
 We then have the base <em>DN</em>, <strong>"o=sevenseas"</strong>, the filter <strong>"(cn=James Hook)"</strong> and the scope : <strong>"sub"</strong>. The last parameter, <strong>"+"</strong>, asks the server to return all the operational attributes.</p>
 <p>The result is just shown as a result of the command (here, we get back one single entry).</p>
 

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.2.2-more-search-options.html Fri Oct  4 17:51:33 2013
@@ -147,8 +147,8 @@
 <h1 id="222-more-search-options">2.2.2 - More search options</h1>
 <p>There are many parameters we haven't explained in the previous chapter. </p>
 <h2 id="boundanonymous-searches">Bound/anonymous searches</h2>
-<p>When you send a SearchRequest to the server, you may be anonymous, or you mave have been bound before the search is done. Binding on a server creates an <strong>LDAP</strong> session, which stores the credentials. This is used by the authorization system to filter the requests and the returned data, depending on the server settings.</p>
-<p>Not all the server allow an anonymous search : <em>Apache Dorectory Server</em> default to not enabling such anonymous searches (this is for security questions).</p>
+<p>When you send a SearchRequest to the server, you may be anonymous, or you may have been bound before the search is done. Binding on a server creates an <strong>LDAP</strong> session, which stores the credentials. This is used by the authorization system to filter the requests and the returned data, depending on the server settings.</p>
+<p>Not all the server allow an anonymous search : <em>Apache Directory Server</em> default to not enabling such anonymous searches (this is for security questions).</p>
 <p>Generally speaking, users do bind before sending a search request.</p>
 <h2 id="filters">Filters</h2>
 <p>The <strong>LDAP</strong> filters can be quite complex. Although they aren't even close to what <strong>SQL</strong> provide : there is no way you can do a Join on a LDAP server.</p>
@@ -180,7 +180,7 @@
 </tr>
 </tbody>
 </table>
-<p>Each node proceeds a check on the attributeType and value provided in the filter. For instance, the <strong>"(o=sevenseas)"</strong> filter tells the server to look for all teh entries whcih have an "organization" atribute with a value of <strong>"sevenseas"</strong>. Here are the various kind of filters you can use :</p>
+<p>Each node proceeds a check on the attributeType and value provided in the filter. For instance, the <strong>"(o=sevenseas)"</strong> filter tells the server to look for all the entries which have an "organization" attribute with a value of <strong>"sevenseas"</strong>. Here are the various kind of filters you can use :</p>
 <table>
 <thead>
 <tr>

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/2.3-introducing-schema.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.3-introducing-schema.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.3-introducing-schema.html Fri Oct  4 17:51:33 2013
@@ -145,7 +145,7 @@
 
 
 <h1 id="23-the-schema">2.3 - The Schema</h1>
-<p>All the data stored into a LDAP server are structured following a schema, a bit like any DBMS. <em>Apache Directory Server</em> does have a dynamic schema : that means you can modify the schema wihout having to restart the server.</p>
+<p>All the data stored into a LDAP server are structured following a schema, a bit like any DBMS. <em>Apache Directory Server</em> does have a dynamic schema : that means you can modify the schema without having to restart the server.</p>
 <p>We won't describe in the basic user guide how to manage the schema, this will be extensively described in the <em>Advanced user guide</em>, this chapter is just a short introduction.</p>
 <h2 id="table-of-content">Table of content</h2>
 <ul>

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/2.3.1-adding-schema-elements.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/2.3.1-adding-schema-elements.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/2.3.1-adding-schema-elements.html Fri Oct  4 17:51:33 2013
@@ -174,7 +174,7 @@ objectClasses: ( 2.5.6.6 NAME &#39;perso
 <h2 id="which-oids-should-you-use">Which OIDs should you use?</h2>
 <p>If you plan to add custom schema elements, you need numerical OIDs (object identifiers) for them. If you implement schema elements defined somewhere else (like eduPerson), you can use the OIDs which are are part of their descriptions. But what if you plan to design your own?</p>
 <h3 id="some-oid-background-information">Some OID background information</h3>
-<p>An OID is a string formed by a series of numbers which are seperated by a dot (like "12.4.1971.0.1"). Many elements in directory world use OIDs: Controls, extended operations and schema elements (like "2.5.6.6" for object class person). They identify these objects in a unique fashion and therefore avoid name clashes.</p>
+<p>An OID is a string formed by a series of numbers which are separated by a dot (like "12.4.1971.0.1"). Many elements in directory world use OIDs: Controls, extended operations and schema elements (like "2.5.6.6" for object class person). They identify these objects in a unique fashion and therefore avoid name clashes.</p>
 <p>How is this accomplished? OIDs are assigned hierarchically: The owner of an OID is allowed to create new IDs by simply appending numbers. S/he is also allowed to delegate ownership of newly created OIDs to someone else. This way every person or organization is able to allocate an arbitrary number of new OIDs after obtaining one from "higher command", and they are still unique world-wide.</p>
 <h3 id="oids-in-the-example">OIDs in the example</h3>
 <p>OIDs starting with <strong>1.3.6.1.4.1</strong> represent IANA-registered private enterprises, Apache Software Foundation for instance owns the OID <strong>1.3.6.1.4.1.18060</strong>. The <strong>1.3.6.1.4.1.18060.0</strong> has been assigned to the Apache Directory project by the ASF, and we have decided to use the branch "1.3.6.1.4.1.18060.0.4.3" for schema elements used as examples in the documentation. </p>

Modified: websites/staging/directory/trunk/content/apacheds/basic-ug/4.1-mozilla-thunderbird.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/basic-ug/4.1-mozilla-thunderbird.html (original)
+++ websites/staging/directory/trunk/content/apacheds/basic-ug/4.1-mozilla-thunderbird.html Fri Oct  4 17:51:33 2013
@@ -194,7 +194,7 @@ Furthermore you need an LDAP server up a
 <h3 id="provide-connection-data">Provide connection data</h3>
 <p>Within the "General" tab, enter basic connection data to your directory:
 <em> Name: A name which is used by Thunderbird within the UI, e.g. "Seven Seas"
-</em> Hostname: th hostname or IP address of the server, "zanzibar" in our case
+</em> Hostname: the hostname or IP address of the server, "zanzibar" in our case
 <em> Base DN: Search base for looking up people, we choose "ou=people,o=sevenSeas"
 </em> Port number: The port the LDAP provider of Apache Directory Server is listening on, "10389" in our case</p>
 <p><img alt="Thunderbird new ldap" src="images/thunderbird-new-ldap-1.png" /></p>

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 Oct  4 17:51:33 2013
@@ -418,7 +418,7 @@ which needs their own configuration :
 </em> partitions
 * replication</p>
 <p>see <a href="adsconfig.html">configuration schema description</a></p>
-<p>Otherwise, we also have a set of simple paramaters, listed in the following
+<p>Otherwise, we also have a set of simple parameters, listed in the following
 table :</p>
 <p><a name="ADS2.0configuration-ads-directoryServiceObjectClass"></a></p>
 <h4 id="ads-directoryservice-objectclass">ads-directoryService ObjectClass</h4>

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 Oct  4 17:51:33 2013
@@ -220,7 +220,7 @@ Downloads are available <a href="downloa
 <p>Downloads are available <a href="downloads.html">here</a></p>
 <h2 class="news">ApacheDS 2.0.0-M14 released <em>posted on July 1st, 2013</em></h2>
 
-<p>The Apache Directory team is pleased to announce the release of ApacheDS 2.0.0-M14, the forteenth milestone towards a 2.0 version.</p>
+<p>The Apache Directory team is pleased to announce the release of ApacheDS 2.0.0-M14, the fourteenth milestone towards a 2.0 version.</p>
 <p>ApacheDS 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>
 <p>This release does not contain any change, but it depends on a new version of the Apache LDAP API, which contains a fix
 for a critical bug. </p>
@@ -306,7 +306,7 @@ for a critical bug. </p>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1802">DIRSERVER-1802</a> - Disabling an authenticator results in a NPE</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1803">DIRSERVER-1803</a> - When the SimpleAuthenticator is disabled, and the auth level is set to SIMPLE, we can bind freely</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1804">DIRSERVER-1804</a> - [patch] Fix ApacheDS code to allow control and reduce number of outputted logs</li>
-<li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1805">DIRSERVER-1805</a> - The replication janitor thread is not stopped correctly when teh server is stopped</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1805">DIRSERVER-1805</a> - The replication janitor thread is not stopped correctly when the server is stopped</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRKRB-85">DIRKRB-85</a> - @CreateKdcServer should include searchBaseDn attribute</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1321">DIRSERVER-1321</a> - Clarify relationship between partition.syncOnWrite and apacheDS.syncPeriodMillis configuration attributes</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1322">DIRSERVER-1322</a> - Auto inferring context entry</li>

Modified: websites/staging/directory/trunk/content/apacheds/news.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/news.html (original)
+++ websites/staging/directory/trunk/content/apacheds/news.html Fri Oct  4 17:51:33 2013
@@ -153,7 +153,7 @@ Downloads are available <a href="downloa
 <p>Downloads are available <a href="downloads.html">here</a></p>
 <h2 class="news">ApacheDS 2.0.0-M14 released <em>posted on July 1st, 2013</em></h2>
 
-<p>The Apache Directory team is pleased to announce the release of ApacheDS 2.0.0-M14, the forteenth milestone towards a 2.0 version.</p>
+<p>The Apache Directory team is pleased to announce the release of ApacheDS 2.0.0-M14, the fourteenth milestone towards a 2.0 version.</p>
 <p>ApacheDS 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>
 <p>This release does not contain any change, but it depends on a new version of the Apache LDAP API, which contains a fix
 for a critical bug. </p>
@@ -239,7 +239,7 @@ for a critical bug. </p>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1802">DIRSERVER-1802</a> - Disabling an authenticator results in a NPE</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1803">DIRSERVER-1803</a> - When the SimpleAuthenticator is disabled, and the auth level is set to SIMPLE, we can bind freely</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1804">DIRSERVER-1804</a> - [patch] Fix ApacheDS code to allow control and reduce number of outputted logs</li>
-<li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1805">DIRSERVER-1805</a> - The replication janitor thread is not stopped correctly when teh server is stopped</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1805">DIRSERVER-1805</a> - The replication janitor thread is not stopped correctly when the server is stopped</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRKRB-85">DIRKRB-85</a> - @CreateKdcServer should include searchBaseDn attribute</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1321">DIRSERVER-1321</a> - Clarify relationship between partition.syncOnWrite and apacheDS.syncPeriodMillis configuration attributes</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1322">DIRSERVER-1322</a> - Auto inferring context entry</li>

Modified: websites/staging/directory/trunk/content/mavibot/coding-standards.html
==============================================================================
--- websites/staging/directory/trunk/content/mavibot/coding-standards.html (original)
+++ websites/staging/directory/trunk/content/mavibot/coding-standards.html Fri Oct  4 17:51:33 2013
@@ -128,12 +128,12 @@
 
 
 <h1 id="mavibot-coding-standards">Mavibot Coding Standards</h1>
-<p>Welcome to you, developper ! You have been elected committer on the project, or you want to contribute some code or some patch? This is great news. However, in order to be able to share your 'vision' and your code, some rules must be followed.</p>
+<p>Welcome to you, developer ! You have been elected committer on the project, or you want to contribute some code or some patch? This is great news. However, in order to be able to share your 'vision' and your code, some rules must be followed.</p>
 <p>Hey, remember that those rules are not the best nor the worst, they are pretty much what they are for historical reasons, or for technical reasons, however, please, accept them as they are, and avoid religious war (please, oh please, no mail to say "WTF ? You are using spaces instead of tab ??? How stupid is this rule etc etc.) Rules are <em><em>alway</em>s</em> stupid, but smart people follow them ;)</p>
 <p><strong>eclipse IDE</strong></p>
-<p>Eclipse users can import those two files to enfore the code formating : <a href="http://svn.apache.org/repos/asf/directory/project/trunk/resources/formatting.xml">formatting.xml</a> and <a href="http://svn.apache.org/repos/asf/directory/project/trunk/resources/codetemplates.xml">codetemplates.xml</a></p>
+<p>Eclipse users can import those two files to enforce the code formating : <a href="http://svn.apache.org/repos/asf/directory/project/trunk/resources/formatting.xml">formatting.xml</a> and <a href="http://svn.apache.org/repos/asf/directory/project/trunk/resources/codetemplates.xml">codetemplates.xml</a></p>
 <p><strong>IDEA IDE</strong></p>
-<p>IDEA users can import <a href="settings.jar">this file</a> to enfore the code formating.</p>
+<p>IDEA users can import <a href="settings.jar">this file</a> to enforce the code formating.</p>
 <h2 id="headers">Headers</h2>
 <p>First, you <strong>must</strong> (and this rule accept no exception) use this header in top of all source file, or each file in which you can have comments :</p>
 <div class="codehilite"><pre><span class="cm">/*</span>
@@ -161,7 +161,7 @@
 <h3 id="classinterface-headers">Class/Interface headers</h3>
 <p>Each <strong>Class</strong> or <em>Interface</em> should have an header which must contains :</p>
 <ul>
-<li>A descrption of this class/interface</li>
+<li>A description of this class/interface</li>
 <li>
 <p>an <em>author</em> tag which should be :</p>
 <div class="codehilite"><pre><span class="nd">@author</span> <span class="o">&lt;</span><span class="n">a</span> <span class="n">href</span><span class="o">=</span><span class="s">&quot;mailto:dev@directory.apache.org&quot;</span><span class="o">&gt;</span><span class="n">Apache</span> <span class="n">Directory</span> <span class="n">Project</span><span class="o">&lt;/</span><span class="n">a</span><span class="o">&gt;</span>
@@ -171,7 +171,7 @@
 </li>
 </ul>
 <DIV class="note" markdown="1">
-Thanks to avoid to put your name. The code is not yours, and much more important, but putting ypur name and e-mail, you will intimidate other developper ("Oh, no, I won't mess with this code, it has been developped by XXXX \!") and second, you will receive mail in three years even if you have stopped all commitment on the project (and those who have sent you an e-mail will think that the project's memeber are not responsive...)
+Thanks to avoid to put your name. The code is not yours, and much more important, but putting your name and e-mail, you will intimidate other developer ("Oh, no, I won't mess with this code, it has been developed by XXXX \!") and second, you will receive mail in three years even if you have stopped all commitment on the project (and those who have sent you an e-mail will think that the project's member are not responsive...)
 </DIV>
 
 <p>If you use <strong>html</strong> tags, remember to escape '&lt;' and '&gt;' characters...</p>
@@ -184,9 +184,9 @@ Thanks to avoid to put your name. The co
 <p>No special rules, except that you should avoid :</p>
 <ul>
 <li>Useless comments like : i++; /* Increment i */</li>
-<li>Overusing comments : if you have to heavily comment a peice of code, then this piece of code might be too complex ...</li>
-<li>Speading little comments all over a method : if possible, write blocs of comments. The method header could hgenerally contains a full description of the code, and if it's not the case, just consider your method might be too long !</li>
-<li>Dead code commented. If it's dead, then put it in a cuffin. We use SVN, the Ressuscitator !</li>
+<li>Overusing comments : if you have to heavily comment a piece of code, then this piece of code might be too complex ...</li>
+<li>Spreading little comments all over a method : if possible, write blocs of comments. The method header generally contains a full description of the code, and if it's not the case, just consider your method might be too long !</li>
+<li>Dead code commented. If it's dead, then put it in a coffin. We use SVN, the Ressuscitator !</li>
 </ul>
 <p>Basically, use your common sense :-)</p>
 <h2 id="naming">Naming</h2>
@@ -198,7 +198,7 @@ Thanks to avoid to put your name. The co
 <li>Interfaces should not start with an 'I'</li>
 <li>Classes which implements an Interface must be followed by the postfix 'impl'</li>
 <li>Variables follow the method naming convention. No '_', please !</li>
-<li>Use meaningfull names.</li>
+<li>Use meaningful names.</li>
 <li>No double letter variables like ii, jj etc...</li>
 </ul>
 <p>If you browse the code, you will see that many classes does not respect those rules. That's life ! Don't fix it if you don't touch a class. If you are fixing a method in a class, then you can change the code to respect the rules. Little by little, we may reach a stable state where all the code respect the rules ;)</p>
@@ -222,7 +222,7 @@ Thanks to avoid to put your name. The co
 <ul>
 <li>Always use '{' and '}' even for a single instruction, or if you have an empty block (don't use ';' for empty blocks)</li>
 <li>No more than one instruction on a single line, the only exception is the '?' ':' operation</li>
-<li>Use <em>this</em> to address the class variable if there is a risk of confusion (for instanc eif you have a parameter with the same name.</li>
+<li>Use <em>this</em> to address the class variable if there is a risk of confusion (for instance if you have a parameter with the same name.</li>
 <li>Don't add a 'a_', or 'the_' before a parameter's name to distinguish it from the class variable which has the same name. Use <strong>this</strong> instead.</li>
 <li>Don't add <strong>final</strong> everywhere. Even if <strong>final</strong> is a substitute for <strong>const</strong>, it's semantic is not clear enough that you use it everywhere.</li>
 <li>Add spaces in method calls after '(' and before ')'</li>
@@ -243,7 +243,7 @@ Thanks to avoid to put your name. The co
 <h2 id="imports">Imports</h2>
 <p>Always declare all the classes you import, do not use <strong>x.y.*</strong></p>
 <h2 id="what-else">What else ?</h2>
-<p>Well, this was a very short introduction about coding rules. Use commen sense, look at what you see around you when adding some code, ask people about format, if you have a question.</p>
+<p>Well, this was a very short introduction about coding rules. Use common sense, look at what you see around you when adding some code, ask people about format, if you have a question.</p>
 <p>That's it ! (I wait your comments, guys :-)</p>
 
 

Modified: websites/staging/directory/trunk/content/mavibot/five-minutes-tutorial.html
==============================================================================
--- websites/staging/directory/trunk/content/mavibot/five-minutes-tutorial.html (original)
+++ websites/staging/directory/trunk/content/mavibot/five-minutes-tutorial.html Fri Oct  4 17:51:33 2013
@@ -183,7 +183,7 @@
 </pre></div>
 
 
-<p>Here, all the modifications wil be stored on disk, and in an efficient way.</p>
+<p>Here, all the modifications will be stored on disk, and in an efficient way.</p>
 <h2 id="operations-on-a-btree">Operations on a BTree</h2>
 <p>The type of operations you can conduct on a <em>Btree</em> are listed below (for the most useful ones )</p>
 <ul>
@@ -196,8 +196,8 @@
 </ul>
 <p>You will find a detailed description of all the associated methods in the Mavibot javadoc.</p>
 <h2 id="values">Values</h2>
-<p>A <em>BTree</em> can stor single value or multiple values, associated to a key. The <em>AllowDuplicates</em> flags is set to true if you want to store multiple values associated with one key.</p>
-<p>The default <em>BTree</em> wll only accept single value.</p>
+<p>A <em>BTree</em> can store single value or multiple values, associated to a key. The <em>AllowDuplicates</em> flags is set to true if you want to store multiple values associated with one key.</p>
+<p>The default <em>BTree</em> will only accept single value.</p>
 <h2 id="revisions">Revisions</h2>
 <p>Your <em>BTree</em> can store a new revision for each new modification done on it. Those revisions are kept until no operation are holding them. The <em>BTree</em> operations can all be done using a specific revision number.</p>
 <p>Once the revision is not longer in use, the associated pages are likely to be reclaimed.</p>

Modified: websites/staging/directory/trunk/content/mavibot/news.html
==============================================================================
--- websites/staging/directory/trunk/content/mavibot/news.html (original)
+++ websites/staging/directory/trunk/content/mavibot/news.html Fri Oct  4 17:51:33 2013
@@ -143,7 +143,7 @@
 <p>Downloads are available <a href="downloads.html">here</a></p>
 <h2 class="news">Apache Mavibot added to Apache Directory project <em>posted on August 6th, 2013</em></h2>
 
-<p>We are pround to announce that after less than one year of development in Apache Directory Labs, the Mavibot project has been accepted as a Apache Directory subproject.</p>
+<p>We are proud to announce that after less than one year of development in Apache Directory Labs, the Mavibot project has been accepted as a Apache Directory subproject.</p>
 <p>The project is still in its infancy, and anyone willing to participate in the effort is very welcome !</p>
 
 

Modified: websites/staging/directory/trunk/content/mavibot/user-guide/2.1-logical-structure.html
==============================================================================
--- websites/staging/directory/trunk/content/mavibot/user-guide/2.1-logical-structure.html (original)
+++ websites/staging/directory/trunk/content/mavibot/user-guide/2.1-logical-structure.html Fri Oct  4 17:51:33 2013
@@ -183,7 +183,7 @@
 <h3 id="special-btrees">Special BTrees</h3>
 <p>We have two special <em>BTree</em>s we use to manage the revisions and the copied pages. We will explain what they are good for</p>
 <h4 id="revision-tree">Revision tree</h4>
-<p>We need to keep a track of each active revision, so that a search can work with a specific revision. The idea is that when a search starts, it uses the latest revision, but as some modification can occur while teh search is bieng processed, some new revisions will be added. In some case, we may want to keep a revision active for quite a long time.</p>
+<p>We need to keep a track of each active revision, so that a search can work with a specific revision. The idea is that when a search starts, it uses the latest revision, but as some modification can occur while the search is bieng processed, some new revisions will be added. In some case, we may want to keep a revision active for quite a long time.</p>
 <p>So we store the active revisions in a dedicated <em>BTree</em>.</p>
 <p>As we may have many <em>BTree</em>s, we have to use a key which is a combinaison of the <em>BTree</em> name and its revision. So the revision <em>BTree</em> manage the revisions of all the managed <em>BTree</em>s.</p>
 <p>When a revision is not anymore used, we can remove it from the revision <em>BTree</em>.</p>



Mime
View raw message