diff --git a/Colour.md b/Colour.md index d12c3f6..7fd0776 100644 --- a/Colour.md +++ b/Colour.md @@ -1,6 +1,4 @@ -# Introduction - Blockly users can choose, create, and blend colours. Colours are primarily used in [the turtle graphics application](https://blockly-demo.appspot.com/static/apps/turtle/index.html) but are also available in [the coding application](https://blockly-demo.appspot.com/static/apps/code/index.html). Note that we use the British spelling of "colour". # Blocks diff --git a/Home.md b/Home.md index 709b35c..81a26bd 100644 --- a/Home.md +++ b/Home.md @@ -1 +1,15 @@ -Welcome to the blockly wiki! +# Blockly Block Wiki + +Blockly has a large number of blocks. They are divided into the following categories: + + * [Logic](Logic) (including [If/Else](IfElse)) + * [Loops](Loops) + * Math + * [Text](Text) + * [Lists](Lists) + * [Colour](Colour) + * [Variables](Variables) + * Functions + +A Blockly application will choose which (if any) of these default blocks are present. +Additionally, most applications will also create their own custom blocks. diff --git a/IfElse.md b/IfElse.md index f6e0cae..6669b08 100644 --- a/IfElse.md +++ b/IfElse.md @@ -1,6 +1,4 @@ -# Introduction - Conditional statements are central to computer programming. They make it possible to express statements like: * If there is a path to the left, turn left. * If score = 100, print "Well done!". diff --git a/Lists.md b/Lists.md index 482d782..43f145d 100644 --- a/Lists.md +++ b/Lists.md @@ -1,6 +1,4 @@ -# Introduction - As in everyday speech, a Blockly list is an ordered collection of items, such as a "to do" list or a shopping list. Items in a list may be of any type, and the same value may appear more than once in a list. # List Creation diff --git a/Logic.md b/Logic.md index 5597196..e8f036c 100644 --- a/Logic.md +++ b/Logic.md @@ -1,11 +1,9 @@ -# Introduction - [Boolean algebra](https://en.wikipedia.org/wiki/Boolean_algebra) is a mathematical system that has two values: * **true** * **false** -Boolean values (also called _conditions_) are used in these control block, which contain examples:: +Boolean values (also called _conditions_) are used in these control block, which contain examples: * [conditional blocks](IfElse) * [repeat blocks](Loops#repeat) diff --git a/Loops.md b/Loops.md index 820f4da..7255730 100644 --- a/Loops.md +++ b/Loops.md @@ -1,6 +1,4 @@ -# Introduction and Terminology - The **Control** category holds blocks that control whether other blocks placed in their **body** are run. (For example, in the below "repeat" block, the body contains the "print" block and its input.) There are two types of control blocks: [IfElse](IfElse) (described on their own page) and these, which control how many times the body is run and, in some cases, the value of a variable used within the body. These structures are called **loops** since the body is repeated (possibly) multiple times, reminiscent of a rope containing loops. Each pass through the loop is called an **iteration**. (How about our using the term "pass"?) For more information, see https://en.wikipedia.org/wiki/Control_flow#Loops. # Blocks for Loop Creation diff --git a/Text.md b/Text.md index fb8e684..4879ddb 100644 --- a/Text.md +++ b/Text.md @@ -1,6 +1,4 @@ -# Introduction - Examples of pieces of text are: * "thing #1" * "March 12, 2010" diff --git a/Variables.md b/Variables.md index 266d74e..99f9b43 100644 --- a/Variables.md +++ b/Variables.md @@ -1,6 +1,4 @@ -# Introduction - We use the term _variable_ the same as it is used in mathematics and in other programming languages: a named value that can be changed (varies). Variables can be created in several different ways. * Every [count with](Loops#count_with) and [for each](Loops#for_each) block uses a variable and defines its values. These values can only be used within the block. A traditional computer science term for these are [loop variables](https://en.wikipedia.org/wiki/Loop_variable). * User-defined functions (also known as "procedures") can define inputs, which creates variables that can be used only within the function. These are traditionally called "[parameters](https://en.wikipedia.org/wiki/Parameter)" or "arguments".