summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-09-21 23:35:30 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-09-21 23:35:30 +0200
commit67231ed9a75eafe5b417e4525e3d80b1a3f8826b (patch)
tree7fe824b836216d6915b209dd61f43d9fe258a3c5 /lib
parent5226ec1d4ae2df09e93c43687380d081567c0d34 (diff)
parenta165710e99edae933b571b475ec13e72b2e89428 (diff)
downloadnextcloud-server-67231ed9a75eafe5b417e4525e3d80b1a3f8826b.tar.gz
nextcloud-server-67231ed9a75eafe5b417e4525e3d80b1a3f8826b.zip
Merge pull request #19231 from phil-davis/r1
Minor text typos
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php6
-rw-r--r--lib/private/activity/event.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/base.php b/lib/base.php
index f5ba05ded74..3624a3fbaf9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -228,7 +228,7 @@ class OC {
public static function checkConfig() {
$l = \OC::$server->getL10N('lib');
- // Create config in case it does not already exists
+ // Create config if it does not already exist
$configFilePath = self::$configDir .'/config.php';
if(!file_exists($configFilePath)) {
@touch($configFilePath);
@@ -314,7 +314,7 @@ class OC {
}
/**
- * check if the instance needs to preform an upgrade
+ * check if the instance needs to perform an upgrade
*
* @return bool
* @deprecated use \OCP\Util::needUpgrade() instead
@@ -567,7 +567,7 @@ class OC {
//try to configure php to enable big file uploads.
//this doesn´t work always depending on the webserver and php configuration.
- //Let´s try to overwrite some defaults anyways
+ //Let´s try to overwrite some defaults anyway
//try to set the maximum execution time to 60min
@set_time_limit(3600);
diff --git a/lib/private/activity/event.php b/lib/private/activity/event.php
index fe6fc485b7b..247113d54a9 100644
--- a/lib/private/activity/event.php
+++ b/lib/private/activity/event.php
@@ -90,7 +90,7 @@ class Event implements IEvent {
}
/**
- * Set the author of the activity
+ * Set the timestamp of the activity
*
* @param int $timestamp
* @return IEvent