diff --git a/apps/files_sharing/ajax/shareinfo.php b/apps/files_sharing/ajax/shareinfo.php
index e531e84ebb..e15e12fd28 100644
--- a/apps/files_sharing/ajax/shareinfo.php
+++ b/apps/files_sharing/ajax/shareinfo.php
@@ -71,12 +71,12 @@ function getChildInfo($dir, $view) {
 	$children = $view->getDirectoryContent($dir->getPath());
 	$result = array();
 	foreach ($children as $child) {
-		$formated = \OCA\Files\Helper::formatFileInfo($child);
+		$formatted = \OCA\Files\Helper::formatFileInfo($child);
 		if ($child->getType() === 'dir') {
-			$formated['children'] = getChildInfo($child, $view);
+			$formatted['children'] = getChildInfo($child, $view);
 		}
-		$formated['mtime'] = $formated['mtime'] / 1000;
-		$result[] = $formated;
+		$formatted['mtime'] = $formatted['mtime'] / 1000;
+		$result[] = $formatted;
 	}
 	return $result;
 }
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 5bfc8e1d4a..07ec5f766a 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -38,7 +38,7 @@
 				var tr = oldCreateRow.apply(this, arguments);
 				var sharePermissions = fileData.permissions;
 				if (fileData.mountType && fileData.mountType === "external-root"){
-					// for external storages we cant use the permissions of the mountpoint
+					// for external storages we can't use the permissions of the mountpoint
 					// instead we show all permissions and only use the share permissions from the mountpoint to handle resharing
 					sharePermissions = sharePermissions | (OC.PERMISSION_ALL & ~OC.PERMISSION_SHARE);
 				}
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 71d6788cb5..7dc9f66f11 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -384,7 +384,7 @@ class Manager {
 	}
 
 	/**
-	 * return a list of shares wich are accepted by the user
+	 * return a list of shares which are accepted by the user
 	 *
 	 * @return array list of accepted server-to-server shares
 	 */
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index c137ba0728..fcc5a343a0 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -193,7 +193,7 @@ class Test_Files_Sharing_Cache extends TestCase {
 					array('name' => 'shareddir', 'path' => ''),
 				)
 			),
-			array('%nonexistant%',
+			array('%nonexistent%',
 				array(
 				)
 			),
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index f6658e092b..9d0ffb8794 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -224,7 +224,7 @@ class Test_Files_Versioning extends \Test\TestCase {
 				),
 				11 // size of all deleted files (every file has the size 1)
 			),
-			// third set of versions, with some gaps inbetween
+			// third set of versions, with some gaps between
 			array(
 				array(
 					// first slice (10sec) keep one version every 2 seconds
@@ -605,7 +605,7 @@ class Test_Files_Versioning extends \Test\TestCase {
 
 	/**
 	 * @param string $hookName name of hook called
-	 * @param string $params variable to recieve parameters provided by hook
+	 * @param string $params variable to receive parameters provided by hook
 	 */
 	private function connectMockHooks($hookName, &$params) {
 		if ($hookName === null) {
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 5235011fb9..0b475ee714 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -221,7 +221,7 @@ class Wizard extends LDAPUtility {
 			$count = intval($this->countUsersWithAttribute($attr, true));
 			if($count > 0) {
 				//no change, but we sent it back to make sure the user interface
-				//is still correct, even if the ajax call was cancelled inbetween
+				//is still correct, even if the ajax call was cancelled meanwhile
 				$this->result->addChange('ldap_display_name', $attr);
 				return $this->result;
 			}
diff --git a/apps/user_ldap/tests/mapping/abstractmappingtest.php b/apps/user_ldap/tests/mapping/abstractmappingtest.php
index c6427be516..a931a07a44 100644
--- a/apps/user_ldap/tests/mapping/abstractmappingtest.php
+++ b/apps/user_ldap/tests/mapping/abstractmappingtest.php
@@ -112,7 +112,7 @@ abstract class AbstractMappingTest extends \Test\TestCase {
 	}
 
 	/**
-	 * tests unmap() for both successfuly and not successful removing of
+	 * tests unmap() for both successful and unsuccessful removing of
 	 * mapping entries
 	 */
 	public function testUnmap() {