diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index a1ff6fed410..3bac5ca5b50 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -57,7 +57,7 @@
     <a href="#DirStructInclude">2.10 nuttx/include/</a><br>
     <a href="#DirStructLib">2.11 nuttx/lib/</a><br>
     <a href="#DirStructLibC">2.12 nuttx/libs/libc/</a><br>
-    <a href="#DirStructLibXX">2.13 nuttx/libxx/</a><br>
+    <a href="#DirStructLibXX">2.13 nuttx/libs/libxx/</a><br>
     <a href="#DirStructMm">2.14 nuttx/mm/</a><br>
     <a href="#DirStructNet">2.15 nuttx/net</a><br>
     <a href="#DirStructSched">2.16 nuttx/sched/</a><br>
@@ -1428,7 +1428,7 @@ libc/
 
 </pre></ul>
 
-<h2>2.13 <a name="DirStructLibXX">nuttx/libxx</a></h2>
+<h2>2.13 <a name="DirStructLibXX">nuttx/libs/libxx</a></h2>
 <p>
   This directory holds a tiny, minimal standard std C++ that can be used to
   build some, simple C++ applications in NuttX.
diff --git a/arch/arm/src/lpc17xx/Kconfig b/arch/arm/src/lpc17xx/Kconfig
index 23645a23878..616402b2832 100644
--- a/arch/arm/src/lpc17xx/Kconfig
+++ b/arch/arm/src/lpc17xx/Kconfig
@@ -524,11 +524,11 @@ config LPC17_ADC_CHANLIST
 		matching the LPC17_ADC0_MASK within the board-specific library.
 
 config LPC17_ADC_BURSTMODE
-    bool "One interrupt at the end of all ADC conversions"
-    default n
-    ---help---
-        Select this if you want to generate only one interrupt once all selected
-	channels has been converted by the ADC
+	bool "One interrupt at the end of all ADC conversions"
+	default n
+	---help---
+		Select this if you want to generate only one interrupt once all selected
+		channels has been converted by the ADC
 
 config LPC17_ADC_NCHANNELS
 	int "ADC0 number of channels"
diff --git a/libs/libc/unistd/Kconfig b/libs/libc/unistd/Kconfig
index 3af70d69bad..ba00dd0c64a 100644
--- a/libs/libc/unistd/Kconfig
+++ b/libs/libc/unistd/Kconfig
@@ -66,7 +66,7 @@ config EXECFUNCS_SYMTAB_ARRAY
 		symbol table.
 
 config EXECFUNCS_NSYMBOLS_VAR
-	string"Name of variable holding the number of symbols"
+	string "Name of variable holding the number of symbols"
 	default "g_nsymbols"
 	---help---
 		The exec[l|v] and posix_spawn() functions are wrapper functions that
diff --git a/tools/kconfig2html.c b/tools/kconfig2html.c
index ec28e8cfb7c..4798fb8e4b7 100644
--- a/tools/kconfig2html.c
+++ b/tools/kconfig2html.c
@@ -80,6 +80,7 @@ enum token_type_e
   TOKEN_CONFIG,
   TOKEN_MENUCONFIG,
   TOKEN_BOOL,
+  TOKEN_TRISTATE,
   TOKEN_INT,
   TOKEN_HEX,
   TOKEN_STRING,
@@ -107,6 +108,7 @@ enum config_type_e
   VALUE_INT,
   VALUE_HEX,
   VALUE_BOOL,
+  VALUE_TRISTATE,
   VALUE_STRING
 };
 
@@ -217,6 +219,7 @@ static struct reserved_s g_reserved[] =
   {TOKEN_CONFIG,     "config"},
   {TOKEN_MENUCONFIG, "menuconfig"},
   {TOKEN_BOOL,       "bool"},
+  {TOKEN_TRISTATE,   "tristate"},
   {TOKEN_INT,        "int"},
   {TOKEN_HEX,        "hex"},
   {TOKEN_STRING,     "string"},
@@ -1173,6 +1176,9 @@ static const char *type2str(enum config_type_e valtype)
       case VALUE_BOOL:
         return "Boolean";
 
+      case VALUE_TRISTATE:
+        return "Tristate";
+
       case VALUE_INT:
         return "Integer";
 
@@ -1620,10 +1626,11 @@ static inline char *process_config(FILE *stream, const char *varname,
           switch (tokid)
             {
               case TOKEN_BOOL:
+              case TOKEN_TRISTATE:
                 {
                   /* Save the type of the configuration variable */
 
-                  config.c_type = VALUE_BOOL;
+                  config.c_type = tokid == TOKEN_BOOL ? VALUE_BOOL : VALUE_TRISTATE;
 
                   /* Get the description following the type */