Update arg names, types for accuracy, consistency

* Change type="Map" to type="PlainObject"

* Change name="events-map" to name="events"
* Change name="eventTypes" to name="events"

Author: kswedberg

entries/animate.xml

@@ -2,7 +2,7 @@
   <desc>Perform a custom animation of a set of CSS properties.</desc>
   <signature>
     <added>1.0</added>
-    <argument name="properties" type="Map">
+    <argument name="properties" type="PlainObject">
       <desc>A map of CSS properties that the animation will move toward.</desc>
     </argument>
     <argument name="duration" type="String,Number" optional="true">
@@ -17,10 +17,10 @@
   </signature>
   <signature>
     <added>1.0</added>
-    <argument name="properties" type="Map">
+    <argument name="properties" type="PlainObject">
       <desc>A map of CSS properties that the animation will move toward.</desc>
     </argument>
-    <argument name="options" type="Map">
+    <argument name="options" type="PlainObject">
       <desc>A map of additional options to pass to the method. Supported keys:
         <ul>
         <li><code>duration</code>: A string or number determining how long the animation will run.</li>

entries/attr.xml

@@ -53,7 +53,7 @@ var title = $("em").attr("title");
   </signature>
   <signature>
     <added>1.0</added>
-    <argument name="map" type="Map">
+    <argument name="attributes" type="PlainObject">
       <desc>A map of attribute-value pairs to set.</desc>
     </argument>
   </signature>
@@ -78,7 +78,7 @@ var title = $("em").attr("title");
 .attr('title', 'Photo by Kelly Clark');</pre>
 
     <h4 id="setting-several-attrs">Setting several attributes at once</h4>
-    <p>To change the <code>alt</code> attribute and add the <code>title</code> attribute at the same time, pass both sets of names and values into the method at once using a map (JavaScript object literal). Each key-value pair in the map adds or modifies an attribute:</p>
+    <p>To change the <code>alt</code> attribute and add the <code>title</code> attribute at the same time, pass both sets of names and values into the method at once using a map (plain JavaScript object). Each key-value pair in the map adds or modifies an attribute:</p>
 <pre>$('#greatphoto').attr({
   alt: 'Beijing Brush Seller',
   title: 'photo by Kelly Clark'

entries/css.xml

@@ -62,7 +62,7 @@ div { width:60px; height:60px; margin:5px; float:left; }
     </signature>
     <signature>
       <added>1.0</added>
-      <argument name="map" type="Map">
+      <argument name="properties" type="PlainObject">
         <desc>A map of property-value pairs to set.</desc>
       </argument>
     </signature>

entries/delegate.xml

@@ -32,7 +32,7 @@
     <argument name="selector" type="String">
       <desc>A selector to filter the elements that trigger the event.</desc>
     </argument>
-    <argument name="events" type="Map">
+    <argument name="events" type="PlainObject">
       <desc>A map of one or more event types and functions to execute for them.</desc>
     </argument>
   </signature>

entries/die.xml

@@ -31,7 +31,7 @@
   </signature>
  <signature>
     <added>1.4.3</added>
-    <argument name="eventTypes" type="Map">
+    <argument name="events" type="PlainObject">
       <desc>A map of one or more event types, such as <code>click</code> or <code>keydown</code> and their corresponding functions that are no longer to be executed.</desc>
     </argument>
   </signature>

entries/jQuery.ajax.xml

@@ -10,9 +10,9 @@
   </signature>
   <signature>
     <added>1.0</added>
-    <argument name="settings" type="Map">
+    <argument name="settings" type="Map" optional="true">
       <desc>A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with <a href="/jQuery.ajaxSetup">$.ajaxSetup()</a>.</desc>
-      <option default="depends on DataType" name="accepts" type="Map">
+      <option default="depends on DataType" name="accepts" type="PlainObject">
         <desc>The content type sent in the request header that tells the server what kind of response it will accept in return. If the <code>accepts</code> setting needs modification, it is recommended to do so once in the <code>$.ajaxSetup()</code> method.</desc>
       </option>
       <option default="true" name="async" type="Boolean">
@@ -27,7 +27,7 @@
       <option name="complete(jqXHR, textStatus)" type="Function, Array">
         <desc>A function to be called when the request finishes (after <code>success</code> and <code>error</code> callbacks are executed). The function gets passed two arguments: The jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object and a string categorizing the status of the request (<code>"success"</code>, <code>"notmodified"</code>, <code>"error"</code>, <code>"timeout"</code>, <code>"abort"</code>, or <code>"parsererror"</code>). <strong>As of jQuery 1.5</strong>, the <code>complete</code> setting can accept an array of functions. Each function will be called in turn. This is an <a href='http://docs.jquery.com/Ajax_Events'>Ajax Event</a>.</desc>
       </option>
-      <option name="contents" type="Map" added="1.5">
+      <option name="contents" type="PlainObject" added="1.5">
         <desc>A map of string/regular-expression pairs that determine how jQuery will parse the response, given its content type.</desc>
       </option>
       <option default="'application/x-www-form-urlencoded'" name="contentType" type="String">
@@ -41,7 +41,7 @@
   $(this).addClass("done");
 });</pre></desc>
       </option>
-      <option name="converters" type="Map" default='{"* text": window.String, "text html": true, "text json": jQuery.parseJSON, "text xml": jQuery.parseXML}' added="1.5">
+      <option name="converters" type="PlainObject" default='{"* text": window.String, "text html": true, "text json": jQuery.parseJSON, "text xml": jQuery.parseXML}' added="1.5">
         <desc>A map of dataType-to-dataType converters. Each converter's value is a function that returns the transformed value of the response.</desc>
       </option>
       <option name="crossDomain" type="Boolean" default="false for same-domain requests, true for cross-domain requests" added="1.5">
@@ -72,7 +72,7 @@
         <option default="true" name="global" type="Boolean">
           <desc>Whether to trigger global Ajax event handlers for this request. The default is <code>true</code>. Set to <code>false</code> to prevent the global handlers like <code>ajaxStart</code> or <code>ajaxStop</code> from being triggered. This can be used to control various <a href='http://docs.jquery.com/Ajax_Events'>Ajax Events</a>.</desc>
         </option>
-        <option name="headers" type="Map" default="{}" added="1.5">
+        <option name="headers" type="PlainObject" default="{}" added="1.5">
           <desc>A map of additional header key/value pairs to send along with the request. This setting is set before the <code>beforeSend</code> function is called; therefore, any values in the headers setting can be overwritten from within the <code>beforeSend</code> function.</desc>
         </option>
         <option default="false" name="ifModified" type="Boolean">
@@ -99,7 +99,7 @@
         <option name="scriptCharset" type="String">
           <desc>Only for requests with "jsonp" or "script" dataType and "GET" type. Forces the request to be interpreted as a certain charset. Only needed for charset differences between the remote and local content.</desc>
         </option>
-        <option name="statusCode" type="Map" default="{}" added="1.5">
+        <option name="statusCode" type="PlainObject" default="{}" added="1.5">
           <desc>
             <p>A map of numeric HTTP codes and functions to be called when the response has the corresponding code. For example, the following will alert when the response status is a 404:</p>
 <pre>$.ajax({
@@ -133,7 +133,7 @@
         <option name="xhr" type="Function" default="ActiveXObject when available (IE), the XMLHttpRequest otherwise">
           <desc>Callback for creating the XMLHttpRequest object. Defaults to the ActiveXObject when available (IE), the XMLHttpRequest otherwise. Override to provide your own implementation for XMLHttpRequest or enhancements to the factory.</desc>
         </option>
-        <option name="xhrFields" type="Map" added="1.5.1">
+        <option name="xhrFields" type="PlainObject" added="1.5.1">
           <desc><p>A map of fieldName-fieldValue pairs to set on the native <code><abbr title="XMLHttpRequest">XHR</abbr></code> object. For example, you can use it to set <code>withCredentials</code> to <code>true</code> for cross-domain requests if needed.
 <pre>$.ajax({
    url: a_cross_domain_url,

entries/jQuery.getJSON.xml

@@ -4,7 +4,7 @@
     <argument name="url" type="String">
       <desc>A string containing the URL to which the request is sent.</desc>
     </argument>
-    <argument name="data" optional="true" type="Map">
+    <argument name="data" optional="true" type="PlainObject">
       <desc>A map or string that is sent to the server with the request.</desc>
     </argument>
     <argument name="success(data, textStatus, jqXHR)" optional="true" type="Function">

entries/live.xml

@@ -24,7 +24,7 @@
   </signature>
   <signature>
     <added>1.4.3</added>
-    <argument name="events-map" type="PlainObject">
+    <argument name="events" type="PlainObject">
       <desc>A map of one or more JavaScript event types and functions to execute for them.</desc>
     </argument>
   </signature>

entries/off.xml

@@ -14,7 +14,7 @@
   </signature>
   <signature>
     <added>1.7</added>
-    <argument name="events-map" type="Map">
+    <argument name="events" type="PlainObject">
       <desc>A map where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s).</desc>
     </argument>
     <argument name="selector" type="String" optional="true">
@@ -30,7 +30,7 @@
 
     <p>A handler can also be removed by specifying the function name in the <code>handler</code> argument. When jQuery attaches an event handler, it assigns a unique id to the handler function. Handlers proxied by <a href="http://api.jquery.com/jQuery.proxy"><code>jQuery.proxy()</code></a> or a similar mechanism will all have the same unique id (the proxy function), so passing proxied handlers to <code>.off</code> may remove more handlers than intended. In those situations it is better to attach and remove event handlers using namespaces.</p>
 
-    <p>As with <code>.on()</code>, you can pass an <code>events-map</code> argument instead of specifying the <code>events</code> and <code>handler</code> as separate arguments. The keys are events and/or namespaces; the values are handler functions or the special value <code>false</code>.</p>
+    <p>As with <code>.on()</code>, you can pass <code>events</code> as an object instead of specifying an <code>events</code> string and <code>handler</code> function as separate arguments. The keys for the <code>events</code> object are events and/or namespaces; the values are handler functions or the special value <code>false</code>.</p>
   </longdesc>
 <example>
   <desc>Add and remove event handlers on the colored button.</desc>

entries/on.xml

@@ -17,7 +17,7 @@
   </signature>
   <signature>
     <added>1.7</added>
-    <argument name="events-map" type="Map">
+    <argument name="events" type="PlainObject">
       <desc>A map in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s).</desc>
     </argument>
     <argument name="selector" type="String" optional="true">
@@ -37,7 +37,7 @@
 
     <p>An event name can be qualified by <em>event namespaces</em> that simplify removing or triggering the event. For example, <code>"click.myPlugin.simple"</code> defines both the myPlugin and simple namespaces for this particular click event. A click event handler attached via that string could be removed with <code>.off("click.myPlugin")</code> or <code>.off("click.simple")</code> without disturbing other click handlers attached to the elements. Namespaces are similar to CSS classes in that they are not hierarchical; only one name needs to match. Namespaces beginning with an underscore are reserved for jQuery's use.</p>
 
-    <p>In the second form of <code>.on()</code>, the <code>events-map</code> argument is a JavaScript Object, or "map". The keys are strings in the same form as the <code>events</code> argument with space-separated event type names and optional namespaces. The value for each key is a function (or <code>false</code> value) that is used as the <code>handler</code> instead of the final argument to the method. In other respects, the two forms are identical in their behavior as described below.</p>
+    <p>In the second form of <code>.on()</code>, the <code>events</code> argument is a JavaScript Object, or "map". The keys are strings in the same form as the <code>events</code> argument with space-separated event type names and optional namespaces. The value for each key is a function (or <code>false</code> value) that is used as the <code>handler</code> instead of the final argument to the method. In other respects, the two forms are identical in their behavior as described below.</p>
 
     <h2 id="direct-and-delegated-events">Direct and delegated events</h2>
 
@@ -66,7 +66,7 @@ $("#dataTable tbody").on("click", "tr", function(event){
 
 <h2 id="event-handler">The event handler and its environment</h2>
 
-<p>The <code>handler</code> argument is a function (or the value <code>false</code>, see below), and is required unless the <code>events-map</code> form is used. You can provide an anonymous handler function at the point of the <code>.on()</code> call, as the examples have done above, or declare a named function and pass its name:</p>
+<p>The <code>handler</code> argument is a function (or the value <code>false</code>, see below), and is required unless you pass an object for the <code>events</code> argument. You can provide an anonymous handler function at the point of the <code>.on()</code> call, as the examples have done above, or declare a named function and pass its name:</p>
 <pre>
 function notify() { alert("clicked"); }
 $("button").on("click", notify);