summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/TarLib.class.php2
-rw-r--r--inc/auth/ad.class.php4
-rw-r--r--inc/parserutils.php2
-rw-r--r--inc/subscription.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/inc/TarLib.class.php b/inc/TarLib.class.php
index 3da3c72c2..7a7acdbdb 100644
--- a/inc/TarLib.class.php
+++ b/inc/TarLib.class.php
@@ -399,7 +399,7 @@ class TarLib {
*
* This function attempts to get the list of the files stored in the
* archive, and return either an error code or an indexed array of
- * associative array containing for each file the following informations :
+ * associative array containing for each file the following information :
*
* checksum Tar Checksum of the file
* filename The full name of the stored file (up to 100 c.)
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php
index 9ae6dbbd1..90fe0266b 100644
--- a/inc/auth/ad.class.php
+++ b/inc/auth/ad.class.php
@@ -26,7 +26,7 @@
* $conf['auth']['ad']['use_ssl'] = 1;
* $conf['auth']['ad']['debug'] = 1;
*
- * // get additional informations to the userinfo array
+ * // get additional information to the userinfo array
* // add a list of comma separated ldap contact fields.
* $conf['auth']['ad']['additional'] = 'field1,field2';
*
@@ -155,7 +155,7 @@ class auth_ad extends auth_basic {
$info['uid'] = $result[0]['samaccountname'][0];
$info['dn'] = $result[0]['dn'];
- // additional informations
+ // additional information
foreach ($this->cnf['additional'] as $field) {
if (isset($result[0][strtolower($field)])) {
$info[$field] = $result[0][strtolower($field)][0];
diff --git a/inc/parserutils.php b/inc/parserutils.php
index 35ccdc1d6..27a5190bd 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -531,7 +531,7 @@ function p_sort_modes($a, $b){
/**
* Renders a list of instruction to the specified output mode
*
- * In the $info array are informations from the renderer returned
+ * In the $info array is information from the renderer returned
*
* @author Harry Fuecks <hfuecks@gmail.com>
* @author Andreas Gohr <andi@splitbrain.org>
diff --git a/inc/subscription.php b/inc/subscription.php
index f39b87eb5..52091bafe 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -65,7 +65,7 @@ function subscription_unlock($id) {
/**
* Set subscription information
*
- * Allows to set subscription informations for permanent storage in meta files.
+ * Allows to set subscription information for permanent storage in meta files.
* Subscriptions consist of a target object, a subscribing user, a subscribe
* style and optional data.
* A subscription may be deleted by specifying an empty subscribe style.