Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Remove notes in docs for unreleased features. #2309

Merged
merged 4 commits into from

2 participants

@parkr
Owner

No description provided.

@parkr parkr referenced this pull request
Closed

Release 2.0 #2166

@mattr-
Owner

:shipit:

@parkr parkr merged commit b6cfb8a into master

1 check passed

Details continuous-integration/travis-ci The Travis CI build passed
@parkr parkr deleted the remove-unreleased-notes branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
12 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: <p>Use <code>Jekyll.configuration</code> to build a full configuration for use w/Jekyll.</p>\n\n<p>Whatever: foo.bar</p>" in "_site/index.html"
View
1  lib/jekyll/document.rb
@@ -194,6 +194,7 @@ def read(opts = {})
def to_liquid
if data.is_a?(Hash)
Utils.deep_merge_hashes data, {
+ "output" => output,
"content" => content,
"path" => path,
"relative_path" => relative_path,
View
8 site/docs/assets.md
@@ -6,14 +6,6 @@ next_section: migrations
permalink: /docs/assets/
---
-<div class="note unreleased">
- <h5>Sass and CoffeeScript support is currently unreleased.</h5>
- <p>
- In order to use this feature, <a href="/docs/installation/#pre-releases">
- install the latest development version of Jekyll</a>.
- </p>
-</div>
-
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:
View
8 site/docs/collections.md
@@ -6,14 +6,6 @@ next_section: datafiles
permalink: /docs/collections/
---
-<div class="note unreleased">
- <h5>Collections support is currently unreleased.</h5>
- <p>
- In order to use this feature, <a href="/docs/installation/#pre-releases">
- install the latest development version of Jekyll</a>.
- </p>
-</div>
-
<div class="note warning">
<h5>Collections support is unstable and may change</h5>
<p>
View
17 site/docs/configuration.md
@@ -278,14 +278,6 @@ before your site is served.
## Frontmatter defaults
-<div class="note unreleased">
- <h5>The front-matter defaults feature is currently unreleased.</h5>
- <p>
- In order to use this feature, <a href="/docs/installation/#pre-releases">
- install the latest development version of Jekyll</a>.
- </p>
-</div>
-
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 %}
-<div class="note unreleased">
- <h5>Kramdown as the default is currently unreleased.</h5>
- <p>
- 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.
- </p>
-</div>
-
## Markdown Options
The various Markdown renderers supported by Jekyll sometimes have extra options available.
View
2  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.
View
6 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:
<code>path</code>, <code>modified_time</code> and <code>extname</code>.
- <strong>Note: this is only available in <a
- href="../installation/">the latest development
- version.</a></strong>
</p></td>
</tr>
@@ -130,9 +127,6 @@ following is a reference of the available data.
<td><p>
A list of all the documents in every collection.
- <strong>Note: this is only available in <a
- href="../installation/">the latest development
- version.</a></strong>
</p></td>
</tr>
Something went wrong with that request. Please try again.