Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

14 files changed, 65 insertions, 65 deletions

diff --git a/extlib/DB/DataObject/Generator.php b/extlib/DB/DataObject/Generator.php
index e14e3ef7f..ff6e42c7d 100644
--- a/extlib/DB/DataObject/Generator.php
+++ b/extlib/DB/DataObject/Generator.php
@@ -632,7 +632,7 @@ class DB_DataObject_Generator extends DB_DataObject
                 echo "*****************************************************************\n".
                      "**               WARNING COLUMN NAME UNUSABLE                  **\n".
                      "** Found column '{$t->name}', of type  '{$t->type}'            **\n".
-                     "** Since this column name cannot be converted to a php variable **\n".
+                     "** Since this column name can't be converted to a php variable **\n".
                      "** name, and the whole idea of mapping would result in a mess  **\n".
                      "** This column has been ignored...                             **\n".
                      "*****************************************************************\n";
@@ -910,7 +910,7 @@ class DB_DataObject_Generator extends DB_DataObject
                 echo "*****************************************************************\n".
                      "**               WARNING COLUMN NAME UNUSABLE                  **\n".
                      "** Found column '{$t->name}', of type  '{$t->type}'            **\n".
-                     "** Since this column name cannot be converted to a php variable **\n".
+                     "** Since this column name can't be converted to a php variable **\n".
                      "** name, and the whole idea of mapping would result in a mess  **\n".
                      "** This column has been ignored...                             **\n".
                      "*****************************************************************\n";
diff --git a/extlib/DB/dbase.php b/extlib/DB/dbase.php
index 15d259c4d..67afc897d 100644
--- a/extlib/DB/dbase.php
+++ b/extlib/DB/dbase.php
@@ -287,7 +287,7 @@ class DB_dbase extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -352,7 +352,7 @@ class DB_dbase extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -373,7 +373,7 @@ class DB_dbase extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/fbsql.php b/extlib/DB/fbsql.php
index 48ff705cf..4de4078f7 100644
--- a/extlib/DB/fbsql.php
+++ b/extlib/DB/fbsql.php
@@ -262,7 +262,7 @@ class DB_fbsql extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -309,7 +309,7 @@ class DB_fbsql extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -376,7 +376,7 @@ class DB_fbsql extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -401,7 +401,7 @@ class DB_fbsql extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/ibase.php b/extlib/DB/ibase.php
index 1e444d634..ee19c5589 100644
--- a/extlib/DB/ibase.php
+++ b/extlib/DB/ibase.php
@@ -353,7 +353,7 @@ class DB_ibase extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -402,7 +402,7 @@ class DB_ibase extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -449,7 +449,7 @@ class DB_ibase extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/ifx.php b/extlib/DB/ifx.php
index dcb3dbd3e..baa6f2867 100644
--- a/extlib/DB/ifx.php
+++ b/extlib/DB/ifx.php
@@ -147,7 +147,7 @@ class DB_ifx extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it cannot actually be designated
+     * {@internal  While this is private, it can't actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -328,7 +328,7 @@ class DB_ifx extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -387,7 +387,7 @@ class DB_ifx extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -411,7 +411,7 @@ class DB_ifx extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -555,7 +555,7 @@ class DB_ifx extends DB_common
      *
      * If analyzing a query result and the result has duplicate field names,
      * an error will be raised saying
-     * <samp>cannot distinguish duplicate field names</samp>.
+     * <samp>can't distinguish duplicate field names</samp>.
      *
      * @param object|string  $result  DB_result object from a query or a
      *                                 string containing the name of a table.
@@ -604,7 +604,7 @@ class DB_ifx extends DB_common
         $count = @ifx_num_fields($id);
 
         if (count($flds) != $count) {
-            return $this->raiseError("cannot distinguish duplicate field names");
+            return $this->raiseError("can't distinguish duplicate field names");
         }
 
         if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
diff --git a/extlib/DB/msql.php b/extlib/DB/msql.php
index ee64f932f..34854f472 100644
--- a/extlib/DB/msql.php
+++ b/extlib/DB/msql.php
@@ -288,7 +288,7 @@ class DB_msql extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * PHP's mSQL extension did weird things with NULL values prior to PHP
@@ -339,7 +339,7 @@ class DB_msql extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -360,7 +360,7 @@ class DB_msql extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -385,7 +385,7 @@ class DB_msql extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/mssql.php b/extlib/DB/mssql.php
index 1aad75671..511a2b686 100644
--- a/extlib/DB/mssql.php
+++ b/extlib/DB/mssql.php
@@ -156,7 +156,7 @@ class DB_mssql extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it cannot actually be designated
+     * {@internal  While this is private, it can't actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -324,7 +324,7 @@ class DB_mssql extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -371,7 +371,7 @@ class DB_mssql extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -392,7 +392,7 @@ class DB_mssql extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -417,7 +417,7 @@ class DB_mssql extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/mysql.php b/extlib/DB/mysql.php
index bfe34dbe8..c67254520 100644
--- a/extlib/DB/mysql.php
+++ b/extlib/DB/mysql.php
@@ -139,7 +139,7 @@ class DB_mysql extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it cannot actually be designated
+     * {@internal  While this is private, it can't actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -359,7 +359,7 @@ class DB_mysql extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -411,7 +411,7 @@ class DB_mysql extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -432,7 +432,7 @@ class DB_mysql extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -457,7 +457,7 @@ class DB_mysql extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -722,7 +722,7 @@ class DB_mysql extends DB_common
             return $result;
         }
         if ($result == 0) {
-            // Failed to get the lock, cannot do the conversion, bail
+            // Failed to get the lock, can't do the conversion, bail
             // with a DB_ERROR_NOT_LOCKED error
             return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED);
         }
@@ -757,7 +757,7 @@ class DB_mysql extends DB_common
      * Quotes a string so it can be safely used as a table or column name
      * (WARNING: using names that require this is a REALLY BAD IDEA)
      *
-     * WARNING:  Older versions of MySQL cannot handle the backtick
+     * WARNING:  Older versions of MySQL can't handle the backtick
      * character (<kbd>`</kbd>) in table or column names.
      *
      * @param string $str  identifier name to be quoted
diff --git a/extlib/DB/mysqli.php b/extlib/DB/mysqli.php
index b6196dfcc..c6941b170 100644
--- a/extlib/DB/mysqli.php
+++ b/extlib/DB/mysqli.php
@@ -142,7 +142,7 @@ class DB_mysqli extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it cannot actually be designated
+     * {@internal  While this is private, it can't actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -434,7 +434,7 @@ class DB_mysqli extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -486,7 +486,7 @@ class DB_mysqli extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -507,7 +507,7 @@ class DB_mysqli extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -532,7 +532,7 @@ class DB_mysqli extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -796,7 +796,7 @@ class DB_mysqli extends DB_common
             return $result;
         }
         if ($result == 0) {
-            // Failed to get the lock, cannot do the conversion, bail
+            // Failed to get the lock, can't do the conversion, bail
             // with a DB_ERROR_NOT_LOCKED error
             return $this->mysqliRaiseError(DB_ERROR_NOT_LOCKED);
         }
@@ -832,7 +832,7 @@ class DB_mysqli extends DB_common
      * Quotes a string so it can be safely used as a table or column name
      * (WARNING: using names that require this is a REALLY BAD IDEA)
      *
-     * WARNING:  Older versions of MySQL cannot handle the backtick
+     * WARNING:  Older versions of MySQL can't handle the backtick
      * character (<kbd>`</kbd>) in table or column names.
      *
      * @param string $str  identifier name to be quoted
diff --git a/extlib/DB/oci8.php b/extlib/DB/oci8.php
index 6ad36643a..d30794871 100644
--- a/extlib/DB/oci8.php
+++ b/extlib/DB/oci8.php
@@ -251,7 +251,7 @@ class DB_oci8 extends DB_common
                                                    $char);
             $error = OCIError();
             if (!empty($error) && $error['code'] == 12541) {
-                // Could not find TNS listener.  Try direct connection.
+                // Couldn't find TNS listener.  Try direct connection.
                 $this->connection = @$connect_function($dsn['username'],
                                                        $dsn['password'],
                                                        null,
@@ -368,7 +368,7 @@ class DB_oci8 extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -415,7 +415,7 @@ class DB_oci8 extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -468,7 +468,7 @@ class DB_oci8 extends DB_common
      * is turned on.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -511,7 +511,7 @@ class DB_oci8 extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/odbc.php b/extlib/DB/odbc.php
index b0dc83ab5..eba43659a 100644
--- a/extlib/DB/odbc.php
+++ b/extlib/DB/odbc.php
@@ -301,7 +301,7 @@ class DB_odbc extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -356,7 +356,7 @@ class DB_odbc extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -377,7 +377,7 @@ class DB_odbc extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -427,7 +427,7 @@ class DB_odbc extends DB_common
      * a DB_Error object for DB_ERROR_UNSUPPORTED is returned.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/pgsql.php b/extlib/DB/pgsql.php
index 498ef8ade..6030bb4c1 100644
--- a/extlib/DB/pgsql.php
+++ b/extlib/DB/pgsql.php
@@ -115,7 +115,7 @@ class DB_pgsql extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it cannot actually be designated
+     * {@internal  While this is private, it can't actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -397,7 +397,7 @@ class DB_pgsql extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -445,7 +445,7 @@ class DB_pgsql extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -535,7 +535,7 @@ class DB_pgsql extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -560,7 +560,7 @@ class DB_pgsql extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/sqlite.php b/extlib/DB/sqlite.php
index 96d5c934a..5c4b396e5 100644
--- a/extlib/DB/sqlite.php
+++ b/extlib/DB/sqlite.php
@@ -334,7 +334,7 @@ class DB_sqlite extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -396,7 +396,7 @@ class DB_sqlite extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -422,7 +422,7 @@ class DB_sqlite extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -447,7 +447,7 @@ class DB_sqlite extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
diff --git a/extlib/DB/sybase.php b/extlib/DB/sybase.php
index 97ab41a22..3befbf6ea 100644
--- a/extlib/DB/sybase.php
+++ b/extlib/DB/sybase.php
@@ -118,7 +118,7 @@ class DB_sybase extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it cannot actually be designated
+     * {@internal  While this is private, it can't actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -302,7 +302,7 @@ class DB_sybase extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -359,7 +359,7 @@ class DB_sybase extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -380,7 +380,7 @@ class DB_sybase extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -405,7 +405,7 @@ class DB_sybase extends DB_common
      * Gets the number of rows in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -835,7 +835,7 @@ class DB_sybase extends DB_common
             $tableName = $table;
 
             /* We're running sp_helpindex directly because it doesn't exist in
-             * older versions of ASE -- unfortunately, we cannot just use
+             * older versions of ASE -- unfortunately, we can't just use
              * DB::isError() because the user may be using callback error
              * handling. */
             $res = @sybase_query("sp_helpindex $table", $this->connection);