aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorOleg Gaidarenko <markelog@gmail.com>2014-12-14 19:48:53 -0500
committerOleg Gaidarenko <markelog@gmail.com>2014-12-15 16:07:10 +0300
commit31b63fc23674ede657f019783ad7b942bb83f9c3 (patch)
tree00160f29bb5f973c322e36622b15bdb3e29653d4 /README.md
parentce308e25e57a0a040cd1ea05f00bf1cc23c1bd8a (diff)
downloadjquery-31b63fc23674ede657f019783ad7b942bb83f9c3.tar.gz
jquery-31b63fc23674ede657f019783ad7b942bb83f9c3.zip
README: various text fixes
Thank you @essamjoubori, @bcbcb, @namlede Closes gh-1926 Closes gh-1927 Closes gh-1928
Diffstat (limited to 'README.md')
-rw-r--r--README.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index a0fd55ba0..8a44ce773 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ cd jquery && npm run build
```
The built version of jQuery will be put in the `dist/` subdirectory, along with the minified copy and associated map file.
-If you want create custom build or help with jQuery development, it would be better to install [grunt command line interface](https://github.com/gruntjs/grunt-cli) as a global package:
+If you want to create custom build or help with jQuery development, it would be better to install [grunt command line interface](https://github.com/gruntjs/grunt-cli) as a global package:
```
npm install -g grunt-cli
@@ -57,7 +57,7 @@ Make sure you have `grunt` installed by testing:
grunt -V
```
-Now by running the `grunt` command, in the jquery directory, you can build a full version of jQuery, just like with a `npm run build` command:
+Now by running the `grunt` command, in the jquery directory, you can build a full version of jQuery, just like with an `npm run build` command:
```
grunt
```
@@ -213,7 +213,7 @@ As the source code is handled by the Git version control system, it's useful to
### Cleaning ###
-If you want to purge your working directory back to the status of upstream, following commands can be used (remember everything you've worked on is gone after these):
+If you want to purge your working directory back to the status of upstream, the following commands can be used (remember everything you've worked on is gone after these):
```bash
git reset --hard upstream/master
@@ -222,7 +222,7 @@ git clean -fdx
### Rebasing ###
-For feature/topic branches, you should always use the `--rebase` flag to `git pull`, or if you are usually handling many temporary "to be in a github pull request" branches, run following to automate this:
+For feature/topic branches, you should always use the `--rebase` flag to `git pull`, or if you are usually handling many temporary "to be in a github pull request" branches, run the following to automate this:
```bash
git config branch.autosetuprebase local
@@ -234,7 +234,7 @@ git config branch.autosetuprebase local
If you're getting merge conflicts when merging, instead of editing the conflicted files manually, you can use the feature
`git mergetool`. Even though the default tool `xxdiff` looks awful/old, it's rather useful.
-Following are some commands that can be used there:
+The following are some commands that can be used there:
* `Ctrl + Alt + M` - automerge as much as possible
* `b` - jump to next merge conflict
@@ -358,7 +358,7 @@ callback( jQueryFromIFrame, iFrameWindow, iFrameDocument );
Loads a given page constructing a url with fileName: `"./data/" + fileName + ".html"`
The given callback is fired when window.iframeCallback is called by the page.
The arguments passed to the callback are the same as the
-arguments passed to window.iframeCallback, whatever that may be
+arguments passed to window.iframeCallback, whatever that may be.
```js
testIframeWithCallback( testName, fileName, callback );