Merge github.com:mermaid-js/mermaid into eslint-fix

src/errorRenderer.js

@@ -3,6 +3,12 @@ import { select } from 'd3';
 import { log } from './logger';
 
 const conf = {};
+
+/**
+ * Merges the value of `conf` with the passed `cnf`
+ *
+ * @param {object} cnf Config to merge
+ */
 export const setConf = function (cnf) {
   const keys = Object.keys(cnf);
 
@@ -14,8 +20,8 @@ export const setConf = function (cnf) {
 /**
  * Draws a an info picture in the tag with id: id based on the graph definition in text.
  *
- * @param {any} id
- * @param {any} ver
+ * @param {string} id The text for the error
+ * @param {string} ver The version
  */
 export const draw = (id, ver) => {
   try {