From a165710e99edae933b571b475ec13e72b2e89428 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Mon, 21 Sep 2015 23:04:25 +0545
Subject: [PATCH] Minor text typos

that I noticed while looking at some code.
---
 autotest.sh                    | 2 +-
 config/config.sample.php       | 2 +-
 cron.php                       | 2 +-
 lib/base.php                   | 6 +++---
 lib/private/activity/event.php | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index 8d0e20cf2a..243b8df0c6 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -171,7 +171,7 @@ function execute_tests {
 		else
 			if [ "MariaDB" != "$(mysql --version | grep -o MariaDB)" ] ; then
 				echo "Your mysql binary is not provided by MariaDB"
-				echo "To use the docker container set the USEDOCKER enviroment variable"
+				echo "To use the docker container set the USEDOCKER environment variable"
 				exit -1
 			fi
 			mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
diff --git a/config/config.sample.php b/config/config.sample.php
index d561ad27e8..8949bd4446 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -452,7 +452,7 @@ $CONFIG = array(
  *                 expire rules. Please refer to Files_versions online documentation 
  *                 for more info.
  *   ``D, auto``   keep versions at least for D days, apply expire rules to all
- *                 versions that older than D days
+ *                 versions that are older than D days
  * * ``auto, D``   delete all versions that are older than D days automatically,
  *                 delete other versions according to expire rules
  * * ``D1, D2``    keep versions for at least D1 days and delete when exceeds D2 days
diff --git a/cron.php b/cron.php
index ed2a20a1e1..e83e37b347 100644
--- a/cron.php
+++ b/cron.php
@@ -113,7 +113,7 @@ try {
 			\OCP\BackgroundJob::setExecutionType('cron');
 		}
 
-		// open the file and try to lock if. If it is not locked, the background
+		// open the file and try to lock it. If it is not locked, the background
 		// job can be executed, otherwise another instance is already running
 		$fp = fopen($lockFile, 'w');
 		$isLocked = flock($fp, LOCK_EX|LOCK_NB, $wouldBlock);
diff --git a/lib/base.php b/lib/base.php
index f5ba05ded7..3624a3fbaf 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 fe6fc485b7..247113d54a 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