From e1f04968e8f5a18d9b09a8a86bc048061e77dcbc Mon Sep 17 00:00:00 2001 From: "Benjamin J. Balter" Date: Thu, 18 Apr 2013 10:10:59 -0400 Subject: [PATCH 01/17] Use pages for documentation, not posts, fixes #980. --- site/_config.yml | 1 - .../configuration.md} | 1 + .../contributing.md} | 1 + .../deployment-methods.md} | 1 + site/{_posts/2012-07-01-extras.md => docs/extras.md} | 1 + .../2012-07-01-frontmatter.md => docs/frontmatter.md} | 1 + .../github-pages.md} | 1 + site/{_posts/2012-07-01-heroku.md => docs/heroku.md} | 1 + site/docs/index.html | 11 ----------- site/{_posts/2012-07-01-home.md => docs/index.md} | 0 .../installation.md} | 1 + .../2012-07-01-migrations.md => docs/migrations.md} | 1 + site/{_posts/2012-07-01-pages.md => docs/pages.md} | 1 + .../2012-07-01-pagination.md => docs/pagination.md} | 1 + .../2012-07-01-permalinks.md => docs/permalinks.md} | 1 + .../{_posts/2012-07-01-plugins.md => docs/plugins.md} | 1 + site/{_posts/2012-07-01-posts.md => docs/posts.md} | 1 + .../2012-07-01-resources.md => docs/resources.md} | 1 + site/{_posts/2012-07-01-sites.md => docs/sites.md} | 1 + .../2012-07-01-structure.md => docs/structure.md} | 1 + .../2012-07-01-templates.md => docs/templates.md} | 1 + .../troubleshooting.md} | 1 + site/{_posts/2012-07-01-usage.md => docs/usage.md} | 1 + .../2012-07-01-variables.md => docs/variables.md} | 1 + 24 files changed, 21 insertions(+), 12 deletions(-) rename site/{_posts/2012-07-01-configuration.md => docs/configuration.md} (99%) rename site/{_posts/2012-07-01-contributing.md => docs/contributing.md} (99%) rename site/{_posts/2012-07-01-deployment-methods.md => docs/deployment-methods.md} (99%) rename site/{_posts/2012-07-01-extras.md => docs/extras.md} (99%) rename site/{_posts/2012-07-01-frontmatter.md => docs/frontmatter.md} (99%) rename site/{_posts/2012-07-01-github-pages.md => docs/github-pages.md} (98%) rename site/{_posts/2012-07-01-heroku.md => docs/heroku.md} (84%) delete mode 100644 site/docs/index.html rename site/{_posts/2012-07-01-home.md => docs/index.md} (100%) rename site/{_posts/2012-07-01-installation.md => docs/installation.md} (98%) rename site/{_posts/2012-07-01-migrations.md => docs/migrations.md} (99%) rename site/{_posts/2012-07-01-pages.md => docs/pages.md} (99%) rename site/{_posts/2012-07-01-pagination.md => docs/pagination.md} (99%) rename site/{_posts/2012-07-01-permalinks.md => docs/permalinks.md} (99%) rename site/{_posts/2012-07-01-plugins.md => docs/plugins.md} (99%) rename site/{_posts/2012-07-01-posts.md => docs/posts.md} (99%) rename site/{_posts/2012-07-01-resources.md => docs/resources.md} (99%) rename site/{_posts/2012-07-01-sites.md => docs/sites.md} (97%) rename site/{_posts/2012-07-01-structure.md => docs/structure.md} (99%) rename site/{_posts/2012-07-01-templates.md => docs/templates.md} (99%) rename site/{_posts/2012-07-01-troubleshooting.md => docs/troubleshooting.md} (99%) rename site/{_posts/2012-07-01-usage.md => docs/usage.md} (98%) rename site/{_posts/2012-07-01-variables.md => docs/variables.md} (99%) diff --git a/site/_config.yml b/site/_config.yml index 2de2c7ff..a80e7c40 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -1,3 +1,2 @@ -permalink: /docs/:categories/:title pygments: true gauges_id: 503c5af6613f5d0f19000027 diff --git a/site/_posts/2012-07-01-configuration.md b/site/docs/configuration.md similarity index 99% rename from site/_posts/2012-07-01-configuration.md rename to site/docs/configuration.md index 1556d449..07fc5afc 100644 --- a/site/_posts/2012-07-01-configuration.md +++ b/site/docs/configuration.md @@ -3,6 +3,7 @@ layout: docs title: Configuration prev_section: structure next_section: frontmatter +permalink: /docs/configuration/ --- Jekyll allows you to concoct your sites in any way you can dream up, and it’s diff --git a/site/_posts/2012-07-01-contributing.md b/site/docs/contributing.md similarity index 99% rename from site/_posts/2012-07-01-contributing.md rename to site/docs/contributing.md index dcab4ffa..cc3754a4 100644 --- a/site/_posts/2012-07-01-contributing.md +++ b/site/docs/contributing.md @@ -3,6 +3,7 @@ layout: docs title: Contributing prev_section: deployment-methods next_section: troubleshooting +permalink: /docs/contributing/ --- So you've got an awesome idea to throw into Jekyll. Great! Please keep the diff --git a/site/_posts/2012-07-01-deployment-methods.md b/site/docs/deployment-methods.md similarity index 99% rename from site/_posts/2012-07-01-deployment-methods.md rename to site/docs/deployment-methods.md index 80b55ae3..dd4369ce 100644 --- a/site/_posts/2012-07-01-deployment-methods.md +++ b/site/docs/deployment-methods.md @@ -3,6 +3,7 @@ layout: docs title: Deployment methods prev_section: github-pages 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. diff --git a/site/_posts/2012-07-01-extras.md b/site/docs/extras.md similarity index 99% rename from site/_posts/2012-07-01-extras.md rename to site/docs/extras.md index 2ac89e32..5f340fc4 100644 --- a/site/_posts/2012-07-01-extras.md +++ b/site/docs/extras.md @@ -3,6 +3,7 @@ layout: docs title: Extras prev_section: plugins next_section: github-pages +permalink: /docs/extras/ --- There are a number of (optional) extra features that Jekyll supports that you diff --git a/site/_posts/2012-07-01-frontmatter.md b/site/docs/frontmatter.md similarity index 99% rename from site/_posts/2012-07-01-frontmatter.md rename to site/docs/frontmatter.md index 337a7388..3591e8e9 100644 --- a/site/_posts/2012-07-01-frontmatter.md +++ b/site/docs/frontmatter.md @@ -3,6 +3,7 @@ layout: docs title: Front-matter prev_section: configuration next_section: posts +permalink: /docs/frontmatter/ --- The front-matter is where Jekyll starts to get really cool. Any file that diff --git a/site/_posts/2012-07-01-github-pages.md b/site/docs/github-pages.md similarity index 98% rename from site/_posts/2012-07-01-github-pages.md rename to site/docs/github-pages.md index 67f49403..fec89e73 100644 --- a/site/_posts/2012-07-01-github-pages.md +++ b/site/docs/github-pages.md @@ -3,6 +3,7 @@ layout: docs title: GitHub Pages prev_section: extras next_section: deployment-methods +permalink: /docs/github-pages/ --- [GitHub Pages](https://pages.github.com) are public web pages for users, diff --git a/site/_posts/2012-07-01-heroku.md b/site/docs/heroku.md similarity index 84% rename from site/_posts/2012-07-01-heroku.md rename to site/docs/heroku.md index 091239c5..84b448b6 100644 --- a/site/_posts/2012-07-01-heroku.md +++ b/site/docs/heroku.md @@ -3,6 +3,7 @@ layout: docs title: Heroku prev_section: github-pages next_section: manual-deployment +permalink: /docs/heroku/ --- Move along, people. Nothing to see here. diff --git a/site/docs/index.html b/site/docs/index.html deleted file mode 100644 index 95b00547..00000000 --- a/site/docs/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - Jekyll - - - - - diff --git a/site/_posts/2012-07-01-home.md b/site/docs/index.md similarity index 100% rename from site/_posts/2012-07-01-home.md rename to site/docs/index.md diff --git a/site/_posts/2012-07-01-installation.md b/site/docs/installation.md similarity index 98% rename from site/_posts/2012-07-01-installation.md rename to site/docs/installation.md index 33f111be..2dd2d60f 100644 --- a/site/_posts/2012-07-01-installation.md +++ b/site/docs/installation.md @@ -3,6 +3,7 @@ layout: docs title: Installation prev_section: home next_section: usage +permalink: /docs/installation/ --- Getting Jekyll installed and ready-to-go should only take a few minutes. If it diff --git a/site/_posts/2012-07-01-migrations.md b/site/docs/migrations.md similarity index 99% rename from site/_posts/2012-07-01-migrations.md rename to site/docs/migrations.md index e4d85dea..c3e6c987 100644 --- a/site/_posts/2012-07-01-migrations.md +++ b/site/docs/migrations.md @@ -3,6 +3,7 @@ layout: docs title: Blog migrations prev_section: variables next_section: templates +permalink: /docs/migrations/ --- If you’re switching to Jekyll from another blogging system, Jekyll’s importers diff --git a/site/_posts/2012-07-01-pages.md b/site/docs/pages.md similarity index 99% rename from site/_posts/2012-07-01-pages.md rename to site/docs/pages.md index c78d6145..36474677 100644 --- a/site/_posts/2012-07-01-pages.md +++ b/site/docs/pages.md @@ -3,6 +3,7 @@ layout: docs title: Creating pages prev_section: posts next_section: variables +permalink: /docs/pages/ --- In addition to [writing posts](../posts), another thing you may want to do with diff --git a/site/_posts/2012-07-01-pagination.md b/site/docs/pagination.md similarity index 99% rename from site/_posts/2012-07-01-pagination.md rename to site/docs/pagination.md index f1710d99..ec76b287 100644 --- a/site/_posts/2012-07-01-pagination.md +++ b/site/docs/pagination.md @@ -3,6 +3,7 @@ layout: docs title: Pagination prev_section: permalinks next_section: plugins +permalink: /docs/pagination/ --- With many websites—especially blogs—it’s very common to break the main listing diff --git a/site/_posts/2012-07-01-permalinks.md b/site/docs/permalinks.md similarity index 99% rename from site/_posts/2012-07-01-permalinks.md rename to site/docs/permalinks.md index b0a7c8cf..7f3b065a 100644 --- a/site/_posts/2012-07-01-permalinks.md +++ b/site/docs/permalinks.md @@ -3,6 +3,7 @@ layout: docs title: Permalinks prev_section: templates next_section: pagination +permalink: /docs/permalinks/ --- Jekyll supports a flexible way to build your site’s URLs. You can specify the diff --git a/site/_posts/2012-07-01-plugins.md b/site/docs/plugins.md similarity index 99% rename from site/_posts/2012-07-01-plugins.md rename to site/docs/plugins.md index e41f1bbc..e32c6fa8 100644 --- a/site/_posts/2012-07-01-plugins.md +++ b/site/docs/plugins.md @@ -3,6 +3,7 @@ layout: docs title: Plugins prev_section: assets next_section: extras +permalink: /docs/plugins/ --- Jekyll has a plugin system with hooks that allow you to create custom generated diff --git a/site/_posts/2012-07-01-posts.md b/site/docs/posts.md similarity index 99% rename from site/_posts/2012-07-01-posts.md rename to site/docs/posts.md index 80f6256e..27194bbe 100644 --- a/site/_posts/2012-07-01-posts.md +++ b/site/docs/posts.md @@ -3,6 +3,7 @@ layout: docs title: Writing posts prev_section: frontmatter next_section: pages +permalink: /docs/posts/ --- One of Jekyll’s best aspects is that it is “blog aware”. What does this mean, diff --git a/site/_posts/2012-07-01-resources.md b/site/docs/resources.md similarity index 99% rename from site/_posts/2012-07-01-resources.md rename to site/docs/resources.md index c14c584c..640b2343 100644 --- a/site/_posts/2012-07-01-resources.md +++ b/site/docs/resources.md @@ -2,6 +2,7 @@ layout: docs title: Resources prev_section: sites +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. diff --git a/site/_posts/2012-07-01-sites.md b/site/docs/sites.md similarity index 97% rename from site/_posts/2012-07-01-sites.md rename to site/docs/sites.md index f28c0280..b5f24836 100644 --- a/site/_posts/2012-07-01-sites.md +++ b/site/docs/sites.md @@ -3,6 +3,7 @@ layout: docs title: Sites using Jekyll prev_section: troubleshooting next_section: resources +permalink: /docs/sites/ --- It’s interesting to see what designs and features others have come up diff --git a/site/_posts/2012-07-01-structure.md b/site/docs/structure.md similarity index 99% rename from site/_posts/2012-07-01-structure.md rename to site/docs/structure.md index 4401373d..2b80e08b 100644 --- a/site/_posts/2012-07-01-structure.md +++ b/site/docs/structure.md @@ -3,6 +3,7 @@ layout: docs title: Directory structure prev_section: usage next_section: configuration +permalink: /docs/structure/ --- Jekyll is, at its core, a text transformation engine. The concept behind the diff --git a/site/_posts/2012-07-01-templates.md b/site/docs/templates.md similarity index 99% rename from site/_posts/2012-07-01-templates.md rename to site/docs/templates.md index d6792ff6..d3e54256 100644 --- a/site/_posts/2012-07-01-templates.md +++ b/site/docs/templates.md @@ -3,6 +3,7 @@ layout: docs title: Templates prev_section: migrations next_section: permalinks +permalink: /docs/templates/ --- Jekyll uses the [Liquid](http://www.liquidmarkup.org/) templating language to diff --git a/site/_posts/2012-07-01-troubleshooting.md b/site/docs/troubleshooting.md similarity index 99% rename from site/_posts/2012-07-01-troubleshooting.md rename to site/docs/troubleshooting.md index 08dac8e8..dc5ecb50 100644 --- a/site/_posts/2012-07-01-troubleshooting.md +++ b/site/docs/troubleshooting.md @@ -3,6 +3,7 @@ layout: docs title: Troubleshooting prev_section: contributing 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. diff --git a/site/_posts/2012-07-01-usage.md b/site/docs/usage.md similarity index 98% rename from site/_posts/2012-07-01-usage.md rename to site/docs/usage.md index 7088f8c3..4ff25e02 100644 --- a/site/_posts/2012-07-01-usage.md +++ b/site/docs/usage.md @@ -3,6 +3,7 @@ layout: docs title: Basic Usage prev_section: installation next_section: structure +permalink: /docs/usage/ --- The Jekyll gem makes a `jekyll` executable available to you in your Terminal diff --git a/site/_posts/2012-07-01-variables.md b/site/docs/variables.md similarity index 99% rename from site/_posts/2012-07-01-variables.md rename to site/docs/variables.md index 3188ec28..d4539cc0 100644 --- a/site/_posts/2012-07-01-variables.md +++ b/site/docs/variables.md @@ -3,6 +3,7 @@ layout: docs title: Variables prev_section: pages next_section: migrations +permalink: /docs/variables/ --- Jekyll traverses your site looking for files to process. Any files with [YAML From 7977c5ed1b80f9f2d1e8ad5d03d704a1caefdc3c Mon Sep 17 00:00:00 2001 From: Marcus Stollsteimer Date: Thu, 9 May 2013 13:26:29 +0200 Subject: [PATCH 02/17] Update to kramdown 1.0.2 --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index f94413a7..50b20188 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency('classifier', "~> 1.3") s.add_runtime_dependency('directory_watcher', "~> 1.4.1") 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('commander', "~> 4.1.3") s.add_runtime_dependency('safe_yaml', "~> 0.7.0") From 3fbddc583c36981c49b3050af41a7cb6f2482383 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 9 May 2013 13:48:34 +0200 Subject: [PATCH 03/17] Update history to reflect merge of #1067 --- History.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/History.markdown b/History.markdown index 9f50a6b6..a9f6a3ff 100644 --- a/History.markdown +++ b/History.markdown @@ -1,6 +1,8 @@ ## HEAD ### Major Enhancements ### Minor Enhancements + * Update Kramdown version to 1.0.2 (#1067) + ### Bug Fixes * Catching that Redcarpet gem isn't installed (#1059) From 8d0543d54c884539495443599368e6c008bb16c4 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Thu, 9 May 2013 13:51:13 +0200 Subject: [PATCH 04/17] Bump pygments.rb version to 0.5.0 --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index 50b20188..1c979018 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency('directory_watcher', "~> 1.4.1") s.add_runtime_dependency('maruku', "~> 0.5") 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('safe_yaml', "~> 0.7.0") s.add_runtime_dependency('colorator', "~> 0.1") From 012717ed0434c518989f60fb5a538a5b3d4b64de Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 9 May 2013 13:51:55 +0200 Subject: [PATCH 05/17] Update history to reflect merge of #1061. --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index a9f6a3ff..59755cfa 100644 --- a/History.markdown +++ b/History.markdown @@ -1,6 +1,7 @@ ## HEAD ### Major Enhancements ### Minor Enhancements + * Update pygments.rb version to 0.5.0 (#1061) * Update Kramdown version to 1.0.2 (#1067) ### Bug Fixes From 07d87b2cc041bd2f50f1d3b1370f06412d5d5310 Mon Sep 17 00:00:00 2001 From: zachgersh Date: Fri, 10 May 2013 08:53:47 -0700 Subject: [PATCH 06/17] Changed link to liquid, was going to a dead link and it really bothered me. --- site/_posts/2012-07-01-templates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_posts/2012-07-01-templates.md b/site/_posts/2012-07-01-templates.md index 8519090a..349bc38c 100644 --- a/site/_posts/2012-07-01-templates.md +++ b/site/_posts/2012-07-01-templates.md @@ -5,7 +5,7 @@ prev_section: migrations next_section: permalinks --- -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 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 From 7a2a9d36a7625a0ac1620a8d4363e84e8a96dc27 Mon Sep 17 00:00:00 2001 From: zachgersh Date: Fri, 10 May 2013 08:59:56 -0700 Subject: [PATCH 07/17] Corrected additional liquid link on the Welcome page. --- site/_posts/2012-07-01-home.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/_posts/2012-07-01-home.md b/site/_posts/2012-07-01-home.md index b6aaa048..41fb5fda 100644 --- a/site/_posts/2012-07-01-home.md +++ b/site/_posts/2012-07-01-home.md @@ -15,7 +15,8 @@ development of Jekyll itself. Jekyll is a simple, blog-aware, static site generator. It takes a template directory containing raw text files in various formats, runs it through [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 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 From 29c165ef4c1547cc06448d75d66dfb8d8e728665 Mon Sep 17 00:00:00 2001 From: zachgersh Date: Fri, 10 May 2013 09:13:18 -0700 Subject: [PATCH 08/17] Changed the liquid link in posts. --- site/_posts/2012-07-01-posts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_posts/2012-07-01-posts.md b/site/_posts/2012-07-01-posts.md index 80f6256e..f0712915 100644 --- a/site/_posts/2012-07-01-posts.md +++ b/site/_posts/2012-07-01-posts.md @@ -95,7 +95,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 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 -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: {% highlight html %} From 59f2a41ced0aea86c02c1ddeddb6567756034d32 Mon Sep 17 00:00:00 2001 From: zachgersh Date: Fri, 10 May 2013 09:15:56 -0700 Subject: [PATCH 09/17] Changed liquid link of the homepage. --- site/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/index.html b/site/index.html index 0fd8317d..b01aea28 100644 --- a/site/index.html +++ b/site/index.html @@ -22,7 +22,7 @@ overview: true

Static

-

Markdown (or Textile), Liquid, HTML & CSS go in. Static sites come out ready for deployment.

+

Markdown (or Textile), Liquid, HTML & CSS go in. Static sites come out ready for deployment.

Jekyll template guide →
From 65a1b33f6c05bba1b818a0cc7a230d665d3c4599 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 10 May 2013 21:55:57 +0200 Subject: [PATCH 10/17] Update history to reflect merge of #1073. --- History.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/History.markdown b/History.markdown index 59755cfa..6f61d677 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,8 @@ * Catching that Redcarpet gem isn't installed (#1059) ### Site Enhancements + * Updated links to Liquid documentation (#1073) + ### Development Fixes ## 1.0.1 / 2013-05-08 From 6bd7feeaa876d899f16f6be517c18478a2771491 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 10 May 2013 22:13:32 +0200 Subject: [PATCH 11/17] Update history to reflect merge of #985. Closes #980. --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 6f61d677..dd9e4bd6 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,7 @@ * Catching that Redcarpet gem isn't installed (#1059) ### Site Enhancements + * Move pages to be Pages for realz (#985) * Updated links to Liquid documentation (#1073) ### Development Fixes From d8070ec6be922145e341d7f57d407428fb4e2941 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 10 May 2013 22:55:01 +0200 Subject: [PATCH 12/17] Make Upgrading docs page a Page. --- site/{_posts/2012-07-01-upgrading.md => docs/upgrading.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site/{_posts/2012-07-01-upgrading.md => docs/upgrading.md} (100%) diff --git a/site/_posts/2012-07-01-upgrading.md b/site/docs/upgrading.md similarity index 100% rename from site/_posts/2012-07-01-upgrading.md rename to site/docs/upgrading.md From 23087b9c3f987ad7e05907a671b530ba31e1c928 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 10 May 2013 22:55:27 +0200 Subject: [PATCH 13/17] Add permalink to docs/upgrading/ --- site/docs/upgrading.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/docs/upgrading.md b/site/docs/upgrading.md index b8288d84..7321ebec 100644 --- a/site/docs/upgrading.md +++ b/site/docs/upgrading.md @@ -2,6 +2,7 @@ layout: docs title: Upgrading prev_section: resources +permalink: /docs/upgrading/ --- Upgrading from an older version of Jekyll? A few things have changed in 1.0.0 From 9530e56176ab9fbec6fa0e15047c38c921761bc8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 10 May 2013 22:57:51 +0200 Subject: [PATCH 14/17] Fix links to /docs/ in the site. --- site/_includes/docs_contents.html | 2 +- site/_includes/docs_contents_mobile.html | 2 +- site/docs/installation.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site/_includes/docs_contents.html b/site/_includes/docs_contents.html index 4575f9ef..3f123550 100644 --- a/site/_includes/docs_contents.html +++ b/site/_includes/docs_contents.html @@ -3,7 +3,7 @@

Getting Started

  • - Welcome + Welcome
  • Installation diff --git a/site/_includes/docs_contents_mobile.html b/site/_includes/docs_contents_mobile.html index 30446d4d..0004668f 100644 --- a/site/_includes/docs_contents_mobile.html +++ b/site/_includes/docs_contents_mobile.html @@ -2,7 +2,7 @@ - + diff --git a/site/docs/index.md b/site/docs/index.md index 41fb5fda..5129643a 100644 --- a/site/docs/index.md +++ b/site/docs/index.md @@ -2,6 +2,7 @@ layout: docs title: Welcome next_section: installation +permalink: /docs/home/ --- This site aims to be a comprehensive guide to Jekyll. We’ll cover topics such diff --git a/site/docs/installation.md b/site/docs/installation.md index 7c08e60c..8c830b75 100644 --- a/site/docs/installation.md +++ b/site/docs/installation.md @@ -1,7 +1,7 @@ --- layout: docs title: Installation -prev_section: "" +prev_section: home next_section: usage permalink: /docs/installation/ --- From fdceb50595bc374db0ab5f81c3c46e8f7aac9a9f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 10 May 2013 23:09:12 +0200 Subject: [PATCH 16/17] Can't use post_url to ask for the url's of the docs anymore. --- site/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/index.html b/site/index.html index b01aea28..d96c7868 100644 --- a/site/index.html +++ b/site/index.html @@ -18,19 +18,19 @@ overview: true

    No more databases, comment moderation, or pesky updates to install—just your content.

    - How Jekyll works → + How Jekyll works →

Static

Markdown (or Textile), Liquid, HTML & CSS go in. Static sites come out ready for deployment.

- Jekyll template guide → + Jekyll template guide →

Blog-aware

Permalinks, categories, pages, posts, and custom layouts are all first-class citizens here.

- Migrate your blog → + Migrate your blog →
From d675ef6662bb2628ad6a6fbb7378c9e6da496b7d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 10 May 2013 23:28:42 +0200 Subject: [PATCH 17/17] Fixed some things on the site. --- site/_includes/primary-nav-items.html | 4 ++-- site/docs/upgrading.md | 2 +- site/index.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/site/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html index 6d6556f5..57956ae0 100644 --- a/site/_includes/primary-nav-items.html +++ b/site/_includes/primary-nav-items.html @@ -3,9 +3,9 @@ Overview
  • - Docsumentation + Docsumentation
  • View on GitHub
    • - \ No newline at end of file + diff --git a/site/docs/upgrading.md b/site/docs/upgrading.md index 7321ebec..6c5b42d2 100644 --- a/site/docs/upgrading.md +++ b/site/docs/upgrading.md @@ -5,7 +5,7 @@ prev_section: resources 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. diff --git a/site/index.html b/site/index.html index d96c7868..93203ebd 100644 --- a/site/index.html +++ b/site/index.html @@ -30,7 +30,7 @@ overview: true

    Permalinks, categories, pages, posts, and custom layouts are all first-class citizens here.

    - Migrate your blog → + Migrate your blog →