aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-06 09:46:58 -0700
committerMark Otto <[email protected]>2013-08-06 09:46:58 -0700
commit440d8f5318c3cf15ec8845fe635c6e01caf27b2b (patch)
treedf2f3ee30b08e622166a25a8e2fbeeb533b94312
parentdb45a60cc86190a060f0baf0b3961cbc690f3a65 (diff)
parent4350c662531e60b9b7fc1dbf9a861578c2f55610 (diff)
downloadbootstrap-440d8f5318c3cf15ec8845fe635c6e01caf27b2b.tar.xz
bootstrap-440d8f5318c3cf15ec8845fe635c6e01caf27b2b.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
-rw-r--r--README.md6
-rw-r--r--components.html2
2 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index 68e14506d..7daa83c61 100644
--- a/README.md
+++ b/README.md
@@ -63,13 +63,13 @@ When completed, you'll be able to run the various Grunt commands provided from t
### Available Grunt commands
#### Build - `grunt`
-Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Requires recess and uglify-js.**
+Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Requires [recess](https://github.com/twitter/recess) and [uglify-js](https://github.com/mishoo/UglifyJS).**
#### Only compile CSS and JavaScript - `grunt dist`
-`grunt dist` creates the `/dist` directory with compiled files. **Requires recess and uglify-js.**
+`grunt dist` creates the `/dist` directory with compiled files. **Requires [recess](https://github.com/twitter/recess) and [uglify-js](https://github.com/mishoo/UglifyJS).**
#### Tests - `grunt test`
-Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.**
+Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires [phantomjs](https://github.com/ariya/phantomjs/).**
#### Watch - `grunt watch`
This is a convenience method for watching just Less files and automatically building them whenever you save.
diff --git a/components.html b/components.html
index 8ce62ae3e..da3a69413 100644
--- a/components.html
+++ b/components.html
@@ -1562,7 +1562,7 @@ body { padding-bottom: 70px; }
</div>
{% highlight html %}
<ul class="pagination pagination-lg">...</ul>
-<ul class="pagination pagination">...</ul>
+<ul class="pagination">...</ul>
<ul class="pagination pagination-sm">...</ul>
{% endhighlight %}