Merge branch 'release/2012030701' of r7.github.com:rapid7/metasploit-framework into release/2012030701

modules/auxiliary/scanner/afp/afp_server_info.rb

@@ -17,9 +17,9 @@ class Metasploit3 < Msf::Auxiliary
 		super(update_info(info,
 			'Name'         => 'Apple Filing Protocol Info Enumerator',
 			'Description'  => %q{
-				This module fetch AFP server information.
+				This module fetches AFP server information, including server name,
-				Including Server name, network address, supported AFP versions,
+				network address, supported AFP versions, signature, machine type,
-				signature, machine type ,and server flags.
+				and server flags.
 			},
 			'References'     =>
 				[

modules/auxiliary/scanner/mongodb/mongodb_login.rb

@@ -18,8 +18,8 @@ class Metasploit3 < Msf::Auxiliary
 		super(update_info(info,
 			'Name'         => 'MongoDB Login Utility',
 			'Description'  => %q{
-				This module scans for MongoDB server. By default MongoDB has no auth. If auth
+				This module attempts to brute force authentication credentials for MongoDB.
-				is used, it is then possible to execute a brute force attack on the server.
+				Note that, by default, MongoDB does not require authentication.
 			},
 			'References'     =>
 				[

modules/exploits/windows/browser/asus_net4switch_ipswcom.rb

@@ -17,9 +17,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Name'           => "ASUS Net4Switch ipswcom.dll ActiveX Stack Buffer Overflow",
 			'Description'    => %q{
 					This module exploits a vulnerability found in ASUS Net4Switch's ipswcom.dll
-				ActiveX control.  A buffer overflow condition is possible in multiple places all
+				ActiveX control.  A buffer overflow condition is possible in multiple places due
-				because of the poor use of the CxDbgPrint() function, which allows remote attackers
+				to the use of the CxDbgPrint() function, which allows remote attackers to gain
-				to gain arbitrary code execution under the context of the user.
+				arbitrary code execution under the context of the user.
 			},
 			'License'        => MSF_LICENSE,
 			'Author'         =>

modules/exploits/windows/fileformat/ibm_pcm_ws.rb

@@ -16,7 +16,7 @@ class Metasploit3 < Msf::Exploit::Remote
 		super(update_info(info,
 			'Name'          => 'IBM Personal Communications I-Series Access WorkStation 5.9 Profile',
 			'Description'   => %q{
-				The IBM Personal Communications I-Series application WorkStation is susceptible to a
+			The IBM Personal Communications I-Series application WorkStation is susceptible to a
 			stack-based buffer overflow vulnerability within file parsing in which data copied to a
 			location in memory exceeds the size of the reserved destination area. The buffer is located
 			on the runtime program stack.

modules/exploits/windows/ssh/sysax_ssh_username.rb

@@ -18,7 +18,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Description'    => %q{
 					This module exploits a vulnerability found in Sysax's SSH service.  By
 				supplying a long username, the SSH server will copy that data on the stack
-				without any proper bounds checking, therefore allowing remote code execution
+				without proper bounds checking, therefore allowing remote code execution
 				under the context of the user.  Please note that previous versions
 				(before 5.53) are also affected by this bug.
 			},