diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 0ab1576188f..8edba79e96f 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -219,7 +219,8 @@
   <td><br></td>
   <td>
     <p>
-      <li>Easily extensible to new processor architectures, SoC architecture, or board architectures.</li>
+      <li>Easily extensible to new processor architectures, SoC architecture, or board architectures.
+          A <a href="NuttxPortingGuide.html">Porting Guide</a> is in development.</li>
     </p>
 </tr>
 
@@ -978,11 +979,11 @@ Other memory:
 <ul><table>
 <tr>
   <td><img src="favicon.ico"></td>
-  <td><a href="NuttxUserGuide.html">User Guide</td>
+  <td><a href="NuttxUserGuide.html">User Guide</a></td>
 </tr>
 <tr>
   <td><img src="favicon.ico"></td>
-  <td><a href="NuttxPortingGuide.html">Porting Guide</td>
+  <td><a href="NuttxPortingGuide.html">Porting Guide</a></td>
 </tr>
 </center></ul>
 
diff --git a/TODO b/TODO
index 24dc5b02768..3351d7e46c1 100644
--- a/TODO
+++ b/TODO
@@ -62,7 +62,7 @@ o File system
 - FAT32: long file names
 
 o Documentation
-- Document fs/ & driver/ logic
+- Document driver/ logic
 - Document C-library APIs
 
 o Build system
@@ -72,7 +72,6 @@ o Build system
 - Dependencies do not work correctly under configs/<board>/src (same as arch/<arch>/src/board).
 
 o Applications & Tests
-- Verify TELNET frontend to nsh
 
 o ARM
 - Add option to use a separate stack for interrupt handling.  At present,