Skip to content

Commit 3c56eac

Browse files
timmywilmgol
authored andcommitted
Release: compat -> 1.x. Remove compat-specific release semantics
(cherry-picked from 25d0afa)
1 parent 66a4ab0 commit 3c56eac

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ This will only run the "css" module tests. This will significantly speed up your
129129

130130
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.
131131

132-
Note that browser support differs depending on whether you are targeting the `master` or `compat` branch.
132+
Note that browser support differs depending on whether you are targeting the `master` or `1.x` branch.

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ In the spirit of open source software development, jQuery always encourages comm
1414
Environments in which to use jQuery
1515
--------------------------------------
1616

17-
- [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 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](http://jquery.com/browser-support/) for more info.
18-
- 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.
17+
- [Browser support](http://jquery.com/browser-support/) differs between the master branch and the 1.x 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 1.x 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.
18+
- To use jQuery in Node, browser extensions, and other non-browser environments, use only master branch releases (2.x). The 1.x branch does not support these environments.
1919

2020

2121
What you need to build your own jQuery
@@ -102,7 +102,7 @@ As a special case, you may also replace Sizzle by using a special flag `grunt cu
102102

103103
*Note*: Excluding Sizzle will also exclude all jQuery selector extensions (such as `effects/animatedSelector` and `css/hiddenVisibleSelectors`).
104104

105-
*Note*: Removing Sizzle is not supported on the `compat` branch.
105+
*Note*: Removing Sizzle is not supported on the `1.x` branch.
106106

107107
The build process shows a message for each dependent module it excludes or includes.
108108

@@ -128,7 +128,7 @@ To create a custom build, first check out the version:
128128
git pull; git checkout VERSION
129129
```
130130

131-
Where VERSION is the version you want to customize. Then, make sure all Node dependencies are installed:
131+
where VERSION is the version you want to customize. Then, make sure all Node dependencies are installed:
132132

133133
```bash
134134
npm install
@@ -154,7 +154,7 @@ Exclude a bunch of modules:
154154
grunt custom:-ajax,-css,-deprecated,-dimensions,-effects,-event/alias,-offset,-wrap
155155
```
156156

157-
For questions or requests regarding custom builds, please start a thread on the [Developing jQuery Core](https://forum.jquery.com/developing-jquery-core) section of the forum. Due to the combinatorics and custom nature of these builds, they are not regularly tested in jQuery's unit test process. The non-Sizzle selector engine currently does not pass unit tests because it is missing too much essential functionality.
157+
For questions or requests regarding custom builds, please start a thread on the [Developing jQuery Core](https://forum.jquery.com/developing-jquery-core) section of the forum. Due to the combinatorics and custom nature of these builds, they are not regularly tested in jQuery's unit test process.
158158

159159
Running the Unit Tests
160160
--------------------------------------
@@ -261,7 +261,7 @@ start();
261261
```
262262

263263

264-
*Note*: QUnit's eventual addition of an argument to stop/start is ignored in this test suite so that start and stop can be passed as callbacks without worrying about their parameters.
264+
Note: QUnit's eventual addition of an argument to stop/start is ignored in this test suite so that start and stop can be passed as callbacks without worrying about their parameters
265265

266266
### Test assertions ###
267267

0 commit comments

Comments
 (0)