From 2468b9f45c379ab5a0750b3e5731f5ad2c9b4f4b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 6 May 2014 14:47:21 -0400 Subject: [PATCH 1/4] Remove notes in docs for unreleased features. --- site/docs/assets.md | 8 -------- site/docs/collections.md | 8 -------- site/docs/configuration.md | 17 ----------------- site/docs/variables.md | 6 ------ 4 files changed, 39 deletions(-) diff --git a/site/docs/assets.md b/site/docs/assets.md index a93581ed..bdfcfddc 100644 --- a/site/docs/assets.md +++ b/site/docs/assets.md @@ -6,14 +6,6 @@ next_section: migrations permalink: /docs/assets/ --- -
-
Sass and CoffeeScript support is currently unreleased.
-

- In order to use this feature, - install the latest development version of Jekyll. -

-
- Jekyll provides built-in support for Sass and CoffeeScript. In order to use them, create a file with the proper extension name (one of `.sass`, `.scss`, or `.coffee`) and start the file with two lines of triple dashes, like this: diff --git a/site/docs/collections.md b/site/docs/collections.md index cfbcd3a7..1cbd5d02 100644 --- a/site/docs/collections.md +++ b/site/docs/collections.md @@ -6,14 +6,6 @@ next_section: datafiles permalink: /docs/collections/ --- -
-
Collections support is currently unreleased.
-

- In order to use this feature, - install the latest development version of Jekyll. -

-
-
Collections support is unstable and may change

diff --git a/site/docs/configuration.md b/site/docs/configuration.md index c273ca6a..e4351847 100644 --- a/site/docs/configuration.md +++ b/site/docs/configuration.md @@ -278,14 +278,6 @@ before your site is served. ## Frontmatter defaults -

-
The front-matter defaults feature is currently unreleased.
-

- In order to use this feature, - install the latest development version of Jekyll. -

-
- You can set default values for your [YAML frontmatter](../frontmatter/) variables in your configuration. This way, you can for example set default layouts or define defaults for your custom variables. Of course, any variable actually specified in @@ -408,15 +400,6 @@ redcloth: hard_breaks: true {% endhighlight %} -
-
Kramdown as the default is currently unreleased.
-

- In the latest development releases, we've deprecated Maruku and will default to - Kramdown instead of Maruku. All versions below this will use Maruku as the - default. -

-
- ## Markdown Options The various Markdown renderers supported by Jekyll sometimes have extra options available. diff --git a/site/docs/variables.md b/site/docs/variables.md index 8e6c22c7..5f4afbea 100644 --- a/site/docs/variables.md +++ b/site/docs/variables.md @@ -119,9 +119,6 @@ following is a reference of the available data. A list of all static files (i.e. files not processed by Jekyll's converters or the Liquid renderer). Each file has three properties: path, modified_time and extname. - Note: this is only available in the latest development - version.

@@ -130,9 +127,6 @@ following is a reference of the available data.

A list of all the documents in every collection. - Note: this is only available in the latest development - version.

From 00f21ee93ca28913ef027caef893488d2f93ff75 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 6 May 2014 14:51:56 -0400 Subject: [PATCH 2/4] Add `output` to Document#to_liquid --- lib/jekyll/document.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 3b2b6eeb..be4ead20 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -194,6 +194,7 @@ module Jekyll def to_liquid if data.is_a?(Hash) Utils.deep_merge_hashes data, { + "output" => output, "content" => content, "path" => path, "relative_path" => relative_path, From fa2713202558acd0b20f2093107f27540193fd4f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 6 May 2014 14:52:02 -0400 Subject: [PATCH 3/4] Fix link to variables docs page --- site/docs/plugins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/docs/plugins.md b/site/docs/plugins.md index 90ac813e..a6bc02bb 100644 --- a/site/docs/plugins.md +++ b/site/docs/plugins.md @@ -73,7 +73,7 @@ instances of and are available via `site.pages`. Static files become instances of [`Jekyll::StaticFile`]({{ site.repository }}/blob/master/lib/jekyll/static_file.rb) and are available via `site.static_files`. See -[the Variables documentation page](../installation/) and +[the Variables documentation page](/docs/variables/) and [`Jekyll::Site`]({{ site.repository }}/blob/master/lib/jekyll/site.rb) for more details. From ea054ef1491843ad78846b85b115fb3eba7e5f88 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 6 May 2014 15:27:13 -0400 Subject: [PATCH 4/4] Add test for document.output. Test for ref: 00f21ee93ca28913ef027caef893488d2f93ff75 Closes #2232. --- features/collections.feature | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/features/collections.feature b/features/collections.feature index 402e7dab..821ae64f 100644 --- a/features/collections.feature +++ b/features/collections.feature @@ -82,3 +82,15 @@ Feature: Collections When I run jekyll build Then the _site directory should exist And I should see "All documents: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" + + Scenario: Documents have an output attribute, which is the converted HTML + Given I have an "index.html" page that contains "First document's output: {{ site.documents.first.output }}" + And I have fixture collections + And I have a "_config.yml" file with content: + """ + collections: + - methods + """ + When I run jekyll build + Then the _site directory should exist + And I should see "First document's output:

Use Jekyll.configuration to build a full configuration for use w/Jekyll.

\n\n

Whatever: foo.bar

" in "_site/index.html"