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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll/configuration.rb
View File

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

3
lib/jekyll/deprecator.rb
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, "--auto", "The switch '--auto' has been replaced with '--watch'."
arg_is_present? args, "--no-auto", "To disable auto-replication, simply leave off \ arg_is_present? args, "--no-auto", "To disable auto-replication, simply leave off \
the '--watch' switch." 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 \ arg_is_present? args, "--paginate", "The 'paginate' setting can only be set in your \
config files." config files."
arg_is_present? args, "--url", "The 'url' 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."

7
site/docs/installation.md
View File

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

4
site/docs/posts.md
View File

@ -139,8 +139,8 @@ your `excerpt_separator` to `""`.
## Highlighting code snippets ## Highlighting code snippets
Jekyll also has built-in support for syntax highlighting of code snippets using 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 either Pygments or Rouge, and including a code snippet in any post is easy. Just
code snippet in any post is easy. Just use the dedicated Liquid tag as follows: use the dedicated Liquid tag as follows:
{% highlight text %} {% highlight text %}
{% raw %}{% highlight ruby %}{% endraw %} {% raw %}{% highlight ruby %}{% endraw %}