Merge branch 'apache:master' into master

Author: masc2008

builtin/exec_builtin.c

@@ -29,7 +29,7 @@
 #include <spawn.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include "builtin/builtin.h"
 

canutils/canlib/canlib_getbaud.c

@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>

canutils/canlib/canlib_getloopback.c

@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>

canutils/canlib/canlib_getsilent.c

@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>

canutils/canlib/canlib_setbaud.c

@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>

canutils/canlib/canlib_setloopback.c

@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>

canutils/canlib/canlib_setsilent.c

@@ -25,7 +25,7 @@
  ****************************************************************************/
 
 #include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <errno.h>
 
 #include <nuttx/can/can.h>

examples/adc/adc_main.c

@@ -35,7 +35,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/analog/adc.h>
 #include <nuttx/analog/ioctl.h>
@@ -95,7 +95,7 @@ static void adc_help(FAR struct adc_state_s *adc)
   printf("Usage: adc [OPTIONS]\n");
   printf("\nArguments are \"sticky\".  "
          "For example, once the ADC device is\n");
-  printf("specified, that device will be re-used until it is changed.\n");
+  printf("specified, that device will be reused until it is changed.\n");
   printf("\n\"sticky\" OPTIONS include:\n");
   printf("  [-p devpath] selects the ADC device.  "
          "Default: %s Current: %s\n",

examples/ajoystick/ajoy_main.c

@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <fixedmath.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 #include <unistd.h>
 
 #include <nuttx/input/ajoystick.h>

examples/battery/batt_main.c

@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
 
 #include <nuttx/power/battery_ioctl.h>
 #include <nuttx/power/battery_charger.h>
@@ -117,7 +117,7 @@ void health_report(int health)
 
       case BATTERY_HEALTH_GOOD:
         {
-          printf("Battery is in good condiction!\n");
+          printf("Battery is in good condition!\n");
         }
         break;