Merge branch 'master' into patch-2

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 2b6732e2ba0..d12869fbdaa 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -1164,7 +1164,7 @@ class View {
 					try {
 						$this->changeLock($path, ILockingProvider::LOCK_EXCLUSIVE);
 					} catch (LockedException $e) {
-						// release the shared lock we acquired before quiting
+						// release the shared lock we acquired before quitting
 						$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
 						throw $e;
 					}
@@ -1725,7 +1725,7 @@ class View {
 	/**
 	 * Get the path of a file by id, relative to the view
 	 *
-	 * Note that the resulting path is not guarantied to be unique for the id, multiple paths can point to the same file
+	 * Note that the resulting path is not guaranteed to be unique for the id, multiple paths can point to the same file
 	 *
 	 * @param int $id
 	 * @param int|null $storageId