Reverted my upgrading.md to fix merge conflict.
This commit is contained in:
zachgersh
commit
81bbafefea
|
|
@ -1,10 +1,16 @@
|
||||||
## HEAD
|
## HEAD
|
||||||
### Major Enhancements
|
### Major Enhancements
|
||||||
### Minor Enhancements
|
### Minor Enhancements
|
||||||
|
* Update pygments.rb version to 0.5.0 (#1061)
|
||||||
|
* Update Kramdown version to 1.0.2 (#1067)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
* Catching that Redcarpet gem isn't installed (#1059)
|
* Catching that Redcarpet gem isn't installed (#1059)
|
||||||
|
|
||||||
### Site Enhancements
|
### Site Enhancements
|
||||||
|
* Move pages to be Pages for realz (#985)
|
||||||
|
* Updated links to Liquid documentation (#1073)
|
||||||
|
|
||||||
### Development Fixes
|
### Development Fixes
|
||||||
|
|
||||||
## 1.0.1 / 2013-05-08
|
## 1.0.1 / 2013-05-08
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ Gem::Specification.new do |s|
|
||||||
s.add_runtime_dependency('classifier', "~> 1.3")
|
s.add_runtime_dependency('classifier', "~> 1.3")
|
||||||
s.add_runtime_dependency('directory_watcher', "~> 1.4.1")
|
s.add_runtime_dependency('directory_watcher', "~> 1.4.1")
|
||||||
s.add_runtime_dependency('maruku', "~> 0.5")
|
s.add_runtime_dependency('maruku', "~> 0.5")
|
||||||
s.add_runtime_dependency('kramdown', "~> 0.14")
|
s.add_runtime_dependency('kramdown', "~> 1.0.2")
|
||||||
s.add_runtime_dependency('pygments.rb', "~> 0.4.2")
|
s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
|
||||||
s.add_runtime_dependency('commander', "~> 4.1.3")
|
s.add_runtime_dependency('commander', "~> 4.1.3")
|
||||||
s.add_runtime_dependency('safe_yaml', "~> 0.7.0")
|
s.add_runtime_dependency('safe_yaml', "~> 0.7.0")
|
||||||
s.add_runtime_dependency('colorator', "~> 0.1")
|
s.add_runtime_dependency('colorator', "~> 0.1")
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,2 @@
|
||||||
permalink: /docs/:categories/:title
|
|
||||||
pygments: true
|
pygments: true
|
||||||
gauges_id: 503c5af6613f5d0f19000027
|
gauges_id: 503c5af6613f5d0f19000027
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
<a href="{{ site.url }}/">Overview</a>
|
<a href="{{ site.url }}/">Overview</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="{% unless page.overview %}current{% endunless %}">
|
<li class="{% unless page.overview %}current{% endunless %}">
|
||||||
<a href="{{ site.url }}/docs">Doc<span class="show-on-mobiles">s</span><span class="hide-on-mobiles">umentation</span></a>
|
<a href="{{ site.url }}/docs/home">Doc<span class="show-on-mobiles">s</span><span class="hide-on-mobiles">umentation</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="">
|
<li class="">
|
||||||
<a href="https://github.com/mojombo/jekyll"><span class="hide-on-mobiles">View on </span>GitHub</a>
|
<a href="https://github.com/mojombo/jekyll"><span class="hide-on-mobiles">View on </span>GitHub</a>
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Configuration
|
title: Configuration
|
||||||
prev_section: structure
|
prev_section: structure
|
||||||
next_section: frontmatter
|
next_section: frontmatter
|
||||||
|
permalink: /docs/configuration/
|
||||||
---
|
---
|
||||||
|
|
||||||
Jekyll allows you to concoct your sites in any way you can dream up, and it’s
|
Jekyll allows you to concoct your sites in any way you can dream up, and it’s
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Contributing
|
title: Contributing
|
||||||
prev_section: deployment-methods
|
prev_section: deployment-methods
|
||||||
next_section: troubleshooting
|
next_section: troubleshooting
|
||||||
|
permalink: /docs/contributing/
|
||||||
---
|
---
|
||||||
|
|
||||||
So you've got an awesome idea to throw into Jekyll. Great! Please keep the
|
So you've got an awesome idea to throw into Jekyll. Great! Please keep the
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Deployment methods
|
title: Deployment methods
|
||||||
prev_section: github-pages
|
prev_section: github-pages
|
||||||
next_section: contributing
|
next_section: contributing
|
||||||
|
permalink: /docs/deployment-methods/
|
||||||
---
|
---
|
||||||
|
|
||||||
Sites built using Jekyll can be deployed in a large number of ways due to the static nature of the generated output. A few of the most common deployment techniques are described below.
|
Sites built using Jekyll can be deployed in a large number of ways due to the static nature of the generated output. A few of the most common deployment techniques are described below.
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Extras
|
title: Extras
|
||||||
prev_section: plugins
|
prev_section: plugins
|
||||||
next_section: github-pages
|
next_section: github-pages
|
||||||
|
permalink: /docs/extras/
|
||||||
---
|
---
|
||||||
|
|
||||||
There are a number of (optional) extra features that Jekyll supports that you
|
There are a number of (optional) extra features that Jekyll supports that you
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Front-matter
|
title: Front-matter
|
||||||
prev_section: configuration
|
prev_section: configuration
|
||||||
next_section: posts
|
next_section: posts
|
||||||
|
permalink: /docs/frontmatter/
|
||||||
---
|
---
|
||||||
|
|
||||||
The front-matter is where Jekyll starts to get really cool. Any file that
|
The front-matter is where Jekyll starts to get really cool. Any file that
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: GitHub Pages
|
title: GitHub Pages
|
||||||
prev_section: extras
|
prev_section: extras
|
||||||
next_section: deployment-methods
|
next_section: deployment-methods
|
||||||
|
permalink: /docs/github-pages/
|
||||||
---
|
---
|
||||||
|
|
||||||
[GitHub Pages](http://pages.github.com) are public web pages for users,
|
[GitHub Pages](http://pages.github.com) are public web pages for users,
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Heroku
|
title: Heroku
|
||||||
prev_section: github-pages
|
prev_section: github-pages
|
||||||
next_section: manual-deployment
|
next_section: manual-deployment
|
||||||
|
permalink: /docs/heroku/
|
||||||
---
|
---
|
||||||
|
|
||||||
Move along, people. Nothing to see here.
|
Move along, people. Nothing to see here.
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
<!DOCTYPE HTML>
|
|
||||||
<html lang="en-US">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta http-equiv="refresh" content="0;url=home">
|
|
||||||
<title>Jekyll</title>
|
|
||||||
</head>
|
|
||||||
<body style="background: #333;">
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
layout: docs
|
layout: docs
|
||||||
title: Welcome
|
title: Welcome
|
||||||
next_section: installation
|
next_section: installation
|
||||||
|
permalink: /docs/home/
|
||||||
---
|
---
|
||||||
|
|
||||||
This site aims to be a comprehensive guide to Jekyll. We’ll cover topics such
|
This site aims to be a comprehensive guide to Jekyll. We’ll cover topics such
|
||||||
|
|
@ -15,7 +16,8 @@ development of Jekyll itself.
|
||||||
Jekyll is a simple, blog-aware, static site generator. It takes a template
|
Jekyll is a simple, blog-aware, static site generator. It takes a template
|
||||||
directory containing raw text files in various formats, runs it through
|
directory containing raw text files in various formats, runs it through
|
||||||
[Markdown](http://daringfireball.net/projects/markdown/) (or
|
[Markdown](http://daringfireball.net/projects/markdown/) (or
|
||||||
[Textile](http://textile.sitemonks.com/)) and [Liquid](http://liquidmarkup.org/)
|
[Textile](http://textile.sitemonks.com/)) and
|
||||||
|
[Liquid](http://wiki.shopify.com/Liquid)
|
||||||
converters, and spits out a complete, ready-to-publish static website suitable
|
converters, and spits out a complete, ready-to-publish static website suitable
|
||||||
for serving with your favorite web server. Jekyll also happens to be the engine
|
for serving with your favorite web server. Jekyll also happens to be the engine
|
||||||
behind [GitHub Pages](http://pages.github.com), which means you can use Jekyll
|
behind [GitHub Pages](http://pages.github.com), which means you can use Jekyll
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Installation
|
title: Installation
|
||||||
prev_section: home
|
prev_section: home
|
||||||
next_section: usage
|
next_section: usage
|
||||||
|
permalink: /docs/installation/
|
||||||
---
|
---
|
||||||
|
|
||||||
Getting Jekyll installed and ready-to-go should only take a few minutes. If it
|
Getting Jekyll installed and ready-to-go should only take a few minutes. If it
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Blog migrations
|
title: Blog migrations
|
||||||
prev_section: variables
|
prev_section: variables
|
||||||
next_section: templates
|
next_section: templates
|
||||||
|
permalink: /docs/migrations/
|
||||||
---
|
---
|
||||||
|
|
||||||
If you’re switching to Jekyll from another blogging system, Jekyll’s importers
|
If you’re switching to Jekyll from another blogging system, Jekyll’s importers
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Creating pages
|
title: Creating pages
|
||||||
prev_section: posts
|
prev_section: posts
|
||||||
next_section: variables
|
next_section: variables
|
||||||
|
permalink: /docs/pages/
|
||||||
---
|
---
|
||||||
|
|
||||||
In addition to [writing posts](../posts), another thing you may want to do with
|
In addition to [writing posts](../posts), another thing you may want to do with
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Pagination
|
title: Pagination
|
||||||
prev_section: permalinks
|
prev_section: permalinks
|
||||||
next_section: plugins
|
next_section: plugins
|
||||||
|
permalink: /docs/pagination/
|
||||||
---
|
---
|
||||||
|
|
||||||
With many websites—especially blogs—it’s very common to break the main listing
|
With many websites—especially blogs—it’s very common to break the main listing
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Permalinks
|
title: Permalinks
|
||||||
prev_section: templates
|
prev_section: templates
|
||||||
next_section: pagination
|
next_section: pagination
|
||||||
|
permalink: /docs/permalinks/
|
||||||
---
|
---
|
||||||
|
|
||||||
Jekyll supports a flexible way to build your site’s URLs. You can specify the
|
Jekyll supports a flexible way to build your site’s URLs. You can specify the
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Plugins
|
title: Plugins
|
||||||
prev_section: assets
|
prev_section: assets
|
||||||
next_section: extras
|
next_section: extras
|
||||||
|
permalink: /docs/plugins/
|
||||||
---
|
---
|
||||||
|
|
||||||
Jekyll has a plugin system with hooks that allow you to create custom generated
|
Jekyll has a plugin system with hooks that allow you to create custom generated
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Writing posts
|
title: Writing posts
|
||||||
prev_section: frontmatter
|
prev_section: frontmatter
|
||||||
next_section: pages
|
next_section: pages
|
||||||
|
permalink: /docs/posts/
|
||||||
---
|
---
|
||||||
|
|
||||||
One of Jekyll’s best aspects is that it is “blog aware”. What does this mean,
|
One of Jekyll’s best aspects is that it is “blog aware”. What does this mean,
|
||||||
|
|
@ -95,7 +96,7 @@ Linking to a PDF for readers to download:
|
||||||
It’s all well and good to have posts in a folder, but a blog is no use unless
|
It’s all well and good to have posts in a folder, but a blog is no use unless
|
||||||
you have a list of posts somewhere. Creating an index of posts on another page
|
you have a list of posts somewhere. Creating an index of posts on another page
|
||||||
(or in a [template](../templates)) is easy, thanks to the [Liquid template
|
(or in a [template](../templates)) is easy, thanks to the [Liquid template
|
||||||
language](http://liquidmarkup.org/) and its tags. Here’s a basic example of how
|
language](http://wiki.shopify.com/Liquid) and its tags. Here’s a basic example of how
|
||||||
to create a list of links to your blog posts:
|
to create a list of links to your blog posts:
|
||||||
|
|
||||||
{% highlight html %}
|
{% highlight html %}
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Resources
|
title: Resources
|
||||||
prev_section: sites
|
prev_section: sites
|
||||||
next_section: upgrading
|
next_section: upgrading
|
||||||
|
permalink: /docs/resources/
|
||||||
---
|
---
|
||||||
|
|
||||||
Jekyll’s growing use is producing a wide variety of tutorials, frameworks, extensions, examples, and other resources that can be very helpful. Below is a collection of links to some of the most popular Jekyll resources.
|
Jekyll’s growing use is producing a wide variety of tutorials, frameworks, extensions, examples, and other resources that can be very helpful. Below is a collection of links to some of the most popular Jekyll resources.
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Sites using Jekyll
|
title: Sites using Jekyll
|
||||||
prev_section: troubleshooting
|
prev_section: troubleshooting
|
||||||
next_section: resources
|
next_section: resources
|
||||||
|
permalink: /docs/sites/
|
||||||
---
|
---
|
||||||
|
|
||||||
It’s interesting to see what designs and features others have come up
|
It’s interesting to see what designs and features others have come up
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Directory structure
|
title: Directory structure
|
||||||
prev_section: usage
|
prev_section: usage
|
||||||
next_section: configuration
|
next_section: configuration
|
||||||
|
permalink: /docs/structure/
|
||||||
---
|
---
|
||||||
|
|
||||||
Jekyll is, at its core, a text transformation engine. The concept behind the
|
Jekyll is, at its core, a text transformation engine. The concept behind the
|
||||||
|
|
@ -3,9 +3,10 @@ layout: docs
|
||||||
title: Templates
|
title: Templates
|
||||||
prev_section: migrations
|
prev_section: migrations
|
||||||
next_section: permalinks
|
next_section: permalinks
|
||||||
|
permalink: /docs/templates/
|
||||||
---
|
---
|
||||||
|
|
||||||
Jekyll uses the [Liquid](http://www.liquidmarkup.org/) templating language to
|
Jekyll uses the [Liquid](http://wiki.shopify.com/Liquid) templating language to
|
||||||
process templates. All of the [standard Liquid tags and
|
process templates. All of the [standard Liquid tags and
|
||||||
filters](http://wiki.github.com/shopify/liquid/liquid-for-designers) are
|
filters](http://wiki.github.com/shopify/liquid/liquid-for-designers) are
|
||||||
supported, Jekyll even adds a few handy filters and tags of its own to make
|
supported, Jekyll even adds a few handy filters and tags of its own to make
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Troubleshooting
|
title: Troubleshooting
|
||||||
prev_section: contributing
|
prev_section: contributing
|
||||||
next_section: sites
|
next_section: sites
|
||||||
|
permalink: /docs/troubleshooting/
|
||||||
---
|
---
|
||||||
|
|
||||||
If you ever run into problems installing or using Jekyll, here’s a few tips that might be of help. If the problem you’re experiencing isn’t covered below, please [report an issue](https://github.com/mojombo/jekyll/issues/new) so the Jekyll community can make everyone’s experience better.
|
If you ever run into problems installing or using Jekyll, here’s a few tips that might be of help. If the problem you’re experiencing isn’t covered below, please [report an issue](https://github.com/mojombo/jekyll/issues/new) so the Jekyll community can make everyone’s experience better.
|
||||||
|
|
@ -2,10 +2,10 @@
|
||||||
layout: docs
|
layout: docs
|
||||||
title: Upgrading
|
title: Upgrading
|
||||||
prev_section: resources
|
prev_section: resources
|
||||||
next_section: changelist
|
permalink: /docs/upgrading/
|
||||||
---
|
---
|
||||||
|
|
||||||
Upgrading from an older version of Jekyll? A few things have changed in 1.0.0
|
Upgrading from an older version of Jekyll? A few things have changed in 1.0
|
||||||
that you'll want to know about.
|
that you'll want to know about.
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Basic Usage
|
title: Basic Usage
|
||||||
prev_section: installation
|
prev_section: installation
|
||||||
next_section: structure
|
next_section: structure
|
||||||
|
permalink: /docs/usage/
|
||||||
---
|
---
|
||||||
|
|
||||||
The Jekyll gem makes a `jekyll` executable available to you in your Terminal
|
The Jekyll gem makes a `jekyll` executable available to you in your Terminal
|
||||||
|
|
@ -3,6 +3,7 @@ layout: docs
|
||||||
title: Variables
|
title: Variables
|
||||||
prev_section: pages
|
prev_section: pages
|
||||||
next_section: migrations
|
next_section: migrations
|
||||||
|
permalink: /docs/variables/
|
||||||
---
|
---
|
||||||
|
|
||||||
Jekyll traverses your site looking for files to process. Any files with [YAML
|
Jekyll traverses your site looking for files to process. Any files with [YAML
|
||||||
|
|
@ -18,19 +18,19 @@ overview: true
|
||||||
<p>
|
<p>
|
||||||
No more databases, comment moderation, or pesky updates to install—just <em>your content</em>.
|
No more databases, comment moderation, or pesky updates to install—just <em>your content</em>.
|
||||||
</p>
|
</p>
|
||||||
<a href="{% post_url 2012-07-01-usage %}" class="">How Jekyll works →</a>
|
<a href="/docs/usage" class="">How Jekyll works →</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="unit one-third">
|
<div class="unit one-third">
|
||||||
<h2>Static</h2>
|
<h2>Static</h2>
|
||||||
<p><a href="http://daringfireball.net/projects/markdown/">Markdown</a> (or <a href="http://textile.sitemonks.com/">Textile</a>), <a href="http://liquidmarkup.org/">Liquid</a>, HTML <span class="amp">&</span> CSS go in. Static sites come out ready for deployment.</p>
|
<p><a href="http://daringfireball.net/projects/markdown/">Markdown</a> (or <a href="http://textile.sitemonks.com/">Textile</a>), <a href="http://wiki.shopify.com/Liquid">Liquid</a>, HTML <span class="amp">&</span> CSS go in. Static sites come out ready for deployment.</p>
|
||||||
<a href="{% post_url 2012-07-01-templates %}" class="">Jekyll template guide →</a>
|
<a href="/docs/templates" class="">Jekyll template guide →</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="unit one-third">
|
<div class="unit one-third">
|
||||||
<h2>Blog-aware</h2>
|
<h2>Blog-aware</h2>
|
||||||
<p>
|
<p>
|
||||||
Permalinks, categories, pages, posts, and custom layouts are all first-class citizens here.
|
Permalinks, categories, pages, posts, and custom layouts are all first-class citizens here.
|
||||||
</p>
|
</p>
|
||||||
<a href="{% post_url 2012-07-01-migrations %}" class="">Migrate your blog →</a>
|
<a href="/docs/migrations" class="">Migrate your blog →</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue