From 94e7471607080a3e50f088dd5d177debdb1ea722 Mon Sep 17 00:00:00 2001
From: Carol Nichols <carol.nichols@gmail.com>
Date: Mon, 27 Feb 2012 17:54:26 -0700
Subject: [PATCH] Correct some comments and documentation regarding user emails

---
 app/controllers/users_controller.rb | 5 +++--
 app/models/author.rb                | 2 +-
 docs/app_index.html                 | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 050d9497..c04cd142 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -236,8 +236,7 @@ def reset_password_new
     end
   end
 
-  # Submitted passwords are checked for length and confirmation. If the user
-  # does not have an email address they are required to provide one. Once the
+  # Submitted passwords are checked for length and confirmation. Once the
   # password has been reset the user is redirected to /
   def reset_password_create
     user = nil
@@ -264,6 +263,8 @@ def reset_password_create
         return
       end
 
+      # TODO: This may be unreachable, since we don't allow password reset
+      # without an email... look into this and remove this code if so.
       if user.email.nil?
         if params[:email].empty?
           flash[:notice] = "Email must be provided"
diff --git a/app/models/author.rb b/app/models/author.rb
index 7e4011b6..5f82670c 100644
--- a/app/models/author.rb
+++ b/app/models/author.rb
@@ -138,7 +138,7 @@ def avatar_url
     if image_url.present?
       image_url
 
-    # If the user has an email (Don't they have to?), look for a gravatar url.
+    # If the user has an email, look for a gravatar url.
     elsif email.present?
       gravatar_url
 
diff --git a/docs/app_index.html b/docs/app_index.html
index 060f1744..d7a843a8 100644
--- a/docs/app_index.html
+++ b/docs/app_index.html
@@ -246,7 +246,7 @@
         <div class="pilwrap">
           <a class="pilcrow" href="#section-models-authorization">&#182;</a>
         </div>
-        <p>An Authorization is an ability of a User to log in to rstat.us. Currently, the only ways an Authorization is created are if a User logs in to rstat.us with Twitter or a User associates their Twitter account with their existing rstat.us email account.</p>
+        <p>An Authorization is an ability of a User to log in to rstat.us. Currently, the only ways an Authorization is created are if a User logs in to rstat.us with Twitter or a User associates their Twitter account with their existing rstat.us username account.</p>
       </td>
       <td class=code>
         <div class='highlight'><pre>|- <a class="source" href="app/models/authorization.html">authorization.rb</a></pre></div>