From 10c1254d159dbd3d78e8afca590fe53b0c6dfa26 Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Thu, 14 Jan 2016 12:22:45 -0500 Subject: [PATCH] Docs: remove compat references --- CONTRIBUTING.md | 2 -- README.md | 6 ++---- test/unit/core.js | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1975f7109..3ed61a4b3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -137,5 +137,3 @@ Click "Load with AMD" after loading the test page. ### Browser support 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](https://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 `compat` branch. diff --git a/README.md b/README.md index ae686a13a..e96f62586 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](https://jquery.com/browser-support/) differs between the master branch and the compat branch. Specifically, the master branch does not support legacy browsers such as IE8. 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](https://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. +- [Browser support](https://jquery.com/browser-support/) +- jQuery also supports Node, browser extensions, and other non-browser environments. What you need to build your own jQuery @@ -103,8 +103,6 @@ As a special case, you may also replace Sizzle by using a special flag `grunt cu *Note*: Excluding Sizzle will also exclude all jQuery selector extensions (such as `effects/animatedSelector` and `css/hiddenVisibleSelectors`). -*Note*: Removing Sizzle is not supported on the `compat` branch. - The build process shows a message for each dependent module it excludes or includes. ##### AMD name diff --git a/test/unit/core.js b/test/unit/core.js index 05f99156f..5f7d41d69 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -589,7 +589,7 @@ QUnit.test( "jQuery('html')", function( assert ) { assert.ok( s, "Creating a script" ); assert.ok( !jQuery[ "foo" ], "Make sure the script wasn't executed prematurely" ); jQuery( "body" ).append( "" ); - assert.ok( jQuery[ "foo" ], "Executing a scripts contents in the right context" ); + assert.ok( jQuery[ "foo" ], "Executing a script's contents in the right context" ); // Test multi-line HTML div = jQuery( "
\r\nsome text\n

some p

\nmore text\r\n
" )[ 0 ];