Merge branch 'replace-xxx-todo' into rails-3-develop

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb
index e019eba97..190e79e97 100644
--- a/lib/mail_handler/backends/mail_backend.rb
+++ b/lib/mail_handler/backends/mail_backend.rb
@@ -323,7 +323,7 @@ module MailHandler
                             end
                         end
                     end
-                    # XXX call _convert_part_body_to_text here, but need to get charset somehow
+                    # TODO: call _convert_part_body_to_text here, but need to get charset somehow
                     # e.g. http://www.whatdotheyknow.com/request/1593/response/3088/attach/4/Freedom%20of%20Information%20request%20-%20car%20oval%20sticker:%20Article%2020,%20Convention%20on%20Road%20Traffic%201949.txt
                     body = headers + "\n" + body
                 end
diff --git a/lib/mail_handler/mail_handler.rb b/lib/mail_handler/mail_handler.rb
index 53033d440..47015f207 100644
--- a/lib/mail_handler/mail_handler.rb
+++ b/lib/mail_handler/mail_handler.rb
@@ -70,7 +70,7 @@ module MailHandler
         # note re. charset: TMail always tries to convert email bodies
         # to UTF8 by default, so normally it should already be that.
         text = ''
-        # XXX - tell all these command line tools to return utf-8
+        # TODO: - tell all these command line tools to return utf-8
         if content_type == 'text/plain'
             text += body + "\n\n"
         else
@@ -151,7 +151,7 @@ module MailHandler
                     body = entry.get_input_stream.read
                 rescue
                     # move to next attachment silently if there were problems
-                    # XXX really should reduce this to specific exceptions?
+                    # TODO: really should reduce this to specific exceptions?
                     # e.g. password protected
                     next
                 end