From db5fa3d15e7fcde96d66f888c8854d6debcfd0bf Mon Sep 17 00:00:00 2001 From: Yi Zeng Date: Thu, 8 May 2014 14:56:15 +1200 Subject: [PATCH] Use symbol instead of HTML number in upgrading.md Fix case #2349 --- site/docs/upgrading.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/docs/upgrading.md b/site/docs/upgrading.md index 3cf5a1ef..3a3f1670 100644 --- a/site/docs/upgrading.md +++ b/site/docs/upgrading.md @@ -35,7 +35,7 @@ rebuild each time a file changes, just add the `--watch` flag at the end.

With the new subcommands, the way sites are previewed locally changed a bit. Instead of specifying `server: true` in the site's configuration file, use `jekyll serve`. The same hold's true for - `watch: true`. Instead, use the `--watch` flag with either `jekyll serve` + `watch: true`. Instead, use the `--watch` flag with either `jekyll serve` or `jekyll build`.

@@ -97,13 +97,13 @@ to one or more config files (comma-delimited, no spaces).
The config flag explicitly specifies your configuration file(s)
-

If you use the `--config` flag, Jekyll will ignore your - `_config.yml` file. Want to merge a custom configuration with the normal +

If you use the `--config` flag, Jekyll will ignore your + `_config.yml` file. Want to merge a custom configuration with the normal configuration? No problem. Jekyll will accept more than one custom config 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`, - the values in the config files on the right (`_config-dev.yml`) overwrite - those on the left (`_config.yml`) when both contain the same key.

+ that if I run `jekyll serve --config _config.yml,_config-dev.yml`, + the values in the config files on the right (`_config-dev.yml`) overwrite + those on the left (`_config.yml`) when both contain the same key.

### New Config File Options