From 6ea3a78b470dafb830a7822e321c0a40035e7591 Mon Sep 17 00:00:00 2001
From: Tod Beardsley <tod_beardsley@rapid7.com>
Date: Tue, 14 Oct 2014 11:57:43 -0500
Subject: [PATCH 1/3] Clarify the description on HP perfd module

Introduced in #3992
---
 modules/auxiliary/gather/hp_enum_perfd.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/auxiliary/gather/hp_enum_perfd.rb b/modules/auxiliary/gather/hp_enum_perfd.rb
index 998024c76a..f99197800f 100644
--- a/modules/auxiliary/gather/hp_enum_perfd.rb
+++ b/modules/auxiliary/gather/hp_enum_perfd.rb
@@ -19,8 +19,8 @@ class Metasploit3 < Msf::Auxiliary
     super(
       'Name'        => 'HP Operations Manager Perfd Environment Scanner',
       'Description' => %q{
-        This module will enumerate the environment
-        HP Operation Manager via daemon perfd.
+        This module will enumerate the process list of a remote machine by abusing
+        HP Operation Manager's unauthenticated 'perfd' daemon.
         },
       'Author'      => [ 'Roberto Soares Espreto <robertoespreto[at]gmail.com>' ],
       'License'     => MSF_LICENSE

From b1223165d4250b204a81c654dd8d113222ca14c9 Mon Sep 17 00:00:00 2001
From: Tod Beardsley <tod_beardsley@rapid7.com>
Date: Tue, 14 Oct 2014 12:00:50 -0500
Subject: [PATCH 2/3] Trivial grammar fixes

---
 modules/exploits/unix/webapp/php_wordpress_infusionsoft.rb | 2 +-
 modules/exploits/windows/http/rejetto_hfs_exec.rb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/exploits/unix/webapp/php_wordpress_infusionsoft.rb b/modules/exploits/unix/webapp/php_wordpress_infusionsoft.rb
index b6f808a934..ef966a230b 100644
--- a/modules/exploits/unix/webapp/php_wordpress_infusionsoft.rb
+++ b/modules/exploits/unix/webapp/php_wordpress_infusionsoft.rb
@@ -15,7 +15,7 @@ class Metasploit3 < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Wordpress InfusionSoft Upload Vulnerability',
       'Description'    => %q{
-        This module exploits an arbitrary PHP code upload in the wordpress Infusionsoft Gravity
+        This module exploits an arbitrary PHP code upload in the WordPress Infusionsoft Gravity
         Forms plugin, versions from 1.5.3 to 1.5.10. The vulnerability allows for arbitrary file
         upload and remote code execution.
       },
diff --git a/modules/exploits/windows/http/rejetto_hfs_exec.rb b/modules/exploits/windows/http/rejetto_hfs_exec.rb
index 4311617bd6..bcc051ceb9 100644
--- a/modules/exploits/windows/http/rejetto_hfs_exec.rb
+++ b/modules/exploits/windows/http/rejetto_hfs_exec.rb
@@ -18,7 +18,7 @@ class Metasploit3 < Msf::Exploit::Remote
       'Name'           => "Rejetto HttpFileServer Remote Command Execution",
       'Description'    => %q{
         Rejetto HttpFileServer (HFS) is vulnerable to remote command execution attack due to a
-        poor regex in the file ParserLib.pas. This module exploit the HFS scripting commands by
+        poor regex in the file ParserLib.pas. This module exploits the HFS scripting commands by
         using '%00' to bypass the filtering. This module has been tested successfully on HFS 2.3b
         over Windows XP SP3, Windows 7 SP1 and Windows 8.
       },

From 56534e7ad37c59f83b54a3391d22f4e25eb08ad3 Mon Sep 17 00:00:00 2001
From: Tod Beardsley <tod_beardsley@rapid7.com>
Date: Tue, 14 Oct 2014 12:01:09 -0500
Subject: [PATCH 3/3] Changed a login failed to vprint instead of print

People often like to supress failed attempts. Note that this change may
or may not have any effect, given the status of #3995.

This module was introduced in PR #3947.
---
 modules/auxiliary/scanner/http/jenkins_login.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/auxiliary/scanner/http/jenkins_login.rb b/modules/auxiliary/scanner/http/jenkins_login.rb
index a921eba05d..283c99ff2d 100644
--- a/modules/auxiliary/scanner/http/jenkins_login.rb
+++ b/modules/auxiliary/scanner/http/jenkins_login.rb
@@ -16,7 +16,7 @@ class Metasploit3 < Msf::Auxiliary
   def initialize
     super(
       'Name'           => 'Jenkins-CI Login Utility',
-      'Description'    => 'This module simply attempts to login to a Jenkins-CI instance using a specific user/pass.',
+      'Description'    => 'This module attempts to login to a Jenkins-CI instance using a specific user/pass.',
       'Author'         => [ 'Nicholas Starke <starke.nicholas[at]gmail.com>' ],
       'License'        => MSF_LICENSE
     )
@@ -67,7 +67,7 @@ class Metasploit3 < Msf::Auxiliary
         print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
       else
         invalidate_login(credential_data)
-        print_status "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status})"
+        vprint_status "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status})"
       end
     end
   end