Merge remote-tracking branch 'alinex/master'

jbt · Feb 15, 2014 · 2e8f031 · 2e8f031
2 parents 58ffb6d + 9e649fc
commit 2e8f031
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/docker.js b/src/docker.js
@@ -815,6 +815,7 @@ Docker.prototype.languages = {
   },
   coffeescript: {
     extensions: [ 'coffee' ],
+    names: [ 'cakefile' ],
     executables: [ 'coffee' ],
     comment: '#',  multiLine: [ /^\s*#{3}\s*$/m, /^\s*#{3}\s*$/m ], jsDoc: true
   },
@@ -905,7 +906,7 @@ Docker.prototype.languages = {
   },
   jade: {
     extensions: ['jade'],
-    comment: '//', multiLine: [ /\/\*\*?/, /\*\// ], jsDoc: true
+    comment: '//-?', multiLine: [ /\/\*\*?/, /\*\// ], jsDoc: true
   },
   groovy: {
     extensions: ['groovy'],