summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xautotest-external.sh2
-rw-r--r--lib/private/share/share.php2
-rw-r--r--settings/js/users/groups.js2
-rw-r--r--tests/core/command/encryption/changekeystorageroottest.php4
4 files changed, 5 insertions, 5 deletions
diff --git a/autotest-external.sh b/autotest-external.sh
index 643153bb064..ef6516c0721 100755
--- a/autotest-external.sh
+++ b/autotest-external.sh
@@ -218,7 +218,7 @@ EOF
stopFile=`echo "$startFile" | sed 's/start/stop/'`
echo "stop: $stopFile"
if [ -f $FILES_EXTERNAL_BACKEND_ENV_PATH/$stopFile ]; then
- # execute stop file if existant
+ # execute stop file if existent
./$FILES_EXTERNAL_BACKEND_ENV_PATH/$stopFile
fi
if [ "$DOEXIT" ]; then
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 3dcfa14079b..c6f7258c536 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1265,7 +1265,7 @@ class Share extends Constants {
/**
* validate expiration date if it meets all constraints
*
- * @param string $expireDate well formate date string, e.g. "DD-MM-YYYY"
+ * @param string $expireDate well formatted date string, e.g. "DD-MM-YYYY"
* @param string $shareTime timestamp when the file was shared
* @param string $itemType
* @param string $itemSource
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 27c41884504..36ebbd2fa6e 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -31,7 +31,7 @@ GroupList = {
setUserCount: function (groupLiElement, usercount) {
if ($sortGroupBy !== 1) {
- // If we don't sort by group count we dont display them either
+ // If we don't sort by group count we don't display them either
return;
}
diff --git a/tests/core/command/encryption/changekeystorageroottest.php b/tests/core/command/encryption/changekeystorageroottest.php
index 6cb52cdea99..2a1f48983f1 100644
--- a/tests/core/command/encryption/changekeystorageroottest.php
+++ b/tests/core/command/encryption/changekeystorageroottest.php
@@ -74,9 +74,9 @@ class ChangeKeyStorageRootTest extends TestCase {
$this->outputInterface = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
$this->userInterface = $this->getMock('\OCP\UserInterface');
- $outputFormaterInterface = $this->getMock('Symfony\Component\Console\Formatter\OutputFormatterInterface');
+ $outputFormatterInterface = $this->getMock('Symfony\Component\Console\Formatter\OutputFormatterInterface');
$this->outputInterface->expects($this->any())->method('getFormatter')
- ->willReturn($outputFormaterInterface);
+ ->willReturn($outputFormatterInterface);
$this->changeKeyStorageRoot = new ChangeKeyStorageRoot(
$this->view,