Fix various typos and improve the doc

This commit is contained in:
Robin Dupret 2013-12-23 12:42:38 +01:00
parent cab9047de1
commit 3ca2cb0119
4 changed files with 9 additions and 7 deletions

View File

@ -213,7 +213,7 @@ module Jekyll
Jekyll.logger.warn "Deprecation:", "The 'pygments' configuration option" +
" has been renamed to 'highlighter'. Please update your" +
" config file accordingly. The allowed values are 'rouge', " +
"'pygments' or null"
"'pygments' or null."
config['highlighter'] = 'pygments' if config['pygments']
config.delete('pygments')

View File

@ -9,7 +9,8 @@ module Jekyll
arg_is_present? args, "--auto", "The switch '--auto' has been replaced with '--watch'."
arg_is_present? args, "--no-auto", "To disable auto-replication, simply leave off \
the '--watch' switch."
arg_is_present? args, "--pygments", "The 'pygments' setting has been removed"
arg_is_present? args, "--pygments", "The 'pygments'settings has been removed in \
favour of 'highlighter'."
arg_is_present? args, "--paginate", "The 'paginate' setting can only be set in your \
config files."
arg_is_present? args, "--url", "The 'url' setting can only be set in your config files."

View File

@ -66,9 +66,10 @@ Check out [the extras page](../extras/) for more information.
<h5>ProTip™: Enable Syntax Highlighting</h5>
<p>
If youre the kind of person who is using Jekyll, then chances are youll
want to enable syntax highlighting using Pygments or Rouge. You should
really <a href="../templates/#code_snippet_highlighting">check out how to
do that</a> before you go any further.
want to enable syntax highlighting using <a href="http://pygments.org/">Pygments</a>
or <a href="https://github.com/jayferd/rouge">Rouge</a>. You should really
<a href="../templates/#code_snippet_highlighting">check out how to
do that</a> before you go any farther.
</p>
</div>

View File

@ -139,8 +139,8 @@ your `excerpt_separator` to `""`.
## Highlighting code snippets
Jekyll also has built-in support for syntax highlighting of code snippets using
either Pygments or [Rouge](https://github.com/jayferd/rouge), and including a
code snippet in any post is easy. Just use the dedicated Liquid tag as follows:
either Pygments or Rouge, and including a code snippet in any post is easy. Just
use the dedicated Liquid tag as follows:
{% highlight text %}
{% raw %}{% highlight ruby %}{% endraw %}