Fix cascade problem with site.baseurl. Fixes #931.

2013-04-07 22:47:55 +02:00 · 2013-04-07 22:47:55 +02:00 · 1526aa3b1d
parent 5fe31bcbca
commit 1526aa3b1d
2 changed files with 1 additions and 2 deletions
--- a/bin/jekyll
+++ b/bin/jekyll
@ -77,7 +77,6 @@ command :serve do |c|
  c.action do |args, options|
    options.default :port => '4000',
                    :host => '0.0.0.0',
-                    :baseurl => '/',
                    :serving => true

    options = normalize_options(options.__hash__)
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@ -68,7 +68,7 @@ module Jekyll

    'markdown'      => 'maruku',
    'permalink'     => 'date',
-    'baseurl'       => '',
+    'baseurl'       => '/',
    'include'       => ['.htaccess'],
    'paginate_path' => 'page:num',