Merge branch 'msftidy/no-twitter-handles' of github.com:todb-r7/metasploit-framework into todb-r7-msftidy/no-twitter-handles

Author: sinn3r

modules/exploits/multi/misc/pbot_exec.rb

@@ -28,7 +28,7 @@ def initialize(info = {})
 				[
 					'evilcry', # pbot analysis'
 					'Jay Turla', # pbot analysis
-					'@bwallHatesTwits', # PoC
+					'bwall', # aka @bwallHatesTwits, PoC
 					'juan vazquez' # Metasploit module
 				],
 			'License'        => MSF_LICENSE,

modules/exploits/windows/browser/adobe_cooltype_sing.rb

@@ -25,8 +25,7 @@ def initialize(info = {})
 			'Author'         =>
 				[
 					'Unknown',    # 0day found in the wild
-					'@sn0wfl0w',  # initial analysis
-					'@vicheck',   # initial analysis
+					'sn0wfl0w',   # initial analysis, also @vicheck on twitter
 					'jduck'       # Metasploit module
 				],
 			'References'     =>

modules/exploits/windows/browser/ms10_090_ie_css_clip.rb

@@ -49,7 +49,7 @@ def initialize(info = {})
 			'Author'         =>
 				[
 					'unknown',        # discovered in the wild
-					'@yuange1975',    # PoC posted to twitter
+					'Yuange',         # PoC posted to twitter under @yuange1975
 					'Matteo Memelli', # exploit-db version
 					'jduck'           # Metasploit module
 				],

modules/exploits/windows/fileformat/adobe_cooltype_sing.rb

@@ -25,8 +25,7 @@ def initialize(info = {})
 			'Author'         =>
 				[
 					'Unknown',    # 0day found in the wild
-					'@sn0wfl0w',  # initial analysis
-					'@vicheck',   # initial analysis
+					'sn0wfl0w',   # initial analysis, also @vicheck on twitter
 					'jduck'       # Metasploit module
 				],
 			'References'     =>

tools/msftidy.rb

@@ -204,7 +204,7 @@ def check_badchars
 				end
 
 				if author_name =~ /^@.+$/
-					error("No Twitter handle, please. Try leaving it in a comment instead.")
+					error("No Twitter handles, please. Try leaving it in a comment instead.")
 				end
 
 				if not author_name.ascii_only?
@@ -279,6 +279,7 @@ def check_title_casing
 			words.each do |word|
 				if %w{and or the for to in of as with a an on at}.include?(word)
 					next
+				elsif %w{pbot}.include?(word)
 				elsif word =~ /^[a-z]+$/
 					warn("Improper capitalization in module title: '#{word}'")
 				end