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

4 files changed, 9 insertions, 9 deletions

diff --git a/plugins/Facebook/facebook/facebook.php b/plugins/Facebook/facebook/facebook.php
index 016e8e8e0..7b0107788 100644
--- a/plugins/Facebook/facebook/facebook.php
+++ b/plugins/Facebook/facebook/facebook.php
@@ -57,7 +57,7 @@ class Facebook {
    * @param api_key                  your Developer API key
    * @param secret                   your Developer API secret
    * @param generate_session_secret  whether to automatically generate a session
-   *                                 if the user doesn't have one, but
+   *                                 if the user does not have one, but
    *                                 there is an auth token present in the url,
    */
   public function __construct($api_key, $secret, $generate_session_secret=false) {
@@ -192,7 +192,7 @@ class Facebook {
       }
       return $session_secret;
     } catch (FacebookRestClientException $e) {
-      // API_EC_PARAM means we don't have a logged in user, otherwise who
+      // API_EC_PARAM means we do not have a logged in user, otherwise who
       // knows what it means, so just throw it.
       if ($e->getCode() != FacebookAPIErrorCodes::API_EC_PARAM) {
         throw $e;
@@ -204,7 +204,7 @@ class Facebook {
     try {
       return $this->api_client->auth_getSession($auth_token, $this->generate_session_secret);
     } catch (FacebookRestClientException $e) {
-      // API_EC_PARAM means we don't have a logged in user, otherwise who
+      // API_EC_PARAM means we do not have a logged in user, otherwise who
       // knows what it means, so just throw it.
       if ($e->getCode() != FacebookAPIErrorCodes::API_EC_PARAM) {
         throw $e;
@@ -265,7 +265,7 @@ class Facebook {
     if ($this->in_fb_canvas()) {
       echo '<fb:redirect url="' . $url . '"/>';
     } else if (preg_match('/^https?:\/\/([^\/]*\.)?facebook\.com(:\d+)?/i', $url)) {
-      // make sure facebook.com url's load in the full frame so that we don't
+      // make sure facebook.com url's load in the full frame so that we do not
       // get a frame within a frame.
       echo "<script type=\"text/javascript\">\ntop.location.href = \"$url\";\n</script>";
     } else {
diff --git a/plugins/Facebook/facebook/facebook_desktop.php b/plugins/Facebook/facebook/facebook_desktop.php
index e79a2ca34..425bb5c7b 100644
--- a/plugins/Facebook/facebook/facebook_desktop.php
+++ b/plugins/Facebook/facebook/facebook_desktop.php
@@ -93,7 +93,7 @@ class FacebookDesktop extends Facebook {
   }
 
   public function verify_signature($fb_params, $expected_sig) {
-    // we don't want to verify the signature until we have a valid
+    // we do not want to verify the signature until we have a valid
     // session secret
     if ($this->verify_sig) {
       return parent::verify_signature($fb_params, $expected_sig);
diff --git a/plugins/Facebook/facebook/facebookapi_php5_restlib.php b/plugins/Facebook/facebook/facebookapi_php5_restlib.php
index 55cb7fb86..c742df748 100755
--- a/plugins/Facebook/facebook/facebookapi_php5_restlib.php
+++ b/plugins/Facebook/facebook/facebookapi_php5_restlib.php
@@ -46,7 +46,7 @@ class FacebookRestClient {
   // on canvas pages
   public $added;
   public $is_user;
-  // we don't pass friends list to iframes, but we want to make
+  // we do not pass friends list to iframes, but we want to make
   // friends_get really simple in the canvas_user (non-logged in) case.
   // So we use the canvas_user as default arg to friends_get
   public $canvas_user;
@@ -657,7 +657,7 @@ function toggleDisplay(id, type) {
    * deleted.
    *
    * IMPORTANT: If your application has registered public tags
-   * that other applications may be using, don't delete those tags!
+   * that other applications may be using, do not delete those tags!
    * Doing so can break the FBML ofapplications that are using them.
    *
    * @param array $tag_names the names of the tags to delete (optinal)
@@ -820,7 +820,7 @@ function toggleDisplay(id, type) {
 
     if (is_array($target_ids)) {
       $target_ids = json_encode($target_ids);
-      $target_ids = trim($target_ids, "[]"); // we don't want square brackets
+      $target_ids = trim($target_ids, "[]"); // we do not want square brackets
     }
 
     return $this->call_method('facebook.feed.publishUserAction',
diff --git a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
index 29509deba..9c6c62663 100644
--- a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
+++ b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
@@ -1,5 +1,5 @@
 <?php
-# In PHP 5.2 or higher we don't need to bring this in
+# In PHP 5.2 or higher we do not need to bring this in
 if (!function_exists('json_encode')) {
 	require_once 'jsonwrapper_inner.php';
 }