diff --git a/site/docs/upgrading.md b/site/docs/upgrading.md index 0999ce01..b2e44f5e 100644 --- a/site/docs/upgrading.md +++ b/site/docs/upgrading.md @@ -73,14 +73,14 @@ to one or more config files (comma-delimited, no spaces). * `--paginate`
-
The `--config` 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 +

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 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.

### Draft posts @@ -93,10 +93,11 @@ and add a new markdown file to it. To preview your new post, simply run the
Drafts don't have dates
-

Unlike posts, drafts don't have a date, since they haven't - 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 - post to eventually be titled, here `my-draft-post.md`.

+

+ Unlike posts, drafts don't have a date, since they haven't + 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 + post to eventually be titled, here `my-draft-post.md`.

### Baseurl