Merge branch 'master' of github.com:GitbookIO/gitbook into fork

Conflicts:
	lib/parse/page.js

2 files changed, 8 insertions, 4 deletions

diff --git a/lib/generate/fs.js b/lib/generate/fs.js
index 464c2cc..4c232e7 100644
--- a/lib/generate/fs.js
+++ b/lib/generate/fs.js
@@ -74,4 +74,5 @@ module.exports = {
         fs.exists(path, d.resolve);
         return d.promise;
     },
+    readFileSync: fs.readFileSync.bind(fs)
 };
diff --git a/lib/generate/site/index.js b/lib/generate/site/index.js
index 8190381..47d09f2 100644
--- a/lib/generate/site/index.js
+++ b/lib/generate/site/index.js
@@ -123,12 +123,15 @@ Generator.prototype.prepareFile  = function(content, _input) {
         return parse.page(page, {
             // Local files path
             dir: path.dirname(_input) || '/',
-            // Project's include folder
-            includes_dir: path.join(that.options.input, '_includes'),
+
             // Output directory
             outdir: path.dirname(_input) || '/',
-            // Templating variables
-            variables: that.options.variables,
+
+            // Includer for templating
+            includer: parse.includer(that.options.variables, [
+                    path.dirname(_input) || '/',
+                    path.join(that.options.input, '_includes'),
+            ], path.join, fs.readFileSync)
         });
     })
     .then(function(sections) {