{{ page.title }}
{{ content }}
-
+
-Use Jekyll.configuration to build a full configuration for use w/Jekyll.
Whatever: foo.bar
\nJekyll.sanitized_path is used to make sure your path is in your source.
Run your generators! default
\nPage without title.
\nRun your generators! default
" in "_site/index.html" + And I should see "Collections:Use Jekyll.configuration to build a full configuration for use w/Jekyll.
Whatever: foo.bar
\nSigns are nice
\nJekyll.sanitized_path is used to make sure your path is in your source.
Run your generators! default
\nPage without title.
\nRun your generators! default
" in "_site/index.html" And the "_site/methods/configuration.html" file should not exist Scenario: Rendered collection @@ -70,7 +70,7 @@ Feature: Collections """ When I run jekyll build Then the _site directory should exist - And I should see "Collections: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" + And I should see "Collections: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" Scenario: Collections specified as an hash Given I have an "index.html" page that contains "Collections: {% for method in site.methods %}{{ method.relative_path }} {% endfor %}" @@ -82,7 +82,7 @@ Feature: Collections """ When I run jekyll build Then the _site directory should exist - And I should see "Collections: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" + And I should see "Collections: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" Scenario: All the documents Given I have an "index.html" page that contains "All documents: {% for doc in site.documents %}{{ doc.relative_path }} {% endfor %}" @@ -94,7 +94,7 @@ Feature: Collections """ When I run jekyll build Then the _site directory should exist - And I should see "All documents: _methods/configuration.md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" + And I should see "All documents: _methods/configuration.md _methods/escape-\+ #%20\[\].md _methods/sanitized_path.md _methods/site/generate.md _methods/site/initialize.md _methods/um_hi.md" in "_site/index.html" Scenario: Documents have an output attribute, which is the converted HTML Given I have an "index.html" page that contains "First document's output: {{ site.documents.first.output }}" @@ -118,7 +118,7 @@ Feature: Collections """ When I run jekyll build Then the _site directory should exist - And I should see "Item count: 1" in "_site/index.html" + And I should see "Item count: 2" in "_site/index.html" Scenario: Sort by title Given I have an "index.html" page that contains "{% assign items = site.methods | sort: 'title' %}1. of {{ items.size }}: {{ items.first.output }}" @@ -130,7 +130,7 @@ Feature: Collections """ When I run jekyll build Then the _site directory should exist - And I should see "1. of 5:Page without title.
" in "_site/index.html" + And I should see "1. of 7:Page without title.
" in "_site/index.html" Scenario: Sort by relative_path Given I have an "index.html" page that contains "Collections: {% assign methods = site.methods | sort: 'relative_path' %}{% for method in methods %}{{ method.title }}, {% endfor %}" @@ -142,4 +142,4 @@ Feature: Collections """ When I run jekyll build Then the _site directory should exist - And I should see "Collections: Jekyll.configuration, Jekyll.sanitized_path, Site#generate, , Site#generate," in "_site/index.html" + And I should see "Collections: Jekyll.configuration, Jekyll.escape, Jekyll.sanitized_path, Site#generate, , Site#generate," in "_site/index.html" diff --git a/features/drafts.feature b/features/drafts.feature index c55edbb9..5d7982ec 100644 --- a/features/drafts.feature +++ b/features/drafts.feature @@ -43,4 +43,4 @@ Feature: Draft Posts | Recipe | 2009-03-27 | simple | Post path: {{ page.path }} | When I run jekyll build --drafts Then the _site directory should exist - And I should see "Post path: _drafts/recipe.textile" in "_site/recipe.html" + And I should see "Post path: _drafts/recipe.markdown" in "_site/recipe.html" diff --git a/features/embed_filters.feature b/features/embed_filters.feature index 889a1fc7..d6f99fc7 100644 --- a/features/embed_filters.feature +++ b/features/embed_filters.feature @@ -20,8 +20,6 @@ Feature: Embed filters And I have the following post: | title | date | layout | content | | Star & Wars | 2009-03-27 | default | These aren't the droids you're looking for. | - - And I have a default layout that contains "{{ page.title | xml_escape }}" When I run jekyll build Then the _site directory should exist @@ -33,7 +31,7 @@ Feature: Embed filters And I have the following post: | title | date | layout | content | | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. | - And I have a default layout that contains "{{ content | xml_escape }}" + And I have a default layout that contains "{{ content | number_of_words }}" When I run jekyll build Then the _site directory should exist And I should see "7" in "_site/2009/03/27/star-wars.html" @@ -49,13 +47,13 @@ Feature: Embed filters Then the _site directory should exist And I should see "scifi, movies, and force" in "_site/2009/03/27/star-wars.html" - Scenario: Textilize a given string + Scenario: Markdownify a given string Given I have a _posts directory And I have a _layouts directory And I have the following post: | title | date | layout | content | | Star Wars | 2009-03-27 | default | These aren't the droids you're looking for. | - And I have a default layout that contains "By {{ '_Obi-wan_' | textilize }}" + And I have a default layout that contains "By {{ '_Obi-wan_' | markdownify }}" When I run jekyll build Then the _site directory should exist And I should see "ByObi-wan
" in "_site/2009/03/27/star-wars.html" diff --git a/features/frontmatter_defaults.feature b/features/frontmatter_defaults.feature index 7ac2d0a8..a9a64ae2 100644 --- a/features/frontmatter_defaults.feature +++ b/features/frontmatter_defaults.feature @@ -25,7 +25,7 @@ Feature: frontmatter defaults And I have a configuration file with "defaults" set to "[{scope: {path: ""}, values: {custom: "some special data", author: "Ben"}}]" When I run jekyll build Then the _site directory should exist - And I should see "some special data
some special data
\ncontent of site/2013/10/14/about.html
" in "_site/2013/10/14/about.html" + And I should see "main:content of site/special/2013/10/14/about1.html
" in "_site/special/2013/10/14/about1.html" + And I should see "main:content of site/special/2013/10/14/about2.html
" in "_site/special/2013/10/14/about2.html" + Scenario: Override frontmatter defaults by type Given I have a _posts directory And I have the following post: @@ -78,10 +100,19 @@ Feature: frontmatter defaults And I should see "nothing" in "_site/override.html" But the "_site/perma.html" file should not exist + Scenario: Define permalink default for posts + Given I have a _posts directory + And I have the following post: + | title | date | category | content | + | testpost | 2013-10-14 | blog | blabla | + And I have a configuration file with "defaults" set to "[{scope: {path: "", type: "posts"}, values: {permalink: "/:categories/:title/"}}]" + When I run jekyll build + Then I should see "blabla" in "_site/blog/testpost/index.html" + Scenario: Use frontmatter defaults in collections Given I have a _slides directory And I have a "index.html" file that contains "nothing" - And I have a "_slides/slide1.html" file with content: + And I have a "_slides/slide1.html" file with content: """ --- --- @@ -107,7 +138,7 @@ Feature: frontmatter defaults Scenario: Override frontmatter defaults inside a collection Given I have a _slides directory And I have a "index.html" file that contains "nothing" - And I have a "_slides/slide2.html" file with content: + And I have a "_slides/slide2.html" file with content: """ --- myval: Override diff --git a/features/include_tag.feature b/features/include_tag.feature index 22a83480..c7e03ded 100644 --- a/features/include_tag.feature +++ b/features/include_tag.feature @@ -9,15 +9,15 @@ Feature: Include tags And I have an "_includes/params.html" file that contains "Parameters:The only winning move is not to play.
" in "_site/2009/03/27/wargames.html" + When I run jekyll build + Then the _site directory should exist + And I should see "Post Layout:The only winning move is not to play.
" in "_site/2009/03/27/wargames.html" + + Scenario: Generate a metadata file + Given I have an "index.html" file that contains "Basic Site" + When I run jekyll build + Then the ".jekyll-metadata" file should exist + + Scenario: Rebuild when content is changed + Given I have an "index.html" file that contains "Basic Site" + When I run jekyll build + Then the _site directory should exist + And I should see "Basic Site" in "_site/index.html" + When I wait 1 second + Then I have an "index.html" file that contains "Bacon Site" + When I run jekyll build + Then the _site directory should exist + And I should see "Bacon Site" in "_site/index.html" + + Scenario: Rebuild when layout is changed + Given I have a _layouts directory + And I have an "index.html" page with layout "default" that contains "Basic Site with Layout" + And I have a default layout that contains "Page Layout: {{ content }}" + When I run jekyll build + Then the _site directory should exist + And I should see "Page Layout: Basic Site with Layout" in "_site/index.html" + When I wait 1 second + Then I have a default layout that contains "Page Layout Changed: {{ content }}" + When I run jekyll build --full-rebuild + Then the _site directory should exist + And I should see "Page Layout Changed: Basic Site with Layout" in "_site/index.html" + + Scenario: Rebuild when an include is changed + Given I have a _includes directory + And I have an "index.html" page that contains "Basic Site with include tag: {% include about.textile %}" + And I have an "_includes/about.textile" file that contains "Generated by Jekyll" + When I run jekyll build + Then the _site directory should exist + And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html" + When I wait 1 second + Then I have an "_includes/about.textile" file that contains "Regenerated by Jekyll" + When I run jekyll build + Then the _site directory should exist + And I should see "Basic Site with include tag: Regenerated by Jekyll" in "_site/index.html" diff --git a/features/markdown.feature b/features/markdown.feature index 659eed0f..2342951a 100644 --- a/features/markdown.feature +++ b/features/markdown.feature @@ -17,7 +17,10 @@ Feature: Markdown And I should see "My awesome codecontent for entry1.
" in "_site/index.html" - And I should see exactly "content for entry1.
" in "_site/2007/12/31/entry1.html" + And I should see "content for entry1.
" in "_site/index.html" + And I should see "content for entry1.
\n\n" in "_site/2007/12/31/entry1.html" diff --git a/features/rendering.feature b/features/rendering.feature index e0b9d8f0..55a9d3d2 100644 --- a/features/rendering.feature +++ b/features/rendering.feature @@ -15,6 +15,7 @@ Feature: Rendering Scenario: Don't place asset files in layout Given I have an "index.scss" page with layout "simple" that contains ".foo-bar { color:black; }" And I have an "index.coffee" page with layout "simple" that contains "whatever()" + And I have a configuration file with "gems" set to "[jekyll-coffeescript]" And I have a simple layout that contains "{{ content }}Ahoy, indeed!" When I run jekyll build Then the _site directory should exist @@ -28,8 +29,15 @@ Feature: Rendering Then the _site directory should exist And I should see ".foo-bar {\n color: red; }" in "_site/index.css" - Scenario: Render liquid in CoffeeScript + Scenario: Not render liquid in CoffeeScript without explicitly including jekyll-coffeescript Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'" When I run jekyll build Then the _site directory should exist + And the "_site/index.js" file should not exist + + Scenario: Render liquid in CoffeeScript with jekyll-coffeescript enabled + Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'" + And I have a configuration file with "gems" set to "[jekyll-coffeescript]" + When I run jekyll build + Then the _site directory should exist And I should see "hey = 'for cicada';" in "_site/index.js" diff --git a/features/site_configuration.feature b/features/site_configuration.feature index 1d067f0c..d3dadd2a 100644 --- a/features/site_configuration.feature +++ b/features/site_configuration.feature @@ -170,8 +170,8 @@ Feature: Site configuration When I run jekyll build Then the _site directory should exist And I should see "Page Layout: 2" in "_site/index.html" - And I should see "Post Layout:content for entry1.
built at 2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html" - And I should see "Post Layout:content for entry2.
built at 2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html" + And I should see "Post Layout:content for entry1.
\n built at 2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html" + And I should see "Post Layout:content for entry2.
\n built at 2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html" Scenario: Generate proper dates with explicitly set timezone (different than posts' time) Given I have a _layouts directory @@ -180,19 +180,19 @@ Feature: Site configuration And I have an "index.html" page with layout "page" that contains "site index page" And I have a configuration file with: | key | value | - | timezone | Australia/Melbourne | + | timezone | Pacific/Honolulu | And I have a _posts directory And I have the following posts: | title | date | layout | content | - | entry1 | 2013-04-09 23:22 -0400 | post | content for entry1. | - | entry2 | 2013-04-10 03:14 -0400 | post | content for entry2. | + | entry1 | 2013-04-09 23:22 +0400 | post | content for entry1. | + | entry2 | 2013-04-10 03:14 +0400 | post | content for entry2. | When I run jekyll build Then the _site directory should exist And I should see "Page Layout: 2" in "_site/index.html" - And the "_site/2013/04/10/entry1.html" file should exist - And the "_site/2013/04/10/entry2.html" file should exist - And I should see escaped "Post Layout:content for entry1.
built at 2013-04-10T13:22:00+10:00" in "_site/2013/04/10/entry1.html" - And I should see escaped "Post Layout:content for entry2.
built at 2013-04-10T17:14:00+10:00" in "_site/2013/04/10/entry2.html" + And the "_site/2013/04/09/entry1.html" file should exist + And the "_site/2013/04/09/entry2.html" file should exist + And I should see "Post Layout:content for entry1.
\n built at 2013-04-09T09:22:00-10:00" in "_site/2013/04/09/entry1.html" + And I should see "Post Layout:content for entry2.
\n built at 2013-04-09T13:14:00-10:00" in "_site/2013/04/09/entry2.html" Scenario: Limit the number of posts generated by most recent date Given I have a _posts directory diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb index b75379f5..5e0509e1 100644 --- a/features/step_definitions/jekyll_steps.rb +++ b/features/step_definitions/jekyll_steps.rb @@ -8,7 +8,7 @@ def file_content_from_hash(input_hash) input_hash['content'] end - <', '').sub('#{code}#{h(code).strip} tags to code blocks
- code = code.sub(/\n*/,'')
- code = code.sub(/\n*<\/pre>/,"
")
- code.strip
+ code_attributes = [
+ "class=\"language-#{@lang.to_s.gsub('+', '-')}\"",
+ "data-lang=\"#{@lang.to_s}\""
+ ].join(" ")
+ "#{code.chomp}
"
end
end
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 3eb4d7c0..b809ffe7 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -101,20 +101,29 @@ eos
end
def tag_includes_dir
- '_includes'
+ '_includes'.freeze
end
def render(context)
+ site = context.registers[:site]
dir = resolved_includes_dir(context)
file = render_variable(context) || @file
validate_file_name(file)
path = File.join(dir, file)
- validate_path(path, dir, context.registers[:site].safe)
+ validate_path(path, dir, site.safe)
+
+ # Add include to dependency tree
+ if context.registers[:page] and context.registers[:page].has_key? "path"
+ site.regenerator.add_dependency(
+ site.in_source_dir(context.registers[:page]["path"]),
+ path
+ )
+ end
begin
- partial = Liquid::Template.parse(source(path, context))
+ partial = Liquid::Template.parse(read_file(path, context))
context.stack do
context['include'] = parse_params(context) if @params
@@ -126,7 +135,7 @@ eos
end
def resolved_includes_dir(context)
- File.join(File.realpath(context.registers[:site].source), @includes_dir)
+ context.registers[:site].in_source_dir(@includes_dir)
end
def validate_path(path, dir, safe)
@@ -146,14 +155,14 @@ eos
end
# This method allows to modify the file content by inheriting from the class.
- def source(file, context)
+ def read_file(file, context)
File.read(file, file_read_opts(context))
end
end
class IncludeRelativeTag < IncludeTag
def tag_includes_dir
- '.'
+ '.'.freeze
end
def page_path(context)
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 6bed8d57..14b70631 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -44,12 +44,12 @@ module Jekyll
#
# Returns the _unsanitized String URL
def generated_permalink
- (@generated_permlink ||= generate_url(@permalink)) if @permalink
+ (@generated_permalink ||= generate_url(@permalink)) if @permalink
end
# Generates a URL from the template
#
- # Returns the _unsanitized String URL
+ # Returns the unsanitized String URL
def generated_url
@generated_url ||= generate_url(@template)
end
@@ -57,11 +57,16 @@ module Jekyll
# Internal: Generate the URL by replacing all placeholders with their
# respective values in the given template
#
- # Returns the _unsanitizied_ String URL
+ # Returns the unsanitized String URL
def generate_url(template)
@placeholders.inject(template) do |result, token|
break result if result.index(':').nil?
- result.gsub(/:#{token.first}/, self.class.escape_path(token.last))
+ if token.last.nil?
+ # Remove leading '/' to avoid generating urls with `//`
+ result.gsub(/\/:#{token.first}/, '')
+ else
+ result.gsub(/:#{token.first}/, self.class.escape_path(token.last))
+ end
end
end
@@ -76,7 +81,7 @@ module Jekyll
.gsub(/\A([^\/])/, '/\1')
# Append a trailing slash to the URL if the unsanitized URL had one
- url << "/" if in_url[-1].eql?('/')
+ url << "/" if in_url.end_with?("/")
url
end
@@ -102,7 +107,7 @@ module Jekyll
# pct-encoded = "%" HEXDIG HEXDIG
# sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
# / "*" / "+" / "," / ";" / "="
- URI.escape(path, /[^a-zA-Z\d\-._~!$&\'()*+,;=:@\/]/).encode('utf-8')
+ URI.escape(path, /[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]/).encode('utf-8')
end
# Unescapes a URL path segment
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index 34861593..39302790 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -2,6 +2,12 @@ module Jekyll
module Utils
extend self
+ # Constants for use in #slugify
+ SLUGIFY_MODES = %w{raw default pretty}
+ SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze
+ SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze
+ SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
+
# Merges a master hash with another hash, recursively.
#
# master_hash - the "parent" hash whose values will be overridden
@@ -90,7 +96,7 @@ module Jekyll
# Returns the parsed date if successful, throws a FatalException
# if not
def parse_date(input, msg = "Input could not be parsed.")
- Time.parse(input)
+ Time.parse(input).localtime
rescue ArgumentError
raise Errors::FatalException.new("Invalid date '#{input}': " + msg)
end
@@ -104,21 +110,92 @@ module Jekyll
# Slugify a filename or title.
#
- # name - the filename or title to slugify
+ # string - the filename or title to slugify
+ # mode - how string is slugified
#
- # Returns the given filename or title in lowercase, with every
- # sequence of spaces and non-alphanumeric characters replaced with a
- # hyphen.
- def slugify(string)
- unless string.nil?
- string \
- # Replace each non-alphanumeric character sequence with a hyphen
- .gsub(/[^a-z0-9]+/i, '-') \
- # Remove leading/trailing hyphen
- .gsub(/^\-|\-$/i, '') \
- # Downcase it
- .downcase
+ # When mode is "none", return the given string in lowercase.
+ #
+ # When mode is "raw", return the given string in lowercase,
+ # with every sequence of spaces characters replaced with a hyphen.
+ #
+ # When mode is "default" or nil, non-alphabetic characters are
+ # replaced with a hyphen too.
+ #
+ # When mode is "pretty", some non-alphabetic characters (._~!$&'()+,;=@)
+ # are not replaced with hyphen.
+ #
+ # Examples:
+ # slugify("The _config.yml file")
+ # # => "the-config-yml-file"
+ #
+ # slugify("The _config.yml file", "pretty")
+ # # => "the-_config.yml-file"
+ #
+ # Returns the slugified string.
+ def slugify(string, mode=nil)
+ mode ||= 'default'
+ return nil if string.nil?
+ return string.downcase unless SLUGIFY_MODES.include?(mode)
+
+ # Replace each character sequence with a hyphen
+ re = case mode
+ when 'raw'
+ SLUGIFY_RAW_REGEXP
+ when 'default'
+ SLUGIFY_DEFAULT_REGEXP
+ when 'pretty'
+ # "._~!$&'()+,;=@" is human readable (not URI-escaped) in URL
+ # and is allowed in both extN and NTFS.
+ SLUGIFY_PRETTY_REGEXP
end
+
+ string.
+ # Strip according to the mode
+ gsub(re, '-').
+ # Remove leading/trailing hyphen
+ gsub(/^\-|\-$/i, '').
+ # Downcase
+ downcase
+ end
+
+ # Add an appropriate suffix to template so that it matches the specified
+ # permalink style.
+ #
+ # template - permalink template without trailing slash or file extension
+ # permalink_style - permalink style, either built-in or custom
+ #
+ # The returned permalink template will use the same ending style as
+ # specified in permalink_style. For example, if permalink_style contains a
+ # trailing slash (or is :pretty, which indirectly has a trailing slash),
+ # then so will the returned template. If permalink_style has a trailing
+ # ":output_ext" (or is :none, :date, or :ordinal) then so will the returned
+ # template. Otherwise, template will be returned without modification.
+ #
+ # Examples:
+ # add_permalink_suffix("/:basename", :pretty)
+ # # => "/:basename/"
+ #
+ # add_permalink_suffix("/:basename", :date)
+ # # => "/:basename:output_ext"
+ #
+ # add_permalink_suffix("/:basename", "/:year/:month/:title/")
+ # # => "/:basename/"
+ #
+ # add_permalink_suffix("/:basename", "/:year/:month/:title")
+ # # => "/:basename"
+ #
+ # Returns the updated permalink template
+ def add_permalink_suffix(template, permalink_style)
+ case permalink_style
+ when :pretty
+ template << "/"
+ when :date, :ordinal, :none
+ template << ":output_ext"
+ else
+ template << "/" if permalink_style.to_s.end_with?("/")
+ template << ":output_ext" if permalink_style.to_s.end_with?(":output_ext")
+ end
+ template
end
end
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 4df11160..64cdaba2 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
module Jekyll
- VERSION = '2.5.2'
+ VERSION = '3.0.0.beta2'
end
diff --git a/lib/site_template/.gitignore b/lib/site_template/.gitignore
index badbc02f..45c15053 100644
--- a/lib/site_template/.gitignore
+++ b/lib/site_template/.gitignore
@@ -1,2 +1,3 @@
_site
.sass-cache
+.jekyll-metadata
diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
index 2f03e74d..f4151011 100644
--- a/lib/site_template/_config.yml
+++ b/lib/site_template/_config.yml
@@ -5,7 +5,7 @@ description: > # this means to ignore newlines until "baseurl:"
Write an awesome description for your new site here. You can edit this
line in _config.yml. It will appear in your document head meta (for
Google search results) and in your feed.xml site description.
-baseurl: "" # the subpath of your site, e.g. /blog/
+baseurl: "" # the subpath of your site, e.g. /blog
url: "http://yourdomain.com" # the base hostname & protocol for your site
twitter_username: jekyllrb
github_username: jekyll
diff --git a/lib/site_template/_includes/footer.html b/lib/site_template/_includes/footer.html
index be3976f7..8fa89ba9 100644
--- a/lib/site_template/_includes/footer.html
+++ b/lib/site_template/_includes/footer.html
@@ -5,19 +5,19 @@
{{ site.title }}