Commit Graph

9079 Commits

Author SHA1 Message Date
jekyllbot b75d3a8783 Merge pull request #5711 from Ch4s3/master
Merge pull request 5711
2017-01-01 21:24:27 -08:00
Chase da1a36eff9 update Classifier-Reborn to 2.1.0 2017-01-01 18:20:45 -05:00
jekyllbot b704df0245 Update history to reflect merge of #5683 [ci skip] 2017-01-01 06:51:40 -08:00
jekyllbot 0d62e7fb41 Merge pull request #5683 from Nursen/patch-1
Merge pull request 5683
2017-01-01 06:51:38 -08:00
jekyllbot 0197b65e71 Update history to reflect merge of #5705 [ci skip] 2016-12-31 13:44:17 -08:00
jekyllbot d45ea7f493 Merge pull request #5705 from robcrocombe/robcrocombe-patch-1
Merge pull request 5705
2016-12-31 13:44:16 -08:00
jekyllbot 0014b1d9f0 Update history to reflect merge of #5689 [ci skip] 2016-12-29 19:02:54 -08:00
jekyllbot 817c9f6605 Merge pull request #5689 from tomjohnson1492/patch-3
Merge pull request 5689
2016-12-29 19:02:53 -08:00
Tom Johnson c8ef313d03 fixing sentence in dispute 2016-12-29 09:31:30 -08:00
Tom Johnson 192e79ed1e reset permalinks to same state it was in in patch-3 branch. i couldn't seem to remove it from the previous commit. 2016-12-29 08:57:39 -08:00
Tom Johnson 57d6d5986f update quickstart.md
I must have just updated the wrong doc or branch in the last commit. i hope this fixes it.
2016-12-29 08:27:42 -08:00
Frank Taillandier 685a142a83 Rebase patch 10 on patch 11 2016-12-29 11:58:57 +01:00
Tom Johnson acff6cd269 Removed erroneous liquid code, added back spacing
- removed erroneous liquid code with conditional include parameters
- added back spacing in {{ }} tags
2016-12-29 11:55:22 +01:00
Tom Johnson 56a7038a7e Updated to remove spacing from include variables
It turns out Liquid throws an error when you write `{% if {{ include.url }} %}` instead of `{% if {{include.url}} %}`. I updated the examples here to omit the spacing. To avoid inconsistency, I just omitted the spacing from all curly braces. Also added a note explaining the issue and put the blame on Liquid.
2016-12-29 11:55:22 +01:00
Tom Johnson 8289b61316 made requested updates
- made `{{ }}` formatting more readable by adding spacing. 
- added formatting to code samples to properly reflect line breaks for readability
2016-12-29 11:55:22 +01:00
Tom Johnson 240ea13576 Added new includes.md topic to docs
Added new includes.md topic.

See https://github.com/jekyll/jekyll/pull/5630 for more details on the update. 

@jekyll/documentation
@DirtyF
2016-12-29 11:55:22 +01:00
Rob Crocombe 6a2c7f2718 Add Jekyll-Post to plugins.md 2016-12-29 10:20:15 +00:00
Tom Johnson caf5c00842 made requested updates 2016-12-29 00:29:45 -08:00
Tom Johnson 90da02b1fc made updates from Parkr's review
- most prominent update is example of how to override minima default
2016-12-29 00:15:52 -08:00
Tom Johnson 391bf5d33c made fixes
made requested fixes
2016-12-28 23:46:25 -08:00
Tom Johnson b1b0d00c5a made updates
- made updates from Parkr's review
- update to Extensionless permalinks section
- update to note about not using built-in perm styles in front matter
- update for readability in places
2016-12-28 23:42:37 -08:00
Tom Johnson 2c8b826460 made requested change
**includes** --> *includes*
2016-12-28 23:00:06 -08:00
Parker Moore 02056f7b15 Merge pull request #5679 from jekyll/liquid-4-utils
[liquid 4] Utils
2016-12-28 21:55:55 -08:00
Parker Moore 1bc82b9c8a
Fix script/stackprof & add some GC stats.
When running 'script/stackprof object', I noticed that it would be helpful to see
GC information. It appears we create a lot of junk -- a source of optimization if
we decide to go down that path.

An average Jekyll build doesn't run a GC, but auto-regeneration likely would eventually
require a GC run and it would be interesting to see if we can reduce how much we throw
away with each call to 'site.process'.
2016-12-28 22:54:37 -07:00
Tom Johnson adc619ca6c added info about jekyll new --help 2016-12-28 15:21:57 -08:00
Tom Johnson c317161942 fixed space 2016-12-28 08:15:20 -08:00
Tom Johnson 56ae6ed571 Removed erroneous liquid code, added back spacing
- removed erroneous liquid code with conditional include parameters
- added back spacing in {{ }} tags
2016-12-27 21:39:56 -08:00
Tom Johnson f18363ea13 Updated to remove spacing from include variables
It turns out Liquid throws an error when you write `{% if {{ include.url }} %}` instead of `{% if {{include.url}} %}`. I updated the examples here to omit the spacing. To avoid inconsistency, I just omitted the spacing from all curly braces. Also added a note explaining the issue and put the blame on Liquid.
2016-12-27 11:03:23 -08:00
Tom Johnson 845580a258 Documentation on how to build navigation
I added a documentation page on how to build navigation for your site. This topic is primarily intended for users who have a lot of pages on their site (such as for documentation websites), and want to build a more robust sidebar navigation.

Jekyll combines Liquid with YAML in interesting ways that aren't really documented clearly in the existing docs, except for a brief reference [here](http://jekyllrb.com/docs/datafiles/#the-data-folder). You can read about Liquid on Shopify and YAML in YAML's docs, but exactly how you store YAML files in a Jekyll project and iterate through them using Liquid loops and filters to generate lists of pages is something that isn't clear to a lot of people. (You can see origins of these questions in [previous help issues](https://github.com/jekyll/jekyll-help/issues/266).)  The documentation on navigation would fit well into the Jekyll docs.
2016-12-26 23:15:22 -08:00
Tom Johnson 190ea160e5 Made updates as requested by reviewers
Made requested updates.
2016-12-26 20:40:07 -08:00
Tom Johnson 938388a6be Made updates requested by others in PR
I made various updates as requested by the reviewers.
2016-12-26 20:31:54 -08:00
Tom Johnson 6c5f6ce164 Made requested updates on this topic
Made minor grammar updates
2016-12-26 19:48:38 -08:00
Tom Johnson b37b433b60 made requested updates
I made the requested updates. Mostly just small formatting improvements.
2016-12-26 18:48:42 -08:00
Tom Johnson 488ec5489c moved includes to appear after templates
made update based on review. moved includes topic after templates in nav list.
2016-12-26 18:36:39 -08:00
Tom Johnson 31de9ea484 made requested updates
- made `{{ }}` formatting more readable by adding spacing. 
- added formatting to code samples to properly reflect line breaks for readability
2016-12-26 18:28:27 -08:00
Tom Johnson a6d357050a Updated to correct content
I previously had pasted in the wrong page here. Now it's fixed.
2016-12-25 23:03:22 -08:00
Tom Johnson 503420a9b4 Added new includes.md topic to docs
Added new includes.md topic.

See https://github.com/jekyll/jekyll/pull/5630 for more details on the update. 

@jekyll/documentation
@DirtyF
2016-12-25 20:44:35 -08:00
Tom Johnson 2d0df85b93 Add includes link to doc nav
I created more advanced details about includes and created a new page for it instead of putting all the info on the templates page.

See https://github.com/jekyll/jekyll/pull/5630 for more details on the update. 

@jekyll/documentation
@DirtyF
2016-12-25 20:42:16 -08:00
Tom Johnson 9e1c613818 Improve template docs
See https://github.com/jekyll/jekyll/pull/5630 for more details on the update. 

@jekyll/documentation
@DirtyF
2016-12-25 20:37:24 -08:00
Tom Johnson 93cd0cdb50 Improve permalinks docs
See https://github.com/jekyll/jekyll/pull/5630 for more details on the update. 

@jekyll/documentation
@DirtyF
2016-12-25 20:36:25 -08:00
Tom Johnson 91cd32ca49 Improve pages docs
See https://github.com/jekyll/jekyll/pull/5630 for more details on the update. 

@jekyll/documentation
@DirtyF
2016-12-25 20:35:31 -08:00
Tom Johnson f5eb869e58 Improve collections docs
See https://github.com/jekyll/jekyll/pull/5630 for more details on the update. 

@jekyll/documentation
@DirtyF
2016-12-25 20:34:20 -08:00
Tom Johnson 11b4ae05e5 Improve theme docs
See https://github.com/jekyll/jekyll/pull/5630 for more details on the update. 

@jekyll/documentation
@DirtyF
2016-12-25 20:33:09 -08:00
Tom Johnson 317eae5580 Improve quickstart docs
See https://github.com/jekyll/jekyll/pull/5630 for more details on the update. 

@jekyll/documentation
@DirtyF
2016-12-25 20:31:32 -08:00
Ashwin Maroli e463813416 use compatible versions of gems
- json: "~> 2.0"
    # https://github.com/flori/json/issues/303#issuecomment-259426660

  - pygments.rb: "~> 1.1"
2016-12-25 11:48:06 +05:30
Ashwin Maroli 2133397412 test against ruby-2.4.0 2016-12-25 10:08:49 +05:30
Nursen d442c4fe13 Update windows.md 2016-12-24 02:16:20 -08:00
Nursen 80d3c7a204 Update windows.md
fixing typo
2016-12-24 01:25:03 -08:00
Nursen 467f0a1371 Update windows.md
revising terminology to avoid ambiguity and moving in relation to alternative install instructions.
2016-12-24 01:22:55 -08:00
Nursen 704910b297 Update windows.md
Added an update to installation instructions, as a cert authority change in Ruby causes problems with the prior recommended version of Ruby.
2016-12-23 14:08:54 -08:00