From a151a16f09c6b23f331966d1a737c530454f5720 Mon Sep 17 00:00:00 2001 From: Tom Bell Date: Wed, 19 Dec 2012 18:23:34 +0000 Subject: [PATCH] Remove command options from default config Removing command line options from the config is a path towards cleaning up the configuration file and not including options which don't really belong there. --- lib/jekyll.rb | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 2b008f88..d7f011d3 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -51,26 +51,22 @@ require_all 'jekyll/tags' module Jekyll VERSION = '0.11.2' - # Default options. Overriden by values in _config.yml or command-line opts. + # Default options. Overriden by values in _config.yml. # Strings rather than symbols are used for compatability with YAML. DEFAULTS = { - 'safe' => false, - 'auto' => false, - 'server' => false, - 'server_port' => 4000, - 'source' => Dir.pwd, 'destination' => File.join(Dir.pwd, '_site'), + 'plugins' => File.join(Dir.pwd, '_plugins'), 'layouts' => '_layouts', - 'future' => true, - 'lsi' => false, - 'pygments' => false, - 'markdown' => 'maruku', - 'permalink' => 'date', - 'include' => ['.htaccess'], - 'paginate_path' => 'page:num', + 'future' => true, # remove and make true just default + 'pygments' => false, # remove and make true just default + + 'markdown' => 'maruku', # no longer a command option + 'permalink' => 'date', # no longer a command option + 'include' => ['.htaccess'], # no longer a command option + 'paginate_path' => 'page:num', # no longer a command option 'markdown_ext' => 'markdown,mkd,mkdn,md', 'textile_ext' => 'textile',