summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/dav/lib/caldav/caldavbackend.php4
-rw-r--r--apps/dav/lib/carddav/carddavbackend.php2
-rw-r--r--apps/dav/lib/connector/sabre/lockplugin.php2
-rw-r--r--apps/dav/tests/unit/connector/sabre/filesplugin.php2
-rw-r--r--apps/files_external/js/statusmanager.js2
-rw-r--r--apps/files_external/service/globalstoragesservice.php2
-rw-r--r--apps/files_external/service/legacystoragesservice.php2
-rw-r--r--apps/files_external/service/storagesservice.php4
-rw-r--r--apps/files_external/service/userstoragesservice.php2
-rw-r--r--apps/files_trashbin/lib/trashbin.php2
-rw-r--r--apps/files_trashbin/tests/storage.php4
11 files changed, 14 insertions, 14 deletions
diff --git a/apps/dav/lib/caldav/caldavbackend.php b/apps/dav/lib/caldav/caldavbackend.php
index 5f82db10b39..f0f236de3ff 100644
--- a/apps/dav/lib/caldav/caldavbackend.php
+++ b/apps/dav/lib/caldav/caldavbackend.php
@@ -705,7 +705,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
*
* This default may well be good enough for personal use, and calendars
* that aren't very large. But if you anticipate high usage, big calendars
- * or high loads, you are strongly adviced to optimize certain paths.
+ * or high loads, you are strongly advised to optimize certain paths.
*
* The best way to do so is override this method and to optimize
* specifically for 'common filters'.
@@ -1299,7 +1299,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
}
if ($componentType === 'VEVENT' && $component->DTSTART) {
$firstOccurence = $component->DTSTART->getDateTime()->getTimeStamp();
- // Finding the last occurence is a bit harder
+ // Finding the last occurrence is a bit harder
if (!isset($component->RRULE)) {
if (isset($component->DTEND)) {
$lastOccurence = $component->DTEND->getDateTime()->getTimeStamp();
diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php
index 97f5706049a..28d5ed1ae99 100644
--- a/apps/dav/lib/carddav/carddavbackend.php
+++ b/apps/dav/lib/carddav/carddavbackend.php
@@ -392,7 +392,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
}
/**
- * Returns a specfic card.
+ * Returns a specific card.
*
* The same set of properties must be returned as with getCards. The only
* exception is that 'carddata' is absolutely required.
diff --git a/apps/dav/lib/connector/sabre/lockplugin.php b/apps/dav/lib/connector/sabre/lockplugin.php
index ff4e1dc01bb..66da39a57c8 100644
--- a/apps/dav/lib/connector/sabre/lockplugin.php
+++ b/apps/dav/lib/connector/sabre/lockplugin.php
@@ -49,7 +49,7 @@ class LockPlugin extends ServerPlugin {
}
public function getLock(RequestInterface $request) {
- // we cant listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
+ // we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
// so instead we limit ourselves to the PUT method manually
if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
return;
diff --git a/apps/dav/tests/unit/connector/sabre/filesplugin.php b/apps/dav/tests/unit/connector/sabre/filesplugin.php
index 0a790ec6fc9..e88066a12da 100644
--- a/apps/dav/tests/unit/connector/sabre/filesplugin.php
+++ b/apps/dav/tests/unit/connector/sabre/filesplugin.php
@@ -366,7 +366,7 @@ class FilesPlugin extends \Test\TestCase {
* |-text.txt
* |-test.txt
*
- * FolderA is an incomming shared folder and there are no delete permissions.
+ * FolderA is an incoming shared folder and there are no delete permissions.
* Thus moving /FolderA/test.txt to /test.txt should fail already on that check
*
* @expectedException \Sabre\DAV\Exception\Forbidden
diff --git a/apps/files_external/js/statusmanager.js b/apps/files_external/js/statusmanager.js
index 33d2ea104be..118ec17d246 100644
--- a/apps/files_external/js/statusmanager.js
+++ b/apps/files_external/js/statusmanager.js
@@ -497,7 +497,7 @@ OCA.External.StatusManager.Utils = {
if (folder instanceof $) {
trFolder = folder;
} else {
- // cant use here FileList.findFileEl(OCA.External.StatusManager.Utils.jqSelEscape(folder)); return incorrect instance of filelist
+ // can't use here FileList.findFileEl(OCA.External.StatusManager.Utils.jqSelEscape(folder)); return incorrect instance of filelist
trFolder = $('#fileList tr[data-file=\"' + OCA.External.StatusManager.Utils.jqSelEscape(folder) + '\"]');
}
trFolder.removeClass('externalErroredRow').removeClass('externalDisabledRow');
diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/service/globalstoragesservice.php
index 312d8417a92..62da314c5fa 100644
--- a/apps/files_external/service/globalstoragesservice.php
+++ b/apps/files_external/service/globalstoragesservice.php
@@ -72,7 +72,7 @@ class GlobalStoragesService extends StoragesService {
/**
* Triggers signal_create_mount or signal_delete_mount to
- * accomodate for additions/deletions in applicableUsers
+ * accommodate for additions/deletions in applicableUsers
* and applicableGroups fields.
*
* @param StorageConfig $oldStorage old storage config
diff --git a/apps/files_external/service/legacystoragesservice.php b/apps/files_external/service/legacystoragesservice.php
index bab1008e561..158fc2b5137 100644
--- a/apps/files_external/service/legacystoragesservice.php
+++ b/apps/files_external/service/legacystoragesservice.php
@@ -188,7 +188,7 @@ abstract class LegacyStoragesService {
$storagesWithConfigHash[$configId] = $currentStorage;
}
} catch (\UnexpectedValueException $e) {
- // dont die if a storage backend doesn't exist
+ // don't die if a storage backend doesn't exist
\OCP\Util::writeLog(
'files_external',
'Could not load storage: "' . $e->getMessage() . '"',
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 1762b55a06c..6542be146d6 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -96,7 +96,7 @@ abstract class StoragesService {
$config->setId((int)$mount['mount_id']);
return $config;
} catch (\UnexpectedValueException $e) {
- // dont die if a storage backend doesn't exist
+ // don't die if a storage backend doesn't exist
\OCP\Util::writeLog(
'files_external',
'Could not load storage: "' . $e->getMessage() . '"',
@@ -352,7 +352,7 @@ abstract class StoragesService {
/**
* Triggers signal_create_mount or signal_delete_mount to
- * accomodate for additions/deletions in applicableUsers
+ * accommodate for additions/deletions in applicableUsers
* and applicableGroups fields.
*
* @param StorageConfig $oldStorage old storage data
diff --git a/apps/files_external/service/userstoragesservice.php b/apps/files_external/service/userstoragesservice.php
index d4b04de609d..c46846e76d6 100644
--- a/apps/files_external/service/userstoragesservice.php
+++ b/apps/files_external/service/userstoragesservice.php
@@ -82,7 +82,7 @@ class UserStoragesService extends StoragesService {
/**
* Triggers signal_create_mount or signal_delete_mount to
- * accomodate for additions/deletions in applicableUsers
+ * accommodate for additions/deletions in applicableUsers
* and applicableGroups fields.
*
* @param StorageConfig $oldStorage old storage data
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 46447908b90..52692950a65 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -56,7 +56,7 @@ class Trashbin {
private static $scannedVersions = false;
/**
- * Ensure we dont need to scan the file during the move to trash
+ * Ensure we don't need to scan the file during the move to trash
* by triggering the scan in the pre-hook
*
* @param array $params
diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php
index 958c5f79a98..afc07ff36c8 100644
--- a/apps/files_trashbin/tests/storage.php
+++ b/apps/files_trashbin/tests/storage.php
@@ -435,7 +435,7 @@ class Storage extends \Test\TestCase {
}
/**
- * Delete should fail is the source file cant be deleted
+ * Delete should fail if the source file can't be deleted.
*/
public function testSingleStorageDeleteFileFail() {
/**
@@ -472,7 +472,7 @@ class Storage extends \Test\TestCase {
}
/**
- * Delete should fail is the source folder cant be deleted
+ * Delete should fail if the source folder can't be deleted.
*/
public function testSingleStorageDeleteFolderFail() {
/**