summaryrefslogtreecommitdiff
path: root/extlib/Net
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 23:33:58 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 23:33:58 +0100
commitb10f362ede8c39746c168363bf4fa6481995592b (patch)
treec7a6d4d2ca280ba50d1dbac1113507432e3fe12e /extlib/Net
parent5ab709b73977131813884558bf56d97172a7aa26 (diff)
parentfc5002015b2a9e16a3c6b9992d55b45c73a8d2fb (diff)
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'extlib/Net')
-rw-r--r--extlib/Net/LDAP2/Entry.php2
-rw-r--r--extlib/Net/LDAP2/Filter.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/extlib/Net/LDAP2/Entry.php b/extlib/Net/LDAP2/Entry.php
index 5531bfa13..66de96678 100644
--- a/extlib/Net/LDAP2/Entry.php
+++ b/extlib/Net/LDAP2/Entry.php
@@ -665,7 +665,7 @@ class Net_LDAP2_Entry extends PEAR
* To force replace mode instead of add, you can set $force to true.
*
* @param array $attr Attributes to replace
- * @param bool $force Force replacing mode in case we cannot read the attr value but are allowed to replace it
+ * @param bool $force Force replacing mode in case we can't read the attr value but are allowed to replace it
*
* @access public
* @return true|Net_LDAP2_Error
diff --git a/extlib/Net/LDAP2/Filter.php b/extlib/Net/LDAP2/Filter.php
index bd13d1ee4..0723edab2 100644
--- a/extlib/Net/LDAP2/Filter.php
+++ b/extlib/Net/LDAP2/Filter.php
@@ -439,7 +439,7 @@ class Net_LDAP2_Filter extends PEAR
*
* This method is only for compatibility to the perl interface.
* However, the original method was called "print" but due to PHP language restrictions,
- * we cannot have a print() method.
+ * we can't have a print() method.
*
* @param resource $FH (optional) A filehandle resource
*