From 570a585f4ed64aa05502bd3fadb5f21d1ae7240f Mon Sep 17 00:00:00 2001
From: Michael Mathews <micmath@gmail.com>
Date: Mon, 1 Oct 2012 17:42:48 +0100
Subject: [PATCH 1/2] Fix bug that caused failing tests when no conf.json file
 is present. Closes #206

---
 rhino_modules/jsdoc/config.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rhino_modules/jsdoc/config.js b/rhino_modules/jsdoc/config.js
index 61b39253..8cc6c61c 100644
--- a/rhino_modules/jsdoc/config.js
+++ b/rhino_modules/jsdoc/config.js
@@ -14,10 +14,14 @@ var util = require('common/util');
 
 // required config values, override these defaults in your config.json if necessary
 const defaults = {
+    "tags": {
+        "allowUnknownTags": true
+    },
     "source": {
         "includePattern": ".+\\.js(doc)?$",
         "excludePattern": "(^|\\/)_"
     },
+    "plugins": [],
     "jsVersion": 180
 };
 
@@ -28,7 +32,6 @@ const defaults = {
  */
 function Config(json) {
     json = JSON.parse( (json || "{}") );
-    
     this._config = util.mergeRecurse(defaults, json);
 }
 

From 10a54620fc052ad1a8880db685cbfcec358c88a1 Mon Sep 17 00:00:00 2001
From: Jeff Williams <jeffrey.l.williams@gmail.com>
Date: Thu, 4 Oct 2012 09:20:33 -0700
Subject: [PATCH 2/2] use consistent path separators on windows (#207)

---
 rhino_modules/fs.js          | 2 +-
 templates/default/publish.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rhino_modules/fs.js b/rhino_modules/fs.js
index 1074b701..ebebcc39 100644
--- a/rhino_modules/fs.js
+++ b/rhino_modules/fs.js
@@ -77,7 +77,7 @@ var ls = exports.ls = function(dir, recurse, _allFiles, _path) {
         }
         else { // it's a file
             _allFiles.push(
-                (_path.join('/') + '/' + file).replace(/[\/\\]+/g, '/')
+                path.normalize(_path.join('/') + '/' + file)
             );
         }
     }
diff --git a/templates/default/publish.js b/templates/default/publish.js
index 91040e79..12f36cd6 100644
--- a/templates/default/publish.js
+++ b/templates/default/publish.js
@@ -232,12 +232,12 @@ exports.publish = function(taffyData, opts, tutorials) {
     // update outdir if necessary, then create outdir
     var packageInfo = ( find({kind: 'package'}, false) || [] ) [0];
     if (packageInfo && packageInfo.name) {
-        outdir += '/' + packageInfo.name + '/' + packageInfo.version + '/';
+        outdir = path.join(outdir, packageInfo.name, packageInfo.version);
     }
     fs.mkPath(outdir);
 
     // copy static files to outdir
-    var fromDir = templatePath + '/static',
+    var fromDir = path.join(templatePath, 'static'),
         staticFiles = fs.ls(fromDir, 3);
         
     staticFiles.forEach(function(fileName) {