Updated as per jlee-r7 feedback

Author: void-in

lib/metasploit/framework/database.rb

@@ -22,7 +22,7 @@ module Database
       #
       # @param options [Hash{Symbol=>String}]
       # @option options [String] :path Path to use instead of first element of {configurations_pathnames}
-      # @return [String] pathname if configuration pathname exists.
+      # @return [Pathname] if configuration pathname exists.
       # @return [nil] if configuration pathname does not exist.
       def self.configurations_pathname(options={})
         options.assert_valid_keys(:path)

lib/msf/core/auxiliary/report.rb

@@ -113,13 +113,11 @@ def get_host(opts)
 
   #
   # Report a client connection
-  #
-  # opts must contain
-  #	:host the address of the client connecting
-  #	:ua_string a string that uniquely identifies this client
-  # opts can contain
-  #	:ua_name a brief identifier for the client, e.g. "Firefox"
-  #	:ua_ver  the version number of the client, e.g. "3.0.11"
+  # @param opts [Hash] report client information based on user-agent
+  # @option opts [String] :host the address of the client connecting
+  # @option opts [String] :ua_string a string that uniquely identifies this client
+  # @option opts [String] :ua_name a brief identifier for the client, e.g. "Firefox"
+  # @option opts [String] :ua_ver  the version number of the client, e.g. "3.0.11"
   #
   def report_client(opts={})
     return if not db

lib/msf/core/exploit/smb/client/psexec.rb

@@ -52,7 +52,7 @@ def display_name
 
   # Retrieve the SERVICE_DESCRIPTION option
   #
-  # @return [String] service_description the service description.
+  # @return [String] the service description.
   def service_description
     @service_description ||= datastore['SERVICE_DESCRIPTION']
   end

lib/msf/core/handler/reverse_http.rb

@@ -99,7 +99,7 @@ def payload_uri(req)
     "#{scheme}://#{callback_host}/"
   end
 
-  # Use the refname to determine whether this handler uses SSL or not
+  # Use the {#refname} to determine whether this handler uses SSL or not
   #
   def ssl?
     !!(self.refname.index("https"))

lib/msf/core/post/windows/services.rb

@@ -528,7 +528,7 @@ def service_restart(name, start_type=START_TYPE_AUTO, server=nil)
   # Parses out a SERVICE_STATUS struct from the
   # lpServiceStatus out parameter
   #
-  # @param (lpServiceStatus) lpServiceStatus latest status of calling service
+  # @param lpServiceStatus [String] the latest status of calling service
   #
   # @return [Hash] Containing SERVICE_STATUS values
   #

lib/msf/java/rmi/client.rb

@@ -109,8 +109,7 @@ def recv_return(opts = {})
 
         # Helper method to read fragmented data from a ```Rex::Socket::Tcp```
         #
-        # @param [Hash] nsock
-        # @option [Rex::Socket::Tcp] sock
+        # @param nsock [Rex::Socket::Tcp,#get_once]
         # @return [String]
         def safe_get_once(nsock = sock)
           data = ''

lib/rex/java/serialization/model/field.rb

@@ -11,13 +11,13 @@ class Field < Element
           include Rex::Java::Serialization::Model::Contents
 
           # @!attribute type
-          #   @return [String] The type of the field.
+          # @return [String] The type of the field.
           attr_accessor :type
           # @!attribute name
-          #   @return [Rex::Java::Serialization::Model::Utf] The name of the field.
+          # @return [Rex::Java::Serialization::Model::Utf] The name of the field.
           attr_accessor :name
           # @!attribute field_type
-          #   @return [Rex::Java::Serialization::Model::Utf] The type of the field on object types.
+          # @return [Rex::Java::Serialization::Model::Utf] The type of the field on object types.
           attr_accessor :field_type
 
           # @param stream [Rex::Java::Serialization::Model::Stream] the stream where it belongs to
@@ -32,7 +32,7 @@ def initialize(stream = nil)
           #
           # @param io [IO] the io to read from
           # @return [self] if deserialization succeeds
-          # @return [RuntimeError] false if deserialization doesn't succeed
+          # @raise [RuntimeError] if deserialization doesn't succeed
           def decode(io)
             code = io.read(1)