Parker Moore 42cc2445a5 Merge branch 'master' into themes ...

* master: (58 commits)
  Update history to reflect merge of #4792 [ci skip]
  Update history to reflect merge of #4793 [ci skip]
  Update history to reflect merge of #4804 [ci skip]
  Update history to reflect merge of #4754 [ci skip]
  Update history to reflect merge of #4813 [ci skip]
  Added missing single quote on rsync client side command
  Add v3.0.4 and v3.1.3 to the history.
  Fixed typo
  Add jekyll-autoprefixer plugin
  Explicitly require Filters rather than implicitly.
  Update history to reflect merge of #4786 [ci skip]
  Update history to reflect merge of #4789 [ci skip]
  updates example domain in config template
  Globalize Jekyll's Filters.
  Update JRuby to 9.0.5.0; Drop the double digit test.
  Update Rack-Jekyll Heroku deployment blog post url
  convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files
  Update history to reflect merge of #4734 [ci skip]
  Update history to reflect merge of #4478 [ci skip]
  Fix rubocop warning.
  ...

2016-04-21 11:43:35 -07:00

..

upgrading

Subdirectories of _posts are no longer categories

2016-03-05 10:59:54 +00:00

assets.md

Updating assets documentation

2016-03-24 09:52:16 -04:00

collections.md

Updates documentation for collections

2016-04-07 20:28:16 -04:00

conduct.md

Rakefile: siteify_file should allow overrides from task [ci skip]

2016-03-10 10:21:15 -06:00

configuration.md

Fixed typo

2016-04-17 20:39:20 +01:00

continuous-integration.md

Set protocol of jekyllrb.com to HTTPS

2016-04-03 10:28:09 +02:00

contributing.md

Fix history for #4693 & its cherry-pick into master which doesn't need a history line

2016-04-12 13:40:24 -04:00

datafiles.md

Made statement about data file format more explicit

2016-04-10 09:53:50 -07:00

deployment-methods.md

Added missing single quote on rsync client side command

2016-04-19 13:59:23 -04:00

drafts.md

Wrap lines

2015-03-11 20:17:23 -04:00

extras.md

Fix link issues in the site found by HTML Proofer.

2016-03-01 19:43:22 -08:00

frontmatter.md

Use HTTPS

2016-02-22 22:17:02 -05:00

github-pages.md

Feedback from @parkr

2016-02-23 11:20:32 -05:00

history.md

rebuild site

2016-03-11 14:45:14 -05:00

index.md

Use HTTPS

2016-02-22 22:17:02 -05:00

installation.md

Use HTTPS

2016-02-22 22:17:02 -05:00

migrations.md

Use HTTPS

2016-02-22 22:17:02 -05:00

pages.md

Use HTTPS

2016-02-22 22:17:02 -05:00

pagination.md

Update pagination docs to reflect removal of pagination as runtime dep.

2015-11-20 10:51:16 -08:00

permalinks.md

site: fix :hour, :minute, :second permalink keys to refer to date front matter value

2016-01-11 13:37:27 -08:00

plugins.md

Add jekyll-autoprefixer plugin

2016-04-16 14:48:35 +02:00

posts.md

Use HTTPS

2016-02-22 22:17:02 -05:00

quickstart.md

Docs: Quickstart - removed alternatively

2016-02-01 10:22:31 -05:00

resources.md

more form baas

2016-04-04 19:07:57 +02:00

sites.md

Removed Leonard Lamprecht's website

2016-04-08 14:19:51 +05:30

static_files.md

static files mtime liquid should return a Time obj

2015-04-14 11:52:25 -07:00

structure.md

Update structure.md

2016-02-15 00:39:53 -05:00

templates.md

Fix minor code style recommendations and typos.

2016-04-12 18:59:56 +01:00

themes.md

use variables in the docs

2016-03-11 14:43:44 -05:00

troubleshooting.md

Additional repo needed for Fedora 23 Workspace

2016-03-20 05:53:13 -04:00

upgrading.md

Add upgrading docs from 2.x to 3.x

2015-11-18 08:50:49 -08:00

usage.md

Remove brackets around _config.yml

2015-10-16 12:08:29 -05:00

variables.md

Fix a typo in pagination doc

2016-04-07 00:35:24 +08:00

windows.md

Update windows.md

2016-03-20 23:38:45 +01:00