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

Make MaRuKu bend to our will.

This commit is contained in:
Parker Moore 2013-05-14 20:27:17 +02:00
parent 03887262a3
commit 3f21f87ccf
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
site/docs/upgrading.md
View File

@ -73,14 +73,14 @@ to one or more config files (comma-delimited, no spaces).
* `--paginate` * `--paginate`
<div class="note info"> <div class="note info">
<h5 markdown="1">The `--config` explicitly specifies your configuration file(s)</h5> <h5>The config flag explicitly specifies your configuration file(s)</h5>
<p markdown="1">If you use the `--config` flag, Jekyll will ignore your <p markdown="1">If you use the `&#45;&#45;config` flag, Jekyll will ignore your
`config.yml` file. Want to merge a custom configuration with the normal `&#95;config.yml` file. Want to merge a custom configuration with the normal
configuration? No problem. Jekyll will accept more than one custom config configuration? No problem. Jekyll will accept more than one custom config
file via the command line. Config files cascade from right to left, such file via the command line. Config files cascade from right to left, such
that if I run `jekyll serve --config config.yml,config-dev.yml`, that if I run `jekyll serve &#45;&#45;config &#95;config.yml,&#95;config-dev.yml`,
the values in the config files on the right (`config-dev.yml`) overwrite the values in the config files on the right (`&#95;config-dev.yml`) overwrite
those on the left (`config.yml`) when both contain the same key.</p> those on the left (`&#95;config.yml`) when both contain the same key.</p>
</div> </div>
### Draft posts ### Draft posts
@ -93,7 +93,8 @@ and add a new markdown file to it. To preview your new post, simply run the
<div class="note info"> <div class="note info">
<h5 markdown="1">Drafts don't have dates</h5> <h5 markdown="1">Drafts don't have dates</h5>
<p markdown="1">Unlike posts, drafts don't have a date, since they haven't <p markdown="1">
Unlike posts, drafts don't have a date, since they haven't
been published yet. Rather than naming your draft something like been published yet. Rather than naming your draft something like
`2013-07-01-my-draft-post.md`, simply name the file what you'd like your `2013-07-01-my-draft-post.md`, simply name the file what you'd like your
post to eventually be titled, here `my-draft-post.md`.</p> post to eventually be titled, here `my-draft-post.md`.</p>