Docs: 1.x-master branch -> compat branch; 2.x branch -> master branch

timmywil · timmywil · commit b8a084374cc5 · 2014-11-03T12:35:32.000-05:00
Conflicts:
	src/manipulation.js
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -211,4 +211,4 @@ This will only run the "css" module tests. This will significantly speed up your
 
 Remember that jQuery supports multiple browsers and their versions; any contributed code must work in all of them. You can refer to the [browser support page](http://jquery.com/browser-support/) for the current list of supported browsers.
 
-Note that browser support differs depending on whether you are targeting the `master` or `1.x-master` branch.
+Note that browser support differs depending on whether you are targeting the `master` or `compat` branch.
diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@ In the spirit of open source software development, jQuery always encourages comm
 Environments in which to use jQuery
 --------------------------------------
 
-- [Browser support](http://jquery.com/browser-support/) differs between the master (2.x) branch and the 1.x-master branch. Specifically, 2.x does not support legacy browsers such as IE6-8. The jQuery team continues to provide support for legacy browsers on the 1.x-master branch. Use the latest 1.x release if support for those browsers is required. See [browser support](http://jquery.com/browser-support/) for more info.
-- To use jQuery in Node, browser extensions, and other non-browser environments, use only **2.x** releases. 1.x does not support these environments.
+- [Browser support](http://jquery.com/browser-support/) differs between the master branch and the compat branch. Specifically, the master branch does not support legacy browsers such as IE6-8. The jQuery team continues to provide support for legacy browsers on the compat branch. Use the latest compat release if support for those browsers is required. See [browser support](http://jquery.com/browser-support/) for more info.
+- To use jQuery in Node, browser extensions, and other non-browser environments, use only master branch releases given the name "jquery" rather than "jquery-compat". The compat branch does not support these environments.
 
 
 What you need to build your own jQuery

Original file line number	Diff line number	Diff line change
`@@ -211,4 +211,4 @@ This will only run the "css" module tests. This will significantly speed up your`
`211`	`211`
`212`	`212`	`Remember that jQuery supports multiple browsers and their versions; any contributed code must work in all of them. You can refer to the [browser support page](http://jquery.com/browser-support/) for the current list of supported browsers.`
`213`	`213`
`214`		-Note that browser support differs depending on whether you are targeting the `master` or `1.x-master` branch.
	`214`	+Note that browser support differs depending on whether you are targeting the `master` or `compat` branch.