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

1 files changed, 6 insertions, 6 deletions

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);