Merge branch 'kegilbert-patch-3' of ssh://github.com/ARMmbed/mbed-os into rollup

Cruz Monrreal II · Cruz Monrreal II · commit ecd109e0be7b · 2018-10-17T21:38:41.000-05:00
diff --git a/platform/ScopedLock.h b/platform/ScopedLock.h
@@ -60,7 +60,7 @@ namespace mbed {
 template <typename Lockable>
 class ScopedLock : private NonCopyable<ScopedLock<Lockable> > {
 public:
-    /** Locks given locable object
+    /** Locks given lockable object
      *
      * @param lockable reference to the instance of Lockable object
      * @note lockable object should outlive the ScopedLock object

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ namespace mbed {`
`60`	`60`	`template <typename Lockable>`
`61`	`61`	`class ScopedLock : private NonCopyable<ScopedLock<Lockable> > {`
`62`	`62`	`public:`
`63`		`- /** Locks given locable object`
	`63`	`+ /** Locks given lockable object`
`64`	`64`	`*`
`65`	`65`	`* @param lockable reference to the instance of Lockable object`
`66`	`66`	`* @note lockable object should outlive the ScopedLock object`