Correct spelling: MOUNTPOINT not MOUNTPOUNT. Numerous places. Some are problems. From Woohan Lee

14 files changed, 24 insertions, 24 deletions

diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig
index 3e212e746..0036ed928 100644
--- a/apps/nshlib/Kconfig
+++ b/apps/nshlib/Kconfig
@@ -384,7 +384,7 @@ config NSH_CMDOPT_HEXDUMP
 	default y if !DEFAULT_SMALL
 	depends on !NSH_DISABLE_HEXDUMP
 
-config NSH_PROC_MOUNTPOUNT
+config NSH_PROC_MOUNTPOINT
 	string "procfs mountpoint"
 	default "/proc"
 	depends on FS_PROCFS
diff --git a/apps/nshlib/README.txt b/apps/nshlib/README.txt
index b49daf2a0..01f2401bb 100644
--- a/apps/nshlib/README.txt
+++ b/apps/nshlib/README.txt
@@ -188,7 +188,7 @@ NSH to behave as follows at NSH startup time:
 
 - By default, the contents of rcS script are:
 
-    # Create a RAMDISK and mount it at XXXRDMOUNTPOUNTXXX
+    # Create a RAMDISK and mount it at XXXRDMOUNTPOINTXXX
 
     mkrd -m 1 -s 512 1024
     mkfatfs /dev/ram1
diff --git a/apps/nshlib/nsh_proccmds.c b/apps/nshlib/nsh_proccmds.c
index f72d8877f..6d3b6ab66 100644
--- a/apps/nshlib/nsh_proccmds.c
+++ b/apps/nshlib/nsh_proccmds.c
@@ -53,8 +53,8 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifndef CONFIG_NSH_PROC_MOUNTPOUNT
-#  define CONFIG_NSH_PROC_MOUNTPOUNT "/proc"
+#ifndef CONFIG_NSH_PROC_MOUNTPOINT
+#  define CONFIG_NSH_PROC_MOUNTPOINT "/proc"
 #endif
 
 #undef HAVE_CPULOAD
@@ -215,7 +215,7 @@ static int loadavg(pid_t pid, FAR char *buffer, size_t buflen)
 
   /* Form the full path to the 'loadavg' pseudo-file */
 
-  snprintf(path, sizeof(path), CONFIG_NSH_PROC_MOUNTPOUNT "/%d/loadavg",
+  snprintf(path, sizeof(path), CONFIG_NSH_PROC_MOUNTPOINT "/%d/loadavg",
            (int)pid);
 
   /* Read the 'loadavg' pseudo-file into the user buffer */
diff --git a/apps/nshlib/rcS.template b/apps/nshlib/rcS.template
index 996f37fb1..452760e22 100644
--- a/apps/nshlib/rcS.template
+++ b/apps/nshlib/rcS.template
@@ -1,5 +1,5 @@
-# Create a RAMDISK and mount it at XXXRDMOUNTPOUNTXXX
+# Create a RAMDISK and mount it at XXXRDMOUNTPOINTXXX
 
 mkrd -m XXXMKRDMINORXXX -s XXMKRDSECTORSIZEXXX XXMKRDBLOCKSXXX
 mkfatfs /dev/ramXXXMKRDMINORXXX
-mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOUNTXXX
+mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOINTXXX
diff --git a/nuttx/Documentation/NuttShell.html b/nuttx/Documentation/NuttShell.html
index 939e7373c..eafbf6d99 100644
--- a/nuttx/Documentation/NuttShell.html
+++ b/nuttx/Documentation/NuttShell.html
@@ -859,7 +859,7 @@ done
     <li>
       By default, the contents of rcS script are:
 <ul><pre>
-# Create a RAMDISK and mount it at XXXRDMOUNTPOUNTXXX
+# Create a RAMDISK and mount it at XXXRDMOUNTPOINTXXX
 
 mkrd -m 1 -s 512 1024
 mkfatfs /dev/ram1
@@ -3425,11 +3425,11 @@ set FOOBAR ABC_${FOO}_${BAR}
       By default, this <code>rcS</code> start-up script contains the following logic:
     </p>
 <ul><pre>
-# Create a RAMDISK and mount it at XXXRDMOUNTPOUNTXXX
+# Create a RAMDISK and mount it at XXXRDMOUNTPOINTXXX
 
 mkrd -m XXXMKRDMINORXXX -s XXMKRDSECTORSIZEXXX XXMKRDBLOCKSXXX
 mkfatfs /dev/ramXXXMKRDMINORXXX
-mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOUNTXXX
+mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOINTXXX
 </pre></ul>
 
     <p>
@@ -3451,7 +3451,7 @@ mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOUNTXXX
         </p>
       <li>
         <p>
-          <code>XXXRDMOUNTPOUNTXXX</code> will become the configured mount point.
+          <code>XXXRDMOUNTPOINTXXX</code> will become the configured mount point.
           Default: <code>/etc</code>
         </p>
     </ul>
diff --git a/nuttx/configs/cc3200-launchpad/nsh/defconfig b/nuttx/configs/cc3200-launchpad/nsh/defconfig
index c23f89145..68f0e9b58 100644
--- a/nuttx/configs/cc3200-launchpad/nsh/defconfig
+++ b/nuttx/configs/cc3200-launchpad/nsh/defconfig
@@ -695,7 +695,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDOPT_DF_H=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_CMDOPT_HEXDUMP=y
-CONFIG_NSH_PROC_MOUNTPOUNT="/proc"
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=512
 
 #
diff --git a/nuttx/configs/sam4s-xplained-pro/nsh/defconfig b/nuttx/configs/sam4s-xplained-pro/nsh/defconfig
index 527c9c9be..e72bb9593 100644
--- a/nuttx/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/nuttx/configs/sam4s-xplained-pro/nsh/defconfig
@@ -904,7 +904,7 @@ CONFIG_NSH_DISABLE_LOSETUP=y
 CONFIG_NSH_CMDOPT_DF_H=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_CMDOPT_HEXDUMP=y
-CONFIG_NSH_PROC_MOUNTPOUNT="/proc"
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=2048
 CONFIG_NSH_STRERROR=y
 
diff --git a/nuttx/configs/sama5d4-ek/nsh/defconfig b/nuttx/configs/sama5d4-ek/nsh/defconfig
index 54d3e5c1e..552dfea89 100644
--- a/nuttx/configs/sama5d4-ek/nsh/defconfig
+++ b/nuttx/configs/sama5d4-ek/nsh/defconfig
@@ -1284,7 +1284,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=128
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
-CONFIG_NSH_PROC_MOUNTPOUNT="/proc"
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=512
 
 #
diff --git a/nuttx/configs/sama5d4-ek/nxwm/defconfig b/nuttx/configs/sama5d4-ek/nxwm/defconfig
index fd0c40234..aeb4bf4de 100644
--- a/nuttx/configs/sama5d4-ek/nxwm/defconfig
+++ b/nuttx/configs/sama5d4-ek/nxwm/defconfig
@@ -1261,7 +1261,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=128
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
-CONFIG_NSH_PROC_MOUNTPOUNT="/proc"
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=512
 
 #
diff --git a/nuttx/configs/stm32f429i-disco/extflash/defconfig b/nuttx/configs/stm32f429i-disco/extflash/defconfig
index 9ad1cdb0c..313341935 100644
--- a/nuttx/configs/stm32f429i-disco/extflash/defconfig
+++ b/nuttx/configs/stm32f429i-disco/extflash/defconfig
@@ -892,7 +892,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDOPT_DF_H=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_CMDOPT_HEXDUMP=y
-CONFIG_NSH_PROC_MOUNTPOUNT="/proc"
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
diff --git a/nuttx/configs/vsn/include/rcS.template b/nuttx/configs/vsn/include/rcS.template
index 90fd10e61..4860195bd 100755
--- a/nuttx/configs/vsn/include/rcS.template
+++ b/nuttx/configs/vsn/include/rcS.template
@@ -1,9 +1,9 @@
 echo "Versatile Sensor Node V1.2, www.netClamps.com"
 
-# Create a RAMDISK and mount it at XXXRDMOUNTPOUNTXXX
+# Create a RAMDISK and mount it at XXXRDMOUNTPOINTXXX
 #mkrd -m XXXMKRDMINORXXX -s XXMKRDSECTORSIZEXXX XXMKRDBLOCKSXXX
 #mkfatfs /dev/ramXXXMKRDMINORXXX
-#mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOUNTXXX
+#mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOINTXXX
 
 mount -t binfs /dev/ram0 /sbin
 
diff --git a/nuttx/fs/mount/fs_foreachmountpoint.c b/nuttx/fs/mount/fs_foreachmountpoint.c
index dd412a19e..b3ab33abc 100644
--- a/nuttx/fs/mount/fs_foreachmountpoint.c
+++ b/nuttx/fs/mount/fs_foreachmountpoint.c
@@ -51,7 +51,7 @@
 
 #include "inode/inode.h"
 
-#ifndef CONFIG_DISABLE_MOUNTPOUNT
+#ifndef CONFIG_DISABLE_MOUNTPOINT
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/include/nuttx/fs/fs.h b/nuttx/include/nuttx/fs/fs.h
index ad05da5d7..b21d9cf80 100644
--- a/nuttx/include/nuttx/fs/fs.h
+++ b/nuttx/include/nuttx/fs/fs.h
@@ -205,7 +205,7 @@ struct mountpt_operations
    * stats file stat(), file attributes, file truncation, etc.
    */
 };
-#endif /* CONFIG_DISABLE_MOUNTPOUNT */
+#endif /* CONFIG_DISABLE_MOUNTPOINT */
 
 /* Named OS resources are also maintained by the VFS.  This includes:
  *
@@ -224,7 +224,7 @@ struct mountpt_operations
 union inode_ops_u
 {
   FAR const struct file_operations      *i_ops;    /* Driver operations for inode */
-#ifndef CONFIG_DISABLE_MOUNTPOUNT
+#ifndef CONFIG_DISABLE_MOUNTPOINT
   FAR const struct block_operations     *i_bops;   /* Block driver operations */
   FAR const struct mountpt_operations   *i_mops;   /* Operations on a mountpoint */
 #endif
@@ -335,7 +335,7 @@ struct streamlist
  * pseudo-file system.
  */
 
-#ifndef CONFIG_DISABLE_MOUNTPOUNT
+#ifndef CONFIG_DISABLE_MOUNTPOINT
 struct statfs;                    /* Forward reference */
 typedef int (*foreach_mountpoint_t)(FAR const char *mountpoint,
                                     FAR struct statfs *statbuf,
@@ -388,7 +388,7 @@ void fs_initialize(void);
  *
  ****************************************************************************/
 
-#ifndef CONFIG_DISABLE_MOUNTPOUNT
+#ifndef CONFIG_DISABLE_MOUNTPOINT
 int foreach_mountpoint(foreach_mountpoint_t handler, FAR void *arg);
 #endif
 
diff --git a/nuttx/tools/mkromfsimg.sh b/nuttx/tools/mkromfsimg.sh
index 04ae501c6..3950f4689 100755
--- a/nuttx/tools/mkromfsimg.sh
+++ b/nuttx/tools/mkromfsimg.sh
@@ -242,7 +242,7 @@ cat $rcstemplate | \
     sed -e "s,XXXMKRDMINORXXX,$fatdevno,g" | \
     sed -e "s,XXMKRDSECTORSIZEXXX,$fatsectsize,g" | \
     sed -e "s,XXMKRDBLOCKSXXX,$fatnsectors,g" | \
-    sed -e "s,XXXRDMOUNTPOUNTXXX,$fatmpt,g" >$rcsfile
+    sed -e "s,XXXRDMOUNTPOINTXXX,$fatmpt,g" >$rcsfile
 
 # And install it at the specified relative location