Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7

.gitignore

@@ -10,7 +10,7 @@
 coverage
 data/meterpreter/ext_server_pivot.dll
 data/meterpreter/ext_server_pivot.x64.dll
-doc
+doc/
 external/source/meterpreter/java/bin
 external/source/meterpreter/java/build
 external/source/meterpreter/java/extensions

lib/msf/core/option_container.rb

@@ -302,6 +302,10 @@ class OptPort < OptBase
 		return 'port'
 	end
 
+	def normalize(value)
+		value.to_i
+	end
+
 	def valid?(value)
 		return false if empty_required_value?(value)
 

modules/exploits/multi/http/rails_xml_yaml_code_exec.rb

@@ -24,8 +24,8 @@ class Metasploit3 < Msf::Exploit::Remote
 
 				This module has been tested across multiple versions of RoR 3.x and RoR 2.x
 
-				The technique used by this module requires the target to be running a fairly version
-				of Ruby 1.9 (since 2011 or so). Applications using Ruby 1.8 may still be
+				The technique used by this module requires the target to be running a fairly recent
+				version of Ruby 1.9 (since 2011 or so). Applications using Ruby 1.8 may still be
 				exploitable using the init_with() method, but this has not been demonstrated.
 
 			},