Merge branch 'master' of https://github.com/Pyroxenium/Basalt

docs/_sidebar.md

@@ -11,7 +11,7 @@
   - [ChangeableObject](objects/ChangeableObject.md)
   - [Container](objects/Container.md)
     - [BaseFrame](objects/BaseFrame.md)
-    - [BaseFrame](objects/MonitorFrame.md)
+    - [MonitorFrame](objects/MonitorFrame.md)
     - [Frame](objects/Frame.md)
     - [Flexbox](objects/Flexbox.md)
     - [MovableFrame](objects/MovableFrame.md)

docs/objects/Timer/setTime.md

@@ -1,9 +1,9 @@
 ## setTime
-sets the time the timer should wait after calling your function
+sets the time the timer should wait before calling your function
 
 #### Parameters: 
-1. `number` the time to delay
-2. `number` how often it should be repeated -1 is infinite
+1. `number` the time to delay between repetitions
+2. `number` how many times it should be repeated -1 is infinite
 
 #### Returns:
 1. `object` The object
@@ -15,4 +15,4 @@ aTimer:setTime(2)
 ```
 ```xml
 <timer time="2" repeat="1"/>
-```
+```