diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html
index 1c3305be574..56da66b9b97 100644
--- a/Documentation/NXGraphicsSubsystem.html
+++ b/Documentation/NXGraphicsSubsystem.html
@@ -2894,6 +2894,7 @@ endif
   </p>
   <li>
     <p>
+      <b><code>graphics/nxfonts/nxfonts_getfont.c</code></b>.
       Finally, we need to extend the logic that does the run-time font lookups so that can find our new font.
       The lookup function is <a href="#nxfgetfonthandle"><code>NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid)</code></a>.
       Note that the lookup is based on the font ID that was defined in step 4.
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index 7d0ae8eb3ec..0a6bc8ab332 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -1102,6 +1102,8 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #  CONFIG_EXAMPLES_USBSTRG_DEVMINOR3 and CONFIG_EXAMPLES_USBSTRG_DEVPATH3
 #    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
 #    is 3.  No defaults.
+#  CONFIG_EXAMPLES_USBSTRG_DEBUGMM
+#    Enables some debug tests to check for memory usage and memory leaks.
 #
 #  If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB), then
 #  the example code will also manage the USB trace output.  The amount of trace output
@@ -1122,6 +1124,7 @@ CONFIG_EXAMPLES_USBSTRG_BUILTIN=y
 CONFIG_EXAMPLES_USBSTRG_NLUNS=1
 CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
 CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
+CONFIG_EXAMPLES_USBSTRG_DEBUGMM=n
 CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
 CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
 CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
diff --git a/configs/stm3210e-eval/usbstorage/defconfig b/configs/stm3210e-eval/usbstorage/defconfig
index a560b9a7b80..da24167c74b 100755
--- a/configs/stm3210e-eval/usbstorage/defconfig
+++ b/configs/stm3210e-eval/usbstorage/defconfig
@@ -858,6 +858,8 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 #  CONFIG_EXAMPLES_USBSTRG_DEVMINOR3 and CONFIG_EXAMPLES_USBSTRG_DEVPATH3
 #    Similar parameters that would have to be provided if CONFIG_EXAMPLES_USBSTRG_NLUNS
 #    is 3.  No defaults.
+#  CONFIG_EXAMPLES_USBSTRG_DEBUGMM
+#    Enables some debug tests to check for memory usage and memory leaks.
 #
 #  If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB), then
 #  the example code will also manage the USB trace output.  The amount of trace output
@@ -878,6 +880,7 @@ CONFIG_EXAMPLES_USBSTRG_BUILTIN=n
 CONFIG_EXAMPLES_USBSTRG_NLUNS=1
 CONFIG_EXAMPLES_USBSTRG_DEVMINOR1=0
 CONFIG_EXAMPLES_USBSTRG_DEVPATH1="/dev/mmcsd0"
+CONFIG_EXAMPLES_USBSTRG_DEBUGMM=n
 CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
 CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
 CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
diff --git a/graphics/README.txt b/graphics/README.txt
index 12ac8ffee51..7cbf095e052 100644
--- a/graphics/README.txt
+++ b/graphics/README.txt
@@ -200,10 +200,10 @@ Installing New Fonts
        Where nxfonts_myfont.h is the NuttX font file that we generated in
        step 2 using the bdf-converter tool.
 
-    9. Finally, we need to extend the logic that does the run-time font
-       lookups so that can find our new font.  The lookup function is
-       NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid).  The new
-       font information needs to be added to data structures used by
+    9. graphics/nxfonts/nxfonts_getfont.c.  Finally, we need to extend the
+       logic that does the run-time font lookups so that can find our new
+       font.  The lookup function is NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid).
+       The new font information needs to be added to data structures used by
        that function:
  
        #ifdef CONFIG_NXFONT_SANS23X27
diff --git a/tools/README.txt b/tools/README.txt
index e6f65081d38..e859e873578 100755
--- a/tools/README.txt
+++ b/tools/README.txt
@@ -185,10 +185,10 @@ bdf-convert.c
        Where nxfonts_myfont.h is the NuttX font file that we generated in
        step 2 using the bdf-converter tool.
 
-    9. Finally, we need to extend the logic that does the run-time font
-       lookups so that can find our new font.  The lookup function is
-       NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid).  The new
-       font information needs to be added to data structures used by
+    9. graphics/nxfonts/nxfonts_getfont.c.  Finally, we need to extend the
+       logic that does the run-time font lookups so that can find our new
+       font.  The lookup function is NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid).
+       The new font information needs to be added to data structures used by
        that function:
  
        #ifdef CONFIG_NXFONT_SANS23X27