Parker Moore a30068bf3f Merge remote-tracking branch 'origin/master' into themes ...

* origin/master: (65 commits)
  Update history to reflect merge of #4703 [ci skip]
  Update history to reflect merge of #4712 [ci skip]
  Highlight the test code
  Update history to reflect merge of #4640 [ci skip]
  readded "env=prod"-condition
  Update history to reflect merge of #3849 [ci skip]
  Update history to reflect merge of #4624 [ci skip]
  Update history to reflect merge of #4704 [ci skip]
  Update history to reflect merge of #4706 [ci skip]
  Checks for link file extension in tests
  Updating assets documentation
  Fix test teardown for cleaner.
  Update history to reflect merge of #4542 [ci skip]
  Add explanation of site variables in the example _config.yml
  Use double quotes in the gemfile
  Add test for creation of Gemfile by 'jekyll new'
  Add comment about github-pages
  Update history to reflect merge of #4533 [ci skip]
  Ensure Rouge closes its div/figure properly after highlighting ends.
  Add Site#config= which can be used to set the config
  ...

2016-03-25 16:30:25 -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

Fixes typo on collections

2016-03-11 13:03:32 -08:00

conduct.md

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

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

configuration.md

replace with @parkr suggestion

2016-03-19 18:22:35 +01:00

continuous-integration.md

Merge pull request #4628 from mejackreed/travis-sudo

2016-03-09 11:19:58 -08:00

contributing.md

Highlight the test code

2016-03-25 15:30:53 -04:00

datafiles.md

Update the site history

2016-02-15 21:58:22 -08:00

deployment-methods.md

Adding Aerobatic to list of deployment options

2016-03-02 15:04:15 -08: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 Hook for :site :after_init

2016-03-23 13:14:08 -07: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

Use the correct URL, Fixes #4698

2016-03-22 17:48:57 -04:00

sites.md

Rm date indicators and >1 year inactive sites

2016-01-20 07:22:54 +10:00

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 documentation for push/pop/shift/unshift

2016-03-17 15:50:50 -07: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 spelling of GitHub in docs and history

2016-01-06 17:21:09 +01:00

windows.md

Update windows.md

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