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

Merge pull request #2351 from yizeng/#2349/fix-escaping

This commit is contained in:
Parker Moore 2014-05-08 21:08:04 -04:00
parent edfa1c8ecd db5fa3d15e
commit dd9e5668c2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
site/docs/upgrading.md
View File

@ -35,7 +35,7 @@ rebuild each time a file changes, just add the `--watch` flag at the end.
<p markdown="1">With the new subcommands, the way sites are previewed locally <p markdown="1">With the new subcommands, the way sites are previewed locally
changed a bit. Instead of specifying `server: true` in the site's changed a bit. Instead of specifying `server: true` in the site's
configuration file, use `jekyll serve`. The same hold's true for configuration file, use `jekyll serve`. The same hold's true for
`watch: true`. Instead, use the `&#45;&#45;watch` flag with either `jekyll serve` `watch: true`. Instead, use the `--watch` flag with either `jekyll serve`
or `jekyll build`.</p> or `jekyll build`.</p>
</div> </div>
@ -97,13 +97,13 @@ to one or more config files (comma-delimited, no spaces).
<div class="note info"> <div class="note info">
<h5>The config flag 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 `&#45;&#45;config` flag, Jekyll will ignore your <p markdown="1">If you use the `--config` flag, Jekyll will ignore your
`&#95;config.yml` file. Want to merge a custom configuration with the normal `_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 &#45;&#45;config &#95;config.yml,&#95;config-dev.yml`, that if I run `jekyll serve --config _config.yml,_config-dev.yml`,
the values in the config files on the right (`&#95;config-dev.yml`) overwrite the values in the config files on the right (`_config-dev.yml`) overwrite
those on the left (`&#95;config.yml`) when both contain the same key.</p> those on the left (`_config.yml`) when both contain the same key.</p>
</div> </div>
### New Config File Options ### New Config File Options