Merge branch 'master' into module/add-swann-dvr

modules/post/windows/manage/webcam.rb

@@ -16,8 +16,8 @@ class Metasploit3 < Msf::Post
 		super(update_info(info,
 			'Name'          => 'Windows Manage Webcam',
 			'Description'   => %q{
-					This module will allow you to these things with your target's webcam: detect,
+					This module will allow the user to detect installed webcams (with
-				take a snapshot.
+					the LIST action) or take a snapshot (with the SNAPSHOT) action.
 			},
 			'License'       => MSF_LICENSE,
 			'Author'        => [ 'sinn3r'],
@@ -132,4 +132,5 @@ class Metasploit3 < Msf::Post
 		return webcams
 	end
 
-end
+end
+