From 0a430b9aecf6a82fba5d76a41dba9b5279e8ce89 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Tue, 23 Dec 2014 12:04:46 -0500
Subject: [PATCH 1/2] test: backport use executable in spawn() test

Backport 10703774f01a4005fc74d6b4131c713259e81657 from the v0.12 branch.

Currently, the test-child-process-spawn-typeerror.js is
calling execFile() on a JavaScript source file, which is
causing failures on Windows. This commit switches to calling
spawn() on an actual executable.

Fixes #8930.

Signed-off-by: Julien Gilli <julien.gilli@joyent.com>
---
 test/simple/test-child-process-spawn-typeerror.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/simple/test-child-process-spawn-typeerror.js b/test/simple/test-child-process-spawn-typeerror.js
index 5c2f8ec6352..d0adacc7f33 100644
--- a/test/simple/test-child-process-spawn-typeerror.js
+++ b/test/simple/test-child-process-spawn-typeerror.js
@@ -41,10 +41,10 @@ assert.doesNotThrow(function() { spawn(cmd, a, o); });
 assert.doesNotThrow(function() { spawn(cmd, o); });
 
 // Variants of undefined as explicit 'no argument' at a position
-assert.doesNotThrow(function() { execFile(empty, u, o); });
-assert.doesNotThrow(function() { execFile(empty, a, u); });
-assert.doesNotThrow(function() { execFile(empty, n, o); });
-assert.doesNotThrow(function() { execFile(empty, a, n); });
+assert.doesNotThrow(function() { spawn(cmd, u, o); });
+assert.doesNotThrow(function() { spawn(cmd, a, u); });
+assert.doesNotThrow(function() { spawn(cmd, n, o); });
+assert.doesNotThrow(function() { spawn(cmd, a, n); });
 
 assert.throws(function() { spawn(cmd, s); }, TypeError);
 assert.doesNotThrow(function() { spawn(cmd, a, s); }, TypeError);

From 0c50195071a57bc40df82c8f57d341a435ff1eb6 Mon Sep 17 00:00:00 2001
From: Robert Kowalski <rok@kowalski.gd>
Date: Wed, 7 Jan 2015 22:51:15 +0100
Subject: [PATCH 2/2] docs: delete unused/duplicate css files

 - `sh.css` already exists in `api_assets`
 - `sh_vim-dark.css` is unused, but used in the repo `node-website`
        now

Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Signed-off-by: Julien Gilli <julien.gilli@joyent.com>
---
 doc/sh.css          | 24 ------------------------
 doc/sh_vim-dark.css | 33 ---------------------------------
 2 files changed, 57 deletions(-)
 delete mode 100644 doc/sh.css
 delete mode 100644 doc/sh_vim-dark.css

diff --git a/doc/sh.css b/doc/sh.css
deleted file mode 100644
index 7022e199de6..00000000000
--- a/doc/sh.css
+++ /dev/null
@@ -1,24 +0,0 @@
-.sh_sourceCode {
-  font-weight: normal;
-  font-style: normal;
-}
-
-.sh_sourceCode .sh_symbol,
-.sh_sourceCode .sh_cbracket {
-  color: #333;
-}
-
-.sh_sourceCode .sh_keyword {
-  color: #c96;
-}
-
-.sh_sourceCode .sh_string,
-.sh_sourceCode .sh_regexp,
-.sh_sourceCode .sh_number,
-.sh_sourceCode .sh_specialchar {
-  color: #690;
-}
-
-.sh_sourceCode .sh_comment {
-  color: #666;
-}
diff --git a/doc/sh_vim-dark.css b/doc/sh_vim-dark.css
deleted file mode 100644
index 42b74f44d61..00000000000
--- a/doc/sh_vim-dark.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.sh_sourceCode {
-  font-weight: normal;
-  font-style: normal;
-}
-
-.sh_sourceCode .sh_symbol ,
-.sh_sourceCode .sh_cbracket {
-  color: #fff;
-}
-
-.sh_sourceCode .sh_keyword {
-  font-style: italic;
-}
-
-.sh_sourceCode .sh_string,
-.sh_sourceCode .sh_regexp,
-.sh_sourceCode .sh_number,
-.sh_sourceCode .sh_specialchar {
-  color: #a0c874;
-}
-
-.sh_sourceCode .sh_comment {
-  color: #777;
-}
-
-.alt .sh_sourceCode .sh_keyword {
-  font-style: normal;
-  color: #996633;
-}
-
-.alt .sh_sourceCode .sh_symbol , .alt .sh_sourceCode .sh_cbracket {
-  color: #46483e;
-}