Merge "Fix typo in HtmlForm::setName phpdoc"

diff --combined includes/htmlform/HTMLForm.php
index 25e7f8c,57115ff..d50fac0
--- 1/includes/htmlform/HTMLForm.php
--- 2/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@@ -56,19 -56,19 +56,19 @@@
   *                             Some field types support multi-level arrays.
   *    'options-messages'    -- associative array mapping message keys to values.
   *                             Some field types support multi-level arrays.
 - *    'options-message'     -- message key to be parsed to extract the list of
 + *    'options-message'     -- message key or object to be parsed to extract the list of
   *                             options (like 'ipbreason-dropdown').
 - *    'label-message'       -- message key for a message to use as the label.
 + *    'label-message'       -- message key or object for a message to use as the label.
   *                             can be an array of msg key and then parameters to
   *                             the message.
   *    'label'               -- alternatively, a raw text message. Overridden by
   *                             label-message
   *    'help'                -- message text for a message to use as a help text.
 - *    'help-message'        -- message key for a message to use as a help text.
 + *    'help-message'        -- message key or object for a message to use as a help text.
   *                             can be an array of msg key and then parameters to
   *                             the message.
   *                             Overwrites 'help-messages' and 'help'.
 - *    'help-messages'       -- array of message key. As above, each item can
 + *    'help-messages'       -- array of message keys/objects. As above, each item can
   *                             be an array of msg key and then parameters.
   *                             Overwrites 'help'.
   *    'required'            -- passed through to the object, indicating that it
@@@ -1352,7 -1352,7 +1352,7 @@@ class HTMLForm extends ContextSource 
        }
  
        /**
-        * @param string$ name 'name' attribute for the form
+        * @param string $name 'name' attribute for the form
         * @return HTMLForm $this for chaining calls
         */
        public function setName( $name ) {