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

Merge pull request #1938 from jekyll/excludes-relative-to-site-source-docs

This commit is contained in:
Matt Rogers 2014-01-13 07:15:53 -08:00
parent 0d6db1613f 2966606b1a
commit f9263b6fdf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
site/docs/configuration.md
View File

@ -67,7 +67,7 @@ class="flag">flags</code> (specified on the command-line) that control them.
<p class="description"> <p class="description">
Exclude directories and/or files from the Exclude directories and/or files from the
conversion. These exclusions are relative to the site's conversion. These exclusions are relative to the site's
source directory. source directory and cannot be outside the source directory.
</p> </p>
</td> </td>
<td class='align-center'> <td class='align-center'>

2
test/test_entry_filter.rb
View File

@ -72,7 +72,7 @@ class TestEntryFilter < Test::Unit::TestCase
end end
end end
context "glob_include?" do context "#glob_include?" do
setup do setup do
stub(Jekyll).configuration do stub(Jekyll).configuration do
Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})