diff options
| author | Mark Otto <[email protected]> | 2014-07-09 22:19:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-09 22:19:23 -0700 |
| commit | dae1a68fb15be9015760df32e85d764ef092db44 (patch) | |
| tree | 23dbce03ca690c069a35b3577377bff9a06cf432 /README.md | |
| parent | 216bc3d68b6a9016b3c5fdf90d82cbb291a28f96 (diff) | |
| parent | 643effe382bb12b4ff1460e9e1987948b1763990 (diff) | |
| download | bootstrap-dae1a68fb15be9015760df32e85d764ef092db44.tar.xz bootstrap-dae1a68fb15be9015760df32e85d764ef092db44.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/navs.html
docs/_includes/css/images.html
docs/_includes/js/dropdowns.html
docs/_includes/js/tabs.html
docs/assets/css/docs.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -69,8 +69,8 @@ Bootstrap's documentation, included in this repo in the root directory, is built 1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.1.x). - **Windows users:** Read [this unofficial guide](https://github.com/juthilo/run-jekyll-on-windows/) to get Jekyll up and running without problems. 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`. -2. From the root `/bootstrap` directory, run `jekyll serve` in the command line. -3. Open <http://localhost:9001> in your browser, and voilà. +3. From the root `/bootstrap` directory, run `jekyll serve` in the command line. +4. Open <http://localhost:9001> in your browser, and voilà. Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/). |