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

clean up language a bit to clarify meaning

This commit is contained in:
Benjamin J. Balter 2013-04-14 13:11:37 -04:00
parent 37f332d58e
commit f4c61e59a6
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
site/_posts/2012-07-01-upgrading.md
View File

@ -9,27 +9,29 @@ Upgrading from an older version of Jekyll? A few things have changed in 1.0.
### The Jekyll Command ### The Jekyll Command
For better clarity, Jekyll now accepts the commands `build` and `serve`. For better clarity, Jekyll now accepts the commands `build` and `serve`.
Rather than just `jekyll` and `jekyll --serve`. If you want Jekyll to Whereas before you might simply run the command `jekyll` to generate a site
automatically rebuild each time a file changes, just add the `--watch` flag. and `jekyll --serve` to view it locally, now use the subcommands `jekyll build`
and `jekyll serve` to do the same. And if you want Jekyll to automatically
rebuild each time a file changes, just add the `--watch` flag at the end.
### Custom Config File ### Custom Config File
Rather than passing individual flags via the command line, you can now pass an Rather than passing individual flags via the command line, you can now pass an
entire custom Jekyll config file. This helps to distinguish between entire custom Jekyll config file. This helps to distinguish between
environments, or lets you programmatically override user-specified defaults. environments, or lets you programmatically override user-specified defaults.
Simply add the `--config` flag, followed by the path to one or more config Simply add the `--config` flag to the `jekyll` command, followed by the path
files. to one or more config files.
<div class="note info"> <div class="note info">
<h5 mardown="1">The `--config` flag overrides your `_config.yml` file</h5> <h5 mardown="1">The `--config` flag overrides your `_config.yml` file</h5>
<p markdown="1">If you use the `--config` flag, Jekyll will ignore your <p markdown="1">If you use the `--config` flag, Jekyll will ignore your
`_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. Simply pass the URL to both files with the latter file via the command line. Simply pass the path to both files with the latter
file overriding the first.</p> file overriding the former.</p>
</div> </div>
#### As a result, the following command line flags are deprecated: #### As a result, the following command line flags are now deprecated:
* `--no-server` * `--no-server`
* `--no-auto` * `--no-auto`