0.2.169

# Conflicts:
#	package.json

README.md

@@ -13,6 +13,7 @@ PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt
 
 The following commands are a 1-time setup after synching the repo on your machine.
 
+* clone this repo to your computer
 * install the PXT command line
 ```
 npm install -g pxt

docs/about.md

@@ -29,19 +29,23 @@ The BBC micro:bit was made possible by many [partners](https://www.microbit.co.u
 The micro:bit provides an easy and fun introduction to programming and making – switch on, program it to do something fun – wear it, customize it.
 Just like Arduino, the micro:bit can be connected to and interact with sensors, displays, and other devices. 
 
-## Blocks or JavaScript
+## Hardware: The Device
 
-The student can program the BBC micro:bit using Blocks or JavaScript.
+Learn about about the [hardware components](/device) of the micro:bit to make the most of it!
+
+## Programming: Blocks or JavaScript
+
+The student can program the BBC micro:bit using [Blocks](/blocks) or [JavaScript](/typescript), via the [micro:bit APIs](/reference):
 
 ```blocks
 basic.showString("Hi!");
 ```
 
-## Compile and Flash
+## Compile and Flash: Your Program!
 
 When a user has her code ready, she can connect her BBC micro:bit to a computer via a USB cable, so it appears as a mounted drive (named MICROBIT). 
 
-Compilation to the ARM thumb machine code happens in the browser.
+Compilation to ARM thumb machine code from [Blocks](/blocks) or [JavaScript](/typescript) happens in the browser.
 
 The student is prompted to save the ARM binary program to a file, which she then simply drags to the micro:bit mounted drive, 
 which flashes the micro:bit device with the new program.
@@ -56,7 +60,7 @@ The simulator has support for the LED screen, buttons, as well as compass, accel
 The [C++ BBC micro:bit runtime](http://lancaster-university.github.io/microbit-docs/), created at [Lancaster University](http://www.lancaster.ac.uk/), provides access to the hardware functions of the micro:bit, 
 as well as a set of helper functions (such as displaying a number/image/string on the LED screen). 
 
-The JavaScript micro:bit library mirrors the functions of the C++ library. 
+The [micro:bit library](/reference) mirrors the functions of the C++ library. 
 When code is compiled to ARM machine code, the calls to JavaScript micro:bit functions are replaced with calls to the corresponding C++ functions.
 
 ## Open Source

docs/blocks.md

@@ -1,6 +1,6 @@
 # Blocks language
 
-```namspaces
+```namespaces
 for (let i = 0;i<5;++i) {}
 if (true){}
 let x = 0;

docs/blocks/logic/boolean.md

@@ -2,8 +2,6 @@
 
 true or false.
 
-### @parent blocks/language
-
 A Boolean has one of two possible values: `true`; `false`.  Boolean (logical) operators (*and*, *or*, *not*) take Boolean inputs and yields a Boolean value. Comparison operators on other types ([numbers](/reference/types/number), [strings](/reference/types/string) yields a Boolean value.
 
 The following blocks represent the true and false Boolean values, which can be plugged in anywhere a Boolean value is expected:
@@ -32,7 +30,7 @@ The next six blocks represent comparison operators that yield a Boolean value. M
 42 >= 0;
 ```
 
-Boolean values and operators are often used with an [if](/reference/logic/if) or [while](/reference/loops/while) statement to determine which code will execute next. For example:
+Boolean values and operators are often used with an [if](/blocks/logic/if) or [while](/blocks/loops/while) statement to determine which code will execute next. For example:
 
 ### Functions that return a Boolean
 
@@ -100,5 +98,5 @@ See the documentation on [Numbers](/reference/types/number) for more information
 
 ### See also
 
-[if](/reference/logic/if), [while](/reference/loops/while), [number](/reference/types/number)
+[if](/blocks/logic/if), [while](/blocks/loops/while), [number](/reference/types/number)
 

docs/blocks/logic/if.md

@@ -0,0 +1,28 @@
+# If
+
+### @parent blocks/language
+ 
+
+Conditionally run code depending on whether a [Boolean](/blocks/logic/boolean) condition is true or false.
+
+```blocks
+if(true) {
+}
+```
+
+Click on the dark blue gear icon (see above) to add an *else* or *if* to the current block.
+
+### Example: adjusting screen brightness
+
+```blocks
+if(input.lightLevel()<100){
+    led.setBrightness(255);
+}
+```
+
+If the [light level](/reference/input/light-level) is `< 100`, this code sets the brightness to `255`:
+
+### See also
+
+[while loop](/blocks/loops/while), [for](/blocks/loops/for), [boolean](/blocks/logic/boolean)
+

docs/blocks/loops.md

@@ -3,5 +3,5 @@
 ```cards
 for(let i = 0;i<5;i++) {}
 while(true) {}
-basic.forever(() => {})
+basic.forever(() => {});
 ```

docs/blocks/loops/for.md

@@ -16,5 +16,5 @@ basic.showNumber(i)
 
 ### See also
 
-[repeat](/reference/loops/repeat), [while](/reference/loops/while), [if](/reference/logic/if), [show number](/reference/basic/show-number)
+[repeat](/blocks/loops/repeat), [while](/blocks/loops/while), [if](/blocks/logic/if), [show number](/reference/basic/show-number)
 

docs/blocks/loops/repeat.md

@@ -8,5 +8,5 @@ Run part of the program the number of times you say.
 
 ### See also
 
-[for](/reference/loops/for), [while](/reference/loops/while), [if](/reference/logic/if), [show number](/reference/basic/show-number)
+[for](/blocks/loops/for), [while](/blocks/loops/while), [if](/blocks/logic/if), [show number](/reference/basic/show-number)
 

docs/blocks/loops/while.md

@@ -1,16 +1,13 @@
 # While
 
-### @parent blocks/language
- 
-
-Repeat code while a [Boolean](/reference/types/boolean) `condition` is true.
+Repeat code while a [Boolean](/blocks/logic/boolean) `condition` is true.
 
 ```blocks
 while(true) {
 }
 ```
 
-The while loop has a *condition* that evaluates to a [Boolean](/reference/types/boolean) value. After the `do` keyword, add the code that you want to run while the `condition` is `true`. The while loop concludes with `end while`.
+The while loop has a *condition* that evaluates to a [Boolean](/blocks/logic/boolean) value. After the `do` keyword, add the code that you want to run while the `condition` is `true`. The while loop concludes with `end while`.
 
 The condition is tested before any code runs. Which means that if the condition is false, the code inside the loop doesn't execute.
 
@@ -28,5 +25,5 @@ while(index >= 0) {
 
 ### See also
 
-[on button pressed](/reference/input/on-button-pressed), [for](/reference/loops/for), [if](/reference/logic/if), [forever](/reference/basic/forever)
+[on button pressed](/reference/input/on-button-pressed), [for](/blocks/loops/for), [if](/blocks/logic/if), [forever](/reference/basic/forever)
 

docs/blocks/math/math.md

@@ -1,15 +1,9 @@
-# Math Library
-
-Functions in the math library.
+# Math functions
 
 ### @parent blocks/language
 
 The math library includes math related functions that you can use with [Numbers](/reference/types/number).
 
-* In the [Block editor](/blocks/editor), click **maths** on the left to see the available blocks
-
-The functions available in Block Editor are:
-
 ### abs
 
 math `->` abs (x : [Number](/reference/types/number)) *returns* [Number](/reference/types/number)
@@ -44,5 +38,5 @@ returns a random [Number](/reference/types/number) between 0 and the parameter *
 
 ### See also
 
-[Block Editor documentation](/blocks/contents), [Number](/reference/types/number)
+[Number](/reference/types/number)
 

docs/blocks/variables.md

@@ -1,6 +1,6 @@
 ## Variables
 
-[Assign](/reference/variables/assign) (set) a variable's value
+[Assign](/blocks/variables/assign) (set) a variable's value
 
 ```blocks
 let x = 0;
@@ -13,7 +13,7 @@ let x = 0;
 x;
 ```
 
-[Change](/reference/variables/change-var) a variable's value
+[Change](/blocks/variables/change-var) a variable's value
 
 ```blocks
 let x = 0;

docs/blocks/variables/assign.md

@@ -1,6 +1,6 @@
 # Assignment Operator
 
-Use an equals sign to make a [variable](/reference/variables/var) store the [number](/reference/types/number) 
+Use an equals sign to make a [variable](/blocks/variables/var) store the [number](/reference/types/number) 
 or [string](/reference/types/string) you say.
 
 When you use the equals sign to store something in a variable, the equals sign is called
@@ -32,5 +32,5 @@ a variable can store, like a number or string.
 
 ### See also
 
-[variable](/reference/variables/var), [types](/reference/types)
+[variable](/blocks/variables/var), [types](/reference/types)
 

docs/blocks/variables/change-var.md

@@ -0,0 +1,40 @@
+# Change Value
+
+Set the value for local and global variables.
+
+### @parent blocks/change-value
+
+Change the value of a variable
+
+```blocks
+let x = 0
+x += 1
+```
+
+### Declare a variable
+
+Use the assignment operator to set the value of a [variable](/blocks/variables/var). Change the value of a variable from 0 to 1 using the change item block. Like this:
+
+```blocks
+let x = 0
+x += 1
+```
+
+### Example
+
+Use the assignment operator to set the value of a [variable](/blocks/variables/var). Change the value of a variable from 0 to 1 using the change item block. Then display the new value of the variable on the LED screen. Like this:
+
+```blocks
+let x = 0;
+x += 1;
+basic.showNumber(x);
+```
+
+### Notes
+
+* You can use the assignment operator with variables of each of the supported [types](/reference/types).
+
+### See also
+
+[variable](/blocks/variables/var), [types](/reference/types)
+

docs/blocks/variables/var.md

@@ -13,7 +13,7 @@ A variable is a place where you can store and retrieve data. Variables have a na
 ### Var statement
 
 Use the Block Editor variable statement to create a variable 
-and the [assignment operator](/reference/variables/assign) 
+and the [assignment operator](/blocks/variables/assign) 
 to store something in the variable.
 
 For example, this code stores the number `2` in the `x` variable:
@@ -27,7 +27,7 @@ Here's how to define a variable in the Block Editor:
 
 2. Change the default variable name if you like.
 
-3. Drag a block type on the right-side of the [assignment operator](/reference/variables/assign) and click the down arrow to change the variable name.
+3. Drag a block type on the right-side of the [assignment operator](/blocks/variables/assign) and click the down arrow to change the variable name.
 
 A variable is created for the number returned by the [brightness](/reference/led/brightness) function.
 
@@ -83,5 +83,5 @@ if (led.brightness() > 128) {
 
 ### See also
 
-[types](/reference/types), [assignment operator](/reference/variables/assign)
+[types](/reference/types), [assignment operator](/blocks/variables/assign)
 

docs/device/usb.md

@@ -2,7 +2,8 @@
 
 How to compile, transfer, and run a script on your micro:bit.
 
-While you're writing and testing your Block Editor or Touch Develop scripts, you'll mostly be running scripts in your browser by clicking the `Run` button (see [run code in your browser](/device/simulator) for info about this).
+While you're writing and testing your scripts, you'll mostly be running scripts in your browser by clicking the `PLay` button 
+(see [run code in your browser](/device/simulator) for info about this).
 
 Once your masterpiece is complete, you can compile your script and run it on your micro:bit.
 

docs/docs.md

@@ -26,8 +26,8 @@ input.onButtonPressed(Button.B, () => {
 
 * **[getting started](/getting-started)**
 * Get started with [projects](/projects)
-* Browse the [API reference](/reference)
-* Learn more about the [device](/device)
+* Browse the [micro:bit APIs](/reference)
+* Learn more about the [micro:bit device](/device)
 * Frequently Asked Question [faq](/faq)
 * Follow up with the [release notes](/release-notes)
 

docs/getting-started.md

@@ -4,15 +4,16 @@
 
 Are you ready to build cool BBC micro:bit programs?
 
-Here are some challenges for you. Unscramble the blocks in the editor
+Here are some challenges for you. Arrange the blocks in the editor
 to make real programs that work!
 
 ## ~
 
 ### Happy face
 
-There are three blocks in the editor (the area to the left).
-They should look like this:
+Use the **Basic** drawer in the editor (to the left) 
+to drag out and arrange three blocks (two `show leds` and one `forever` block)
+to create this program:
 
 ```blocks
 basic.forever(() => {
@@ -33,7 +34,7 @@ basic.forever(() => {
 });
 ```
 
-When you run this program, you will see a smiley face, then a blank
+When you run this program (click the **Play** button) you will see a smiley face, then a blank
 screen, then a smiley again -- it never stops! (That's because of the
 ``forever`` block.)
 
@@ -69,7 +70,7 @@ Click **Compile** to move your program to the BBC micro:bit!
 
 ### Your turn!
 
-Pile up more ``show leds`` blocks to create your animation! Create an
+Pile up more ``show leds`` blocks to create an animation! Create an
 animation with at least 5 pictures.  What does this animation show?
 
 ```blocks
@@ -496,7 +497,7 @@ input.onButtonPressed(Button.B, () => {
 ```
 Click **Compile** to move your program to the BBC micro:bit!
 
-## Your turn!
 
-How else can you make your game better?
-Ever hear of [Rock Paper Scissors Spock Lizard](http://www.samkass.com/theories/RPSSL.html)?
+# Want to do more?
+
+There are [10 great projects](/projects) waiting for you.

docs/lessons.md

@@ -30,7 +30,6 @@
 * [Guess the Number](/lessons/guess-the-number),  guess a random number with pick number
 * [Counter](/lessons/counter), display a number with a variable
 * [Love Meter](/lessons/love-meter), create a love meter with on pin pressed
-* [Rock Paper Scissors](/lessons/rock-paper-scissors), create the classic game of rock paper scissors with if statement
 * [Truth or Dare](/lessons/truth-or-dare), a game that forces each player to reveal a secret or do something funny with if statement
 * [Spinner](/lessons/spinner), spin the arrow with multiple if statements
 * [Dice Roll](/lessons/dice-roll), spin with more if statements
@@ -43,7 +42,6 @@
 * [Zoomer](/lessons/zoomer), measure the force with acceleration
 * [Glowing Pendulum](/lessons/glowing-pendulum), construct a pendulum that glows using acceleration
 * [Classic Beatbox](/lessons/classic-beatbox), make a beatbox music player with variables
-* [Light Beatbox](/lessons/light-beatbox), make a beatbox music player with light level
 
 ### ~
 
@@ -65,5 +63,3 @@
 ### ~
 
 ### @section full
-
-The lessons promote computational thinking and computer science literacy.

docs/lessons/counter.md

@@ -34,7 +34,7 @@ basic.showLeds(`
     `)
 ```
 
-* **variable**: [read more...](/reference/variables/var)
+* **variable**: [read more...](/blocks/variables)
 * **arithmetic operators**: [read more...](/reference/types/number)
 * **on button pressed** : [read more...](/reference/input/on-button-pressed)
 * **show number** : [read more...](/reference/basic/show-number)

docs/lessons/headbands.md

@@ -42,19 +42,18 @@ Learn how to create a charades game with **collections**, ` create -> Collection
 ## Documentation
 
 * **collection**
-* **global variables** : [read more...](/reference/variables/globals.md)
-* **Boolean** : [read more...](/reference/types/boolean)
-* **on logo up** [read more...](/functions/on-logo-up)
-* **on screen down** [read more...](/functions/on-screen-down)
-* **on screen up** [read more...](/functions/on-screen-up)
+* **variables** : [read more...](/blocks/variables)
+* **Boolean** : [read more...](/blocks/logic/boolean)
+* **on logo up** [read more...](/reference/input/on-gesture)
+* **on screen down** [read more...](/reference/input/on-gesture)
+* **on screen up** [read more...](/reference/input/on-gesture)
 * **show string** : [read more...](/reference/basic/show-string)
-* **game library** : [read more...](/reference/game-library)
+* **game library** : [read more...](/reference/game)
 
 ## Resources
 
 * Activity: [tutorial](/lessons/headbands/activity)
-* Activity: [quiz](/lessons/headbands/quiz)
-* Extended Activity: [challenges](/lessons/headbands/challenges)
+* Quiz: [quiz](/lessons/headbands/quiz)
 
 ## Objectives
 
@@ -115,15 +114,6 @@ Computational Thinking Concept: AB = Abstraction; DE = Decomposition; AL = Algor
 * [tutorial](/lessons/headbands/activity)
 * [quiz](/lessons/headbands/quiz)
 
-## Extended Activity
-
-* time: 20 min.
-* [challenges](/lessons/headbands/challenges)
-
-## Homework
-
-* Extended Activity: [challenges](/lessons/headbands/challenges)
-
 ## Intended follow on
 
 Publish script to the classroom.