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

Merge pull request #3388 from chrisfinazzo/extra-spaces-are-for-animals

This commit is contained in:
Parker Moore 2015-01-31 11:26:18 -08:00
parent ec7d2ed5b6 ec397e1629
commit 922a92d67a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
site/_docs/contributing.md
View File

@ -97,7 +97,7 @@ You can find the documentation for jekyllrb.com in the
[site]({{ site.repository }}/tree/master/site) directory of [site]({{ site.repository }}/tree/master/site) directory of
Jekyll's repo on GitHub.com. Jekyll's repo on GitHub.com.
All documentation pull requests should be directed at `master`. Pull All documentation pull requests should be directed at `master`. Pull
requests directed at another branch will not be accepted. requests directed at another branch will not be accepted.
The [Jekyll wiki]({{ site.repository }}/wiki) on GitHub The [Jekyll wiki]({{ site.repository }}/wiki) on GitHub

2
site/_docs/drafts.md
View File

@ -15,5 +15,5 @@ first draft:
{% endhighlight %} {% endhighlight %}
To preview your site with drafts, simply run `jekyll serve` or `jekyll build` with To preview your site with drafts, simply run `jekyll serve` or `jekyll build` with
the `--drafts` switch. Each will be assigned the value modification time of the draft file the `--drafts` switch. Each will be assigned the value modification time of the draft file
for its date, and thus you will see currently edited drafts as the latest posts. for its date, and thus you will see currently edited drafts as the latest posts.

6
site/_docs/troubleshooting.md
View File

@ -101,9 +101,9 @@ http://localhost:4000/blog
The order of precedence for conflicting [configuration settings](../configuration/) The order of precedence for conflicting [configuration settings](../configuration/)
is as follows: is as follows:
1. Command-line flags 1. Command-line flags
2. Configuration file settings 2. Configuration file settings
3. Defaults 3. Defaults
That is: defaults are overridden by options specified in `_config.yml`, That is: defaults are overridden by options specified in `_config.yml`,
and flags specified at the command-line will override all other settings and flags specified at the command-line will override all other settings