From b8a084374cc51aa6060e121e6bdc0e1f3ceb3576 Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Mon, 3 Nov 2014 12:34:45 -0500 Subject: [PATCH] Docs: 1.x-master branch -> compat branch; 2.x branch -> master branch Conflicts: src/manipulation.js --- CONTRIBUTING.md | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 22e34c183..f02bf0863 100644 --- 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 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