From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 5 Jun 2012 15:59:07 +0000 (-0400)
Subject: Adds "grunt submodules" docs to readme, removes old make command docs
X-Git-Tag: 1.8b1~82
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ef31b678d370570d4cef0128e3fb7da3ae6d0a3e;p=jquery.git

Adds "grunt submodules" docs to readme, removes old make command docs

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
---

diff --git a/README.md b/README.md
index aa0d7d55b..5eaf86774 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Make sure you have `grunt` installed by testing:
 
 Then, to get a complete, minified (w/ Ugligy.js), linted (w/ JSHint) version of jQuery, type the following:
 
-`grunt`
+#### `grunt` ####
 
 
 The built version of jQuery will be put in the `dist/` subdirectory.
@@ -99,6 +99,17 @@ With this example, the output files would be:
 ```
 
 
+Updating Submodules
+-------------------
+
+Update the submodules to what is probably the latest upstream code.
+
+#### `grunt submodules` ####
+
+
+Note: This task will also be run any time the default `grunt` command is used.
+
+
 
 Git for dummies
 ---------------
@@ -139,21 +150,6 @@ but remember to push the submodule changes before pushing the new jquery commit:
 4. `git add src/sizzle`
 5. `git commit`
 
-The makefile has some targets to simplify submodule handling:
-
-#### `make update_submodules` ####
-
-checks out the commit pointed to by jquery, but merges your local changes, if any. This target is executed
-when you are doing a normal `make`.
-
-#### `make pull_submodules` ####
-
-updates the content of the submodules to what is probably the latest upstream code.
-
-#### `make pull` ####
-
-make a `make pull_submodules` and after that a `git pull`. if you have no remote tracking in your master branch, you can
-execute this command as `make pull REMOTE=origin BRANCH=master` instead.
 
 ### cleaning ###