dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1247 from mojombo/jekyll-new-redcarpet 

Complete the transition to Redcarpet for new sites
This commit is contained in:
Parker Moore 2013-06-27 11:18:21 -07:00
parent 744cc3c001 90962a5acc
commit 15bb9c6759
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jekyll.gemspec
View File

@ -32,6 +32,7 @@ Gem::Specification.new do |s|
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")
s.add_runtime_dependency('redcarpet', "~> 2.2.2")
s.add_development_dependency('rake', "~> 10.0.3") s.add_development_dependency('rake', "~> 10.0.3")
s.add_development_dependency('rdoc', "~> 3.11") s.add_development_dependency('rdoc', "~> 3.11")
@ -41,7 +42,6 @@ Gem::Specification.new do |s|
s.add_development_dependency('cucumber', "~> 1.2.1", '!= 1.2.4') s.add_development_dependency('cucumber', "~> 1.2.1", '!= 1.2.4')
s.add_development_dependency('RedCloth', "~> 4.2") s.add_development_dependency('RedCloth', "~> 4.2")
s.add_development_dependency('rdiscount', "~> 1.6") s.add_development_dependency('rdiscount', "~> 1.6")
s.add_development_dependency('redcarpet', "~> 2.2.2")
s.add_development_dependency('launchy', "~> 2.1.2") s.add_development_dependency('launchy', "~> 2.1.2")
s.add_development_dependency('simplecov', "~> 0.7") s.add_development_dependency('simplecov', "~> 0.7")
s.add_development_dependency('simplecov-gem-adapter', "~> 1.0.1") s.add_development_dependency('simplecov-gem-adapter', "~> 1.0.1")

8
site/docs/quickstart.md
View File

@ -18,4 +18,10 @@ For the impatient, here's how to get a boilerplate Jekyll site up and running.
That's nothing, though. The real magic happens when you start creating blog That's nothing, though. The real magic happens when you start creating blog
posts, using the front-matter to control templates and layouts, and taking posts, using the front-matter to control templates and layouts, and taking
advantage of all the awesome configuration options Jekyll makes available. advantage of all the awesome configuration options Jekyll makes available.
<div class="note info">
<h5>Redcarpet is the default Markdown engine for new sites</h5>
<p>In Jekyll 1.1, we switched the default markdown engine for sites
generated with <code>jekyll new</code> to Redcarpet</p>
</div>