Merge branch 'master' into typo-1

OpenLightingProject · May 16, 2018 · ea3b1ad · ea3b1ad
2 parents e21f308 + cb9cb64
commit ea3b1ad
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.travis-ci.sh b/.travis-ci.sh
@@ -24,6 +24,7 @@ SPELLINGBLACKLIST=$(cat <<-BLACKLIST
       -wholename "./config/ltsugar.m4" -or \
       -wholename "./config/missing" -or \
       -wholename "./libtool" -or \
+      -wholename "./config.log" -or \
       -wholename "./config.status" -or \
       -wholename "./Makefile" -or \
       -wholename "./Makefile.in" -or \

diff --git a/common/base/Init.cpp b/common/base/Init.cpp
@@ -137,7 +137,7 @@ bool SetThreadScheduling() {
     OLA_WARN << "Maximum value for --scheduler-priority is " << max;
     return false;
   }
-#endif  // _POSIX_PRORITY_SCHEDULING
+#endif  // _POSIX_PRIORITY_SCHEDULING
 
   // Set the scheduling parameters.
   struct sched_param param;

diff --git a/common/utils/Clock.cpp b/common/utils/Clock.cpp
@@ -23,7 +23,7 @@
  *     provide timersub.
  *   - Reduces bugs by using the compiler to check if the value was supposed
  *     to be an interval or absolute time. For example, passing an absolute
- *     time intstead of an Interval to RegisterTimeout would be bad.
+ *     time instead of an Interval to RegisterTimeout would be bad.
  */
 
 #include <ola/Clock.h>

diff --git a/include/ola/rdm/PidStore.h b/include/ola/rdm/PidStore.h
@@ -44,7 +44,7 @@ namespace rdm {
 class PidStore;
 class PidDescriptor;
 
-// The following % before Device is to stop Doxygen interpretting it as a class
+// The following % before Device is to stop Doxygen interpreting it as a class
 /**
  * @brief The root of the RDM parameter descriptor store.
  *