diff --git a/config/config.sample.php b/config/config.sample.php
index dfa29f329c468b31c334e7ae6121d06c1996b6e6..4d1950d60eec8a9d96fae119ff1fce8ea31d108c 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -129,17 +129,17 @@ $CONFIG = array(
/* Are we connected to the internet or are we running in a closed network? */
"has_internet_connection" => true,
- /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
+/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
"log_type" => "owncloud",
-/* File for the owncloud logger to log to, (default is ownloud.log in the data dir */
+/* File for the owncloud logger to log to, (default is ownloud.log in the data dir) */
"logfile" => "",
/* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
"loglevel" => "",
-/* Append All database query and parameters to the log file.
- (whatch out, this option can increase the size of your log file)*/
+/* Append all database queries and parameters to the log file.
+ (watch out, this option can increase the size of your log file)*/
"log_query" => false,
/* Lifetime of the remember login cookie, default is 15 days */
@@ -167,8 +167,8 @@ $CONFIG = array(
/* Set an array of path for your apps directories
key 'path' is for the fs path and the key 'url' is for the http path to your
- applications paths. 'writable' indicate if the user can install apps in this folder.
- You must have at least 1 app folder writable or you must set the parameter : appstoreenabled to false
+ applications paths. 'writable' indicates whether the user can install apps in this folder.
+ You must have at least 1 app folder writable or you must set the parameter 'appstoreenabled' to false
*/
array(
'path'=> '/var/www/owncloud/apps',
diff --git a/lib/app.php b/lib/app.php
index f9b1c5ca7b55c21c065568ce135d2a6e2fd3f7f9..baacf508d8e280ad185c4a7fe9ca3091a225c938 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -424,7 +424,7 @@ class OC_App{
return $navigation;
}
- /// This is private as well. It simply works, so don't ask for more details
+ // This is private as well. It simply works, so don't ask for more details
private static function proceedNavigation( $list ) {
foreach( $list as &$naventry ) {
if( $naventry['id'] == self::$activeapp ) {
@@ -473,7 +473,7 @@ class OC_App{
}
/**
* Get the directory for the given app.
- * If the app is defined in multiple directory, the first one is taken. (false if not found)
+ * If the app is defined in multiple directories, the first one is taken. (false if not found)
*/
public static function getAppPath($appid) {
if( ($dir = self::findAppInDirectories($appid)) != false) {
@@ -484,7 +484,7 @@ class OC_App{
/**
* Get the path for the given app on the access
- * If the app is defined in multiple directory, the first one is taken. (false if not found)
+ * If the app is defined in multiple directories, the first one is taken. (false if not found)
*/
public static function getAppWebPath($appid) {
if( ($dir = self::findAppInDirectories($appid)) != false) {
@@ -818,7 +818,7 @@ class OC_App{
}
/**
- * check if the app need updating and update when needed
+ * check if the app needs updating and update when needed
*/
public static function checkUpgrade($app) {
if (in_array($app, self::$checkedApps)) {
diff --git a/lib/archive.php b/lib/archive.php
index 61239c82076bb3394b6466aa80363e5807e31ef1..70615db714e40e8bc230ad19c8e882feaf5c5f18 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -8,7 +8,7 @@
abstract class OC_Archive{
/**
- * open any of the supporeted archive types
+ * open any of the supported archive types
* @param string path
* @return OC_Archive
*/
@@ -69,7 +69,7 @@ abstract class OC_Archive{
*/
abstract function getFolder($path);
/**
- *get all files in the archive
+ * get all files in the archive
* @return array
*/
abstract function getFiles();
@@ -113,7 +113,7 @@ abstract class OC_Archive{
*/
abstract function getStream($path, $mode);
/**
- * add a folder and all it's content
+ * add a folder and all its content
* @param string $path
* @param string source
* @return bool
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index e7c81389619a8f2d00cb94aea7cb3b275895cb46..a1c0535b1c3e49a71b706d64632fec92d96478f8 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -182,7 +182,7 @@ class OC_Archive_TAR extends OC_Archive{
return $folderContent;
}
/**
- *get all files in the archive
+ * get all files in the archive
* @return array
*/
function getFiles() {
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index 8e31795ded1512c02cdadd667c1175dc2263c949..8a866716a7949f7442611bb40ae8090fbba153c5 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -94,7 +94,7 @@ class OC_Archive_ZIP extends OC_Archive{
return $folderContent;
}
/**
- *get all files in the archive
+ * get all files in the archive
* @return array
*/
function getFiles() {
diff --git a/lib/files/cache/updater.php b/lib/files/cache/updater.php
index 87c33a313a482ebb755ef0bbdfc3ac56bfbb37ec..1f30173a8f8b18d1a1741e4171217d45813bb3b0 100644
--- a/lib/files/cache/updater.php
+++ b/lib/files/cache/updater.php
@@ -26,7 +26,7 @@ class Updater {
}
/**
- * preform a write update
+ * perform a write update
*
* @param string $path the relative path of the file
*/
@@ -46,7 +46,7 @@ class Updater {
}
/**
- * preform a delete update
+ * perform a delete update
*
* @param string $path the relative path of the file
*/
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 3d7d5abf8fe49463107cb329cd8179c7a68da183..1bf7270c7f17422a787deb6f67cf7c504f83b7d7 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -8,7 +8,7 @@
/**
* Class for abstraction of filesystem functions
- * This class won't call any filesystem functions for itself but but will pass them to the correct OC_Filestorage object
+ * This class won't call any filesystem functions for itself but will pass them to the correct OC_Filestorage object
* this class should also handle all the file permission related stuff
*
* Hooks provided:
@@ -717,7 +717,7 @@ class Filesystem {
/**
* Get the path of a file by id
*
- * 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
* @return string
diff --git a/lib/preferences.php b/lib/preferences.php
index 5f6434bcf9cd9a12b1ab43d7a8e4dd9fa796acef..11ca760830edea40b35ead1154e02d516fc92328 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -59,7 +59,7 @@ class OC_Preferences{
}
/**
- * @brief Get all apps of a user
+ * @brief Get all apps of an user
* @param string $user user
* @return array with app ids
*