Merge branch 'develop'

Author: jenssogaard

docs/0.9.71/functionality/conditionals-and-branching/index.html

@@ -8,7 +8,7 @@
 
 	<meta name="description" content="Conversational Form is an open-source concept by SPACE10 to easily turn any form element on a web page into a conversational form interface.">
 	<meta name="keywords" content="conversational interfaces, conversational form, interface, bot, cui">
-	<link rel="icon" href="../../assets/favicon.ico">
+	<link rel="icon" href="../assets/favicon.ico">
 
 	<link rel="publisher" href="http://space10.io/"/>
 

docs/0.9.71/functionality/custom-error-message/index.html

@@ -8,7 +8,7 @@
 
 	<meta name="description" content="Conversational Form is an open-source concept by SPACE10 to easily turn any form element on a web page into a conversational form interface.">
 	<meta name="keywords" content="conversational interfaces, conversational form, interface, bot, cui">
-	<link rel="icon" href="../assets/favicon.ico">
+	<link rel="icon" href="../../assets/favicon.ico">
 
 	<link rel="publisher" href="http://space10.io/"/>
 

docs/0.9.71/functionality/custom-placeholder/index.html

@@ -8,7 +8,7 @@
 
 	<meta name="description" content="Conversational Form is an open-source concept by SPACE10 to easily turn any form element on a web page into a conversational form interface.">
 	<meta name="keywords" content="conversational interfaces, conversational form, interface, bot, cui">
-	<link rel="icon" href="../assets/favicon.ico">
+	<link rel="icon" href="../../assets/favicon.ico">
 
 	<link rel="publisher" href="http://space10.io/"/>
 

docs/0.9.71/getting-started/previous-versions/index.html

@@ -8,7 +8,7 @@
 
 	<meta name="description" content="Conversational Form is an open-source concept by SPACE10 to easily turn any form element on a web page into a conversational form interface.">
 	<meta name="keywords" content="conversational interfaces, conversational form, interface, bot, cui">
-	<link rel="icon" href="../../assets/favicon.ico">
+	<link rel="icon" href="../assets/favicon.ico">
 
 	<link rel="publisher" href="http://space10.io/"/>
 

docs/0.9.71/options/index.html

@@ -172,13 +172,13 @@ <h1 id="options">Options</h1>
     		</tr>
             <tr>
                 <td>userImage</td>
-                <td>base64, image url or an string beginning with "text:" (eg. "text:JD") (max 3 characters)</td>
+                <td>base64, image url or a string beginning with "text:" (eg. "text:JD") (max 3 characters)</td>
                 <td></td>
                 <td>Add a custom user image or short text string, without overwritting the user dictionary.</td>
             </tr>
             <tr>
                 <td>robotImage</td>
-                <td>base64, image url or an string beginning with "text:" (eg. "text:JD") (max 3 characters)</td>
+                <td>base64, image url or a string beginning with "text:" (eg. "text:JD") (max 3 characters)</td>
                 <td></td>
                 <td>Add a custom robot image or short text string, without overwritting the robot dictionary.</td>
             </tr>

docs/0.9.71/src/pages/options/index.twig

@@ -50,13 +50,13 @@
     		</tr>
             <tr>
                 <td>userImage</td>
-                <td>base64, image url or an string beginning with "text:" (eg. "text:JD") (max 3 characters)</td>
+                <td>base64, image url or a string beginning with "text:" (eg. "text:JD") (max 3 characters)</td>
                 <td></td>
                 <td>Add a custom user image or short text string, without overwritting the user dictionary.</td>
             </tr>
             <tr>
                 <td>robotImage</td>
-                <td>base64, image url or an string beginning with "text:" (eg. "text:JD") (max 3 characters)</td>
+                <td>base64, image url or a string beginning with "text:" (eg. "text:JD") (max 3 characters)</td>
                 <td></td>
                 <td>Add a custom robot image or short text string, without overwritting the robot dictionary.</td>
             </tr>