Merge https://github.com/jquery/api.jquery.com into patch-1

Conflicts:
	entries/jQuery.ajax.xml

Author: ubershmekel

.gitattributes

@@ -0,0 +1,5 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# JS files must always use LF for tools to work
+*.js eol=lf

.gitignore

@@ -1,10 +1,3 @@
-dist
-entries_tmp
-node_modules
-config.json
-.project
-*~
-*.diff
-*.patch
-.DS_Store
-.settings
+/dist/
+/node_modules/
+config.js*

.mailmap

@@ -0,0 +1 @@
+Matic Potočnik <maticpotocnik@gmail.com> <hairyfotr@gmail.com>

CONTRIBUTING.md

@@ -2,4 +2,4 @@ Welcome! Thanks for your interest in contributing to api.jquery.com. You're **al
 
 You may also want to take a look at our [commit & pull request guide](http://contribute.jquery.org/commits-and-pull-requests/) and [style guides](http://contribute.jquery.org/style-guide/) for instructions on how to maintain your fork and submit your code. Before we can merge any pull request, we'll also need you to sign our [contributor license agreement](http://contribute.jquery.org/cla).
 
-You can find us on [IRC](http://irc.jquery.org), specifically in [#jquery-dev](irc://irc.freenode.net/#jquery-dev) and [#jquery-content](irc://irc.freenode.net/#jquery-content) should you have any questions. If you've never contributed to open source before, we've put together [a short guide with tips, tricks, and ideas on getting started](http://contribute.jquery.org/open-source/).
+You can find us on [IRC](http://irc.jquery.org), specifically in #jquery-dev and #jquery-content should you have any questions. If you've never contributed to open source before, we've put together [a short guide with tips, tricks, and ideas on getting started](http://contribute.jquery.org/open-source/).

Gruntfile.js

@@ -0,0 +1,41 @@
+module.exports = function( grunt ) {
+
+grunt.loadNpmTasks( "grunt-jquery-content" );
+
+grunt.initConfig({
+	xmllint: {
+		all: [
+			"entries/**",
+			"includes/**",
+			"categories.xml",
+			"entries2html.xsl",
+			"notes.xsl"
+		]
+	},
+	"build-posts": {
+		page: "pages/**"
+	},
+	"build-xml-entries": {
+		all: "entries/**"
+	},
+	"build-resources": {
+		all: "resources/**"
+	},
+	wordpress: (function() {
+		var config = require( "./config" );
+		config.dir = "dist/wordpress";
+		return config;
+	})()
+});
+
+grunt.registerTask( "lint", [ "xmllint" ]);
+
+grunt.registerTask( "build", [
+	"build-posts",
+	"build-resources",
+	"build-xml-entries",
+	"build-xml-categories",
+	"build-xml-full"
+]);
+
+};

LICENSE-MIT.txt LICENSE.txtLICENSE-MIT.txt renamed to LICENSE.txt

@@ -1,9 +1,14 @@
-Copyright (c) 2009 Packt Publishing, http://packtpub.com/
-Copyright (c) 2013 jQuery Foundation, http://jquery.org/
+Copyright Packt Publishing (http://packtpub.com/),
+jQuery Foundation (https://jquery.org/), and other contributors.
 
 This software consists of voluntary contributions made by many
 individuals. For exact contribution history, see the revision history
-and logs, available at http://github.com/jquery/api.jquery.com
+available at https://github.com/jquery/api.jquery.com
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -23,3 +28,18 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+Copyright and related rights for sample code are waived via CC0. Sample
+code is defined as all source code displayed within the prose of the
+documentation and all examples and demos.
+
+CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+====
+
+All files located in the node_modules directory are externally
+maintained libraries used by this software which have their own
+licenses; we recommend you read them, as their terms may differ from the
+terms above.

README.md

@@ -1,18 +1,15 @@
-## Referencing Bug Tracker Tickets
+# api.jquery.com
 
-* Pull requests for changes that were requested or recommended via the [jQuery Bug Tracker](http://bugs.jquery.com) should include a link back to the relevant ticket.
+## Building and Deploying
 
-## Building
+To build and deploy your changes for previewing in a [`jquery-wp-content`](https://github.com/jquery/jquery-wp-content) instance, follow the [workflow instructions](http://contribute.jquery.org/web-sites/#workflow) from our documentation on [contributing to jQuery Foundation web sites](http://contribute.jquery.org/web-sites/).
 
 ### Requirements
-* <a href="http://www.xmlsoft.org/">libxml2</a>
-* <a href="http://xmlsoft.org/XSLT/">libxslt</a>
 
-The `xmllint` and `xsltproc` utilities need to be in your path. If you are on Windows, you can get libxml2 and libxslt from <a href="http://www.zlatkovic.com/libxml.en.html">zlatkovic.com</a>.
-
-### Build
+* [libxml2](http://xmlsoft.org/)
+* [libxslt](http://xmlsoft.org/libxslt/)
 
-To build and deploy your changes for previewing in a [jquery-wp-content](https://github.com/jquery/jquery-wp-content) instance, follow the [workflow instructions](http://contribute.jquery.org/web-sites/#workflow) from our documentation on [contributing to jQuery Foundation web sites](http://contribute.jquery.org/web-sites/).
+The `xmllint` and `xsltproc` utilities need to be in your path. If you are on Windows, you can get libxml2 and libxslt from <a href="http://www.zlatkovic.com/libxml.en.html">zlatkovic.com</a>.
 
 ## Style Guidelines
 
@@ -27,11 +24,13 @@ To build and deploy your changes for previewing in a [jquery-wp-content](https:/
   * **No**: The `load`, `scroll` and `error` events (e.g., on an `<img>` element) do not bubble
 
 #### Spelling
+
 * The documentation standardizes on American English spelling. For example:
   * **Yes**: color, while, among, customize, argument
   * **No**: colour, whilst, amongst, customise, arguement
 
 #### Pronoun Usage
+
 * Use second-person pronoun ("you") when necessary, but try to avoid it.
 * Favor the definite article ("the") over second-person possesive ("your").
   * **Yes**: Insert the paragraph after the unordered list.
@@ -41,28 +40,32 @@ To build and deploy your changes for previewing in a [jquery-wp-content](https:/
   * **No**: And now we have our paragraph beneath the unordered list.
 
 #### "Voice"
+
 * Prefer active voice over passive.
   * **Active**: Calling `.click()` binds a click handler to the elements in the collection
   * **Passive**: Click handlers are bound to elements in the collection when `.click()` is called
 
 ### Code Style
-Code in the API documentation should follow the [jQuery Core Style Guide](http://docs.jquery.com/JQuery_Core_Style_Guidelines) with the following addition and exception:
+
+Code in the API documentation should follow the [jQuery Core Style Guide](http://contribute.jquery.org/style-guide/) with the following addition:
 
 * **Document ready syntax**: Use `$( document ).ready(function() {` instead of `$(function() {` as it's harder for new users to distinguish the difference between the latter and an IIFE.
-* **Indentation**: Core guidelines say to use tabs. In API documentation, *use 2 spaces instead*. This helps keep the line width manageable and avoid horizontal scrollbars.
 
 #### Code within prose content (paragraphs and the like):
-* Methods: use a dot, followed by the method name, followed by parentheses: e.g. The `.focus()` method is a shortcut for `.bind('focus', handler)` in the first and second variations, and `.trigger('focus')` in the third.
+
+* Methods: use a dot, followed by the method name, followed by parentheses: e.g. The `.focus()` method is a shortcut for `.on( "focus", handler )` in the first and second variations, and `.trigger( "focus" )` in the third.
 * Properties: use a dot, followed by the property name: e.g. `.length`.
 * Functions: use the function name, followed by parentheses: `myFunction()`.
 
 #### Examples
+
 * Examples should indicate what the expected result will be before presenting the code. This makes code clearer and skimming easier, especially for newer coders who may not understand what is supposed to be happening from reading the code itself.
   * **Yes**: Find all p elements that are children of a div element and apply a border to them.
   * **No**: Find all p elements that are children of a div element.
 * Make your example easy to follow with good comments so that the explanation isn't necessary.
 
 ### Rhetorical Context
+
 * Subject
   * The entirety of jQuery's public API
 * Audience

categories.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <categories>
   <category name="Ajax" slug="ajax">
-    <desc><![CDATA[The jQuery library has a full suite of AJAX capabilities. The functions and methods therein allow us to load data from the server without a browser page refresh. ]]></desc>
+    <desc><![CDATA[The jQuery library has a full suite of Ajax capabilities. The functions and methods therein allow us to load data from the server without a browser page refresh. ]]></desc>
     <category name="Global Ajax Event Handlers" slug="global-ajax-event-handlers">
-      <desc><![CDATA[These methods register handlers to be called when certain events, such as initialization or completion, take place for any AJAX request on the page. The global events are fired on each AJAX request if the <code>global</code> property in <a href="http://api.jquery.com/jQuery.ajaxSetup/"><code>jQuery.ajaxSetup()</code></a> is <code>true</code>, which it is by default. <em>Note: Global events are never fired for cross-domain script or JSONP requests, regardless of the value of <code>global</code>.</em>]]></desc>
+      <desc><![CDATA[These methods register handlers to be called when certain events, such as initialization or completion, take place for any Ajax request on the page. The global events are fired on each Ajax request if the <code>global</code> property in <a href="/jQuery.ajaxSetup/"><code>jQuery.ajaxSetup()</code></a> is <code>true</code>, which it is by default. <em>Note: Global events are never fired for cross-domain script or JSONP requests, regardless of the value of <code>global</code>.</em>]]></desc>
     </category>
     <category name="Helper Functions" slug="helper-functions">
-      <desc><![CDATA[These functions assist with common idioms encountered when performing AJAX tasks.]]></desc>
+      <desc><![CDATA[These functions assist with common idioms encountered when performing Ajax tasks.]]></desc>
     </category>
     <category name="Low-Level Interface" slug="low-level-interface">
-      <desc><![CDATA[These methods can be used to make arbitrary AJAX requests.]]></desc>
+      <desc><![CDATA[These methods can be used to make arbitrary Ajax requests.]]></desc>
     </category>
     <category name="Shorthand Methods" slug="shorthand-methods">
-      <desc><![CDATA[These methods perform the more common types of AJAX requests in less code.]]></desc>
+      <desc><![CDATA[These methods perform the more common types of Ajax requests in less code.]]></desc>
     </category>
   </category>
   <category name="Attributes" slug="attributes">
@@ -38,7 +38,7 @@
     <desc/>
     <category name="Deprecated 1.3" slug="deprecated-1.3">
       <desc><![CDATA[All the aspects of the API that were deprecated in the corresponding version of jQuery.
-        <p>For more information, see the <a href="http://docs.jquery.com/Release:jQuery_1.3">jQuery 1.3 Release Notes</a>.</p>
+        <p>For more information, see the <a href="http://blog.jquery.com/2009/01/14/jquery-1-3-released/">jQuery 1.3 Release Notes</a>.</p>
       ]]></desc>
     </category>
     <category name="Deprecated 1.4" slug="deprecated-1.4">
@@ -56,6 +56,11 @@
         <p>For more information, see the Release Notes/Changelog at <a href="http://blog.jquery.com/2012/08/09/jquery-1-8-released/">http://blog.jquery.com/2012/08/09/jquery-1-8-released/</a></p>
       ]]></desc>
     </category>
+    <category name="Deprecated 1.9" slug="deprecated-1.9">
+      <desc><![CDATA[All the aspects of the API that were deprecated in the corresponding version of jQuery.
+        <p>For more information, see the Release Notes/Changelog at <a href="http://blog.jquery.com/2013/01/15/jquery-1-9-final-jquery-2-0-beta-migrate-final-released/">http://blog.jquery.com/2013/01/15/jquery-1-9-final-jquery-2-0-beta-migrate-final-released/</a></p>
+      ]]></desc>
+    </category>
     <category name="Deprecated 1.10" slug="deprecated-1.10">
       <desc><![CDATA[All the aspects of the API that were deprecated in the corresponding version of jQuery.
         <p>For more information, see the Release Notes/Changelog at <a href="http://blog.jquery.com/2013/05/24/jquery-1-10-0-and-2-0-1-released/">http://blog.jquery.com/2013/05/24/jquery-1-10-0-and-2-0-1-released/</a></p>
@@ -138,7 +143,7 @@ jQuery( "body" ).trigger( e );
             </li>
           </ul>
           <p>The following properties are also copied to the event object, though some of their values may be undefined depending on the event:</p>
-          <p>altKey, bubbles, button, cancelable, charCode, clientX, clientY, ctrlKey, currentTarget, data, detail, eventPhase, metaKey, offsetX, offsetY, originalTarget, pageX, pageY, prevValue, relatedTarget, screenX, screenY, shiftKey, target, view, which</p>
+          <p>altKey, bubbles, button, cancelable, charCode, clientX, clientY, ctrlKey, currentTarget, data, detail, eventPhase, metaKey, offsetX, offsetY, originalTarget, pageX, pageY, relatedTarget, screenX, screenY, shiftKey, target, view, which</p>
           <h4>OtherProperties</h4>
           <p>Certain events may have properties specific to them. Those can be accessed as properties of the <code>event.originalEvent</code> object.</p>
           <p>Example:</p>
@@ -328,22 +333,22 @@ jQuery.event.props.push( "dataTransfer" );
     </category>
     <category name="Version 1.2" slug="1.2">
       <desc><![CDATA[All the aspects of the API that were added, or had a new signature added, in the corresponding version of jQuery.
-				<a href="http://docs.jquery.com/Release:jQuery_1.2">jQuery 1.2 Release Notes</a>
+				<a href="http://blog.jquery.com/2007/09/10/jquery-1-2-released/">jQuery 1.2 Release Notes</a>
 			]]></desc>
     </category>
     <category name="Version 1.2.3" slug="1.2.3">
       <desc><![CDATA[All the aspects of the API that were added, or had a new signature added, in the corresponding version of jQuery.
-				Release Notes: <a href="http://docs.jquery.com/Release:jQuery_1.2.1">1.2.1</a>, <a href="http://docs.jquery.com/Release:jQuery_1.2.2">1.2.2</a>, <a href="http://docs.jquery.com/Release:jQuery_1.2.3">1.2.3</a>.
+				Release Notes: <a href="http://blog.jquery.com/2007/09/16/jquery-1-2-1-released/">1.2.1</a>, <a href="http://blog.jquery.com/2008/01/14/jquery-1-2-2-released/">1.2.2</a>, <a href="http://blog.jquery.com/2008/02/07/jquery-1-2-3-released/">1.2.3</a>.
 			]]></desc>
     </category>
     <category name="Version 1.2.6" slug="1.2.6">
       <desc><![CDATA[All the aspects of the API that were added, or had a new signature added, in the corresponding version of jQuery.
-				<a href="http://docs.jquery.com/Release:jQuery_1.2.6">jQuery 1.2.6 Release Notes</a>.
+				<a href="http://blog.jquery.com/2008/05/24/jquery-1-2-6-released/">jQuery 1.2.6 Release Notes</a>.
 			]]></desc>
     </category>
     <category name="Version 1.3" slug="1.3">
       <desc><![CDATA[All the aspects of the API that were added, or had a new signature added, in the corresponding version of jQuery.
-				Release Notes: <a href="http://docs.jquery.com/Release:jQuery_1.3">1.3</a>, <a href="http://docs.jquery.com/Release:jQuery_1.3.1">1.3.1</a>, <a href="http://docs.jquery.com/Release:jQuery_1.3.2">1.3.2</a>
+				Release Notes: <a href="http://blog.jquery.com/2009/01/14/jquery-1-3-released/">1.3</a>, <a href="http://blog.jquery.com/2009/01/21/jquery-131-released/">1.3.1</a>, <a href="http://blog.jquery.com/2009/02/20/jquery-1-3-2-released/">1.3.2</a>
 			]]></desc>
     </category>
     <category name="Version 1.4" slug="1.4">

config-sample.json

@@ -1,5 +1,5 @@
 {
-        "url": "dev.api.jquery.com",
-        "username": "admin",
-        "password": "secret"
+	"url": "vagrant.api.jquery.com",
+	"username": "admin",
+	"password": "secret"
 }