diff --git a/bulkloader/src/main/java/org/apache/directory/mavibot/btree/LdifDataLoader.java b/bulkloader/src/main/java/org/apache/directory/mavibot/btree/LdifDataLoader.java
index 34b015a..2ed896f 100644
--- a/bulkloader/src/main/java/org/apache/directory/mavibot/btree/LdifDataLoader.java
+++ b/bulkloader/src/main/java/org/apache/directory/mavibot/btree/LdifDataLoader.java
@@ -101,7 +101,7 @@
         Set<String> existing = rm.getManagedTrees();
         if( existing.size() > 2 )
         {
-            LOG.warn( "Looks like the given partition directory {} already contains data of a mavibot partiton, please delete this data file and rerun this tool", ldifFile );
+            LOG.warn( "Looks like the given partition directory {} already contains data of a mavibot partition, please delete this data file and rerun this tool", ldifFile );
             return false;
         }
         
diff --git a/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java b/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
index 6cf3263..a9371bb 100644
--- a/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
+++ b/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
@@ -99,7 +99,7 @@
         }
         catch ( Exception e )
         {
-            LOG.error( "Error instantiating custom partiton factory", e );
+            LOG.error( "Error instantiating custom partition factory", e );
             throw new RuntimeException( e );
         }
     }
diff --git a/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java b/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
index 106d9f0..dc4a7b8 100644
--- a/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
+++ b/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
@@ -1245,7 +1245,7 @@
         else if ( LOG.isWarnEnabled() )
         {
             LOG.warn( "ApacheDS shutdown hook has NOT been registered with the runtime."
-                + "  This default setting for standalone operation has been overriden." );
+                + "  This default setting for standalone operation has been overridden." );
         }
 
         initialize();
@@ -2330,4 +2330,4 @@
         return ocProvider;
     }
 
-}
\ No newline at end of file
+}