aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorTimmy Willison <timmywillisn@gmail.com>2014-11-03 12:34:45 -0500
committerTimmy Willison <timmywillisn@gmail.com>2014-11-03 12:35:32 -0500
commitb8a084374cc51aa6060e121e6bdc0e1f3ceb3576 (patch)
tree2823a55e5677ab34fffa322d4e66f7c72a61e61a /README.md
parent2912ddd824228b200a0d2a1682456ee6827459a5 (diff)
downloadjquery-b8a084374cc51aa6060e121e6bdc0e1f3ceb3576.tar.gz
jquery-b8a084374cc51aa6060e121e6bdc0e1f3ceb3576.zip
Docs: 1.x-master branch -> compat branch; 2.x branch -> master branch
Conflicts: src/manipulation.js
Diffstat (limited to 'README.md')
-rw-r--r--README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index 5524e1213..45b92d745 100644
--- 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