diff --git a/config-templates/config.php b/config-templates/config.php
index e21bcd8b476651c9800794de3abe1257210e3268..c5433ce4d6e2abbbd5b09d8463b6645722de5f2d 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -202,13 +202,13 @@ $config = array(
      * Database
      *
      * This database configuration is optional. If you are not using
-     * core funcationlity or modules that require a database, you can
+     * core functionality or modules that require a database, you can
      * skip this configuration.
      */
 
     /*
      * Database connection string.
-     * Ensure that you have the required PDO database drive installed
+     * Ensure that you have the required PDO database driver installed
      * for your connection string.
      */
     'database.dsn' => 'mysql:host=localhost;dbname=saml',
@@ -225,7 +225,7 @@ $config = array(
     'database.prefix' => '',
 
     /*
-     * True or false if you would like a persisent datata connection
+     * True or false if you would like a persistent database connection
      */
     'database.persistent' => false,
 
@@ -235,7 +235,7 @@ $config = array(
      * a master/slave conifguration, you can define as many slave servers
      * as you want here. Slaves will be picked at random to be queried from.
      *
-     * Configuration options in the salve array are exactly the same as the
+     * Configuration options in the slave array are exactly the same as the
      * options for the master (shown above) with the exception of the table
      * prefix.
      */
diff --git a/docs/simplesamlphp-metadata-pdostoragehandler.txt b/docs/simplesamlphp-metadata-pdostoragehandler.txt
index c7c260a170ca55d0e23a2f03a5bab48cf708874d..82656fb09be835821cfcf385c543c3f7f1d902e9 100644
--- a/docs/simplesamlphp-metadata-pdostoragehandler.txt
+++ b/docs/simplesamlphp-metadata-pdostoragehandler.txt
@@ -13,7 +13,7 @@ PDO Metadata Storage Handler
 Introduction
 ------------
 
-If you want to run a clustered simpleSAMLphp IdP service and you would like to have centralized storage for metadata, you can use the PDO metadata storage handler.
+If you want to run a clustered SimpleSAMLphp IdP service and you would like to have centralized storage for metadata, you can use the PDO metadata storage handler.
 
 The present document explains how to configure SimpleSAMLphp and your database.
 
@@ -22,7 +22,7 @@ The present document explains how to configure SimpleSAMLphp and your database.
 Preparations
 ------------
 
-You will need to have the appropriate PDO drivers for your database and you will have to configure the database secion within the config/config.php file.
+You will need to have the appropriate PDO drivers for your database and you will have to configure the database section within the config/config.php file.
 
 
 
@@ -50,7 +50,7 @@ Once you have configured your metadata sources to include a PDO source, you will
 
 	[root@simplesamlphp simplesamlphp]# php bin/initMDSPdo.php
 
-If you connect to your datbase, you will see 11 new empty tables; one for each metadata set.
+If you connect to your database, you will see 11 new empty tables; one for each metadata set.
 
 
 Adding Metadata
diff --git a/lib/SimpleSAML/Database.php b/lib/SimpleSAML/Database.php
index ce9b30b24bf70289d32c716e4ac27eb2b9193668..f490101b0194b204d05766d3a84894c9ae841821 100644
--- a/lib/SimpleSAML/Database.php
+++ b/lib/SimpleSAML/Database.php
@@ -43,7 +43,7 @@ class SimpleSAML_Database {
     /**
 	 * Retrieves the current database instance. Will create a new one if there isn't an existing connection.
 	 *
-	 * @param object $altConfig Optional: Instance of a SimpleSAML_Configruation class
+	 * @param object $altConfig Optional: Instance of a SimpleSAML_Configuration class
 	 * @return SimpleSAML_Database The shared database connection.
 	 */
 	public static function getInstance($altConfig = null) {
@@ -63,7 +63,7 @@ class SimpleSAML_Database {
 	/**
 	 * Private constructor that restricts instantiation to getInstance().
 	 *
-	 * @param object $config Instance of the SimpleSAML_Configruation class
+	 * @param object $config Instance of the SimpleSAML_Configuration class
 	 */
 	private function __construct($config) {
 		$driverOptions = array();
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
index e2ffbb909781d1716d6c85ac9272bdc2782616ec..aeef17b51f5c45ee1629f40c87c6224227296537 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
@@ -77,7 +77,7 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerPdo extends SimpleSAML_Metadata_
 
 
 	/**
-	 * This function loads the given set of metadata from a file our configured database.
+	 * This function loads the given set of metadata from a file to a configured database.
 	 * This function returns NULL if it is unable to locate the given set in the metadata directory.
 	 *
 	 * @param string $set  The set of metadata we are loading.
diff --git a/tests/SimpleSAML/DatabaseTest.php b/tests/SimpleSAML/DatabaseTest.php
index 00921e7966b3ef3e46a55206f48c702d3fae3b48..5f84f0723107132fd44e70f0d01951635e221aa5 100644
--- a/tests/SimpleSAML/DatabaseTest.php
+++ b/tests/SimpleSAML/DatabaseTest.php
@@ -231,7 +231,7 @@ class SimpleSAML_DatabaseTest extends PHPUnit_Framework_TestCase
 	 */
 	public function NoSuchTable()
 	{
-		$this->db->write("DROP TABLE phpunit_nonexistant", false);
+		$this->db->write("DROP TABLE phpunit_nonexistent", false);
 	}
 
 	public function tearDown()