diff --git a/.travis.yml b/.travis.yml index 177239f7..6e847552 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ cache: bundler language: ruby rvm: - - &ruby1 2.6.0 - - &ruby2 2.4.5 + - &ruby1 2.6.3 + - &ruby2 2.4.6 - &jruby jruby-9.2.7.0 matrix: diff --git a/docs/_config.yml b/docs/_config.yml index 0c7a2b1b..e7aebd56 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,6 +1,5 @@ --- version: 3.8.6 -min_ruby_version: 2.4.0 name: Jekyll • Simple, blog-aware, static sites description: Transform your plain text into static websites and blogs url: https://jekyllrb.com @@ -54,6 +53,8 @@ feed: sass: style: compressed +strict_front_matter: true + exclude: - .gitignore - .jekyll-cache diff --git a/docs/_data/ruby.yml b/docs/_data/ruby.yml new file mode 100644 index 00000000..be3cdb28 --- /dev/null +++ b/docs/_data/ruby.yml @@ -0,0 +1,3 @@ +min_version: 2.4.0 +current_version: 2.6.3 +current_version_output: ruby 2.6.3p62 (2019-04-16 revision 67580) diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md index f951564e..e2e6ac68 100644 --- a/docs/_docs/collections.md +++ b/docs/_docs/collections.md @@ -114,8 +114,6 @@ You can link to the generated page using the `url` attribute: There are special [permalink variables for collections](/docs/permalinks/) to help you control the output url for the entire collection. -{% if site.version == '4.0.0' %}{% comment %} Remove this encapsulation when v4.0 ships {% endcomment %} - ## Custom Sorting of Documents By default, documents in a collection are sorted by their paths. But you can control this sorting via the collection's metadata. @@ -164,7 +162,6 @@ collections: ``` If both metadata keys have been defined properly, `order` list takes precedence. -{% endif %} ## Liquid Attributes diff --git a/docs/_docs/front-matter.md b/docs/_docs/front-matter.md index 08423513..a3deb697 100644 --- a/docs/_docs/front-matter.md +++ b/docs/_docs/front-matter.md @@ -33,7 +33,7 @@ relies on.
If you want to use Liquid tags and variables but don’t need anything in your front matter, just leave it empty! The set @@ -114,7 +114,7 @@ front matter of a page or post.
To preview unpublished pages, run `jekyll serve` or `jekyll build` with the `--unpublished` switch. Jekyll also has a handy drafts @@ -201,7 +201,7 @@ These are available out-of-the-box to be used in the front matter for a post.
If you don't want to repeat your frequently used front matter variables over and over, define defaults diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md index e40cebd7..22c60276 100644 --- a/docs/_docs/installation.md +++ b/docs/_docs/installation.md @@ -8,7 +8,7 @@ Jekyll is a [Ruby Gem](/docs/ruby-101/#gems) that can be installed on most syste ## Requirements -* [Ruby](https://www.ruby-lang.org/en/downloads/) version {{ site.min_ruby_version }} or above, including all development headers (ruby version can be checked by running `ruby -v`) +* [Ruby](https://www.ruby-lang.org/en/downloads/) version **{{ site.data.ruby.min_version }}** or above, including all development headers (ruby version can be checked by running `ruby -v`) * [RubyGems](https://rubygems.org/pages/download) (which you can check by running `gem -v`) * [GCC](https://gcc.gnu.org/install/) and [Make](https://www.gnu.org/software/make/) (in case your system doesn't have them installed, which you can check by running `gcc -v`,`g++ -v` and `make -v` in your system's command line interface) diff --git a/docs/_docs/installation/macos.md b/docs/_docs/installation/macos.md index 1a997091..56b1b2ff 100644 --- a/docs/_docs/installation/macos.md +++ b/docs/_docs/installation/macos.md @@ -12,7 +12,7 @@ xcode-select --install ## Install Ruby -Jekyll requires Ruby > {{ site.min_ruby_version }}. +Jekyll requires **Ruby > {{ site.data.ruby.min_version }}**. As macOS Mojave 10.14 comes only with ruby 2.3.x, you'll have to install a newer version of Ruby. ### With Homebrew {#brew} @@ -25,7 +25,7 @@ To run the latest Ruby version you need to install it through [Homebrew](https:/ brew install ruby ``` -Don't forget to add the brew ruby path to your shell config : +Add the brew ruby path to your shell config : ``` export PATH=/usr/local/opt/ruby/bin:$PATH @@ -38,7 +38,7 @@ which ruby # /usr/local/opt/ruby/bin/ruby ruby -v -# ruby 2.6.2p47 (2019-03-13 revision 67232) [x86_64-darwin18] +{{ site.data.ruby.current_version_output }} ``` Yay, we are now running current stable Ruby! @@ -66,10 +66,10 @@ Restart your terminal for changes to take effect. Now you can install the Ruby version of our choice, let's go with current latest stable Ruby: ```sh -rbenv install 2.6.2 -rbenv global 2.6.2 +rbenv install {{ site.data.ruby.current_version }} +rbenv global {{ site.data.ruby.current_version }} ruby -v -# ruby 2.6.2p47 (2019-03-13 revision 67232) [x86_64-darwin18] +{{ site.data.ruby.current_version_output }} ``` That's it! Head over [rbenv command references](https://github.com/rbenv/rbenv#command-reference) to learn how to use different versions of Ruby in your projects. @@ -88,7 +88,7 @@ and then get your Ruby version using ```sh ruby -v -# ruby 2.6.1p33 (2019-01-30 revision 66950) [x86_64-darwin18] +{{ site.data.ruby.current_version_output }} ``` Then append your path file with the following, replacing the `X.X` with the first two digits of your Ruby version. diff --git a/docs/_docs/liquid/filters.md b/docs/_docs/liquid/filters.md index bd33c07c..fafcd250 100644 --- a/docs/_docs/liquid/filters.md +++ b/docs/_docs/liquid/filters.md @@ -104,7 +104,7 @@ The default is `default`. They are as follows (with what they filter): - `ascii`: spaces, non-alphanumeric, and non-ASCII characters - `latin`: like `default`, except Latin characters are first transliterated (e.g. `àèïòü` to `aeiou`) {%- include docs_version_badge.html version="3.7.0" -%}. -### Detecting `nil` values with `where` filter {%- include docs_version_badge.html version="4.0.0" -%} +### Detecting `nil` values with `where` filter {%- include docs_version_badge.html version="4.0" -%} You can use the `where` filter to detect documents and pages with properties that are `nil` or `""`. For example, diff --git a/docs/_docs/liquid/tags.md b/docs/_docs/liquid/tags.md index d5ee9d63..cc181593 100644 --- a/docs/_docs/liquid/tags.md +++ b/docs/_docs/liquid/tags.md @@ -16,19 +16,12 @@ If you have page snippets that you use repeatedly across your site, an Jekyll has built in support for syntax highlighting of over 100 languages thanks to [Rouge](http://rouge.jneen.net). Rouge is the default highlighter -in Jekyll 3 and above. To use it in Jekyll 2, set `highlighter` to `rouge` -and ensure the `rouge` gem is installed properly. +in Jekyll 3 and above. -Alternatively, you can use [Pygments](http://pygments.org) to highlight your -code snippets in Jekyll 3.x and below. To use Pygments, you must have Python -installed on your system, have the `pygments.rb` gem installed and set -`highlighter` to `pygments` in your site's configuration file. Pygments -supports [over 100 languages](http://pygments.org/languages/) - -
Using Pygments has been deprecated and will not be officially supported in
- Jekyll 4, meaning that the configuration setting highlighter: pygments
- will automatically fall back to using Rouge which is written in Ruby
+
Using Pygments has been deprecated and is not supported in
+ Jekyll 4, the configuration setting highlighter: pygments
+ now automatically falls back to using Rouge which is written in Ruby
and 100% compatible with stylesheets for Pygments.
If you are using a language that contains curly braces, you
will likely need to place {% raw %}
and
- {% endraw %}
tags around your code.
{% endraw %}
tags around your code.
+ Since {% include docs_version_badge.html version="4.0" %} you can add render_with_liquid: false
in your front matter to disable Liquid entirely for a particular document.
long_month
Full month name, e.g. “January”.
@@ -149,7 +149,7 @@ Here's the full list of placeholders available:w_year
Week year which may differ from the month year for up to three days at the start of January and end of December
@@ -158,7 +158,7 @@ Here's the full list of placeholders available:week
Week number of the current year, starting with the first week having a majority of its days in January. (01..53)
@@ -167,7 +167,7 @@ Here's the full list of placeholders available:w_day
Day of the week, starting with Monday. (1..7)
@@ -176,7 +176,7 @@ Here's the full list of placeholders available:short_day
Three-letter weekday abbreviation, e.g. “Sun”.
@@ -185,7 +185,7 @@ Here's the full list of placeholders available:long_day
Weekday name, e.g. “Sunday”.
@@ -302,7 +302,7 @@ For posts, Jekyll also provides the following built-in styles for convenience:weekdate
/:categories/:year/W:week/:short_day/:title:output_ext