From fe7f70d35c82e97a6d19ceb7b75393858709e0a5 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 16 Oct 2011 12:12:55 -0700 Subject: [PATCH] [docs] upgrade nanoc --- doc-src/Gemfile | 2 +- doc-src/Gemfile.lock | 19 +++++++------------ doc-src/layouts/partials/example.haml | 2 +- doc-src/layouts/reference.haml | 2 +- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/doc-src/Gemfile b/doc-src/Gemfile index 184436c3..e207f08e 100644 --- a/doc-src/Gemfile +++ b/doc-src/Gemfile @@ -1,6 +1,6 @@ source :gemcutter -gem 'nanoc3', :git => "git://github.com/chriseppstein/nanoc.git" +gem 'nanoc3' gem 'rdiscount' gem 'thor' gem 'rack' diff --git a/doc-src/Gemfile.lock b/doc-src/Gemfile.lock index 3b1322b2..23b07b0a 100644 --- a/doc-src/Gemfile.lock +++ b/doc-src/Gemfile.lock @@ -1,15 +1,8 @@ -GIT - remote: git://github.com/chriseppstein/nanoc.git - revision: 4eee0e60c5121b90498caa88605d416521553378 - specs: - nanoc3 (3.2.0a3) - cri (>= 1.0.0) - PATH remote: .. specs: - compass (0.11.1.93b89a2) - chunky_png (~> 1.1) + compass (0.11.5.38ccee8) + chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) @@ -18,11 +11,11 @@ GEM specs: activesupport (3.0.7) builder (2.1.2) - chunky_png (1.2.0) + chunky_png (1.2.5) coderay (0.9.7) compass-susy-plugin (0.9.beta.3) compass (>= 0.11.beta.3) - cri (1.0.1) + cri (2.0.2) css-slideshow (0.2.0) compass (>= 0.10.0.rc3) css_parser (1.0.1) @@ -31,6 +24,8 @@ GEM i18n (0.4.2) json (1.5.1) mime-types (1.16) + nanoc3 (3.2.2) + cri (~> 2.0) nokogiri (1.4.4) rack (1.2.2) rake (0.8.7) @@ -59,7 +54,7 @@ DEPENDENCIES haml (>= 3.1) json mime-types - nanoc3! + nanoc3 nokogiri rack rake diff --git a/doc-src/layouts/partials/example.haml b/doc-src/layouts/partials/example.haml index 557820c7..1b86ef56 100644 --- a/doc-src/layouts/partials/example.haml +++ b/doc-src/layouts/partials/example.haml @@ -4,7 +4,7 @@ %h1 Demo: #{@item[:title]} #demo= example_html -= yield += yield if block_given? #how %section#markup diff --git a/doc-src/layouts/reference.haml b/doc-src/layouts/reference.haml index cad6909c..67694fee 100644 --- a/doc-src/layouts/reference.haml +++ b/doc-src/layouts/reference.haml @@ -8,7 +8,7 @@ %p.beta This module is fairly new and is currently in BETA (β). -= yield += yield if block_given? %p This file can be imported using: