Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@gmail.com>2015-10-29 10:08:10 +0300
committerXhmikosR <xhmikosr@gmail.com>2015-10-29 19:02:40 +0300
commit2cccdc8e3d964e7bbfbd86b2a01f7abcbfd88d77 (patch)
tree41194418e7159d9bf40afa0435d0500d88c53426
parent2261427a2fbb4407529304cdb9231d9d6b1bafe8 (diff)
Update to Jekyll v.3.0.0.
[skip sauce]
-rw-r--r--.gitignore3
-rw-r--r--.travis.yml2
-rw-r--r--README.md2
3 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 0aaa46c82b..bcd85b4a1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,9 @@ Thumbs.db
.komodotools
*.komodoproject
+# Jekyll metadata
+docs/.jekyll-metadata
+
# Folders to ignore
bower_components
node_modules
diff --git a/.travis.yml b/.travis.yml
index 6fa443c71d..9044842927 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ after_script:
- if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi
env:
global:
- - JEKYLL_VERSION="2.5.3"
+ - JEKYLL_VERSION="3.0.0"
- ROUGE_VERSION="1.8.0"
- SAUCE_USERNAME="bootstrap"
- secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
diff --git a/README.md b/README.md
index 8656c1c652..5785e92239 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built
### Running documentation locally
-1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.5.x).
+1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v3.0.x).
**Note for Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) 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`.
3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.