From e5f1a400ee8a8daeef7e6263f15de43375fda915 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Sun, 12 Jan 2014 11:57:11 -0800 Subject: [PATCH 01/30] first pass at vision --- README.markdown | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 05ade2f9..a7961088 100644 --- a/README.markdown +++ b/README.markdown @@ -9,7 +9,11 @@ By Tom Preston-Werner, Nick Quaranto, and many awesome contributors! -Jekyll is a simple, blog aware, static site generator. It takes a template directory (representing the raw form of a website), runs it through Textile or Markdown and Liquid converters, and spits out a complete, static website suitable for serving with Apache or your favorite web server. This is also the engine behind [GitHub Pages](http://pages.github.com), which you can use to host your project's page or blog right here from GitHub. +Jekyll is a simple, blog aware, static site generator perfect for personal or project sites. Think of it sort of like a file-based CMS, except without all the complexity. Jekyll takes your content, runs it through Markdown converters and Liquid templates, and spits out a complete, static website suitable for serving with Apache, Nginx or your favorite web server. This is also the engine behind [GitHub Pages](http://pages.github.com), which you can use to host your project's page or blog right on GitHub. + +## Philosophy + +Jekyll does what you tell it to do, no more, no less. It doesn't try to outsmart users by making bold assumptions or burden them with needless complexity and configuration. Put simply, Jekyll gets out of your way and allows you to concentrate on what truly matters: your content. ## Getting Started From 2966606b1a5d473d50da4113bbcc02a70b510e26 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 13 Jan 2014 00:17:12 -0800 Subject: [PATCH 02/30] Add docs about the 'new' restriction on excludes. --- site/docs/configuration.md | 2 +- test/test_entry_filter.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/docs/configuration.md b/site/docs/configuration.md index 10f5b10c..8ca54f86 100644 --- a/site/docs/configuration.md +++ b/site/docs/configuration.md @@ -67,7 +67,7 @@ class="flag">flags (specified on the command-line) that control them.

Exclude directories and/or files from the conversion. These exclusions are relative to the site's - source directory. + source directory and cannot be outside the source directory.

diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb index ce50b6a8..aea09601 100644 --- a/test/test_entry_filter.rb +++ b/test/test_entry_filter.rb @@ -72,7 +72,7 @@ class TestEntryFilter < Test::Unit::TestCase end end - context "glob_include?" do + context "#glob_include?" do setup do stub(Jekyll).configuration do Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) From 2c2beb9c1fb1e58048d8e6f477e07688f21e6c11 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Mon, 13 Jan 2014 09:15:54 -0600 Subject: [PATCH 03/30] Update history to reflect merge of #1938 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 2b24a9eb..2c0fdb3b 100644 --- a/History.markdown +++ b/History.markdown @@ -71,6 +71,7 @@ * Disallow selection of path and prompt in bash examples * Add jekyll-compass to the plugin list (#1923) * Add note in Posts docs about stripping `

` tags from excerpt (#1933) + * Add additional info about the new exclude behavior (#1938) ## 1.4.2 / 2013-12-16 From 5aeb2733a107ee32af43870ce47ec3d09ce025f5 Mon Sep 17 00:00:00 2001 From: Rob McGuire-Dale Date: Mon, 13 Jan 2014 10:19:05 -0800 Subject: [PATCH 04/30] Add link to contributors in README. Linkify "awesome contributors" in the README, as in the footer of the [Jekyll home page](http://jekyllrb.com/). --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 05ade2f9..f56cb4ca 100644 --- a/README.markdown +++ b/README.markdown @@ -7,7 +7,7 @@ [![Dependency Status](https://gemnasium.com/jekyll/jekyll.png)](https://gemnasium.com/jekyll/jekyll) [![Coverage Status](https://coveralls.io/repos/jekyll/jekyll/badge.png)](https://coveralls.io/r/jekyll/jekyll) -By Tom Preston-Werner, Nick Quaranto, and many awesome contributors! +By Tom Preston-Werner, Nick Quaranto, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)! Jekyll is a simple, blog aware, static site generator. It takes a template directory (representing the raw form of a website), runs it through Textile or Markdown and Liquid converters, and spits out a complete, static website suitable for serving with Apache or your favorite web server. This is also the engine behind [GitHub Pages](http://pages.github.com), which you can use to host your project's page or blog right here from GitHub. From 750a56d1feec99e611aeb1124b87aa14b34916ac Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Mon, 13 Jan 2014 13:13:29 -0600 Subject: [PATCH 05/30] Update history to reflect merge of #1940 --- History.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/History.markdown b/History.markdown index 2c0fdb3b..9145f044 100644 --- a/History.markdown +++ b/History.markdown @@ -72,6 +72,8 @@ * Add jekyll-compass to the plugin list (#1923) * Add note in Posts docs about stripping `

` tags from excerpt (#1933) * Add additional info about the new exclude behavior (#1938) + * Linkify 'awesome contributors' to point to the contributors graph on + GitHub (#1940) ## 1.4.2 / 2013-12-16 From edc9ffcb6518c4a21d6256023670492089244c84 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 13 Jan 2014 22:26:38 -0800 Subject: [PATCH 06/30] Add 1.4.3 release post by @BenBalter for master branch. --- .../2014-01-13-jekyll-1-4-3-released.markdown | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 site/_posts/2014-01-13-jekyll-1-4-3-released.markdown diff --git a/site/_posts/2014-01-13-jekyll-1-4-3-released.markdown b/site/_posts/2014-01-13-jekyll-1-4-3-released.markdown new file mode 100644 index 00000000..a97bcec4 --- /dev/null +++ b/site/_posts/2014-01-13-jekyll-1-4-3-released.markdown @@ -0,0 +1,26 @@ +--- +layout: news_item +title: 'Jekyll 1.4.3 Released' +date: 2014-01-13 17:43:32 -0800 +author: benbalter +version: 1.4.3 +categories: [release] +--- + +Jekyll 1.4.3 contains two **critical** security fixes. If you run Jekyll locally +and do not run Jekyll in "safe" mode (e.g. you do not build Jekyll sites on behalf +of others), you are not affected and are not required to update at this time. +([See pull request.]({{ site.repository }}/pull/1944)) + +Versions of Jekyll prior to 1.4.3 and greater than 1.2.0 may allow malicious +users to expose the content of files outside the source directory in the +generated output via improper symlink sanitization, potentially resulting in an +inadvertent information disclosure. + +Versions of Jekyll prior to 1.4.3 may also allow malicious users to write +arbitrary `.html` files outside of the destination folder via relative path +traversal, potentially overwriting otherwise-trusted content with arbitrary HTML +or Javascript depending on your server's configuration. + +*Maintainer's note: Many thanks to @gregose and @charliesome for discovering +these vulnerabilities, and to @BenBalter and @alindeman for writing the patch.* From e87cd8d53ce979861070af11345e21d7f121e6f1 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 13 Jan 2014 22:27:41 -0800 Subject: [PATCH 07/30] Update History.markdown with 1.4.3 release. --- History.markdown | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/History.markdown b/History.markdown index 9145f044..26df264c 100644 --- a/History.markdown +++ b/History.markdown @@ -75,6 +75,11 @@ * Linkify 'awesome contributors' to point to the contributors graph on GitHub (#1940) +## 1.4.3 / 2014-01-13 + +### Bug Fixes + * Patch show-stopping security vulnerabilities (#1944) + ## 1.4.2 / 2013-12-16 ### Bug Fixes From 245597c2dbe0efb5f72c11b14fdc96c3fa5d4b5a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 13 Jan 2014 22:28:16 -0800 Subject: [PATCH 08/30] Require Liquid 2.5.5 <= x < 2.6 --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index 1608ce76..7fe6c10d 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |s| s.rdoc_options = ["--charset=UTF-8"] s.extra_rdoc_files = %w[README.markdown LICENSE] - s.add_runtime_dependency('liquid', "~> 2.5.2") + s.add_runtime_dependency('liquid', "~> 2.5.5") s.add_runtime_dependency('classifier', "~> 1.3") s.add_runtime_dependency('listen', "~> 1.3") s.add_runtime_dependency('maruku', "~> 0.7.0") From 45c0523e553e9fb270746175a5cf5fea009f9a78 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 14 Jan 2014 08:43:29 -0800 Subject: [PATCH 09/30] update dat gemspec --- jekyll.gemspec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jekyll.gemspec b/jekyll.gemspec index 7fe6c10d..e3d74185 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -128,6 +128,8 @@ Gem::Specification.new do |s| lib/site_template/css/syntax.css lib/site_template/index.html script/bootstrap + script/branding + script/cibuild site/.gitignore site/CNAME site/README @@ -167,6 +169,9 @@ Gem::Specification.new do |s| site/_posts/2013-11-04-jekyll-1-3-0-released.markdown site/_posts/2013-11-26-jekyll-1-3-1-released.markdown site/_posts/2013-12-07-jekyll-1-4-0-released.markdown + site/_posts/2013-12-09-jekyll-1-4-1-released.markdown + site/_posts/2013-12-16-jekyll-1-4-2-released.markdown + site/_posts/2014-01-13-jekyll-1-4-3-released.markdown site/css/screen.css site/docs/configuration.md site/docs/contributing.md @@ -195,6 +200,7 @@ Gem::Specification.new do |s| site/docs/upgrading.md site/docs/usage.md site/docs/variables.md + site/docs/windows.md site/favicon.png site/feed.xml site/freenode.txt @@ -221,6 +227,7 @@ Gem::Specification.new do |s| test/source/_data/languages.yml test/source/_data/members.yaml test/source/_data/products.yml + test/source/_includes/include.html test/source/_includes/params.html test/source/_includes/sig.markdown test/source/_layouts/default.html @@ -260,6 +267,8 @@ Gem::Specification.new do |s| test/source/_posts/2013-05-10-number-category.textile test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown test/source/_posts/2013-08-01-mkdn-extension.mkdn + test/source/_posts/2013-12-17-include-variable-filters.markdown + test/source/_posts/2013-12-20-properties.text test/source/_posts/es/2008-11-21-nested.textile test/source/about.html test/source/category/_posts/2008-9-23-categories.textile @@ -271,6 +280,7 @@ Gem::Specification.new do |s| test/source/foo/_posts/bar/2008-12-12-topical-post.textile test/source/index.html test/source/products.yml + test/source/properties.html test/source/sitemap.xml test/source/symlink-test/_data test/source/symlink-test/symlinked-dir From dc599121a07e31c736c2d0bf44fffe9a3a9d8401 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 14 Jan 2014 08:43:53 -0800 Subject: [PATCH 10/30] Update history to reflect merge of #1943 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 9145f044..787f8a52 100644 --- a/History.markdown +++ b/History.markdown @@ -51,6 +51,7 @@ (#1927) * Rename `read_things` to `read_content` (#1928) * Add `script/branding` script for ASCII art lovin' (#1936) + * Update the README to reflect the repo move ### Site Enhancements * Document Kramdown's GFM parser option (#1791) From b3064a9b7dda641564e525f8a0737a25b1a322bd Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 14 Jan 2014 08:44:20 -0800 Subject: [PATCH 11/30] Forgot #1943 in the line, whoopsie --- History.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index 787f8a52..01c820ad 100644 --- a/History.markdown +++ b/History.markdown @@ -51,7 +51,7 @@ (#1927) * Rename `read_things` to `read_content` (#1928) * Add `script/branding` script for ASCII art lovin' (#1936) - * Update the README to reflect the repo move + * Update the README to reflect the repo move (#1943) ### Site Enhancements * Document Kramdown's GFM parser option (#1791) From ea94e5dd1cffe3fe7ba1cf480ad7415214b2ca50 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 14 Jan 2014 08:56:28 -0800 Subject: [PATCH 12/30] Update history to reflect merge of #1949 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 01c820ad..f57a3da1 100644 --- a/History.markdown +++ b/History.markdown @@ -75,6 +75,7 @@ * Add additional info about the new exclude behavior (#1938) * Linkify 'awesome contributors' to point to the contributors graph on GitHub (#1940) + * Update `docs/sites.md` link to GitHub Training materials (#1949) ## 1.4.2 / 2013-12-16 From 7f3b35191c541ed8dae36b38ef24d4538ab52d17 Mon Sep 17 00:00:00 2001 From: Troy Swanson Date: Tue, 14 Jan 2014 21:48:08 -0600 Subject: [PATCH 13/30] Make doc menus more reusable --- site/_data/docs.yml | 43 ++++++++++++++++++++++++ site/_includes/docs_contents.html | 16 +++------ site/_includes/docs_contents_mobile.html | 21 +++--------- site/_includes/docs_option.html | 2 +- site/_includes/docs_ul.html | 4 +-- 5 files changed, 54 insertions(+), 32 deletions(-) create mode 100644 site/_data/docs.yml diff --git a/site/_data/docs.yml b/site/_data/docs.yml new file mode 100644 index 00000000..4e89bcb2 --- /dev/null +++ b/site/_data/docs.yml @@ -0,0 +1,43 @@ +- title: Getting Started + docs: + - home + - quickstart + - installation + - usage + - structure + - configuration + +- title: Your Content + docs: + - frontmatter + - posts + - drafts + - pages + - variables + - datafiles + - migrations + +- title: Customization + docs: + - templates + - permalinks + - pagination + - plugins + - extras + +- title: Deployment + docs: + - github-pages + - deployment-methods + +- title: Miscellaneous + docs: + - troubleshooting + - sites + - resources + - upgrading + +- title: Meta + docs: + - contributing + - history diff --git a/site/_includes/docs_contents.html b/site/_includes/docs_contents.html index 523b5227..2ac64bb4 100644 --- a/site/_includes/docs_contents.html +++ b/site/_includes/docs_contents.html @@ -1,16 +1,8 @@

diff --git a/site/_includes/docs_contents_mobile.html b/site/_includes/docs_contents_mobile.html index bbc367d4..b3e0110c 100644 --- a/site/_includes/docs_contents_mobile.html +++ b/site/_includes/docs_contents_mobile.html @@ -1,23 +1,10 @@
diff --git a/site/_includes/docs_option.html b/site/_includes/docs_option.html index 8284ed96..a1e29cac 100644 --- a/site/_includes/docs_option.html +++ b/site/_includes/docs_option.html @@ -1,4 +1,4 @@ -{% assign items = include.items | split: ' ' %} +{% assign items = include.items %} {% for item in items %} {% assign item_url = item | prepend:'/docs/' | append:'/' %} diff --git a/site/_includes/docs_ul.html b/site/_includes/docs_ul.html index 4ba82479..99ac26ef 100644 --- a/site/_includes/docs_ul.html +++ b/site/_includes/docs_ul.html @@ -1,4 +1,4 @@ -{% assign items = include.items | split: ' ' %} +{% assign items = include.items %}
    {% for item in items %} @@ -16,5 +16,5 @@ {% endif %} {% endfor %} -{% endfor %} +{% endfor %}
From 4c140efba8ae49946de92a1acb40ead4ccd00ffb Mon Sep 17 00:00:00 2001 From: Jens Nazarenus Date: Tue, 14 Jan 2014 22:56:47 +0100 Subject: [PATCH 14/30] fix full path leak to source directory when using include tag --- lib/jekyll/tags/include.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index 5c679dc1..adc7c2bf 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -102,7 +102,7 @@ eos validate_file_name(file) path = File.join(dir, file) - validate_file(path, context.registers[:site].safe) + validate_file(context.registers[:site].source, path, context.registers[:site].safe) begin partial = Liquid::Template.parse(source(path, context)) @@ -122,11 +122,12 @@ eos end end - def validate_file(file, safe) + def validate_file(sourcedir, file, safe) + relative_file = Pathname.new(file).relative_path_from(Pathname.new(sourcedir)) if !File.exists?(file) - raise IOError.new "Included file '#{file}' not found" + raise IOError.new "Included file '#{relative_file}' not found" elsif File.symlink?(file) && safe - raise IOError.new "The included file '#{file}' should not be a symlink" + raise IOError.new "The included file '#{relative_file}' should not be a symlink" end end From 0be62fa2e033658624fd4a538db10740ccead6ae Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Wed, 15 Jan 2014 22:13:31 -0600 Subject: [PATCH 15/30] Update history to reflect merge of #1947 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index fc8d4486..767eb4ad 100644 --- a/History.markdown +++ b/History.markdown @@ -76,6 +76,7 @@ * Linkify 'awesome contributors' to point to the contributors graph on GitHub (#1940) * Update `docs/sites.md` link to GitHub Training materials (#1949) + * Update `master` with the release info from 1.4.3 (#1947) ## 1.4.3 / 2014-01-13 From 3b485b449702da21550452e960148abf5a3a4c6f Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Wed, 15 Jan 2014 23:11:27 -0600 Subject: [PATCH 16/30] Lock Maruku to 0.7.0 This fixes the errors we see in our tests due to the upgrade to Maruku 0.7.1 --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index e3d74185..a891f0bb 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency('liquid', "~> 2.5.5") s.add_runtime_dependency('classifier', "~> 1.3") s.add_runtime_dependency('listen', "~> 1.3") - s.add_runtime_dependency('maruku', "~> 0.7.0") + s.add_runtime_dependency('maruku', "0.7.0") s.add_runtime_dependency('pygments.rb', "~> 0.5.0") s.add_runtime_dependency('mercenary', "~> 0.2.0") s.add_runtime_dependency('safe_yaml', "~> 1.0") From 8337cbb31ff6d384bce5919cda7f1e7cdb12c0e8 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Wed, 15 Jan 2014 23:24:24 -0600 Subject: [PATCH 17/30] Update history to reflect merge of #1958 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 767eb4ad..8ac542da 100644 --- a/History.markdown +++ b/History.markdown @@ -38,6 +38,7 @@ * Change short opts for host and port for `jekyll docs` to be consistent with other subcommands (#1877) * Fix typos (#1910) + * Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 (#1958) ### Development Fixes * Add a link to the site in the README.md file (#1795) From e7139cbd8572e7c6f5d9dc1023197333a54882d3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 15 Jan 2014 23:40:17 -0800 Subject: [PATCH 18/30] Update history to reflect merge of #1953 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 8ac542da..a2a116c6 100644 --- a/History.markdown +++ b/History.markdown @@ -78,6 +78,7 @@ GitHub (#1940) * Update `docs/sites.md` link to GitHub Training materials (#1949) * Update `master` with the release info from 1.4.3 (#1947) + * Define docs nav in datafile (#1953) ## 1.4.3 / 2014-01-13 From 82bee23bd048983e2e11e654754e67359419c5b6 Mon Sep 17 00:00:00 2001 From: Jens Nazarenus Date: Wed, 15 Jan 2014 21:35:55 +0100 Subject: [PATCH 19/30] added tests for full path leak to source directory when using include tag --- test/test_tags.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test/test_tags.rb b/test/test_tags.rb index 8ecaf19b..efc108bd 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -487,6 +487,25 @@ CONTENT end end + context "include missing file" do + setup do + @content = < 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true}) + end + assert_equal 'Included file \'_includes/missing.html\' not found', exception.message + end + end + context "include tag with variable and liquid filters" do setup do stub(Jekyll).configuration do From 09a5d66b3e72789ffb77d86a9d76bd44f1e0a50e Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Thu, 16 Jan 2014 13:18:52 -0500 Subject: [PATCH 20/30] Update post.md with additional info about excerpt Adds a paragraph noting that use of the liquid `| strip_html` flag is possible and useful for meta tag purposes. --- site/docs/posts.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/docs/posts.md b/site/docs/posts.md index f93eb6b5..3c6ca7fe 100644 --- a/site/docs/posts.md +++ b/site/docs/posts.md @@ -155,6 +155,8 @@ If you don't like the automatically-generated post excerpt, it can be overridden `excerpt` to your post's YAML front-matter. Completely disable it by setting your `excerpt_separator` to `""`. +Also, as with any output generated by Liquid tags, you can pass the `| strip_html` flag to remove any html tags in the output. This is particularly helpful if you wish to output a post excerpt as a `meta="description"` tag within the post `head`. + ## Highlighting code snippets Jekyll also has built-in support for syntax highlighting of code snippets using From ded6350c808c143f3e7053ed74637b90107dd7e4 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Thu, 16 Jan 2014 13:24:54 -0500 Subject: [PATCH 21/30] small tweak to clarify last sentence --- site/docs/posts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/docs/posts.md b/site/docs/posts.md index 3c6ca7fe..a8f918f8 100644 --- a/site/docs/posts.md +++ b/site/docs/posts.md @@ -155,7 +155,7 @@ If you don't like the automatically-generated post excerpt, it can be overridden `excerpt` to your post's YAML front-matter. Completely disable it by setting your `excerpt_separator` to `""`. -Also, as with any output generated by Liquid tags, you can pass the `| strip_html` flag to remove any html tags in the output. This is particularly helpful if you wish to output a post excerpt as a `meta="description"` tag within the post `head`. +Also, as with any output generated by Liquid tags, you can pass the `| strip_html` flag to remove any html tags in the output. This is particularly helpful if you wish to output a post excerpt as a `meta="description"` tag within the post `head`, or anywhere else having html tags along with the content is not desirable. ## Highlighting code snippets From e42c1aa02b38ba8e5e51d86bdd0acb2f8f7a416f Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Sat, 18 Jan 2014 14:47:05 -0500 Subject: [PATCH 22/30] rework vision with @redhotvengeance suggestions --- README.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index 813e30bd..2e5af42e 100644 --- a/README.markdown +++ b/README.markdown @@ -9,11 +9,11 @@ By Tom Preston-Werner, Nick Quaranto, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)! -Jekyll is a simple, blog aware, static site generator perfect for personal or project sites. Think of it sort of like a file-based CMS, except without all the complexity. Jekyll takes your content, runs it through Markdown converters and Liquid templates, and spits out a complete, static website suitable for serving with Apache, Nginx or your favorite web server. This is also the engine behind [GitHub Pages](http://pages.github.com), which you can use to host your project's page or blog right on GitHub. +Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, sans all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served with Apache, Nginx or your favorite web server. Jekyll is the engine behind [GitHub Pages](http://pages.github.com), which you can use to host sites right from your GitHub repositories. ## Philosophy -Jekyll does what you tell it to do, no more, no less. It doesn't try to outsmart users by making bold assumptions or burden them with needless complexity and configuration. Put simply, Jekyll gets out of your way and allows you to concentrate on what truly matters: your content. +Jekyll does what you tell it to do — no more, no less. It doesn't try to outsmart users by making bold assumptions, nor does it burden them with needless complexity and configuration. Put simply, Jekyll gets out of your way and allows you to concentrate on what truly matters: your content. ## Getting Started From 90fe9ec055ff1e57103b1cb2fd0c252a7cc47606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Sun, 19 Jan 2014 13:49:52 +0100 Subject: [PATCH 23/30] Add missing next and previous docs --- site/docs/variables.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/site/docs/variables.md b/site/docs/variables.md index 89e11a52..96578311 100644 --- a/site/docs/variables.md +++ b/site/docs/variables.md @@ -244,6 +244,24 @@ following is a reference of the available data.

+ +

page.next

+

+ + The next post relative to the position of the current post in + site.posts. Returns nil for the last entry. + +

+ + +

page.previous

+

+ + The previous post relative to the position of the current post in + site.posts. Returns nil for the first entry. + +

+ From f05da3db03c50d8b5b357d3fa3e9452f5654fb61 Mon Sep 17 00:00:00 2001 From: 4ensicLog Date: Sun, 19 Jan 2014 19:51:51 -0600 Subject: [PATCH 24/30] Update structure.md This is my first attempted edit, so forgive any mistakes in decorum or process. I tried to make improvements on word choice which I think will be much clearer to people who are new to Jekyll and how the post filenames work. --- site/docs/structure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/docs/structure.md b/site/docs/structure.md index d03baee0..c178a65f 100644 --- a/site/docs/structure.md +++ b/site/docs/structure.md @@ -113,7 +113,7 @@ An overview of what each of these does:

- Your dynamic content, so to speak. The format of these files is + Your dynamic content, so to speak. The naming convention of these files is important, and must follow the format: YEAR-MONTH-DAY-title.MARKUP. The permalinks can be customized for each From a859c4509a808f4be0958b8482dfd0fb8cda1132 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Sun, 19 Jan 2014 22:06:00 -0600 Subject: [PATCH 25/30] Update history to reflect merge of #1971 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index a2a116c6..3237b0d6 100644 --- a/History.markdown +++ b/History.markdown @@ -79,6 +79,7 @@ * Update `docs/sites.md` link to GitHub Training materials (#1949) * Update `master` with the release info from 1.4.3 (#1947) * Define docs nav in datafile (#1953) + * Clarify the docs around the naming convention for posts (#1971) ## 1.4.3 / 2014-01-13 From d37ea10cf8e61054bcd03c137497fb8ccd044706 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 19 Jan 2014 23:18:59 -0500 Subject: [PATCH 26/30] Update history to reflect merge of #1970 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 3237b0d6..81f2f1c5 100644 --- a/History.markdown +++ b/History.markdown @@ -80,6 +80,7 @@ * Update `master` with the release info from 1.4.3 (#1947) * Define docs nav in datafile (#1953) * Clarify the docs around the naming convention for posts (#1971) + * Add missing `next` and `previous` docs for post layouts and templates (#1970) ## 1.4.3 / 2014-01-13 From e2258403ee261c1593abc5eef138933f27818a9f Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 20 Jan 2014 21:42:12 -0500 Subject: [PATCH 27/30] language tweaks --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 2e5af42e..228881db 100644 --- a/README.markdown +++ b/README.markdown @@ -9,7 +9,7 @@ By Tom Preston-Werner, Nick Quaranto, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)! -Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, sans all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served with Apache, Nginx or your favorite web server. Jekyll is the engine behind [GitHub Pages](http://pages.github.com), which you can use to host sites right from your GitHub repositories. +Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served by Apache, Nginx or another web server. Jekyll is the engine behind [GitHub Pages](http://pages.github.com), which you can use to host sites right from your GitHub repositories. ## Philosophy From 9210d4ebd8e0fc79eb6f18a9e4cbc6c785eb03a7 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Tue, 21 Jan 2014 07:50:12 -0600 Subject: [PATCH 28/30] Update history to reflect merge of #1935 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 81f2f1c5..8056c82b 100644 --- a/History.markdown +++ b/History.markdown @@ -53,6 +53,7 @@ * Rename `read_things` to `read_content` (#1928) * Add `script/branding` script for ASCII art lovin' (#1936) * Update the README to reflect the repo move (#1943) + * Add the project vision to the README (#1935) ### Site Enhancements * Document Kramdown's GFM parser option (#1791) From f2fadd656238658db174d8442251efa32b8b3191 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 21 Jan 2014 23:05:46 -0500 Subject: [PATCH 29/30] Update history to reflect merge of #1962 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 8056c82b..5477417f 100644 --- a/History.markdown +++ b/History.markdown @@ -82,6 +82,7 @@ * Define docs nav in datafile (#1953) * Clarify the docs around the naming convention for posts (#1971) * Add missing `next` and `previous` docs for post layouts and templates (#1970) + * Add note to `Writing posts` page about how to strip html from excerpt (#1962) ## 1.4.3 / 2014-01-13 From 30d8743853d4ee0d7db047929f3e812a76d8fb9a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 21 Jan 2014 23:07:28 -0500 Subject: [PATCH 30/30] Update history to reflect merge of #1951 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 5477417f..fe27a924 100644 --- a/History.markdown +++ b/History.markdown @@ -39,6 +39,7 @@ other subcommands (#1877) * Fix typos (#1910) * Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 (#1958) + * Fixes full path leak to source directory when using include tag (#1951) ### Development Fixes * Add a link to the site in the README.md file (#1795)